Skip to content

Commit

Permalink
Merge branch 'release-1.32.0'
Browse files Browse the repository at this point in the history 
* release-1.32.0:
  Bumping version to 1.32.0
  Update to latest partitions and endpoints
  Update to latest models
  Feature eks credentials (#3044)
  • Loading branch information
@aws-sdk-python-automation
aws-sdk-python-automation committed Nov 14, 2023
2 parents 84b36af + 25b6318 commit 5f97c41
Show file tree
Hide file tree
Showing 31 changed files with 2,417 additions and 530 deletions.
72 changes: 72 additions & 0 deletions .changes/1.32.0.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[
{
"category": "ContainerProvider",
"description": "Added Support for EKS container credentials",
"type": "feature"
},
{
"category": "``backup``",
"description": "AWS Backup - Features: Provide Job Summary for your backup activity.",
"type": "api-change"
},
{
"category": "``cleanrooms``",
"description": "This feature provides the ability for the collaboration creator to configure either the member who can run queries or a different member in the collaboration to be billed for query compute costs.",
"type": "api-change"
},
{
"category": "``connect``",
"description": "Introducing SegmentAttributes parameter for StartChatContact API",
"type": "api-change"
},
{
"category": "``glue``",
"description": "Introduces new storage optimization APIs to support automatic compaction of Apache Iceberg tables.",
"type": "api-change"
},
{
"category": "``iot``",
"description": "This release introduces new attributes in API CreateSecurityProfile, UpdateSecurityProfile and DescribeSecurityProfile to support management of Metrics Export for AWS IoT Device Defender Detect.",
"type": "api-change"
},
{
"category": "``lambda``",
"description": "Add Python 3.12 (python3.12) support to AWS Lambda",
"type": "api-change"
},
{
"category": "``mediatailor``",
"description": "Removed unnecessary default values.",
"type": "api-change"
},
{
"category": "``pipes``",
"description": "Added support (via new LogConfiguration field in CreatePipe and UpdatePipe APIs) for logging to Amazon CloudWatch Logs, Amazon Simple Storage Service (Amazon S3), and Amazon Kinesis Data Firehose",
"type": "api-change"
},
{
"category": "``resource-explorer-2``",
"description": "Resource Explorer supports multi-account search. You can now use Resource Explorer to search and discover resources across AWS accounts within your organization or organizational unit.",
"type": "api-change"
},
{
"category": "``sagemaker``",
"description": "This release makes Model Registry Inference Specification fields as not required.",
"type": "api-change"
},
{
"category": "``signer``",
"description": "Documentation updates for AWS Signer",
"type": "api-change"
},
{
"category": "``stepfunctions``",
"description": "Update stepfunctions client to latest version",
"type": "api-change"
},
{
"category": "``endpoint-rules``",
"description": "Update endpoint-rules client to latest version",
"type": "api-change"
}
]
19 changes: 19 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@
CHANGELOG
=========

1.32.0
======

* feature:ContainerProvider: Added Support for EKS container credentials
* api-change:``backup``: AWS Backup - Features: Provide Job Summary for your backup activity.
* api-change:``cleanrooms``: This feature provides the ability for the collaboration creator to configure either the member who can run queries or a different member in the collaboration to be billed for query compute costs.
* api-change:``connect``: Introducing SegmentAttributes parameter for StartChatContact API
* api-change:``glue``: Introduces new storage optimization APIs to support automatic compaction of Apache Iceberg tables.
* api-change:``iot``: This release introduces new attributes in API CreateSecurityProfile, UpdateSecurityProfile and DescribeSecurityProfile to support management of Metrics Export for AWS IoT Device Defender Detect.
* api-change:``lambda``: Add Python 3.12 (python3.12) support to AWS Lambda
* api-change:``mediatailor``: Removed unnecessary default values.
* api-change:``pipes``: Added support (via new LogConfiguration field in CreatePipe and UpdatePipe APIs) for logging to Amazon CloudWatch Logs, Amazon Simple Storage Service (Amazon S3), and Amazon Kinesis Data Firehose
* api-change:``resource-explorer-2``: Resource Explorer supports multi-account search. You can now use Resource Explorer to search and discover resources across AWS accounts within your organization or organizational unit.
* api-change:``sagemaker``: This release makes Model Registry Inference Specification fields as not required.
* api-change:``signer``: Documentation updates for AWS Signer
* api-change:``stepfunctions``: Update stepfunctions client to latest version
* api-change:``endpoint-rules``: Update endpoint-rules client to latest version


1.31.85
=======

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

__version__ = '1.31.85'
__version__ = '1.32.0'


class NullHandler(logging.Handler):
Expand Down
14 changes: 13 additions & 1 deletion botocore/credentials.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1886,6 +1886,7 @@ class ContainerProvider(CredentialProvider):
ENV_VAR = 'AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'
ENV_VAR_FULL = 'AWS_CONTAINER_CREDENTIALS_FULL_URI'
ENV_VAR_AUTH_TOKEN = 'AWS_CONTAINER_AUTHORIZATION_TOKEN'
ENV_VAR_AUTH_TOKEN_FILE = 'AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE'

def __init__(self, environ=None, fetcher=None):
if environ is None:
Expand Down Expand Up @@ -1919,10 +1920,21 @@ def _retrieve_or_fail(self):
)

