Revert clidriver change and use start_as_current_context in tests instead

Author: AndrewAsseily

awscli/clidriver.py

@@ -109,7 +109,8 @@
 
 
 def main():
-    return AWSCLIEntryPoint().main(sys.argv[1:])
+    with start_as_current_context():
+        return AWSCLIEntryPoint().main(sys.argv[1:])
 
 
 def create_clidriver(args=None, event_hooks=None):
@@ -238,8 +239,7 @@ def __init__(self, driver=None):
 
     def main(self, args):
         try:
-            with start_as_current_context():
-                rc = self._do_main(args)
+            rc = self._do_main(args)
         except BaseException as e:
             LOG.debug("Exception caught in AWSCLIEntryPoint", exc_info=True)
             return self._error_handler.handle_exception(

tests/functional/sso/test_login.py

@@ -15,6 +15,8 @@
 import os
 import re
 
+from botocore.context import start_as_current_context
+
 from awscli.testutils import mock
 from tests.functional.sso import BaseSSOTest
 
@@ -562,7 +564,8 @@ def test_config_not_rewritten_when_region_matches(self):
 
     def test_vanity_url_sets_feature_id_in_user_agent(self):
         self.add_oidc_auth_code_responses(self.access_token)
-        self.run_cmd('sso login')
+        with start_as_current_context():
+            self.run_cmd('sso login')
         self.assertIn('AM', self.last_request_dict['headers']['User-Agent'])
 
 
@@ -636,6 +639,7 @@ def test_login_uses_configured_region(self):
 
     def test_direct_url_does_not_set_vanity_feature_id(self):
         self.add_oidc_auth_code_responses(self.access_token)
-        self.run_cmd('sso login')
+        with start_as_current_context():
+            self.run_cmd('sso login')
         user_agent = self.last_request_dict['headers']['User-Agent']
         self.assertNotIn('AM', user_agent.split('m/')[-1])