Address review comments

Roll back change to the botocore version from
'2.0.0' to the previous version, and drop it from
the user agent string.

Remove "requires CRT"-related checks, including
in the user agent builder and tests.

Fix functional test that was checking for "Python"
in the user agent string, which previously held
the Python version; this now would have been
present only because the user agent implementation
adds `md/pyimpl#CPython` to the string. Updated
the test to remove check for "Python" and include
checking for `md/installer` and `md/command`.

awscli/botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '2.0.0'
+__version__ = '2.0.0dev155'
 
 
 class NullHandler(logging.Handler):

awscli/botocore/args.py

@@ -575,4 +575,4 @@ def _compute_user_agent_appid_config(self, config_kwargs):
                 'The configured value for user_agent_appid exceeds the '
                 f'maximum length of {USERAGENT_APPID_MAXLEN} characters.'
             )
-        config_kwargs['user_agent_appid'] = user_agent_appid
+        config_kwargs['user_agent_appid'] = user_agent_appid

awscli/botocore/compat.py

@@ -289,17 +289,6 @@ def get_tzinfo_options():
         return (tzlocal,)
 
 
-# Detect if CRT is available for use
-try:
-    import awscrt.auth
-
-    # Allow user opt-out if needed
-    disabled = os.environ.get('BOTO_DISABLE_CRT', "false")
-    HAS_CRT = not disabled.lower() == 'true'
-except ImportError:
-    HAS_CRT = False
-
-
 ########################################################
 #              urllib3 compat backports                #
 ########################################################

awscli/botocore/session.py

@@ -59,8 +59,6 @@
 from botocore.regions import EndpointResolver
 from botocore.useragent import UserAgentString
 
-from botocore.compat import HAS_CRT  # noqa
-
 
 logger = logging.getLogger(__name__)
 

awscli/botocore/useragent.py

@@ -29,7 +29,6 @@
 from typing import NamedTuple, Optional
 
 from botocore import __version__ as botocore_version
-from botocore.compat import HAS_CRT
 
 _USERAGENT_ALLOWED_CHARACTERS = ascii_letters + digits + "!$%&'*+-.^_`|~"
 _USERAGENT_ALLOWED_OS_NAMES = (
@@ -198,9 +197,7 @@ def __init__(
 
     @classmethod
     def from_environment(cls):
-        crt_version = None
-        if HAS_CRT:
-            crt_version = _get_crt_version() or 'Unknown'
+        crt_version = _get_crt_version() or 'Unknown'
         return cls(
             platform_name=platform.system(),
             platform_version=platform.release(),
@@ -298,9 +295,6 @@ def _build_sdk_metadata(self):
                         self._session_user_agent_name,
                         self._session_user_agent_version,
                     ),
-                    UserAgentComponent(
-                        'md', _USERAGENT_SDK_NAME, botocore_version
-                    ),
                 ]
             )
         else:

tests/functional/test_clidriver.py

@@ -110,7 +110,10 @@ def test_user_agent_in_request(self):
             'aws-cli' in
             self._send.call_args[0][0].headers['User-Agent'].decode('utf-8'))
         self.assertTrue(
-            'Python' in
+            'md/installer' in
+            self._send.call_args[0][0].headers['User-Agent'].decode('utf-8'))
+        self.assertTrue(
+            'md/command' in
             self._send.call_args[0][0].headers['User-Agent'].decode('utf-8'))
 
 

tests/unit/botocore/test_useragent.py

@@ -22,24 +22,6 @@
     sanitize_user_agent_string_component,
 )
 
-# TODO: fix this import and remove the `requires_crt` method.
-# The imported method conflicts with the `requires_crt`
-# that comes from s3transfer tests.
-
-# from tests import requires_crt
-
-from botocore.compat import HAS_CRT
-
-
-def requires_crt(reason=None):
-    if reason is None:
-        reason = "Test requires awscrt to be installed"
-
-    def decorator(func):
-        return unittest.skipIf(not HAS_CRT, reason)(func)
-
-    return decorator
-
 
 @pytest.mark.parametrize(
     'raw_str, allow_hash, expected_str',
@@ -164,7 +146,6 @@ def test_from_environment(monkeypatch):
     assert uas._python_implementation == 'Cpython'
 
 
-@requires_crt()
 def test_from_environment_can_read_crt_version(monkeypatch):
     import awscrt