Skip to content

Commit

Permalink
Merge branch 'release-1.27.76'
Browse files Browse the repository at this point in the history
* release-1.27.76:
  Bumping version to 1.27.76
  Update to latest endpoints
  Update to latest models
  Endpoint resolution v2: builtin parameter values (#2759)
  Support for context params in service models (#2740)
  • Loading branch information
aws-sdk-python-automation committed Sep 19, 2022
2 parents 55b9fc7 + 628c7b1 commit 0492a8c
Show file tree
Hide file tree
Showing 15 changed files with 1,161 additions and 114 deletions.
22 changes: 22 additions & 0 deletions .changes/1.27.76.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``cloudtrail``",
"description": "This release includes support for importing existing trails into CloudTrail Lake.",
"type": "api-change"
},
{
"category": "``ec2``",
"description": "This release adds CapacityAllocations field to DescribeCapacityReservations",
"type": "api-change"
},
{
"category": "``mediaconnect``",
"description": "This change allows the customer to use the SRT Caller protocol as part of their flows",
"type": "api-change"
},
{
"category": "``rds``",
"description": "This release adds support for Amazon RDS Proxy with SQL Server compatibility.",
"type": "api-change"
}
]
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.27.76
=======

* api-change:``cloudtrail``: This release includes support for importing existing trails into CloudTrail Lake.
* api-change:``ec2``: This release adds CapacityAllocations field to DescribeCapacityReservations
* api-change:``mediaconnect``: This change allows the customer to use the SRT Caller protocol as part of their flows
* api-change:``rds``: This release adds support for Amazon RDS Proxy with SQL Server compatibility.


1.27.75
=======

Expand Down
2 changes: 1 addition & 1 deletion botocore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import os
import re

__version__ = '1.27.75'
__version__ = '1.27.76'


class NullHandler(logging.Handler):
Expand Down
71 changes: 69 additions & 2 deletions botocore/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import botocore.utils
from botocore.config import Config
from botocore.endpoint import EndpointCreator
from botocore.regions import EndpointResolverBuiltins as EPRBuiltins
from botocore.signers import RequestSigner

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -344,8 +345,10 @@ def _compute_sts_endpoint_config(self, **resolve_endpoint_kwargs):
def _should_set_global_sts_endpoint(
self, region_name, endpoint_url, endpoint_config
):
endpoint_variant_tags = endpoint_config['metadata'].get('tags')
if endpoint_url or endpoint_variant_tags:
has_variant_tags = endpoint_config and endpoint_config.get(
'metadata', {}
).get('tags')
if endpoint_url or has_variant_tags:
return False
return (
self._get_sts_regional_endpoints_config() == 'legacy'
Expand Down Expand Up @@ -464,3 +467,67 @@ def _ensure_boolean(self, val):
return val
else:
return val.lower() == 'true'

def compute_endpoint_resolver_builtin_defaults(
self,
region_name,
service_name,
s3_config,
endpoint_bridge,
client_endpoint_url,
legacy_endpoint_url,
):
# EndpointResolverv2 rulesets may accept an "SDK::Endpoint" as input.
# If the endpoint_url argument of create_client() is set, it always
# takes priority.
if client_endpoint_url:
given_endpoint = client_endpoint_url
# If an endpoints.json data file other than the one bundled within
# the botocore/data directory is used, the output of legacy
# endpoint resolution is provided to EndpointResolverv2.
elif not endpoint_bridge.endpoint_resolver.uses_builtin_data:
given_endpoint = legacy_endpoint_url
else:
given_endpoint = None

return {
EPRBuiltins.AWS_REGION: region_name,
EPRBuiltins.AWS_USE_FIPS: (
endpoint_bridge._resolve_endpoint_variant_config_var(
'use_fips_endpoint'
)
or False
and not given_endpoint
),
EPRBuiltins.AWS_USE_DUALSTACK: (
endpoint_bridge._resolve_use_dualstack_endpoint(service_name)
or False
and not given_endpoint
),
EPRBuiltins.AWS_STS_USE_GLOBAL_ENDPOINT: (
self._should_set_global_sts_endpoint(
region_name=region_name,
endpoint_url=None,
endpoint_config=None,
)
),
EPRBuiltins.AWS_S3_USE_GLOBAL_ENDPOINT: (
self._should_force_s3_global(region_name, s3_config)
),
EPRBuiltins.AWS_S3_ACCELERATE: s3_config.get(
'use_accelerate_endpoint', False
),
EPRBuiltins.AWS_S3_FORCE_PATH_STYLE: (
s3_config.get('addressing_style') == 'path'
),
EPRBuiltins.AWS_S3_USE_ARN_REGION: s3_config.get(
'use_arn_region', True
),
EPRBuiltins.AWS_S3CONTROL_USE_ARN_REGION: s3_config.get(
'use_arn_region', False
),
EPRBuiltins.AWS_S3_DISABLE_MRAP: s3_config.get(
's3_disable_multiregion_access_points', False
),
EPRBuiltins.SDK_ENDPOINT: given_endpoint,
}
12 changes: 12 additions & 0 deletions botocore/data/cloudtrail/2013-11-01/paginators-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
"input_token": "NextToken",
"output_token": "NextToken",
"result_key": "Trails"
},
"ListImportFailures": {
"input_token": "NextToken",
"limit_key": "MaxResults",
"output_token": "NextToken",
"result_key": "Failures"
},
"ListImports": {
"input_token": "NextToken",
"limit_key": "MaxResults",
"output_token": "NextToken",
"result_key": "Imports"
}
}
}
Loading

0 comments on commit 0492a8c

Please sign in to comment.