botocore 1.38.45__py3-none-any.whl → 1.39.0__py3-none-any.whl

botocore/tokens.py

@@ -28,7 +28,12 @@ from botocore.exceptions import (
     InvalidConfigError,
     TokenRetrievalError,
 )
-from botocore.utils import CachedProperty, JSONFileCache, SSOTokenLoader
+from botocore.utils import (
+    CachedProperty,
+    JSONFileCache,
+    SSOTokenLoader,
+    get_token_from_environment,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -39,6 +44,7 @@ def _utc_now():
 
 def create_token_resolver(session):
     providers = [
+        ScopedEnvTokenProvider(session),
         SSOTokenProvider(session),
     ]
     return TokenProviderChain(providers=providers)
@@ -162,9 +168,9 @@ class TokenProviderChain:
             providers = []
         self._providers = providers
 
-    def load_token(self):
+    def load_token(self, **kwargs):
         for provider in self._providers:
-            token = provider.load_token()
+            token = provider.load_token(**kwargs)
             if token is not None:
                 return token
         return None
@@ -321,10 +327,36 @@ class SSOTokenProvider:
             token_dict["accessToken"], expiration=expiration
         )
 
-    def load_token(self):
+    def load_token(self, **kwargs):
         if self._sso_config is None:
             return None
 
         return DeferredRefreshableToken(
             self.METHOD, self._refresher, time_fetcher=self._now
         )
+
+
+class ScopedEnvTokenProvider:
+    """
+    Token provider that loads tokens from environment variables scoped to
+    a specific `signing_name`.
+    """
+
+    METHOD = 'env'
+
+    def __init__(self, session, environ=None):
+        self._session = session
+        if environ is None:
+            environ = os.environ
+        self.environ = environ
+
+    def load_token(self, **kwargs):
+        signing_name = kwargs.get("signing_name")
+        if signing_name is None:
+            return None
+
+        token = get_token_from_environment(signing_name, self.environ)
+
+        if token is not None:
+            logger.info("Found token in environment variables.")
+            return FrozenAuthToken(token)

botocore/useragent.py

@@ -68,6 +68,7 @@ _USERAGENT_FEATURE_MAPPINGS = {
     'ACCOUNT_ID_MODE_DISABLED': 'Q',
     'ACCOUNT_ID_MODE_REQUIRED': 'R',
     'SIGV4A_SIGNING': 'S',
+    'RESOLVED_ACCOUNT_ID': 'T',
     'FLEXIBLE_CHECKSUMS_REQ_CRC32': 'U',
     'FLEXIBLE_CHECKSUMS_REQ_CRC32C': 'V',
     'FLEXIBLE_CHECKSUMS_REQ_CRC64': 'W',
@@ -77,7 +78,7 @@ _USERAGENT_FEATURE_MAPPINGS = {
     'FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED': 'a',
     'FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED': 'b',
     'FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED': 'c',
-    'RESOLVED_ACCOUNT_ID': 'T',
+    'BEARER_SERVICE_ENV_VARS': '3',
 }
 
 

botocore/utils.py

@@ -3569,6 +3569,21 @@ def is_s3express_bucket(bucket):
     return bucket.endswith('--x-s3')
 
 
+def get_token_from_environment(signing_name, environ=None):
+    if not isinstance(signing_name, str) or not signing_name.strip():
+        return None
+
+    if environ is None:
+        environ = os.environ
+    env_var = _get_bearer_env_var_name(signing_name)
+    return environ.get(env_var)
+
+
+def _get_bearer_env_var_name(signing_name):
+    bearer_name = signing_name.replace('-', '_').replace(' ', '_').upper()
+    return f"AWS_BEARER_TOKEN_{bearer_name}"
+
+
 # This parameter is not part of the public interface and is subject to abrupt
 # breaking changes or removal without prior announcement.
 # Mapping of services that have been renamed for backwards compatibility reasons.

{botocore-1.38.45.dist-info → botocore-1.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: botocore
-Version: 1.38.45
+Version: 1.39.0
 Summary: Low-level, data-driven core of boto 3.
 Home-page: https://github.com/boto/botocore
 Author: Amazon Web Services