Skip to content

Commit 1b5c96f

Browse files
Merge branch 'release-1.38.40'
* release-1.38.40: Bumping version to 1.38.40 Update to latest models Format strings in tests Format botocore files for imports and string formatting fixes Update dependency versions and ruff config
2 parents c40e2b3 + e4fea1c commit 1b5c96f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+673
-247
lines changed

.changes/1.38.40.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[
2+
{
3+
"category": "``bedrock``",
4+
"description": "This release of the SDK has the API and documentation for the createcustommodel API. This feature lets you copy a trained model into Amazon Bedrock for inference.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``emr-serverless``",
9+
"description": "This release adds the capability to enable IAM IdentityCenter Trusted Identity Propagation for users running Interactive Sessions on EMR Serverless Applications.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``lambda``",
14+
"description": "Support Schema Registry feature for Kafka Event Source Mapping. Customers can now configure a Schema Registry to enable schema validation and filtering for Avro, Protobuf, and JSON-formatted events in Lambda for Kafka Event Source.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``payment-cryptography``",
19+
"description": "Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``payment-cryptography-data``",
24+
"description": "Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``sagemaker``",
29+
"description": "This release introduces alternative support for utilizing CFN templates from S3 for SageMaker Projects.",
30+
"type": "api-change"
31+
}
32+
]

.pre-commit-config.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ exclude: "\
1414
)"
1515
repos:
1616
- repo: 'https://github.com/pre-commit/pre-commit-hooks'
17-
rev: v4.5.0
17+
rev: v5.0.0
1818
hooks:
1919
- id: check-yaml
2020
- id: end-of-file-fixer
2121
- id: trailing-whitespace
22-
- repo: 'https://github.com/PyCQA/isort'
23-
rev: 5.12.0
24-
hooks:
25-
- id: isort
2622
- repo: https://github.com/astral-sh/ruff-pre-commit
27-
rev: v0.4.8
23+
rev: v0.12.0
2824
hooks:
29-
- id: ruff
25+
- id: ruff-check
3026
args: [ --fix ]
3127
- id: ruff-format

CHANGELOG.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
CHANGELOG
33
=========
44

5+
1.38.40
6+
=======
7+
8+
* api-change:``bedrock``: This release of the SDK has the API and documentation for the createcustommodel API. This feature lets you copy a trained model into Amazon Bedrock for inference.
9+
* api-change:``emr-serverless``: This release adds the capability to enable IAM IdentityCenter Trusted Identity Propagation for users running Interactive Sessions on EMR Serverless Applications.
10+
* api-change:``lambda``: Support Schema Registry feature for Kafka Event Source Mapping. Customers can now configure a Schema Registry to enable schema validation and filtering for Avro, Protobuf, and JSON-formatted events in Lambda for Kafka Event Source.
11+
* api-change:``payment-cryptography``: Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export
12+
* api-change:``payment-cryptography-data``: Additional support for managing HMAC keys that adheres to changes documented in X9.143-2021 and provides better interoperability for key import/export
13+
* api-change:``sagemaker``: This release introduces alternative support for utilizing CFN templates from S3 for SageMaker Projects.
14+
15+
516
1.38.39
617
=======
718

botocore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import os
1717
import re
1818

19-
__version__ = '1.38.39'
19+
__version__ = '1.38.40'
2020

2121

2222
class NullHandler(logging.Handler):

botocore/args.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030
from botocore.regions import EndpointRulesetResolver
3131
from botocore.signers import RequestSigner
3232
from botocore.useragent import UserAgentString, register_feature_id
33-
from botocore.utils import PRIORITY_ORDERED_SUPPORTED_PROTOCOLS # noqa: F401
34-
from botocore.utils import ensure_boolean, is_s3_accelerate_url
33+
from botocore.utils import (
34+
PRIORITY_ORDERED_SUPPORTED_PROTOCOLS, # noqa: F401
35+
ensure_boolean,
36+
is_s3_accelerate_url,
37+
)
3538