def _build_headers(self):
auth_token = self._environ.get(self.ENV_VAR_AUTH_TOKEN)
auth_token = None
if self.ENV_VAR_AUTH_TOKEN_FILE in self._environ:
auth_token_file_path = self._environ[self.ENV_VAR_AUTH_TOKEN_FILE]
with open(auth_token_file_path) as token_file:
auth_token = token_file.read()
elif self.ENV_VAR_AUTH_TOKEN in self._environ:
auth_token = self._environ[self.ENV_VAR_AUTH_TOKEN]
if auth_token is not None:
self._validate_auth_token(auth_token)
return {'Authorization': auth_token}

def _validate_auth_token(self, auth_token):
if "\r" in auth_token or "\n" in auth_token:
raise ValueError("Auth token value is not a legal header value")

def _create_fetcher(self, full_uri, headers):
def fetch_creds():
try:
Expand Down
40 changes: 20 additions & 20 deletions botocore/data/backup/2018-11-15/endpoint-rule-set-1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [
Expand Down Expand Up @@ -83,7 +82,8 @@
},
"type": "endpoint"
}
]
],
"type": "tree"
},
{
"conditions": [
Expand All @@ -96,7 +96,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [
Expand All @@ -110,7 +109,6 @@
"assign": "PartitionResult"
}
],
"type": "tree",
"rules": [
{
"conditions": [
Expand All @@ -133,7 +131,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [
Expand Down Expand Up @@ -168,7 +165,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [],
Expand All @@ -179,14 +175,16 @@
},
"type": "endpoint"
}
]
],
"type": "tree"
},
{
"conditions": [],
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
"type": "error"
}
]
],
"type": "tree"
},
{
"conditions": [
Expand All @@ -200,14 +198,12 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
true,
{
"fn": "getAttr",
"argv": [
Expand All @@ -216,11 +212,11 @@
},
"supportsFIPS"
]
}
},
true
]
}
],
"type": "tree",
"rules": [
{
"conditions": [],
Expand All @@ -231,14 +227,16 @@
},
"type": "endpoint"
}
]
],
"type": "tree"
},
{
"conditions": [],
"error": "FIPS is enabled but this partition does not support FIPS",
"type": "error"
}
]
],
"type": "tree"
},
{
"conditions": [
Expand All @@ -252,7 +250,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [
Expand All @@ -272,7 +269,6 @@
]
}
],
"type": "tree",
"rules": [
{
"conditions": [],
Expand All @@ -283,14 +279,16 @@
},
"type": "endpoint"
}
]
],
"type": "tree"
},
{
"conditions": [],
"error": "DualStack is enabled but this partition does not support DualStack",
"type": "error"
}
]
],
"type": "tree"
},
{
"conditions": [],
Expand All @@ -301,9 +299,11 @@
},
"type": "endpoint"
}
]
],
"type": "tree"
}
]
],
"type": "tree"
},
{
"conditions": [],
Expand Down
Loading

0 comments on commit 5f97c41

Please sign in to comment.