From 4351aceca018b66f3b63e343ebc4c5ee4f761c6f Mon Sep 17 00:00:00 2001 From: SamRemis Date: Thu, 15 Aug 2024 16:32:30 -0400 Subject: [PATCH 1/4] Multi-auth trait support (#3233) * Multiauth Adds support for the new multi-auth trait that will allow a service or operation to specify a list of compatible authentication types --------- Co-authored-by: Nate Prewitt --- .../enhancement-signing-83434.json | 5 ++ botocore/args.py | 3 + botocore/auth.py | 27 ++++++- botocore/client.py | 18 +++-- botocore/config.py | 7 ++ botocore/configprovider.py | 6 ++ botocore/exceptions.py | 2 +- botocore/handlers.py | 22 ++++-- botocore/model.py | 15 ++++ botocore/regions.py | 4 +- tests/functional/test_auth_config.py | 77 +++++++++++++++++++ tests/unit/auth/test_auth_trait.py | 42 ++++++++++ tests/unit/test_handlers.py | 59 +++++++++++++- tests/unit/test_model.py | 17 ++++ 14 files changed, 286 insertions(+), 18 deletions(-) create mode 100644 .changes/next-release/enhancement-signing-83434.json create mode 100644 tests/functional/test_auth_config.py create mode 100644 tests/unit/auth/test_auth_trait.py diff --git a/.changes/next-release/enhancement-signing-83434.json b/.changes/next-release/enhancement-signing-83434.json new file mode 100644 index 0000000000..a90654a772 --- /dev/null +++ b/.changes/next-release/enhancement-signing-83434.json @@ -0,0 +1,5 @@ +{ + "type": "feature", + "category": "signing", + "description": "Adds internal support for the new 'auth' trait to allow a priority list of auth types for a service or operation." +} diff --git a/botocore/args.py b/botocore/args.py index 758a3c3c92..741ca77886 100644 --- a/botocore/args.py +++ b/botocore/args.py @@ -268,6 +268,9 @@ def compute_client_args( client_config.disable_request_compression ), client_context_params=client_config.client_context_params, + sigv4a_signing_region_set=( + client_config.sigv4a_signing_region_set + ), ) self._compute_retry_config(config_kwargs) self._compute_connect_timeout(config_kwargs) diff --git a/botocore/auth.py b/botocore/auth.py index 6b296cfaaa..66e605a665 100644 --- a/botocore/auth.py +++ b/botocore/auth.py @@ -35,7 +35,12 @@ urlsplit, urlunsplit, ) -from botocore.exceptions import NoAuthTokenError, NoCredentialsError +from botocore.exceptions import ( + NoAuthTokenError, + NoCredentialsError, + UnknownSignatureVersionError, + UnsupportedSignatureVersionError, +) from botocore.utils import ( is_valid_ipv6_endpoint_url, normalize_url_path, @@ -1132,6 +1137,19 @@ def add_auth(self, request): request.headers['Authorization'] = auth_header +def resolve_auth_type(auth_trait): + for auth_type in auth_trait: + if auth_type == 'smithy.api#noAuth': + return AUTH_TYPE_TO_SIGNATURE_VERSION[auth_type] + elif auth_type in AUTH_TYPE_TO_SIGNATURE_VERSION: + signature_version = AUTH_TYPE_TO_SIGNATURE_VERSION[auth_type] + if signature_version in AUTH_TYPE_MAPS: + return signature_version + else: + raise UnknownSignatureVersionError(signature_version=auth_type) + raise UnsupportedSignatureVersionError(signature_version=auth_trait) + + AUTH_TYPE_MAPS = { 'v2': SigV2Auth, 'v3': SigV3Auth, @@ -1160,3 +1178,10 @@ def add_auth(self, request): 's3v4-query': S3SigV4QueryAuth, } ) + +AUTH_TYPE_TO_SIGNATURE_VERSION = { + 'aws.auth#sigv4': 'v4', + 'aws.auth#sigv4a': 'v4a', + 'smithy.api#httpBearerAuth': 'bearer', + 'smithy.api#noAuth': 'none', +} diff --git a/botocore/client.py b/botocore/client.py index e57d1ded31..ab1be75365 100644 --- a/botocore/client.py +++ b/botocore/client.py @@ -14,7 +14,7 @@ from botocore import waiter, xform_name from botocore.args import ClientArgsCreator -from botocore.auth import AUTH_TYPE_MAPS +from botocore.auth import AUTH_TYPE_MAPS, resolve_auth_type from botocore.awsrequest import prepare_request_dict from botocore.compress import maybe_compress_request from botocore.config import Config @@ -148,15 +148,19 @@ def create_client( region_name, client_config = self._normalize_fips_region( region_name, client_config ) + if auth := service_model.metadata.get('auth'): + service_signature_version = resolve_auth_type(auth) + else: + service_signature_version = service_model.metadata.get( + 'signatureVersion' + ) endpoint_bridge = ClientEndpointBridge( self._endpoint_resolver, scoped_config, client_config, service_signing_name=service_model.metadata.get('signingName'), config_store=self._config_store, - service_signature_version=service_model.metadata.get( - 'signatureVersion' - ), + service_signature_version=service_signature_version, ) client_args = self._get_client_args( service_model, @@ -487,7 +491,7 @@ def _default_s3_presign_to_sigv2(self, signature_version, **kwargs): return if signature_version.startswith('v4-s3express'): - return f'{signature_version}' + return signature_version for suffix in ['-query', '-presign-post']: if signature_version.endswith(suffix): @@ -953,8 +957,10 @@ def _make_api_call(self, operation_name, api_params): 'client_region': self.meta.region_name, 'client_config': self.meta.config, 'has_streaming_input': operation_model.has_streaming_input, - 'auth_type': operation_model.auth_type, + 'auth_type': operation_model.resolved_auth_type, + 'unsigned_payload': operation_model.unsigned_payload, } + api_params = self._emit_api_params( api_params=api_params, operation_model=operation_model, diff --git a/botocore/config.py b/botocore/config.py index 87b52b6f1a..587dc95ad8 100644 --- a/botocore/config.py +++ b/botocore/config.py @@ -221,6 +221,12 @@ class Config: Defaults to None. + :type sigv4a_signing_region_set: string + :param sigv4a_signing_region_set: A set of AWS regions to apply the signature for + when using SigV4a for signing. Set to ``*`` to represent all regions. + + Defaults to None. + :type client_context_params: dict :param client_context_params: A dictionary of parameters specific to individual services. If available, valid parameters can be found in @@ -257,6 +263,7 @@ class Config: ('request_min_compression_size_bytes', None), ('disable_request_compression', None), ('client_context_params', None), + ('sigv4a_signing_region_set', None), ] ) diff --git a/botocore/configprovider.py b/botocore/configprovider.py index 5ed2dc63ce..b0dd09f09f 100644 --- a/botocore/configprovider.py +++ b/botocore/configprovider.py @@ -168,6 +168,12 @@ False, utils.ensure_boolean, ), + 'sigv4a_signing_region_set': ( + 'sigv4a_signing_region_set', + 'AWS_SIGV4A_SIGNING_REGION_SET', + None, + None, + ), } # A mapping for the s3 specific configuration vars. These are the configuration # vars that typically go in the s3 section of the config file. This mapping diff --git a/botocore/exceptions.py b/botocore/exceptions.py index 1c480abbf8..9fa0dfaa84 100644 --- a/botocore/exceptions.py +++ b/botocore/exceptions.py @@ -514,7 +514,7 @@ class UnknownClientMethodError(BotoCoreError): class UnsupportedSignatureVersionError(BotoCoreError): """Error when trying to use an unsupported Signature Version.""" - fmt = 'Signature version is not supported: {signature_version}' + fmt = 'Signature version(s) are not supported: {signature_version}' class ClientError(Exception): diff --git a/botocore/handlers.py b/botocore/handlers.py index 211ed0477c..99eed3bfc5 100644 --- a/botocore/handlers.py +++ b/botocore/handlers.py @@ -203,6 +203,11 @@ def set_operation_specific_signer(context, signing_name, **kwargs): if auth_type == 'bearer': return 'bearer' + # If the operation needs an unsigned body, we set additional context + # allowing the signer to be aware of this. + if context.get('unsigned_payload') or auth_type == 'v4-unsigned-body': + context['payload_signing_enabled'] = False + if auth_type.startswith('v4'): if auth_type == 'v4-s3express': return auth_type @@ -210,7 +215,8 @@ def set_operation_specific_signer(context, signing_name, **kwargs): if auth_type == 'v4a': # If sigv4a is chosen, we must add additional signing config for # global signature. - signing = {'region': '*', 'signing_name': signing_name} + region = _resolve_sigv4a_region(context) + signing = {'region': region, 'signing_name': signing_name} if 'signing' in context: context['signing'].update(signing) else: @@ -219,11 +225,6 @@ def set_operation_specific_signer(context, signing_name, **kwargs): else: signature_version = 'v4' - # If the operation needs an unsigned body, we set additional context - # allowing the signer to be aware of this. - if auth_type == 'v4-unsigned-body': - context['payload_signing_enabled'] = False - # Signing names used by s3 and s3-control use customized signers "s3v4" # and "s3v4a". if signing_name in S3_SIGNING_NAMES: @@ -232,6 +233,15 @@ def set_operation_specific_signer(context, signing_name, **kwargs): return signature_version +def _resolve_sigv4a_region(context): + region = None + if 'client_config' in context: + region = context['client_config'].sigv4a_signing_region_set + if not region and context.get('signing', {}).get('region'): + region = context['signing']['region'] + return region or '*' + + def decode_console_output(parsed, **kwargs): if 'Output' in parsed: try: diff --git a/botocore/model.py b/botocore/model.py index df9159e36e..677266c8d2 100644 --- a/botocore/model.py +++ b/botocore/model.py @@ -15,6 +15,7 @@ from collections import defaultdict from typing import NamedTuple, Union +from botocore.auth import resolve_auth_type from botocore.compat import OrderedDict from botocore.exceptions import ( MissingServiceIdError, @@ -623,10 +624,24 @@ def context_parameters(self): def request_compression(self): return self._operation_model.get('requestcompression') + @CachedProperty + def auth(self): + return self._operation_model.get('auth') + @CachedProperty def auth_type(self): return self._operation_model.get('authtype') + @CachedProperty + def resolved_auth_type(self): + if self.auth: + return resolve_auth_type(self.auth) + return self.auth_type + + @CachedProperty + def unsigned_payload(self): + return self._operation_model.get('unsignedPayload') + @CachedProperty def error_shapes(self): shapes = self._operation_model.get("errors", []) diff --git a/botocore/regions.py b/botocore/regions.py index ab20130304..cfa3bde115 100644 --- a/botocore/regions.py +++ b/botocore/regions.py @@ -722,7 +722,9 @@ def auth_schemes_to_signing_ctx(self, auth_schemes): signing_context['region'] = scheme['signingRegion'] elif 'signingRegionSet' in scheme: if len(scheme['signingRegionSet']) > 0: - signing_context['region'] = scheme['signingRegionSet'][0] + signing_context['region'] = ','.join( + scheme['signingRegionSet'] + ) if 'signingName' in scheme: signing_context.update(signing_name=scheme['signingName']) if 'disableDoubleEncoding' in scheme: diff --git a/tests/functional/test_auth_config.py b/tests/functional/test_auth_config.py new file mode 100644 index 0000000000..7fe096d338 --- /dev/null +++ b/tests/functional/test_auth_config.py @@ -0,0 +1,77 @@ +# Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You +# may not use this file except in compliance with the License. A copy of +# the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +# ANY KIND, either express or implied. See the License for the specific +# language governing permissions and limitations under the License. +import pytest + +from botocore.session import get_session + +# In the future, a service may have a list of credentials requirements where one +# signature may fail and others may succeed. e.g. a service may want to use bearer +# auth but fall back to sigv4 if a token isn't available. There's currently no way to do +# this in botocore, so this test ensures we handle this gracefully when the need arises. + + +# The dictionary's value here needs to be hashable to be added to the set below; any +# new auth types with multiple requirements should be added in a comma-separated list +AUTH_TYPE_REQUIREMENTS = { + 'aws.auth#sigv4': 'credentials', + 'aws.auth#sigv4a': 'credentials', + 'smithy.api#httpBearerAuth': 'bearer_token', + 'smithy.api#noAuth': 'none', +} + + +def _all_test_cases(): + session = get_session() + loader = session.get_component('data_loader') + + services = loader.list_available_services('service-2') + auth_services = [] + auth_operations = [] + + for service in services: + service_model = session.get_service_model(service) + auth_config = service_model.metadata.get('auth', {}) + if auth_config: + auth_services.append([service, auth_config]) + for operation in service_model.operation_names: + operation_model = service_model.operation_model(operation) + if operation_model.auth: + auth_operations.append([service, operation_model]) + return auth_services, auth_operations + + +AUTH_SERVICES, AUTH_OPERATIONS = _all_test_cases() + + +@pytest.mark.validates_models +@pytest.mark.parametrize("auth_service, auth_config", AUTH_SERVICES) +def test_all_requirements_match_for_service(auth_service, auth_config): + # Validates that all service-level signature types have the same requirements + message = f'Found mixed signer requirements for service: {auth_service}' + assert_all_requirements_match(auth_config, message) + + +@pytest.mark.validates_models +@pytest.mark.parametrize("auth_service, operation_model", AUTH_OPERATIONS) +def test_all_requirements_match_for_operation(auth_service, operation_model): + # Validates that all operation-level signature types have the same requirements + message = f'Found mixed signer requirements for operation: {auth_service}.{operation_model.name}' + auth_config = operation_model.auth + assert_all_requirements_match(auth_config, message) + + +def assert_all_requirements_match(auth_config, message): + auth_requirements = set( + AUTH_TYPE_REQUIREMENTS[auth_type] for auth_type in auth_config + ) + assert len(auth_requirements) == 1 diff --git a/tests/unit/auth/test_auth_trait.py b/tests/unit/auth/test_auth_trait.py new file mode 100644 index 0000000000..c1209a576c --- /dev/null +++ b/tests/unit/auth/test_auth_trait.py @@ -0,0 +1,42 @@ +# Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). You +# may not use this file except in compliance with the License. A copy of +# the License is located at +# +# http://aws.amazon.com/apache2.0/ +# +# or in the "license" file accompanying this file. This file is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +# ANY KIND, either express or implied. See the License for the specific +# language governing permissions and limitations under the License. + +from botocore.auth import BaseSigner, resolve_auth_type +from botocore.exceptions import ( + UnknownSignatureVersionError, + UnsupportedSignatureVersionError, +) +from tests import mock, unittest + + +class TestAuthTraitResolution(unittest.TestCase): + def test_auth_resolves_first_available(self): + auth = ['aws.auth#foo', 'aws.auth#bar'] + # Don't declare a signer for "foo" + auth_types = {'bar': mock.Mock(spec=BaseSigner)} + auth_type_conversions = {'aws.auth#foo': 'foo', 'aws.auth#bar': 'bar'} + + with mock.patch('botocore.auth.AUTH_TYPE_MAPS', auth_types): + with mock.patch( + 'botocore.auth.AUTH_TYPE_TO_SIGNATURE_VERSION', + auth_type_conversions, + ): + assert resolve_auth_type(auth) == 'bar' + + def test_invalid_auth_type_error(self): + with self.assertRaises(UnknownSignatureVersionError): + resolve_auth_type(['aws.auth#invalidAuth']) + + def test_no_known_auth_type(self): + with self.assertRaises(UnsupportedSignatureVersionError): + resolve_auth_type([]) diff --git a/tests/unit/test_handlers.py b/tests/unit/test_handlers.py index 44ebbecc3f..fef4c43eab 100644 --- a/tests/unit/test_handlers.py +++ b/tests/unit/test_handlers.py @@ -1036,13 +1036,11 @@ def test_set_operation_specific_signer_v4a_existing_signing_context(self): signing_name = 'myservice' context = { 'auth_type': 'v4a', - 'signing': {'foo': 'bar', 'region': 'abc'}, + 'signing': {'foo': 'bar'}, } handlers.set_operation_specific_signer( context=context, signing_name=signing_name ) - # region has been updated - self.assertEqual(context['signing']['region'], '*') # signing_name has been added self.assertEqual(context['signing']['signing_name'], signing_name) # foo remained untouched @@ -1073,6 +1071,61 @@ def test_set_operation_specific_signer_s3v4_unsigned_payload(self): self.assertEqual(response, 's3v4') self.assertEqual(context.get('payload_signing_enabled'), False) + def test_set_operation_specific_signer_defaults_to_asterisk(self): + signing_name = 'myservice' + context = { + 'auth_type': 'v4a', + } + handlers.set_operation_specific_signer( + context=context, signing_name=signing_name + ) + self.assertEqual(context['signing']['region'], '*') + + def test_set_operation_specific_signer_prefers_client_config(self): + signing_name = 'myservice' + context = { + 'auth_type': 'v4a', + 'client_config': Config( + sigv4a_signing_region_set="region_1,region_2" + ), + 'signing': { + 'region': 'abc', + }, + } + handlers.set_operation_specific_signer( + context=context, signing_name=signing_name + ) + self.assertEqual(context['signing']['region'], 'region_1,region_2') + + def test_payload_signing_disabled_sets_proper_key(self): + signing_name = 'myservice' + context = { + 'auth_type': 'v4', + 'signing': { + 'foo': 'bar', + 'region': 'abc', + }, + 'unsigned_payload': True, + } + handlers.set_operation_specific_signer( + context=context, signing_name=signing_name + ) + self.assertEqual(context.get('payload_signing_enabled'), False) + + def test_no_payload_signing_disabled_does_not_set_key(self): + signing_name = 'myservice' + context = { + 'auth_type': 'v4', + 'signing': { + 'foo': 'bar', + 'region': 'abc', + }, + } + handlers.set_operation_specific_signer( + context=context, signing_name=signing_name + ) + self.assertNotIn('payload_signing_enabled', context) + @pytest.mark.parametrize( 'auth_type, expected_response', [('v4', 's3v4'), ('v4a', 's3v4a')] diff --git a/tests/unit/test_model.py b/tests/unit/test_model.py index 303ed1a31a..da95a18bea 100644 --- a/tests/unit/test_model.py +++ b/tests/unit/test_model.py @@ -182,6 +182,7 @@ def setUp(self): 'errors': [{'shape': 'NoSuchResourceException'}], 'documentation': 'Docs for OperationName', 'authtype': 'v4', + 'auth': ['aws.auth#sigv4'], }, 'OperationTwo': { 'http': { @@ -396,6 +397,22 @@ def test_error_shapes(self): operation.error_shapes[0].name, 'NoSuchResourceException' ) + def test_has_auth(self): + operation = self.service_model.operation_model('OperationName') + self.assertEqual(operation.auth, ["aws.auth#sigv4"]) + + def test_auth_not_set(self): + operation = self.service_model.operation_model('OperationTwo') + self.assertIsNone(operation.auth) + + def test_has_resolved_auth_type(self): + operation = self.service_model.operation_model('OperationName') + self.assertEqual(operation.resolved_auth_type, 'v4') + + def test_resolved_auth_type_not_set(self): + operation = self.service_model.operation_model('OperationTwo') + self.assertIsNone(operation.resolved_auth_type) + def test_has_auth_type(self): operation = self.service_model.operation_model('OperationName') self.assertEqual(operation.auth_type, 'v4') From d8cce8e195aca4ccfbbd184c4abf6b0e5ec8f39a Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 16 Aug 2024 18:05:29 +0000 Subject: [PATCH 2/4] Update to latest models --- .../next-release/api-change-batch-5973.json | 5 ++++ .../api-change-inspector2-63213.json | 5 ++++ .../api-change-quicksight-53473.json | 5 ++++ .../api-change-sagemaker-17194.json | 5 ++++ .../next-release/api-change-sesv2-52101.json | 5 ++++ botocore/data/batch/2016-08-10/service-2.json | 14 +++++++++- .../data/inspector2/2020-06-08/service-2.json | 15 ++++++++-- .../data/quicksight/2018-04-01/service-2.json | 15 ++++++++++ .../data/sagemaker/2017-07-24/service-2.json | 28 +++++++++++++++++++ botocore/data/sesv2/2019-09-27/service-2.json | 6 ++-- 10 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 .changes/next-release/api-change-batch-5973.json create mode 100644 .changes/next-release/api-change-inspector2-63213.json create mode 100644 .changes/next-release/api-change-quicksight-53473.json create mode 100644 .changes/next-release/api-change-sagemaker-17194.json create mode 100644 .changes/next-release/api-change-sesv2-52101.json diff --git a/.changes/next-release/api-change-batch-5973.json b/.changes/next-release/api-change-batch-5973.json new file mode 100644 index 0000000000..921c82b4d5 --- /dev/null +++ b/.changes/next-release/api-change-batch-5973.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``batch``", + "description": "Improvements of integration between AWS Batch and EC2." +} diff --git a/.changes/next-release/api-change-inspector2-63213.json b/.changes/next-release/api-change-inspector2-63213.json new file mode 100644 index 0000000000..9ccfb74d6c --- /dev/null +++ b/.changes/next-release/api-change-inspector2-63213.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``inspector2``", + "description": "Update the correct format of key and values for resource tags" +} diff --git a/.changes/next-release/api-change-quicksight-53473.json b/.changes/next-release/api-change-quicksight-53473.json new file mode 100644 index 0000000000..30d3360771 --- /dev/null +++ b/.changes/next-release/api-change-quicksight-53473.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``quicksight``", + "description": "Amazon QuickSight launches Customer Managed Key (CMK) encryption for Data Source metadata" +} diff --git a/.changes/next-release/api-change-sagemaker-17194.json b/.changes/next-release/api-change-sagemaker-17194.json new file mode 100644 index 0000000000..c3c9599a3e --- /dev/null +++ b/.changes/next-release/api-change-sagemaker-17194.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``sagemaker``", + "description": "Introduce Endpoint and EndpointConfig Arns in sagemaker:ListPipelineExecutionSteps API response" +} diff --git a/.changes/next-release/api-change-sesv2-52101.json b/.changes/next-release/api-change-sesv2-52101.json new file mode 100644 index 0000000000..25ac97d5a7 --- /dev/null +++ b/.changes/next-release/api-change-sesv2-52101.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``sesv2``", + "description": "Marking use case description field of account details as deprecated." +} diff --git a/botocore/data/batch/2016-08-10/service-2.json b/botocore/data/batch/2016-08-10/service-2.json index b134bc2fa7..1eac45acda 100644 --- a/botocore/data/batch/2016-08-10/service-2.json +++ b/botocore/data/batch/2016-08-10/service-2.json @@ -26,7 +26,7 @@ {"shape":"ClientException"}, {"shape":"ServerException"} ], - "documentation":"

Cancels a job in an Batch job queue. Jobs that are in the SUBMITTED or PENDING are canceled. A job inRUNNABLE remains in RUNNABLE until it reaches the head of the job queue. Then the job status is updated to FAILED.

A PENDING job is canceled after all dependency jobs are completed. Therefore, it may take longer than expected to cancel a job in PENDING status.

When you try to cancel an array parent job in PENDING, Batch attempts to cancel all child jobs. The array parent job is canceled when all child jobs are completed.

Jobs that progressed to the STARTING or RUNNING state aren't canceled. However, the API operation still succeeds, even if no job is canceled. These jobs must be terminated with the TerminateJob operation.

" + "documentation":"

Cancels a job in an Batch job queue. Jobs that are in a SUBMITTED, PENDING, or RUNNABLE state are cancelled and the job status is updated to FAILED.

A PENDING job is canceled after all dependency jobs are completed. Therefore, it may take longer than expected to cancel a job in PENDING status.

When you try to cancel an array parent job in PENDING, Batch attempts to cancel all child jobs. The array parent job is canceled when all child jobs are completed.

Jobs that progressed to the STARTING or RUNNING state aren't canceled. However, the API operation still succeeds, even if no job is canceled. These jobs must be terminated with the TerminateJob operation.

" }, "CreateComputeEnvironment":{ "name":"CreateComputeEnvironment", @@ -681,6 +681,10 @@ "uuid":{ "shape":"String", "documentation":"

Unique identifier for the compute environment.

" + }, + "context":{ + "shape":"String", + "documentation":"

Reserved.

" } }, "documentation":"

An object that represents an Batch compute environment.

" @@ -1176,6 +1180,10 @@ "eksConfiguration":{ "shape":"EksConfiguration", "documentation":"

The details for the Amazon EKS cluster that supports the compute environment.

" + }, + "context":{ + "shape":"String", + "documentation":"

Reserved.

" } }, "documentation":"

Contains the parameters for CreateComputeEnvironment.

" @@ -4082,6 +4090,10 @@ "updatePolicy":{ "shape":"UpdatePolicy", "documentation":"

Specifies the updated infrastructure update policy for the compute environment. For more information about infrastructure updates, see Updating compute environments in the Batch User Guide.

" + }, + "context":{ + "shape":"String", + "documentation":"

Reserved.

" } }, "documentation":"

Contains the parameters for UpdateComputeEnvironment.

" diff --git a/botocore/data/inspector2/2020-06-08/service-2.json b/botocore/data/inspector2/2020-06-08/service-2.json index 9c28347bc9..6e1551274f 100644 --- a/botocore/data/inspector2/2020-06-08/service-2.json +++ b/botocore/data/inspector2/2020-06-08/service-2.json @@ -7849,7 +7849,7 @@ }, "TagValueList":{ "type":"list", - "member":{"shape":"String"}, + "member":{"shape":"TargetResourceTagsValue"}, "max":5, "min":1 }, @@ -7870,11 +7870,22 @@ }, "TargetResourceTags":{ "type":"map", - "key":{"shape":"NonEmptyString"}, + "key":{"shape":"TargetResourceTagsKey"}, "value":{"shape":"TagValueList"}, "max":5, "min":1 }, + "TargetResourceTagsKey":{ + "type":"string", + "max":128, + "min":1, + "pattern":"^[\\p{L}\\p{Z}\\p{N}_.:/=\\-@]*$" + }, + "TargetResourceTagsValue":{ + "type":"string", + "max":256, + "min":1 + }, "TargetStatusFilterList":{ "type":"list", "member":{"shape":"CisTargetStatusFilter"}, diff --git a/botocore/data/quicksight/2018-04-01/service-2.json b/botocore/data/quicksight/2018-04-01/service-2.json index becd2890a8..4e7264dca5 100644 --- a/botocore/data/quicksight/2018-04-01/service-2.json +++ b/botocore/data/quicksight/2018-04-01/service-2.json @@ -184,6 +184,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"ResourceExistsException"}, {"shape":"ThrottlingException"}, + {"shape":"CustomerManagedKeyUnavailableException"}, {"shape":"InternalFailureException"} ], "documentation":"

Creates a data source.

" @@ -2884,6 +2885,7 @@ {"shape":"InvalidParameterValueException"}, {"shape":"ThrottlingException"}, {"shape":"ResourceNotFoundException"}, + {"shape":"CustomerManagedKeyUnavailableException"}, {"shape":"InternalFailureException"} ], "documentation":"

Updates a data source.

" @@ -9578,6 +9580,19 @@ }, "documentation":"

The configuration of custom values for the destination parameter in DestinationParameterValueConfiguration.

" }, + "CustomerManagedKeyUnavailableException":{ + "type":"structure", + "members":{ + "Message":{"shape":"String"}, + "RequestId":{ + "shape":"String", + "documentation":"

The Amazon Web Services request ID for this operation.

" + } + }, + "documentation":"

The customer managed key that is registered to your Amazon QuickSight account is unavailable.

", + "error":{"httpStatusCode":400}, + "exception":true + }, "Dashboard":{ "type":"structure", "members":{ diff --git a/botocore/data/sagemaker/2017-07-24/service-2.json b/botocore/data/sagemaker/2017-07-24/service-2.json index 67b9fe6cd6..9b5c96fb65 100644 --- a/botocore/data/sagemaker/2017-07-24/service-2.json +++ b/botocore/data/sagemaker/2017-07-24/service-2.json @@ -18182,6 +18182,16 @@ "CreationTime" ] }, + "EndpointConfigStepMetadata":{ + "type":"structure", + "members":{ + "Arn":{ + "shape":"EndpointConfigArn", + "documentation":"

The Amazon Resource Name (ARN) of the endpoint configuration used in the step.

" + } + }, + "documentation":"

Metadata for an endpoint configuration step.

" + }, "EndpointConfigSummary":{ "type":"structure", "required":[ @@ -18400,6 +18410,16 @@ "UpdateRollbackFailed" ] }, + "EndpointStepMetadata":{ + "type":"structure", + "members":{ + "Arn":{ + "shape":"EndpointArn", + "documentation":"

The Amazon Resource Name (ARN) of the endpoint in the step.

" + } + }, + "documentation":"

Metadata for an endpoint step.

" + }, "EndpointSummary":{ "type":"structure", "required":[ @@ -30960,6 +30980,14 @@ "AutoMLJob":{ "shape":"AutoMLJobStepMetadata", "documentation":"

The Amazon Resource Name (ARN) of the AutoML job that was run by this step.

" + }, + "Endpoint":{ + "shape":"EndpointStepMetadata", + "documentation":"

The endpoint that was invoked during this step execution.

" + }, + "EndpointConfig":{ + "shape":"EndpointConfigStepMetadata", + "documentation":"

The endpoint configuration used to create an endpoint during this step execution.

" } }, "documentation":"

Metadata for a step execution.

" diff --git a/botocore/data/sesv2/2019-09-27/service-2.json b/botocore/data/sesv2/2019-09-27/service-2.json index 623c355028..1b2a0e9c1e 100644 --- a/botocore/data/sesv2/2019-09-27/service-2.json +++ b/botocore/data/sesv2/2019-09-27/service-2.json @@ -5509,8 +5509,7 @@ "type":"structure", "required":[ "MailType", - "WebsiteURL", - "UseCaseDescription" + "WebsiteURL" ], "members":{ "MailType":{ @@ -6959,8 +6958,9 @@ }, "UseCaseDescription":{ "type":"string", + "deprecated":true, + "deprecatedMessage":"Use case description is optional and deprecated", "max":5000, - "min":1, "sensitive":true }, "UseDefaultIfPreferenceUnavailable":{"type":"boolean"}, From d780ee8c335da9aee90c0082e8b088b41ae3f52b Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 16 Aug 2024 18:05:30 +0000 Subject: [PATCH 3/4] Update endpoints model --- botocore/data/endpoints.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index 2f6bff8017..4c24f2afa5 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -20436,6 +20436,7 @@ }, "vpc-lattice" : { "endpoints" : { + "af-south-1" : { }, "ap-northeast-1" : { }, "ap-northeast-2" : { }, "ap-south-1" : { }, @@ -20444,6 +20445,7 @@ "ca-central-1" : { }, "eu-central-1" : { }, "eu-north-1" : { }, + "eu-south-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, "eu-west-3" : { }, From 756df074a7c7a612898a9b676df3aaede033054b Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Fri, 16 Aug 2024 18:06:41 +0000 Subject: [PATCH 4/4] Bumping version to 1.35.0 --- .changes/1.35.0.json | 32 +++++++++++++++++++ .../next-release/api-change-batch-5973.json | 5 --- .../api-change-inspector2-63213.json | 5 --- .../api-change-quicksight-53473.json | 5 --- .../api-change-sagemaker-17194.json | 5 --- .../next-release/api-change-sesv2-52101.json | 5 --- .../enhancement-signing-83434.json | 5 --- CHANGELOG.rst | 11 +++++++ botocore/__init__.py | 2 +- docs/source/conf.py | 4 +-- 10 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 .changes/1.35.0.json delete mode 100644 .changes/next-release/api-change-batch-5973.json delete mode 100644 .changes/next-release/api-change-inspector2-63213.json delete mode 100644 .changes/next-release/api-change-quicksight-53473.json delete mode 100644 .changes/next-release/api-change-sagemaker-17194.json delete mode 100644 .changes/next-release/api-change-sesv2-52101.json delete mode 100644 .changes/next-release/enhancement-signing-83434.json diff --git a/.changes/1.35.0.json b/.changes/1.35.0.json new file mode 100644 index 0000000000..4e67543734 --- /dev/null +++ b/.changes/1.35.0.json @@ -0,0 +1,32 @@ +[ + { + "category": "``batch``", + "description": "Improvements of integration between AWS Batch and EC2.", + "type": "api-change" + }, + { + "category": "``inspector2``", + "description": "Update the correct format of key and values for resource tags", + "type": "api-change" + }, + { + "category": "``quicksight``", + "description": "Amazon QuickSight launches Customer Managed Key (CMK) encryption for Data Source metadata", + "type": "api-change" + }, + { + "category": "``sagemaker``", + "description": "Introduce Endpoint and EndpointConfig Arns in sagemaker:ListPipelineExecutionSteps API response", + "type": "api-change" + }, + { + "category": "``sesv2``", + "description": "Marking use case description field of account details as deprecated.", + "type": "api-change" + }, + { + "category": "signing", + "description": "Adds internal support for the new 'auth' trait to allow a priority list of auth types for a service or operation.", + "type": "feature" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-batch-5973.json b/.changes/next-release/api-change-batch-5973.json deleted file mode 100644 index 921c82b4d5..0000000000 --- a/.changes/next-release/api-change-batch-5973.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``batch``", - "description": "Improvements of integration between AWS Batch and EC2." -} diff --git a/.changes/next-release/api-change-inspector2-63213.json b/.changes/next-release/api-change-inspector2-63213.json deleted file mode 100644 index 9ccfb74d6c..0000000000 --- a/.changes/next-release/api-change-inspector2-63213.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``inspector2``", - "description": "Update the correct format of key and values for resource tags" -} diff --git a/.changes/next-release/api-change-quicksight-53473.json b/.changes/next-release/api-change-quicksight-53473.json deleted file mode 100644 index 30d3360771..0000000000 --- a/.changes/next-release/api-change-quicksight-53473.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``quicksight``", - "description": "Amazon QuickSight launches Customer Managed Key (CMK) encryption for Data Source metadata" -} diff --git a/.changes/next-release/api-change-sagemaker-17194.json b/.changes/next-release/api-change-sagemaker-17194.json deleted file mode 100644 index c3c9599a3e..0000000000 --- a/.changes/next-release/api-change-sagemaker-17194.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``sagemaker``", - "description": "Introduce Endpoint and EndpointConfig Arns in sagemaker:ListPipelineExecutionSteps API response" -} diff --git a/.changes/next-release/api-change-sesv2-52101.json b/.changes/next-release/api-change-sesv2-52101.json deleted file mode 100644 index 25ac97d5a7..0000000000 --- a/.changes/next-release/api-change-sesv2-52101.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``sesv2``", - "description": "Marking use case description field of account details as deprecated." -} diff --git a/.changes/next-release/enhancement-signing-83434.json b/.changes/next-release/enhancement-signing-83434.json deleted file mode 100644 index a90654a772..0000000000 --- a/.changes/next-release/enhancement-signing-83434.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "feature", - "category": "signing", - "description": "Adds internal support for the new 'auth' trait to allow a priority list of auth types for a service or operation." -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7779efcaa5..497b6a1fa3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,17 @@ CHANGELOG ========= +1.35.0 +====== + +* api-change:``batch``: Improvements of integration between AWS Batch and EC2. +* api-change:``inspector2``: Update the correct format of key and values for resource tags +* api-change:``quicksight``: Amazon QuickSight launches Customer Managed Key (CMK) encryption for Data Source metadata +* api-change:``sagemaker``: Introduce Endpoint and EndpointConfig Arns in sagemaker:ListPipelineExecutionSteps API response +* api-change:``sesv2``: Marking use case description field of account details as deprecated. +* feature:signing: Adds internal support for the new 'auth' trait to allow a priority list of auth types for a service or operation. + + 1.34.162 ======== diff --git a/botocore/__init__.py b/botocore/__init__.py index 46e292e5b2..8283fd1d74 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.34.162' +__version__ = '1.35.0' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index cabc753965..90d7befae9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '1.34.1' +version = '1.35' # The full version, including alpha/beta/rc tags. -release = '1.34.162' +release = '1.35.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.