3639
logger = logging.getLogger(__name__)
3740

botocore/auth.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
from botocore.compat import (
2828
HAS_CRT,
29+
MD5_AVAILABLE, # noqa: F401
2930
HTTPHeaders,
3031
encodebytes,
3132
ensure_unicode,
@@ -47,10 +48,6 @@
4748
percent_encode_sequence,
4849
)
4950

50-
# Imports for backwards compatibility
51-
from botocore.compat import MD5_AVAILABLE # noqa
52-
53-
5451
logger = logging.getLogger(__name__)
5552

5653

@@ -88,7 +85,7 @@ def _host_from_url(url):
8885
}
8986
if url_parts.port is not None:
9087
if url_parts.port != default_ports.get(url_parts.scheme):
91-
host = '%s:%d' % (host, url_parts.port)
88+
host = f'{host}:{url_parts.port}'
9289
return host
9390

9491

botocore/client.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
# language governing permissions and limitations under the License.
1313
import logging
1414

15-
from botocore import waiter, xform_name
15+
from botocore import (
16+
UNSIGNED, # noqa: F401
17+
waiter,
18+
xform_name,
19+
)
1620
from botocore.args import ClientArgsCreator
1721
from botocore.auth import AUTH_TYPE_MAPS, resolve_auth_type
1822
from botocore.awsrequest import prepare_request_dict
@@ -27,6 +31,7 @@
2731
)
2832
from botocore.docs.docstring import ClientMethodDocstring, PaginatorDocstring
2933
from botocore.exceptions import (
34+
ClientError, # noqa: F401
3035
DataNotFoundError,
3136
InvalidEndpointDiscoveryConfigurationError,
3237
OperationNotPageableError,
@@ -46,26 +51,18 @@
4651
from botocore.utils import (
4752
CachedProperty,
4853
EventbridgeSignerSetter,
54+
S3ArnParamHandler, # noqa: F401
55+
S3ControlArnParamHandler, # noqa: F401
4956
S3ControlArnParamHandlerv2,
57+
S3ControlEndpointSetter, # noqa: F401
58+
S3EndpointSetter, # noqa: F401
5059
S3ExpressIdentityResolver,
60+
S3RegionRedirector, # noqa: F401
5161
S3RegionRedirectorv2,
5262
ensure_boolean,
5363
get_service_module_name,
5464
)
5565

56-
# Keep these imported. There's pre-existing code that uses:
57-
# "from botocore.client import UNSIGNED"
58-
# "from botocore.client import ClientError"
59-
# etc.
60-
from botocore.exceptions import ClientError # noqa
61-
from botocore.utils import S3ArnParamHandler # noqa
62-
from botocore.utils import S3ControlArnParamHandler # noqa
63-
from botocore.utils import S3ControlEndpointSetter # noqa
64-
from botocore.utils import S3EndpointSetter # noqa
65-
from botocore.utils import S3RegionRedirector # noqa
66-
from botocore import UNSIGNED # noqa
67-
68-
6966
logger = logging.getLogger(__name__)
7067
history_recorder = get_global_history_recorder()
7168

botocore/data/bedrock/2023-04-20/service-2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2161,7 +2161,7 @@
21612161
"type":"string",
21622162
"max":1011,
21632163
"min":20,
2164-
"pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12})"
2164+
"pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/(imported|[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})/[a-z0-9]{12}"
21652165
},
21662166
"CustomModelName":{
21672167
"type":"string",

botocore/data/emr-serverless/2021-07-13/service-2.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@
375375
"schedulerConfiguration":{
376376
"shape":"SchedulerConfiguration",
377377
"documentation":"<p>The scheduler configuration for batch and streaming jobs running on this application. Supported with release labels emr-7.0.0 and above.</p>"
378+
},
379+
"identityCenterConfiguration":{
380+
"shape":"IdentityCenterConfiguration",
381+
"documentation":"<p>The IAM Identity Center configuration applied to enable trusted identity propagation. </p>"
378382
}
379383
},
380384
"documentation":"<p>Information about an application. Amazon EMR Serverless uses applications to run jobs.</p>"
@@ -749,6 +753,10 @@
749753
"schedulerConfiguration":{
750754
"shape":"SchedulerConfiguration",
751755
"documentation":"<p>The scheduler configuration for batch and streaming jobs running on this application. Supported with release labels emr-7.0.0 and above.</p>"
756+
},
757+
"identityCenterConfiguration":{
758+
"shape":"IdentityCenterConfigurationInput",
759+
"documentation":"<p>The IAM Identity Center Configuration accepts the Identity Center instance parameter required to enable trusted identity propagation. This configuration allows identity propagation between integrated services and the Identity Center instance.</p>"
752760
}
753761
}
754762
},
@@ -973,6 +981,40 @@
973981
"min":20,
974982
"pattern":"arn:(aws[a-zA-Z0-9-]*):iam::([0-9]{12}):(role((\\u002F)|(\\u002F[\\u0021-\\u007F]+\\u002F))[\\w+=,.@-]+)"
975983
},
984+
"IdentityCenterApplicationArn":{
985+
"type":"string",
986+
"pattern":"arn:(aws[a-zA-Z0-9-]*):sso::\\d{12}:application/(sso)?ins-[a-zA-Z0-9-.]{16}/apl-[a-zA-Z0-9]{16}"
987+
},
988+
"IdentityCenterConfiguration":{
989+
"type":"structure",
990+
"members":{
991+
"identityCenterInstanceArn":{
992+
"shape":"IdentityCenterInstanceArn",
993+
"documentation":"<p>The ARN of the IAM Identity Center instance.</p>"
994+
},
995+
"identityCenterApplicationArn":{
996+
"shape":"IdentityCenterApplicationArn",
997+
"documentation":"<p>The ARN of the EMR Serverless created IAM Identity Center Application that provides trusted-identity propagation.</p>"
998+
}
999+
},
1000+
"documentation":"<p>The IAM Identity Center Configuration that includes the Identify Center instance and application ARNs that provide trusted-identity propagation.</p>"
1001+
},
1002+
"IdentityCenterConfigurationInput":{
1003+
"type":"structure",
1004+
"members":{
1005+
"identityCenterInstanceArn":{
1006+
"shape":"IdentityCenterInstanceArn",
1007+
"documentation":"<p>The ARN of the IAM Identity Center instance.</p>"
1008+
}
1009+
},
1010+
"documentation":"<p>Specifies the IAM Identity Center configuration used to enable or disable trusted identity propagation. When provided, this configuration determines how the application interacts with IAM Identity Center for user authentication and access control.</p>"
1011+
},
1012+
"IdentityCenterInstanceArn":{
1013+
"type":"string",
1014+
"max":1024,
1015+
"min":10,
1016+
"pattern":"arn:(aws[a-zA-Z0-9-]*):sso:::instance/(sso)?ins-[a-zA-Z0-9-.]{16}"
1017+
},
9761018
"ImageConfiguration":{
9771019
"type":"structure",
9781020
"required":["imageUri"],
@@ -2226,6 +2268,10 @@
22262268
"schedulerConfiguration":{
22272269
"shape":"SchedulerConfiguration",
22282270
"documentation":"<p>The scheduler configuration for batch and streaming jobs running on this application. Supported with release labels emr-7.0.0 and above.</p>"
2271+
},
2272+
"identityCenterConfiguration":{
2273+
"shape":"IdentityCenterConfigurationInput",
2274+
"documentation":"<p>Specifies the IAM Identity Center configuration used to enable or disable trusted identity propagation. When provided, this configuration determines how the application interacts with IAM Identity Center for user authentication and access control.</p>"
22292275
}
22302276
}
22312277
},

0 commit comments

Comments
 (0)