botocore 1.40.0__py3-none-any.whl → 1.40.2__py3-none-any.whl

botocore/__init__.py

@@ -17,7 +17,7 @@ import os
 import re
 from logging import NullHandler
 
-__version__ = '1.40.0'
+__version__ = '1.40.2'
 
 
 # Configure default logger to do nothing

botocore/args.py

@@ -839,7 +839,8 @@ class ClientArgsCreator:
         ):
             logger.warning(
                 'The configured value for user_agent_appid exceeds the '
-                f'maximum length of {USERAGENT_APPID_MAXLEN} characters.'
+                'maximum length of %d characters.',
+                USERAGENT_APPID_MAXLEN,
             )
         config_kwargs['user_agent_appid'] = user_agent_appid
 

botocore/auth.py

@@ -30,6 +30,7 @@ from botocore.compat import (
     HTTPHeaders,
     encodebytes,
     ensure_unicode,
+    get_current_datetime,
     parse_qs,
     quote,
     unquote,
@@ -419,7 +420,7 @@ class SigV4Auth(BaseSigner):
     def add_auth(self, request):
         if self.credentials is None:
             raise NoCredentialsError()
-        datetime_now = datetime.datetime.utcnow()
+        datetime_now = get_current_datetime()
         request.context['timestamp'] = datetime_now.strftime(SIGV4_TIMESTAMP)
         # This could be a retry.  Make sure the previous
         # authorization header is removed first.
@@ -557,7 +558,7 @@ class S3ExpressPostAuth(S3ExpressAuth):
     REQUIRES_IDENTITY_CACHE = True
 
     def add_auth(self, request):
-        datetime_now = datetime.datetime.utcnow()
+        datetime_now = get_current_datetime()
         request.context['timestamp'] = datetime_now.strftime(SIGV4_TIMESTAMP)
 
         fields = {}
@@ -816,7 +817,7 @@ class S3SigV4PostAuth(SigV4Auth):
     """
 
     def add_auth(self, request):
-        datetime_now = datetime.datetime.utcnow()
+        datetime_now = get_current_datetime()
         request.context['timestamp'] = datetime_now.strftime(SIGV4_TIMESTAMP)
 
         fields = {}
@@ -993,7 +994,7 @@ class HmacV1Auth(BaseSigner):
         string_to_sign = self.canonical_string(
             method, split, headers, auth_path=auth_path
         )
-        logger.debug(f'StringToSign:\n{string_to_sign}')
+        logger.debug('StringToSign:\n%s', string_to_sign)
         return self.sign_string(string_to_sign)
 
     def add_auth(self, request):
@@ -1001,7 +1002,7 @@ class HmacV1Auth(BaseSigner):
             raise NoCredentialsError
         logger.debug("Calculating signature using hmacv1 auth.")
         split = urlsplit(request.url)
-        logger.debug(f'HTTP request method: {request.method}')
+        logger.debug("HTTP request method: %s", request.method)
         signature = self.get_signature(
             request.method, split, request.headers, auth_path=request.auth_path
         )
@@ -1158,7 +1159,7 @@ def resolve_auth_scheme_preference(preference_list, auth_options):
     ]
     if unsupported:
         logger.debug(
-            f"Unsupported auth schemes in preference list: {', '.join(unsupported)}"
+            "Unsupported auth schemes in preference list: %r", unsupported
         )
 
     combined = preference_list + service_supported

botocore/client.py

@@ -220,10 +220,11 @@ class ClientCreator:
                 else:
                     client_config = config_use_fips_endpoint
                 logger.warning(
-                    f'transforming region from {region_name} to '
-                    f'{normalized_region_name} and setting '
+                    'transforming region from %s to %s and setting '
                     'use_fips_endpoint to true. client should not '
-                    'be configured with a fips psuedo region.'
+                    'be configured with a fips psuedo region.',
+                    region_name,
+                    normalized_region_name,
                 )
                 region_name = normalized_region_name
         return region_name, client_config
@@ -786,7 +787,10 @@ class ClientEndpointBridge:
                 hostname, is_secure, ['http', 'https']
             )
         logger.debug(
-            f'Assuming an endpoint for {service_name}, {region_name}: {endpoint_url}'
+            'Assuming an endpoint for %s, %s: %s',
+            service_name,
+            region_name,
+            endpoint_url,
         )
         # We still want to allow the user to provide an explicit version.
         signature_version = self._resolve_signature_version(

botocore/compat.py

@@ -306,6 +306,14 @@ def has_minimum_crt_version(minimum_version):
     return crt_version_tuple >= minimum_version
 
 
+def get_current_datetime(remove_tzinfo=True):
+    """Retrieve the current timezone in UTC, with or without an explicit timezone."""
+    datetime_now = datetime.datetime.now(datetime.timezone.utc)
+    if remove_tzinfo:
+        datetime_now = datetime_now.replace(tzinfo=None)
+    return datetime_now
+
+
 ########################################################
 #              urllib3 compat backports                #
 ########################################################

botocore/credentials.py

@@ -824,7 +824,7 @@ class BaseAssumeRoleCredentialFetcher(CachedCredentialFetcher):
             account_id = arn_parser.parse_arn(role_arn)['account']
             response['Credentials']['AccountId'] = account_id
         else:
-            logger.debug(f"Unable to extract account ID from Arn: {role_arn}")
+            logger.debug("Unable to extract account ID from Arn: %s", role_arn)
 
 
 class AssumeRoleCredentialFetcher(BaseAssumeRoleCredentialFetcher):

botocore/crt/auth.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-import datetime
 from io import BytesIO
 
 from botocore.auth import (
@@ -22,7 +21,14 @@ from botocore.auth import (
     _get_body_as_dict,
     _host_from_url,
 )
-from botocore.compat import HTTPHeaders, awscrt, parse_qs, urlsplit, urlunsplit
+from botocore.compat import (
+    HTTPHeaders,
+    awscrt,
+    get_current_datetime,
+    parse_qs,
+    urlsplit,
+    urlunsplit,
+)
 from botocore.exceptions import NoCredentialsError
 from botocore.useragent import register_feature_id
 from botocore.utils import percent_encode_sequence
@@ -55,11 +61,7 @@ class CrtSigV4Auth(BaseSigner):
         if self.credentials is None:
             raise NoCredentialsError()
 
-        # Use utcnow() because that's what gets mocked by tests, but set
-        # timezone because CRT assumes naive datetime is local time.
-        datetime_now = datetime.datetime.utcnow().replace(
-            tzinfo=datetime.timezone.utc
-        )
+        datetime_now = get_current_datetime(remove_tzinfo=False)
 
         # Use existing 'X-Amz-Content-SHA256' header if able
         existing_sha256 = self._get_existing_sha256(request)
@@ -253,11 +255,7 @@ class CrtSigV4AsymAuth(BaseSigner):
         if self.credentials is None:
             raise NoCredentialsError()
 
-        # Use utcnow() because that's what gets mocked by tests, but set
-        # timezone because CRT assumes naive datetime is local time.
-        datetime_now = datetime.datetime.utcnow().replace(
-            tzinfo=datetime.timezone.utc
-        )
+        datetime_now = get_current_datetime(remove_tzinfo=False)
 
         # Use existing 'X-Amz-Content-SHA256' header if able
         existing_sha256 = self._get_existing_sha256(request)

botocore/data/arc-region-switch/2022-07-26/paginators-1.json

@@ -0,0 +1,46 @@
+{
+  "pagination": {
+    "GetPlanEvaluationStatus": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "warnings"
+    },
+    "GetPlanExecution": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "stepStates"
+    },
+    "ListPlanExecutionEvents": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "items"
+    },
+    "ListPlanExecutions": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "items"
+    },
+    "ListPlans": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "plans"
+    },
+    "ListPlansInRegion": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "plans"
+    },
+    "ListRoute53HealthChecks": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "healthChecks"
+    }
+  }
+}

botocore/data/arc-region-switch/2022-07-26/paginators-1.sdk-extras.json

@@ -0,0 +1,33 @@
+{
+  "version": 1.0,
+  "merge": {
+    "pagination": {
+      "GetPlanEvaluationStatus": {
+        "non_aggregate_keys": [
+          "lastEvaluatedVersion", 
+          "planArn",
+          "lastEvaluationTime",
+          "evaluationState",
+          "region"
+        ]
+      },
+      "GetPlanExecution": {
+         "non_aggregate_keys": [
+           "comment",
+           "executionRegion",
+           "endTime",
+           "startTime",
+           "executionState",
+           "executionAction",
+           "plan",
+           "executionId",
+           "updatedAt",
+           "planArn",
+           "actualRecoveryTime",
+           "version",
+           "mode"
+         ]
+      }
+    }
+  }
+}

botocore/data/arc-region-switch/2022-07-26/waiters-2.json

@@ -0,0 +1,57 @@
+{
+  "version" : 2,
+  "waiters" : {
+    "PlanEvaluationStatusPassed" : {
+      "delay" : 30,
+      "maxAttempts" : 5,
+      "operation" : "GetPlanEvaluationStatus",
+      "acceptors" : [ {
+        "matcher" : "path",
+        "argument" : "evaluationState",
+        "state" : "success",
+        "expected" : "passed"
+      }, {
+        "matcher" : "path",
+        "argument" : "evaluationState",
+        "state" : "failure",
+        "expected" : "actionRequired"
+      }, {
+        "matcher" : "path",
+        "argument" : "evaluationState",
+        "state" : "retry",
+        "expected" : "pendingEvaluation"
+      } ]
+    },
+    "PlanExecutionCompleted" : {
+      "delay" : 30,
+      "maxAttempts" : 5,
+      "operation" : "GetPlanExecution",
+      "acceptors" : [ {
+        "matcher" : "path",
+        "argument" : "executionState",
+        "state" : "success",
+        "expected" : "completed"
+      }, {
+        "matcher" : "path",
+        "argument" : "executionState",
+        "state" : "success",
+        "expected" : "completedWithExceptions"
+      }, {
+        "matcher" : "path",
+        "argument" : "executionState",
+        "state" : "failure",
+        "expected" : "failed"
+      }, {
+        "matcher" : "path",
+        "argument" : "executionState",
+        "state" : "failure",
+        "expected" : "canceled"
+      }, {
+        "matcher" : "path",
+        "argument" : "executionState",
+        "state" : "failure",
+        "expected" : "planExecutionTimedOut"
+      } ]
+    }
+  }
+}