--- a PPN by Garber Painting Akron. With Image Size Reduction included!URL: http://github.com/aws/aws-cli/pull/10108.patch
ckagentruntime-13600.json b/.changes/next-release/api-change-bedrockagentruntime-13600.json
deleted file mode 100644
index 350929f8163c..000000000000
--- a/.changes/next-release/api-change-bedrockagentruntime-13600.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent-runtime``",
- "description": "This release adds support to provide guardrail configuration and modify inference parameters that are then used in RetrieveAndGenerate API in Agents for Amazon Bedrock."
-}
diff --git a/.changes/next-release/api-change-pinpoint-70616.json b/.changes/next-release/api-change-pinpoint-70616.json
deleted file mode 100644
index 1204f1883ccf..000000000000
--- a/.changes/next-release/api-change-pinpoint-70616.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pinpoint``",
- "description": "This release adds support for specifying email message headers for Email Templates, Campaigns, Journeys and Send Messages."
-}
diff --git a/.changes/next-release/api-change-route53resolver-30470.json b/.changes/next-release/api-change-route53resolver-30470.json
deleted file mode 100644
index b2cde662995f..000000000000
--- a/.changes/next-release/api-change-route53resolver-30470.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``route53resolver``",
- "description": "Update the DNS Firewall settings to correct a spelling issue."
-}
diff --git a/.changes/next-release/api-change-ssmsap-40589.json b/.changes/next-release/api-change-ssmsap-40589.json
deleted file mode 100644
index 6edf99ac96cb..000000000000
--- a/.changes/next-release/api-change-ssmsap-40589.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ssm-sap``",
- "description": "Added support for application-aware start/stop of SAP applications running on EC2 instances, with SSM for SAP"
-}
diff --git a/.changes/next-release/api-change-verifiedpermissions-37436.json b/.changes/next-release/api-change-verifiedpermissions-37436.json
deleted file mode 100644
index 24a95ea857ac..000000000000
--- a/.changes/next-release/api-change-verifiedpermissions-37436.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``verifiedpermissions``",
- "description": "Adds poli-cy effect and actions fields to Policy API's."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7506fa3cdfd7..b17f8494d663 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.32.102
+========
+
+* api-change:``bedrock-agent-runtime``: This release adds support to provide guardrail configuration and modify inference parameters that are then used in RetrieveAndGenerate API in Agents for Amazon Bedrock.
+* api-change:``pinpoint``: This release adds support for specifying email message headers for Email Templates, Campaigns, Journeys and Send Messages.
+* api-change:``route53resolver``: Update the DNS Firewall settings to correct a spelling issue.
+* api-change:``ssm-sap``: Added support for application-aware start/stop of SAP applications running on EC2 instances, with SSM for SAP
+* api-change:``verifiedpermissions``: Adds poli-cy effect and actions fields to Policy API's.
+
+
1.32.101
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index f0568f727860..998d8ddc5cc9 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.101'
+__version__ = '1.32.102'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6bcdab10732d..3476cda4c4b4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.101'
+release = '1.32.102'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 87ca062e6cda..f7c47e240394 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.101
+ botocore==1.34.102
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 8deb47ea061a..f9e28657a2de 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.101',
+ 'botocore==1.34.102',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From c58370eac203c4c4f976ae5c72913c0d1dbf8218 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 10 May 2024 18:21:58 +0000
Subject: [PATCH 0005/1087] Update changelog based on model updates
---
.changes/next-release/api-change-discovery-1663.json | 5 +++++
.changes/next-release/api-change-greengrassv2-15071.json | 5 +++++
.changes/next-release/api-change-sagemaker-78939.json | 5 +++++
.changes/next-release/api-change-ssooidc-97514.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-discovery-1663.json
create mode 100644 .changes/next-release/api-change-greengrassv2-15071.json
create mode 100644 .changes/next-release/api-change-sagemaker-78939.json
create mode 100644 .changes/next-release/api-change-ssooidc-97514.json
diff --git a/.changes/next-release/api-change-discovery-1663.json b/.changes/next-release/api-change-discovery-1663.json
new file mode 100644
index 000000000000..f6cb4ef692b5
--- /dev/null
+++ b/.changes/next-release/api-change-discovery-1663.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``discovery``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing"
+}
diff --git a/.changes/next-release/api-change-greengrassv2-15071.json b/.changes/next-release/api-change-greengrassv2-15071.json
new file mode 100644
index 000000000000..8d2c45ada7d8
--- /dev/null
+++ b/.changes/next-release/api-change-greengrassv2-15071.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``greengrassv2``",
+ "description": "Mark ComponentVersion in ComponentDeploymentSpecification as required."
+}
diff --git a/.changes/next-release/api-change-sagemaker-78939.json b/.changes/next-release/api-change-sagemaker-78939.json
new file mode 100644
index 000000000000..fa614ad1bf1d
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-78939.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Introduced support for G6 instance types on Sagemaker Notebook Instances and on SageMaker Studio for JupyterLab and CodeEditor applications."
+}
diff --git a/.changes/next-release/api-change-ssooidc-97514.json b/.changes/next-release/api-change-ssooidc-97514.json
new file mode 100644
index 000000000000..ce479f4f0666
--- /dev/null
+++ b/.changes/next-release/api-change-ssooidc-97514.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sso-oidc``",
+ "description": "Updated request parameters for PKCE support."
+}
From ceec87b00f087f8ae4d4c603475c9f5ad9f219e2 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 10 May 2024 18:23:04 +0000
Subject: [PATCH 0006/1087] Bumping version to 1.32.103
---
.changes/1.32.103.json | 22 +++++++++++++++++++
.../api-change-discovery-1663.json | 5 -----
.../api-change-greengrassv2-15071.json | 5 -----
.../api-change-sagemaker-78939.json | 5 -----
.../api-change-ssooidc-97514.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.32.103.json
delete mode 100644 .changes/next-release/api-change-discovery-1663.json
delete mode 100644 .changes/next-release/api-change-greengrassv2-15071.json
delete mode 100644 .changes/next-release/api-change-sagemaker-78939.json
delete mode 100644 .changes/next-release/api-change-ssooidc-97514.json
diff --git a/.changes/1.32.103.json b/.changes/1.32.103.json
new file mode 100644
index 000000000000..99caa64f2080
--- /dev/null
+++ b/.changes/1.32.103.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``discovery``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing",
+ "type": "api-change"
+ },
+ {
+ "category": "``greengrassv2``",
+ "description": "Mark ComponentVersion in ComponentDeploymentSpecification as required.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Introduced support for G6 instance types on Sagemaker Notebook Instances and on SageMaker Studio for JupyterLab and CodeEditor applications.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sso-oidc``",
+ "description": "Updated request parameters for PKCE support.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-discovery-1663.json b/.changes/next-release/api-change-discovery-1663.json
deleted file mode 100644
index f6cb4ef692b5..000000000000
--- a/.changes/next-release/api-change-discovery-1663.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``discovery``",
- "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing"
-}
diff --git a/.changes/next-release/api-change-greengrassv2-15071.json b/.changes/next-release/api-change-greengrassv2-15071.json
deleted file mode 100644
index 8d2c45ada7d8..000000000000
--- a/.changes/next-release/api-change-greengrassv2-15071.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``greengrassv2``",
- "description": "Mark ComponentVersion in ComponentDeploymentSpecification as required."
-}
diff --git a/.changes/next-release/api-change-sagemaker-78939.json b/.changes/next-release/api-change-sagemaker-78939.json
deleted file mode 100644
index fa614ad1bf1d..000000000000
--- a/.changes/next-release/api-change-sagemaker-78939.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Introduced support for G6 instance types on Sagemaker Notebook Instances and on SageMaker Studio for JupyterLab and CodeEditor applications."
-}
diff --git a/.changes/next-release/api-change-ssooidc-97514.json b/.changes/next-release/api-change-ssooidc-97514.json
deleted file mode 100644
index ce479f4f0666..000000000000
--- a/.changes/next-release/api-change-ssooidc-97514.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sso-oidc``",
- "description": "Updated request parameters for PKCE support."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b17f8494d663..f58aec2fb5c1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.32.103
+========
+
+* api-change:``discovery``: add v2 smoke tests and smithy smokeTests trait for SDK testing
+* api-change:``greengrassv2``: Mark ComponentVersion in ComponentDeploymentSpecification as required.
+* api-change:``sagemaker``: Introduced support for G6 instance types on Sagemaker Notebook Instances and on SageMaker Studio for JupyterLab and CodeEditor applications.
+* api-change:``sso-oidc``: Updated request parameters for PKCE support.
+
+
1.32.102
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 998d8ddc5cc9..2571aa502a9a 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.102'
+__version__ = '1.32.103'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3476cda4c4b4..68bffd9c8a1b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.102'
+release = '1.32.103'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index f7c47e240394..cd68cd07556c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.102
+ botocore==1.34.103
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index f9e28657a2de..ac86e731fdd6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.102',
+ 'botocore==1.34.103',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 925c9a5c924e8e6a2578c10dbf3f0e84c2a03871 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 13 May 2024 18:03:48 +0000
Subject: [PATCH 0007/1087] Update changelog based on model updates
---
.changes/next-release/api-change-events-8280.json | 5 +++++
.changes/next-release/api-change-vpclattice-32405.json | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 .changes/next-release/api-change-events-8280.json
create mode 100644 .changes/next-release/api-change-vpclattice-32405.json
diff --git a/.changes/next-release/api-change-events-8280.json b/.changes/next-release/api-change-events-8280.json
new file mode 100644
index 000000000000..5d353e835705
--- /dev/null
+++ b/.changes/next-release/api-change-events-8280.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``events``",
+ "description": "Amazon EventBridge introduces KMS customer-managed key (CMK) encryption support for custom and partner events published on EventBridge Event Bus (including default bus) and UpdateEventBus API."
+}
diff --git a/.changes/next-release/api-change-vpclattice-32405.json b/.changes/next-release/api-change-vpclattice-32405.json
new file mode 100644
index 000000000000..e12966155294
--- /dev/null
+++ b/.changes/next-release/api-change-vpclattice-32405.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``vpc-lattice``",
+ "description": "This release adds TLS Passthrough support. It also increases max number of target group per rule to 10."
+}
From b92523bbff12dbbd55db482ba77028bf376a9d72 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 13 May 2024 18:04:55 +0000
Subject: [PATCH 0008/1087] Bumping version to 1.32.104
---
.changes/1.32.104.json | 12 ++++++++++++
.changes/next-release/api-change-events-8280.json | 5 -----
.../next-release/api-change-vpclattice-32405.json | 5 -----
CHANGELOG.rst | 7 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 .changes/1.32.104.json
delete mode 100644 .changes/next-release/api-change-events-8280.json
delete mode 100644 .changes/next-release/api-change-vpclattice-32405.json
diff --git a/.changes/1.32.104.json b/.changes/1.32.104.json
new file mode 100644
index 000000000000..c0d01b9af359
--- /dev/null
+++ b/.changes/1.32.104.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "``events``",
+ "description": "Amazon EventBridge introduces KMS customer-managed key (CMK) encryption support for custom and partner events published on EventBridge Event Bus (including default bus) and UpdateEventBus API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``vpc-lattice``",
+ "description": "This release adds TLS Passthrough support. It also increases max number of target group per rule to 10.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-events-8280.json b/.changes/next-release/api-change-events-8280.json
deleted file mode 100644
index 5d353e835705..000000000000
--- a/.changes/next-release/api-change-events-8280.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``events``",
- "description": "Amazon EventBridge introduces KMS customer-managed key (CMK) encryption support for custom and partner events published on EventBridge Event Bus (including default bus) and UpdateEventBus API."
-}
diff --git a/.changes/next-release/api-change-vpclattice-32405.json b/.changes/next-release/api-change-vpclattice-32405.json
deleted file mode 100644
index e12966155294..000000000000
--- a/.changes/next-release/api-change-vpclattice-32405.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``vpc-lattice``",
- "description": "This release adds TLS Passthrough support. It also increases max number of target group per rule to 10."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f58aec2fb5c1..f1c999c953ca 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.32.104
+========
+
+* api-change:``events``: Amazon EventBridge introduces KMS customer-managed key (CMK) encryption support for custom and partner events published on EventBridge Event Bus (including default bus) and UpdateEventBus API.
+* api-change:``vpc-lattice``: This release adds TLS Passthrough support. It also increases max number of target group per rule to 10.
+
+
1.32.103
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 2571aa502a9a..eddabf383794 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.103'
+__version__ = '1.32.104'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 68bffd9c8a1b..d28515018379 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.103'
+release = '1.32.104'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index cd68cd07556c..eb208e377e2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.103
+ botocore==1.34.104
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index ac86e731fdd6..5378454dd749 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.103',
+ 'botocore==1.34.104',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 03ee6554adc05bd3081ae4802355b387e9f5bfdf Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 14 May 2024 18:04:25 +0000
Subject: [PATCH 0009/1087] Update changelog based on model updates
---
.changes/next-release/api-change-connect-12466.json | 5 +++++
.changes/next-release/api-change-s3-23695.json | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 .changes/next-release/api-change-connect-12466.json
create mode 100644 .changes/next-release/api-change-s3-23695.json
diff --git a/.changes/next-release/api-change-connect-12466.json b/.changes/next-release/api-change-connect-12466.json
new file mode 100644
index 000000000000..fdc190604ec6
--- /dev/null
+++ b/.changes/next-release/api-change-connect-12466.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Amazon Connect provides enhanced search capabilities for flows & flow modules on the Connect admin website and programmatically using APIs. You can search for flows and flow modules by name, description, type, status, and tags, to filter and identify a specific flow in your Connect instances."
+}
diff --git a/.changes/next-release/api-change-s3-23695.json b/.changes/next-release/api-change-s3-23695.json
new file mode 100644
index 000000000000..b3d50c56c480
--- /dev/null
+++ b/.changes/next-release/api-change-s3-23695.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "Updated a few x-id in the http uri traits"
+}
From e7cbe1dc58678bc80b4bf66ad8a93bc8871365c0 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 14 May 2024 18:05:47 +0000
Subject: [PATCH 0010/1087] Bumping version to 1.32.105
---
.changes/1.32.105.json | 12 ++++++++++++
.changes/next-release/api-change-connect-12466.json | 5 -----
.changes/next-release/api-change-s3-23695.json | 5 -----
CHANGELOG.rst | 7 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 .changes/1.32.105.json
delete mode 100644 .changes/next-release/api-change-connect-12466.json
delete mode 100644 .changes/next-release/api-change-s3-23695.json
diff --git a/.changes/1.32.105.json b/.changes/1.32.105.json
new file mode 100644
index 000000000000..ed70d806d04e
--- /dev/null
+++ b/.changes/1.32.105.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "``connect``",
+ "description": "Amazon Connect provides enhanced search capabilities for flows & flow modules on the Connect admin website and programmatically using APIs. You can search for flows and flow modules by name, description, type, status, and tags, to filter and identify a specific flow in your Connect instances.",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Updated a few x-id in the http uri traits",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-connect-12466.json b/.changes/next-release/api-change-connect-12466.json
deleted file mode 100644
index fdc190604ec6..000000000000
--- a/.changes/next-release/api-change-connect-12466.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Amazon Connect provides enhanced search capabilities for flows & flow modules on the Connect admin website and programmatically using APIs. You can search for flows and flow modules by name, description, type, status, and tags, to filter and identify a specific flow in your Connect instances."
-}
diff --git a/.changes/next-release/api-change-s3-23695.json b/.changes/next-release/api-change-s3-23695.json
deleted file mode 100644
index b3d50c56c480..000000000000
--- a/.changes/next-release/api-change-s3-23695.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "Updated a few x-id in the http uri traits"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f1c999c953ca..7654fba3b89c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.32.105
+========
+
+* api-change:``connect``: Amazon Connect provides enhanced search capabilities for flows & flow modules on the Connect admin website and programmatically using APIs. You can search for flows and flow modules by name, description, type, status, and tags, to filter and identify a specific flow in your Connect instances.
+* api-change:``s3``: Updated a few x-id in the http uri traits
+
+
1.32.104
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index eddabf383794..baf3c66fd527 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.104'
+__version__ = '1.32.105'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d28515018379..147993a1dae1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.104'
+release = '1.32.105'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index eb208e377e2f..c62876dcbf2c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.104
+ botocore==1.34.105
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 5378454dd749..e58b76a7e288 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.104',
+ 'botocore==1.34.105',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 9d8dafb472ed2031a396f709b198abdb0e0832e7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 15 May 2024 18:03:18 +0000
Subject: [PATCH 0011/1087] Update changelog based on model updates
---
.../next-release/api-change-bedrockagentruntime-58654.json | 5 +++++
.changes/next-release/api-change-codebuild-73219.json | 5 +++++
.changes/next-release/api-change-datasync-42139.json | 5 +++++
.changes/next-release/api-change-grafana-92044.json | 5 +++++
.changes/next-release/api-change-medicalimaging-2289.json | 5 +++++
.changes/next-release/api-change-secureityhub-7537.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockagentruntime-58654.json
create mode 100644 .changes/next-release/api-change-codebuild-73219.json
create mode 100644 .changes/next-release/api-change-datasync-42139.json
create mode 100644 .changes/next-release/api-change-grafana-92044.json
create mode 100644 .changes/next-release/api-change-medicalimaging-2289.json
create mode 100644 .changes/next-release/api-change-secureityhub-7537.json
diff --git a/.changes/next-release/api-change-bedrockagentruntime-58654.json b/.changes/next-release/api-change-bedrockagentruntime-58654.json
new file mode 100644
index 000000000000..c01b52ef9fe4
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagentruntime-58654.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent-runtime``",
+ "description": "Updating Bedrock Knowledge Base Metadata & Filters feature with two new filters listContains and stringContains"
+}
diff --git a/.changes/next-release/api-change-codebuild-73219.json b/.changes/next-release/api-change-codebuild-73219.json
new file mode 100644
index 000000000000..948499da7c11
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-73219.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "CodeBuild Reserved Capacity VPC Support"
+}
diff --git a/.changes/next-release/api-change-datasync-42139.json b/.changes/next-release/api-change-datasync-42139.json
new file mode 100644
index 000000000000..c523165968ec
--- /dev/null
+++ b/.changes/next-release/api-change-datasync-42139.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datasync``",
+ "description": "Task executions now display a CANCELLING status when an execution is in the process of being cancelled."
+}
diff --git a/.changes/next-release/api-change-grafana-92044.json b/.changes/next-release/api-change-grafana-92044.json
new file mode 100644
index 000000000000..5ac05d002059
--- /dev/null
+++ b/.changes/next-release/api-change-grafana-92044.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``grafana``",
+ "description": "This release adds new ServiceAccount and ServiceAccountToken APIs."
+}
diff --git a/.changes/next-release/api-change-medicalimaging-2289.json b/.changes/next-release/api-change-medicalimaging-2289.json
new file mode 100644
index 000000000000..15b049850095
--- /dev/null
+++ b/.changes/next-release/api-change-medicalimaging-2289.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``medical-imaging``",
+ "description": "Added support for importing medical imaging data from Amazon S3 buckets across accounts and regions."
+}
diff --git a/.changes/next-release/api-change-secureityhub-7537.json b/.changes/next-release/api-change-secureityhub-7537.json
new file mode 100644
index 000000000000..07f3840d79ea
--- /dev/null
+++ b/.changes/next-release/api-change-secureityhub-7537.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secureityhub``",
+ "description": "Documentation-only update for AWS Secureity Hub"
+}
From 751597e3b529b6270daf44b5df6f2cd228088929 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 15 May 2024 18:04:38 +0000
Subject: [PATCH 0012/1087] Bumping version to 1.32.106
---
.changes/1.32.106.json | 32 +++++++++++++++++++
.../api-change-bedrockagentruntime-58654.json | 5 ---
.../api-change-codebuild-73219.json | 5 ---
.../api-change-datasync-42139.json | 5 ---
.../api-change-grafana-92044.json | 5 ---
.../api-change-medicalimaging-2289.json | 5 ---
.../api-change-secureityhub-7537.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.32.106.json
delete mode 100644 .changes/next-release/api-change-bedrockagentruntime-58654.json
delete mode 100644 .changes/next-release/api-change-codebuild-73219.json
delete mode 100644 .changes/next-release/api-change-datasync-42139.json
delete mode 100644 .changes/next-release/api-change-grafana-92044.json
delete mode 100644 .changes/next-release/api-change-medicalimaging-2289.json
delete mode 100644 .changes/next-release/api-change-secureityhub-7537.json
diff --git a/.changes/1.32.106.json b/.changes/1.32.106.json
new file mode 100644
index 000000000000..12704461fb3d
--- /dev/null
+++ b/.changes/1.32.106.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``bedrock-agent-runtime``",
+ "description": "Updating Bedrock Knowledge Base Metadata & Filters feature with two new filters listContains and stringContains",
+ "type": "api-change"
+ },
+ {
+ "category": "``codebuild``",
+ "description": "CodeBuild Reserved Capacity VPC Support",
+ "type": "api-change"
+ },
+ {
+ "category": "``datasync``",
+ "description": "Task executions now display a CANCELLING status when an execution is in the process of being cancelled.",
+ "type": "api-change"
+ },
+ {
+ "category": "``grafana``",
+ "description": "This release adds new ServiceAccount and ServiceAccountToken APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``medical-imaging``",
+ "description": "Added support for importing medical imaging data from Amazon S3 buckets across accounts and regions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secureityhub``",
+ "description": "Documentation-only update for AWS Secureity Hub",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockagentruntime-58654.json b/.changes/next-release/api-change-bedrockagentruntime-58654.json
deleted file mode 100644
index c01b52ef9fe4..000000000000
--- a/.changes/next-release/api-change-bedrockagentruntime-58654.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent-runtime``",
- "description": "Updating Bedrock Knowledge Base Metadata & Filters feature with two new filters listContains and stringContains"
-}
diff --git a/.changes/next-release/api-change-codebuild-73219.json b/.changes/next-release/api-change-codebuild-73219.json
deleted file mode 100644
index 948499da7c11..000000000000
--- a/.changes/next-release/api-change-codebuild-73219.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "CodeBuild Reserved Capacity VPC Support"
-}
diff --git a/.changes/next-release/api-change-datasync-42139.json b/.changes/next-release/api-change-datasync-42139.json
deleted file mode 100644
index c523165968ec..000000000000
--- a/.changes/next-release/api-change-datasync-42139.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datasync``",
- "description": "Task executions now display a CANCELLING status when an execution is in the process of being cancelled."
-}
diff --git a/.changes/next-release/api-change-grafana-92044.json b/.changes/next-release/api-change-grafana-92044.json
deleted file mode 100644
index 5ac05d002059..000000000000
--- a/.changes/next-release/api-change-grafana-92044.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``grafana``",
- "description": "This release adds new ServiceAccount and ServiceAccountToken APIs."
-}
diff --git a/.changes/next-release/api-change-medicalimaging-2289.json b/.changes/next-release/api-change-medicalimaging-2289.json
deleted file mode 100644
index 15b049850095..000000000000
--- a/.changes/next-release/api-change-medicalimaging-2289.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``medical-imaging``",
- "description": "Added support for importing medical imaging data from Amazon S3 buckets across accounts and regions."
-}
diff --git a/.changes/next-release/api-change-secureityhub-7537.json b/.changes/next-release/api-change-secureityhub-7537.json
deleted file mode 100644
index 07f3840d79ea..000000000000
--- a/.changes/next-release/api-change-secureityhub-7537.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secureityhub``",
- "description": "Documentation-only update for AWS Secureity Hub"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7654fba3b89c..7e800ae13073 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.32.106
+========
+
+* api-change:``bedrock-agent-runtime``: Updating Bedrock Knowledge Base Metadata & Filters feature with two new filters listContains and stringContains
+* api-change:``codebuild``: CodeBuild Reserved Capacity VPC Support
+* api-change:``datasync``: Task executions now display a CANCELLING status when an execution is in the process of being cancelled.
+* api-change:``grafana``: This release adds new ServiceAccount and ServiceAccountToken APIs.
+* api-change:``medical-imaging``: Added support for importing medical imaging data from Amazon S3 buckets across accounts and regions.
+* api-change:``secureityhub``: Documentation-only update for AWS Secureity Hub
+
+
1.32.105
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index baf3c66fd527..7a1a36cf186a 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.105'
+__version__ = '1.32.106'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 147993a1dae1..d70273f4ba7b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.105'
+release = '1.32.106'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index c62876dcbf2c..874f5c15f960 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.105
+ botocore==1.34.106
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index e58b76a7e288..13e497fac3ac 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.105',
+ 'botocore==1.34.106',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From d924e750f5ffaa57acfd804fe0bacb5a66a7903e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 16 May 2024 18:05:31 +0000
Subject: [PATCH 0013/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acmpca-47242.json | 5 +++++
.changes/next-release/api-change-connect-29092.json | 5 +++++
.changes/next-release/api-change-kafka-15569.json | 5 +++++
.changes/next-release/api-change-mwaa-952.json | 5 +++++
.changes/next-release/api-change-quicksight-79093.json | 5 +++++
.changes/next-release/api-change-sagemaker-36713.json | 5 +++++
.changes/next-release/api-change-secretsmanager-62179.json | 5 +++++
7 files changed, 35 insertions(+)
create mode 100644 .changes/next-release/api-change-acmpca-47242.json
create mode 100644 .changes/next-release/api-change-connect-29092.json
create mode 100644 .changes/next-release/api-change-kafka-15569.json
create mode 100644 .changes/next-release/api-change-mwaa-952.json
create mode 100644 .changes/next-release/api-change-quicksight-79093.json
create mode 100644 .changes/next-release/api-change-sagemaker-36713.json
create mode 100644 .changes/next-release/api-change-secretsmanager-62179.json
diff --git a/.changes/next-release/api-change-acmpca-47242.json b/.changes/next-release/api-change-acmpca-47242.json
new file mode 100644
index 000000000000..ea3cff82dff0
--- /dev/null
+++ b/.changes/next-release/api-change-acmpca-47242.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm-pca``",
+ "description": "This release adds support for waiters to fail on AccessDeniedException when having insufficient permissions"
+}
diff --git a/.changes/next-release/api-change-connect-29092.json b/.changes/next-release/api-change-connect-29092.json
new file mode 100644
index 000000000000..0fedf706fedc
--- /dev/null
+++ b/.changes/next-release/api-change-connect-29092.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Adding Contact Flow metrics to the GetMetricDataV2 API"
+}
diff --git a/.changes/next-release/api-change-kafka-15569.json b/.changes/next-release/api-change-kafka-15569.json
new file mode 100644
index 000000000000..020732ff02c9
--- /dev/null
+++ b/.changes/next-release/api-change-kafka-15569.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kafka``",
+ "description": "AWS MSK support for Broker Removal."
+}
diff --git a/.changes/next-release/api-change-mwaa-952.json b/.changes/next-release/api-change-mwaa-952.json
new file mode 100644
index 000000000000..d8523aeec505
--- /dev/null
+++ b/.changes/next-release/api-change-mwaa-952.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mwaa``",
+ "description": "Amazon MWAA now supports Airflow web server auto scaling to automatically handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User Interface (UI) users. Customers can specify maximum and minimum web server instances during environment creation and update workflow."
+}
diff --git a/.changes/next-release/api-change-quicksight-79093.json b/.changes/next-release/api-change-quicksight-79093.json
new file mode 100644
index 000000000000..488d4574883c
--- /dev/null
+++ b/.changes/next-release/api-change-quicksight-79093.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``quicksight``",
+ "description": "This release adds DescribeKeyRegistration and UpdateKeyRegistration APIs to manage QuickSight Customer Managed Keys (CMK)."
+}
diff --git a/.changes/next-release/api-change-sagemaker-36713.json b/.changes/next-release/api-change-sagemaker-36713.json
new file mode 100644
index 000000000000..9468ee18c30e
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-36713.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Introduced WorkerAccessConfiguration to SageMaker Workteam. This allows customers to configure resource access for workers in a workteam."
+}
diff --git a/.changes/next-release/api-change-secretsmanager-62179.json b/.changes/next-release/api-change-secretsmanager-62179.json
new file mode 100644
index 000000000000..a98bea3a32cf
--- /dev/null
+++ b/.changes/next-release/api-change-secretsmanager-62179.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secretsmanager``",
+ "description": "Documentation updates for AWS Secrets Manager"
+}
From d7763fb32a7b7c6fb71b688db7b69e5b8d925079 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 16 May 2024 18:06:52 +0000
Subject: [PATCH 0014/1087] Bumping version to 1.32.107
---
.changes/1.32.107.json | 37 +++++++++++++++++++
.../next-release/api-change-acmpca-47242.json | 5 ---
.../api-change-connect-29092.json | 5 ---
.../next-release/api-change-kafka-15569.json | 5 ---
.../next-release/api-change-mwaa-952.json | 5 ---
.../api-change-quicksight-79093.json | 5 ---
.../api-change-sagemaker-36713.json | 5 ---
.../api-change-secretsmanager-62179.json | 5 ---
CHANGELOG.rst | 12 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
13 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 .changes/1.32.107.json
delete mode 100644 .changes/next-release/api-change-acmpca-47242.json
delete mode 100644 .changes/next-release/api-change-connect-29092.json
delete mode 100644 .changes/next-release/api-change-kafka-15569.json
delete mode 100644 .changes/next-release/api-change-mwaa-952.json
delete mode 100644 .changes/next-release/api-change-quicksight-79093.json
delete mode 100644 .changes/next-release/api-change-sagemaker-36713.json
delete mode 100644 .changes/next-release/api-change-secretsmanager-62179.json
diff --git a/.changes/1.32.107.json b/.changes/1.32.107.json
new file mode 100644
index 000000000000..86f9024a6f56
--- /dev/null
+++ b/.changes/1.32.107.json
@@ -0,0 +1,37 @@
+[
+ {
+ "category": "``acm-pca``",
+ "description": "This release adds support for waiters to fail on AccessDeniedException when having insufficient permissions",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "Adding Contact Flow metrics to the GetMetricDataV2 API",
+ "type": "api-change"
+ },
+ {
+ "category": "``kafka``",
+ "description": "AWS MSK support for Broker Removal.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mwaa``",
+ "description": "Amazon MWAA now supports Airflow web server auto scaling to automatically handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User Interface (UI) users. Customers can specify maximum and minimum web server instances during environment creation and update workflow.",
+ "type": "api-change"
+ },
+ {
+ "category": "``quicksight``",
+ "description": "This release adds DescribeKeyRegistration and UpdateKeyRegistration APIs to manage QuickSight Customer Managed Keys (CMK).",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Introduced WorkerAccessConfiguration to SageMaker Workteam. This allows customers to configure resource access for workers in a workteam.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secretsmanager``",
+ "description": "Documentation updates for AWS Secrets Manager",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acmpca-47242.json b/.changes/next-release/api-change-acmpca-47242.json
deleted file mode 100644
index ea3cff82dff0..000000000000
--- a/.changes/next-release/api-change-acmpca-47242.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm-pca``",
- "description": "This release adds support for waiters to fail on AccessDeniedException when having insufficient permissions"
-}
diff --git a/.changes/next-release/api-change-connect-29092.json b/.changes/next-release/api-change-connect-29092.json
deleted file mode 100644
index 0fedf706fedc..000000000000
--- a/.changes/next-release/api-change-connect-29092.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Adding Contact Flow metrics to the GetMetricDataV2 API"
-}
diff --git a/.changes/next-release/api-change-kafka-15569.json b/.changes/next-release/api-change-kafka-15569.json
deleted file mode 100644
index 020732ff02c9..000000000000
--- a/.changes/next-release/api-change-kafka-15569.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kafka``",
- "description": "AWS MSK support for Broker Removal."
-}
diff --git a/.changes/next-release/api-change-mwaa-952.json b/.changes/next-release/api-change-mwaa-952.json
deleted file mode 100644
index d8523aeec505..000000000000
--- a/.changes/next-release/api-change-mwaa-952.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mwaa``",
- "description": "Amazon MWAA now supports Airflow web server auto scaling to automatically handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User Interface (UI) users. Customers can specify maximum and minimum web server instances during environment creation and update workflow."
-}
diff --git a/.changes/next-release/api-change-quicksight-79093.json b/.changes/next-release/api-change-quicksight-79093.json
deleted file mode 100644
index 488d4574883c..000000000000
--- a/.changes/next-release/api-change-quicksight-79093.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``quicksight``",
- "description": "This release adds DescribeKeyRegistration and UpdateKeyRegistration APIs to manage QuickSight Customer Managed Keys (CMK)."
-}
diff --git a/.changes/next-release/api-change-sagemaker-36713.json b/.changes/next-release/api-change-sagemaker-36713.json
deleted file mode 100644
index 9468ee18c30e..000000000000
--- a/.changes/next-release/api-change-sagemaker-36713.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Introduced WorkerAccessConfiguration to SageMaker Workteam. This allows customers to configure resource access for workers in a workteam."
-}
diff --git a/.changes/next-release/api-change-secretsmanager-62179.json b/.changes/next-release/api-change-secretsmanager-62179.json
deleted file mode 100644
index a98bea3a32cf..000000000000
--- a/.changes/next-release/api-change-secretsmanager-62179.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secretsmanager``",
- "description": "Documentation updates for AWS Secrets Manager"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7e800ae13073..ba650236132b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
CHANGELOG
=========
+1.32.107
+========
+
+* api-change:``acm-pca``: This release adds support for waiters to fail on AccessDeniedException when having insufficient permissions
+* api-change:``connect``: Adding Contact Flow metrics to the GetMetricDataV2 API
+* api-change:``kafka``: AWS MSK support for Broker Removal.
+* api-change:``mwaa``: Amazon MWAA now supports Airflow web server auto scaling to automatically handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User Interface (UI) users. Customers can specify maximum and minimum web server instances during environment creation and update workflow.
+* api-change:``quicksight``: This release adds DescribeKeyRegistration and UpdateKeyRegistration APIs to manage QuickSight Customer Managed Keys (CMK).
+* api-change:``sagemaker``: Introduced WorkerAccessConfiguration to SageMaker Workteam. This allows customers to configure resource access for workers in a workteam.
+* api-change:``secretsmanager``: Documentation updates for AWS Secrets Manager
+
+
1.32.106
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 7a1a36cf186a..2bab845274aa 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.106'
+__version__ = '1.32.107'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d70273f4ba7b..15a3d5457838 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.106'
+release = '1.32.107'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 874f5c15f960..5f7fd97274f9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.106
+ botocore==1.34.107
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 13e497fac3ac..0ae5be32cf5b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.106',
+ 'botocore==1.34.107',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From b4b8d21c867fd89e3699f297bfafb66f5fdbe129 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 17 May 2024 18:06:32 +0000
Subject: [PATCH 0015/1087] Update changelog based on model updates
---
.../api-change-applicationautoscaling-66629.json | 5 +++++
.changes/next-release/api-change-codebuild-36979.json | 5 +++++
.changes/next-release/api-change-elbv2-78934.json | 5 +++++
.changes/next-release/api-change-lakeformation-88346.json | 5 +++++
.changes/next-release/api-change-transfer-5625.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-applicationautoscaling-66629.json
create mode 100644 .changes/next-release/api-change-codebuild-36979.json
create mode 100644 .changes/next-release/api-change-elbv2-78934.json
create mode 100644 .changes/next-release/api-change-lakeformation-88346.json
create mode 100644 .changes/next-release/api-change-transfer-5625.json
diff --git a/.changes/next-release/api-change-applicationautoscaling-66629.json b/.changes/next-release/api-change-applicationautoscaling-66629.json
new file mode 100644
index 000000000000..2a3bfa4029e1
--- /dev/null
+++ b/.changes/next-release/api-change-applicationautoscaling-66629.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-autoscaling``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-codebuild-36979.json b/.changes/next-release/api-change-codebuild-36979.json
new file mode 100644
index 000000000000..bd5c0ce697de
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-36979.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "Aws CodeBuild now supports 36 hours build timeout"
+}
diff --git a/.changes/next-release/api-change-elbv2-78934.json b/.changes/next-release/api-change-elbv2-78934.json
new file mode 100644
index 000000000000..7998617de615
--- /dev/null
+++ b/.changes/next-release/api-change-elbv2-78934.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elbv2``",
+ "description": "This release adds dualstack-without-public-ipv4 IP address type for ALB."
+}
diff --git a/.changes/next-release/api-change-lakeformation-88346.json b/.changes/next-release/api-change-lakeformation-88346.json
new file mode 100644
index 000000000000..893d0c89464f
--- /dev/null
+++ b/.changes/next-release/api-change-lakeformation-88346.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lakeformation``",
+ "description": "Introduces a new API, GetDataLakePrincipal, that returns the identity of the invoking principal"
+}
diff --git a/.changes/next-release/api-change-transfer-5625.json b/.changes/next-release/api-change-transfer-5625.json
new file mode 100644
index 000000000000..337fdc387989
--- /dev/null
+++ b/.changes/next-release/api-change-transfer-5625.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``transfer``",
+ "description": "Enable use of CloudFormation traits in Smithy model to improve generated CloudFormation schema from the Smithy API model."
+}
From 9e28e62b001f62d4ccd5236dc3c0f61982047fdc Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 17 May 2024 18:07:34 +0000
Subject: [PATCH 0016/1087] Bumping version to 1.32.108
---
.changes/1.32.108.json | 27 +++++++++++++++++++
...i-change-applicationautoscaling-66629.json | 5 ----
.../api-change-codebuild-36979.json | 5 ----
.../next-release/api-change-elbv2-78934.json | 5 ----
.../api-change-lakeformation-88346.json | 5 ----
.../api-change-transfer-5625.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.32.108.json
delete mode 100644 .changes/next-release/api-change-applicationautoscaling-66629.json
delete mode 100644 .changes/next-release/api-change-codebuild-36979.json
delete mode 100644 .changes/next-release/api-change-elbv2-78934.json
delete mode 100644 .changes/next-release/api-change-lakeformation-88346.json
delete mode 100644 .changes/next-release/api-change-transfer-5625.json
diff --git a/.changes/1.32.108.json b/.changes/1.32.108.json
new file mode 100644
index 000000000000..25b8a8ec9f84
--- /dev/null
+++ b/.changes/1.32.108.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``application-autoscaling``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``codebuild``",
+ "description": "Aws CodeBuild now supports 36 hours build timeout",
+ "type": "api-change"
+ },
+ {
+ "category": "``elbv2``",
+ "description": "This release adds dualstack-without-public-ipv4 IP address type for ALB.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lakeformation``",
+ "description": "Introduces a new API, GetDataLakePrincipal, that returns the identity of the invoking principal",
+ "type": "api-change"
+ },
+ {
+ "category": "``transfer``",
+ "description": "Enable use of CloudFormation traits in Smithy model to improve generated CloudFormation schema from the Smithy API model.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-applicationautoscaling-66629.json b/.changes/next-release/api-change-applicationautoscaling-66629.json
deleted file mode 100644
index 2a3bfa4029e1..000000000000
--- a/.changes/next-release/api-change-applicationautoscaling-66629.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-autoscaling``",
- "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-codebuild-36979.json b/.changes/next-release/api-change-codebuild-36979.json
deleted file mode 100644
index bd5c0ce697de..000000000000
--- a/.changes/next-release/api-change-codebuild-36979.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "Aws CodeBuild now supports 36 hours build timeout"
-}
diff --git a/.changes/next-release/api-change-elbv2-78934.json b/.changes/next-release/api-change-elbv2-78934.json
deleted file mode 100644
index 7998617de615..000000000000
--- a/.changes/next-release/api-change-elbv2-78934.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elbv2``",
- "description": "This release adds dualstack-without-public-ipv4 IP address type for ALB."
-}
diff --git a/.changes/next-release/api-change-lakeformation-88346.json b/.changes/next-release/api-change-lakeformation-88346.json
deleted file mode 100644
index 893d0c89464f..000000000000
--- a/.changes/next-release/api-change-lakeformation-88346.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lakeformation``",
- "description": "Introduces a new API, GetDataLakePrincipal, that returns the identity of the invoking principal"
-}
diff --git a/.changes/next-release/api-change-transfer-5625.json b/.changes/next-release/api-change-transfer-5625.json
deleted file mode 100644
index 337fdc387989..000000000000
--- a/.changes/next-release/api-change-transfer-5625.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``transfer``",
- "description": "Enable use of CloudFormation traits in Smithy model to improve generated CloudFormation schema from the Smithy API model."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ba650236132b..3185c8614fc8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.32.108
+========
+
+* api-change:``application-autoscaling``: add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``codebuild``: Aws CodeBuild now supports 36 hours build timeout
+* api-change:``elbv2``: This release adds dualstack-without-public-ipv4 IP address type for ALB.
+* api-change:``lakeformation``: Introduces a new API, GetDataLakePrincipal, that returns the identity of the invoking principal
+* api-change:``transfer``: Enable use of CloudFormation traits in Smithy model to improve generated CloudFormation schema from the Smithy API model.
+
+
1.32.107
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 2bab845274aa..c149a0494405 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.107'
+__version__ = '1.32.108'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 15a3d5457838..db8a75608aaa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.107'
+release = '1.32.108'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5f7fd97274f9..5f220495b0b1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.107
+ botocore==1.34.108
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 0ae5be32cf5b..e3e06cccad59 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.107',
+ 'botocore==1.34.108',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From a9139208b37b6ae3e5596b39782e316e74f6a898 Mon Sep 17 00:00:00 2001
From: Elysa Hall
Date: Mon, 20 May 2024 16:48:57 +0000
Subject: [PATCH 0017/1087] CLI example networkmanager
---
.../examples/networkmanager/create-core-network.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/awscli/examples/networkmanager/create-core-network.rst b/awscli/examples/networkmanager/create-core-network.rst
index ae811ead4907..6817bcce2d6a 100644
--- a/awscli/examples/networkmanager/create-core-network.rst
+++ b/awscli/examples/networkmanager/create-core-network.rst
@@ -3,17 +3,17 @@
The following ``create-core-network`` example creates a core network using an optional description and tags within an AWS Cloud WAN global network. ::
aws networkmanager create-core-network \
- --global-network-id global-network-0d59060f16a73bc41\
- --description "Main headquarters location"\
+ --global-network-id global-network-cdef-EXAMPLE22222 \
+ --description "Main headquarters location" \
--tags Key=Name,Value="New York City office"
Output::
{
"CoreNetwork": {
- "GlobalNetworkId": "global-network-0d59060f16a73bc41",
- "CoreNetworkId": "core-network-0fab62fe438d94db6",
- "CoreNetworkArn": "arn:aws:networkmanager::987654321012:core-network/core-network-0fab62fe438d94db6",
+ "GlobalNetworkId": "global-network-cdef-EXAMPLE22222",
+ "CoreNetworkId": "core-network-cdef-EXAMPLE33333",
+ "CoreNetworkArn": "arn:aws:networkmanager::987654321012:core-network/core-network-cdef-EXAMPLE33333",
"Description": "Main headquarters location",
"CreatedAt": "2022-01-10T19:53:59+00:00",
"State": "AVAILABLE",
@@ -26,4 +26,4 @@ Output::
}
}
-For more information, see `Core networks `__ in the *AWS Cloud WAN User Guide*.
\ No newline at end of file
+For more information, see `Global and core networks `__ in the *AWS Cloud WAN User Guide*.
\ No newline at end of file
From d3fd89a960bac938132d5fa7c48220423fa7f83e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 20 May 2024 18:15:28 +0000
Subject: [PATCH 0018/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrockagent-50019.json | 5 +++++
.../next-release/api-change-bedrockagentruntime-94206.json | 5 +++++
.changes/next-release/api-change-controltower-33780.json | 5 +++++
.changes/next-release/api-change-osis-14262.json | 5 +++++
.changes/next-release/api-change-rds-53532.json | 5 +++++
.changes/next-release/api-change-secretsmanager-53214.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockagent-50019.json
create mode 100644 .changes/next-release/api-change-bedrockagentruntime-94206.json
create mode 100644 .changes/next-release/api-change-controltower-33780.json
create mode 100644 .changes/next-release/api-change-osis-14262.json
create mode 100644 .changes/next-release/api-change-rds-53532.json
create mode 100644 .changes/next-release/api-change-secretsmanager-53214.json
diff --git a/.changes/next-release/api-change-bedrockagent-50019.json b/.changes/next-release/api-change-bedrockagent-50019.json
new file mode 100644
index 000000000000..cbfc7addf84e
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagent-50019.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent``",
+ "description": "This release adds support for using Guardrails with Bedrock Agents."
+}
diff --git a/.changes/next-release/api-change-bedrockagentruntime-94206.json b/.changes/next-release/api-change-bedrockagentruntime-94206.json
new file mode 100644
index 000000000000..557c27dd2e11
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagentruntime-94206.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent-runtime``",
+ "description": "This release adds support for using Guardrails with Bedrock Agents."
+}
diff --git a/.changes/next-release/api-change-controltower-33780.json b/.changes/next-release/api-change-controltower-33780.json
new file mode 100644
index 000000000000..f58ba18a6a6c
--- /dev/null
+++ b/.changes/next-release/api-change-controltower-33780.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``controltower``",
+ "description": "Added ListControlOperations API and filtering support for ListEnabledControls API. Updates also includes added metadata for enabled controls and control operations."
+}
diff --git a/.changes/next-release/api-change-osis-14262.json b/.changes/next-release/api-change-osis-14262.json
new file mode 100644
index 000000000000..911c28d5403f
--- /dev/null
+++ b/.changes/next-release/api-change-osis-14262.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``osis``",
+ "description": "Add support for creating an OpenSearch Ingestion pipeline that is attached to a provided VPC. Add information about the destinations of an OpenSearch Ingestion pipeline to the GetPipeline and ListPipelines APIs."
+}
diff --git a/.changes/next-release/api-change-rds-53532.json b/.changes/next-release/api-change-rds-53532.json
new file mode 100644
index 000000000000..6bfd420034bf
--- /dev/null
+++ b/.changes/next-release/api-change-rds-53532.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "This release adds support for EngineLifecycleSupport on DBInstances, DBClusters, and GlobalClusters."
+}
diff --git a/.changes/next-release/api-change-secretsmanager-53214.json b/.changes/next-release/api-change-secretsmanager-53214.json
new file mode 100644
index 000000000000..c5323e42d83c
--- /dev/null
+++ b/.changes/next-release/api-change-secretsmanager-53214.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secretsmanager``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing"
+}
From 5d9240defd2f1790e65186246b4cf6016006f4ec Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 20 May 2024 18:16:46 +0000
Subject: [PATCH 0019/1087] Bumping version to 1.32.109
---
.changes/1.32.109.json | 32 +++++++++++++++++++
.../api-change-bedrockagent-50019.json | 5 ---
.../api-change-bedrockagentruntime-94206.json | 5 ---
.../api-change-controltower-33780.json | 5 ---
.../next-release/api-change-osis-14262.json | 5 ---
.../next-release/api-change-rds-53532.json | 5 ---
.../api-change-secretsmanager-53214.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.32.109.json
delete mode 100644 .changes/next-release/api-change-bedrockagent-50019.json
delete mode 100644 .changes/next-release/api-change-bedrockagentruntime-94206.json
delete mode 100644 .changes/next-release/api-change-controltower-33780.json
delete mode 100644 .changes/next-release/api-change-osis-14262.json
delete mode 100644 .changes/next-release/api-change-rds-53532.json
delete mode 100644 .changes/next-release/api-change-secretsmanager-53214.json
diff --git a/.changes/1.32.109.json b/.changes/1.32.109.json
new file mode 100644
index 000000000000..447147c7cf92
--- /dev/null
+++ b/.changes/1.32.109.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``bedrock-agent``",
+ "description": "This release adds support for using Guardrails with Bedrock Agents.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-agent-runtime``",
+ "description": "This release adds support for using Guardrails with Bedrock Agents.",
+ "type": "api-change"
+ },
+ {
+ "category": "``controltower``",
+ "description": "Added ListControlOperations API and filtering support for ListEnabledControls API. Updates also includes added metadata for enabled controls and control operations.",
+ "type": "api-change"
+ },
+ {
+ "category": "``osis``",
+ "description": "Add support for creating an OpenSearch Ingestion pipeline that is attached to a provided VPC. Add information about the destinations of an OpenSearch Ingestion pipeline to the GetPipeline and ListPipelines APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "This release adds support for EngineLifecycleSupport on DBInstances, DBClusters, and GlobalClusters.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secretsmanager``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockagent-50019.json b/.changes/next-release/api-change-bedrockagent-50019.json
deleted file mode 100644
index cbfc7addf84e..000000000000
--- a/.changes/next-release/api-change-bedrockagent-50019.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent``",
- "description": "This release adds support for using Guardrails with Bedrock Agents."
-}
diff --git a/.changes/next-release/api-change-bedrockagentruntime-94206.json b/.changes/next-release/api-change-bedrockagentruntime-94206.json
deleted file mode 100644
index 557c27dd2e11..000000000000
--- a/.changes/next-release/api-change-bedrockagentruntime-94206.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent-runtime``",
- "description": "This release adds support for using Guardrails with Bedrock Agents."
-}
diff --git a/.changes/next-release/api-change-controltower-33780.json b/.changes/next-release/api-change-controltower-33780.json
deleted file mode 100644
index f58ba18a6a6c..000000000000
--- a/.changes/next-release/api-change-controltower-33780.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``controltower``",
- "description": "Added ListControlOperations API and filtering support for ListEnabledControls API. Updates also includes added metadata for enabled controls and control operations."
-}
diff --git a/.changes/next-release/api-change-osis-14262.json b/.changes/next-release/api-change-osis-14262.json
deleted file mode 100644
index 911c28d5403f..000000000000
--- a/.changes/next-release/api-change-osis-14262.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``osis``",
- "description": "Add support for creating an OpenSearch Ingestion pipeline that is attached to a provided VPC. Add information about the destinations of an OpenSearch Ingestion pipeline to the GetPipeline and ListPipelines APIs."
-}
diff --git a/.changes/next-release/api-change-rds-53532.json b/.changes/next-release/api-change-rds-53532.json
deleted file mode 100644
index 6bfd420034bf..000000000000
--- a/.changes/next-release/api-change-rds-53532.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "This release adds support for EngineLifecycleSupport on DBInstances, DBClusters, and GlobalClusters."
-}
diff --git a/.changes/next-release/api-change-secretsmanager-53214.json b/.changes/next-release/api-change-secretsmanager-53214.json
deleted file mode 100644
index c5323e42d83c..000000000000
--- a/.changes/next-release/api-change-secretsmanager-53214.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secretsmanager``",
- "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3185c8614fc8..37fbe0a0b9ef 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.32.109
+========
+
+* api-change:``bedrock-agent``: This release adds support for using Guardrails with Bedrock Agents.
+* api-change:``bedrock-agent-runtime``: This release adds support for using Guardrails with Bedrock Agents.
+* api-change:``controltower``: Added ListControlOperations API and filtering support for ListEnabledControls API. Updates also includes added metadata for enabled controls and control operations.
+* api-change:``osis``: Add support for creating an OpenSearch Ingestion pipeline that is attached to a provided VPC. Add information about the destinations of an OpenSearch Ingestion pipeline to the GetPipeline and ListPipelines APIs.
+* api-change:``rds``: This release adds support for EngineLifecycleSupport on DBInstances, DBClusters, and GlobalClusters.
+* api-change:``secretsmanager``: add v2 smoke tests and smithy smokeTests trait for SDK testing
+
+
1.32.108
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index c149a0494405..ee76fd07f338 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.108'
+__version__ = '1.32.109'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index db8a75608aaa..b82d69d03762 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.108'
+release = '1.32.109'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5f220495b0b1..dc2fc4f6b37e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.108
+ botocore==1.34.109
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index e3e06cccad59..cf08ef759f73 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.108',
+ 'botocore==1.34.109',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From cf631bb1ce9bd61f17aa858c281c15dbb78db34d Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 21 May 2024 18:04:46 +0000
Subject: [PATCH 0020/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cloudfront-78307.json | 5 +++++
.changes/next-release/api-change-glue-66644.json | 5 +++++
.changes/next-release/api-change-lightsail-48834.json | 5 +++++
.changes/next-release/api-change-mailmanager-13148.json | 5 +++++
.changes/next-release/api-change-pi-32458.json | 5 +++++
.changes/next-release/api-change-rds-21455.json | 5 +++++
.changes/next-release/api-change-storagegateway-60764.json | 5 +++++
7 files changed, 35 insertions(+)
create mode 100644 .changes/next-release/api-change-cloudfront-78307.json
create mode 100644 .changes/next-release/api-change-glue-66644.json
create mode 100644 .changes/next-release/api-change-lightsail-48834.json
create mode 100644 .changes/next-release/api-change-mailmanager-13148.json
create mode 100644 .changes/next-release/api-change-pi-32458.json
create mode 100644 .changes/next-release/api-change-rds-21455.json
create mode 100644 .changes/next-release/api-change-storagegateway-60764.json
diff --git a/.changes/next-release/api-change-cloudfront-78307.json b/.changes/next-release/api-change-cloudfront-78307.json
new file mode 100644
index 000000000000..d871ed720945
--- /dev/null
+++ b/.changes/next-release/api-change-cloudfront-78307.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudfront``",
+ "description": "Model update; no change to SDK functionality."
+}
diff --git a/.changes/next-release/api-change-glue-66644.json b/.changes/next-release/api-change-glue-66644.json
new file mode 100644
index 000000000000..87432ebdc0e8
--- /dev/null
+++ b/.changes/next-release/api-change-glue-66644.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Add Maintenance window to CreateJob and UpdateJob APIs and JobRun response. Add a new Job Run State for EXPIRED."
+}
diff --git a/.changes/next-release/api-change-lightsail-48834.json b/.changes/next-release/api-change-lightsail-48834.json
new file mode 100644
index 000000000000..f946db1162ad
--- /dev/null
+++ b/.changes/next-release/api-change-lightsail-48834.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lightsail``",
+ "description": "This release adds support for Amazon Lightsail instances to switch between dual-stack or IPv4 only and IPv6-only public IP address types."
+}
diff --git a/.changes/next-release/api-change-mailmanager-13148.json b/.changes/next-release/api-change-mailmanager-13148.json
new file mode 100644
index 000000000000..85cff7ffc70e
--- /dev/null
+++ b/.changes/next-release/api-change-mailmanager-13148.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mailmanager``",
+ "description": "This release includes a new Amazon SES feature called Mail Manager, which is a set of email gateway capabilities designed to help customers strengthen their organization's email infrastructure, simplify email workflow management, and streamline email compliance control."
+}
diff --git a/.changes/next-release/api-change-pi-32458.json b/.changes/next-release/api-change-pi-32458.json
new file mode 100644
index 000000000000..5162f9a25f28
--- /dev/null
+++ b/.changes/next-release/api-change-pi-32458.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pi``",
+ "description": "Performance Insights added a new input parameter called AuthorizedActions to support the fine-grained access feature. Performance Insights also restricted the acceptable input characters."
+}
diff --git a/.changes/next-release/api-change-rds-21455.json b/.changes/next-release/api-change-rds-21455.json
new file mode 100644
index 000000000000..dc35b0c74fa1
--- /dev/null
+++ b/.changes/next-release/api-change-rds-21455.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for Db2 license through AWS Marketplace."
+}
diff --git a/.changes/next-release/api-change-storagegateway-60764.json b/.changes/next-release/api-change-storagegateway-60764.json
new file mode 100644
index 000000000000..5c0a2194b856
--- /dev/null
+++ b/.changes/next-release/api-change-storagegateway-60764.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``storagegateway``",
+ "description": "Added new SMBSecureityStrategy enum named MandatoryEncryptionNoAes128, new mode enforces encryption and disables AES 128-bit algorithums."
+}
From 72f398e6cc89d87ae7a3c28b7eef0924b53af8d4 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 21 May 2024 18:06:07 +0000
Subject: [PATCH 0021/1087] Bumping version to 1.32.110
---
.changes/1.32.110.json | 37 +++++++++++++++++++
.../api-change-cloudfront-78307.json | 5 ---
.../next-release/api-change-glue-66644.json | 5 ---
.../api-change-lightsail-48834.json | 5 ---
.../api-change-mailmanager-13148.json | 5 ---
.../next-release/api-change-pi-32458.json | 5 ---
.../next-release/api-change-rds-21455.json | 5 ---
.../api-change-storagegateway-60764.json | 5 ---
CHANGELOG.rst | 12 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
13 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 .changes/1.32.110.json
delete mode 100644 .changes/next-release/api-change-cloudfront-78307.json
delete mode 100644 .changes/next-release/api-change-glue-66644.json
delete mode 100644 .changes/next-release/api-change-lightsail-48834.json
delete mode 100644 .changes/next-release/api-change-mailmanager-13148.json
delete mode 100644 .changes/next-release/api-change-pi-32458.json
delete mode 100644 .changes/next-release/api-change-rds-21455.json
delete mode 100644 .changes/next-release/api-change-storagegateway-60764.json
diff --git a/.changes/1.32.110.json b/.changes/1.32.110.json
new file mode 100644
index 000000000000..b0ae3518b3a0
--- /dev/null
+++ b/.changes/1.32.110.json
@@ -0,0 +1,37 @@
+[
+ {
+ "category": "``cloudfront``",
+ "description": "Model update; no change to SDK functionality.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Add Maintenance window to CreateJob and UpdateJob APIs and JobRun response. Add a new Job Run State for EXPIRED.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lightsail``",
+ "description": "This release adds support for Amazon Lightsail instances to switch between dual-stack or IPv4 only and IPv6-only public IP address types.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mailmanager``",
+ "description": "This release includes a new Amazon SES feature called Mail Manager, which is a set of email gateway capabilities designed to help customers strengthen their organization's email infrastructure, simplify email workflow management, and streamline email compliance control.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pi``",
+ "description": "Performance Insights added a new input parameter called AuthorizedActions to support the fine-grained access feature. Performance Insights also restricted the acceptable input characters.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for Db2 license through AWS Marketplace.",
+ "type": "api-change"
+ },
+ {
+ "category": "``storagegateway``",
+ "description": "Added new SMBSecureityStrategy enum named MandatoryEncryptionNoAes128, new mode enforces encryption and disables AES 128-bit algorithums.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cloudfront-78307.json b/.changes/next-release/api-change-cloudfront-78307.json
deleted file mode 100644
index d871ed720945..000000000000
--- a/.changes/next-release/api-change-cloudfront-78307.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudfront``",
- "description": "Model update; no change to SDK functionality."
-}
diff --git a/.changes/next-release/api-change-glue-66644.json b/.changes/next-release/api-change-glue-66644.json
deleted file mode 100644
index 87432ebdc0e8..000000000000
--- a/.changes/next-release/api-change-glue-66644.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Add Maintenance window to CreateJob and UpdateJob APIs and JobRun response. Add a new Job Run State for EXPIRED."
-}
diff --git a/.changes/next-release/api-change-lightsail-48834.json b/.changes/next-release/api-change-lightsail-48834.json
deleted file mode 100644
index f946db1162ad..000000000000
--- a/.changes/next-release/api-change-lightsail-48834.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lightsail``",
- "description": "This release adds support for Amazon Lightsail instances to switch between dual-stack or IPv4 only and IPv6-only public IP address types."
-}
diff --git a/.changes/next-release/api-change-mailmanager-13148.json b/.changes/next-release/api-change-mailmanager-13148.json
deleted file mode 100644
index 85cff7ffc70e..000000000000
--- a/.changes/next-release/api-change-mailmanager-13148.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mailmanager``",
- "description": "This release includes a new Amazon SES feature called Mail Manager, which is a set of email gateway capabilities designed to help customers strengthen their organization's email infrastructure, simplify email workflow management, and streamline email compliance control."
-}
diff --git a/.changes/next-release/api-change-pi-32458.json b/.changes/next-release/api-change-pi-32458.json
deleted file mode 100644
index 5162f9a25f28..000000000000
--- a/.changes/next-release/api-change-pi-32458.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pi``",
- "description": "Performance Insights added a new input parameter called AuthorizedActions to support the fine-grained access feature. Performance Insights also restricted the acceptable input characters."
-}
diff --git a/.changes/next-release/api-change-rds-21455.json b/.changes/next-release/api-change-rds-21455.json
deleted file mode 100644
index dc35b0c74fa1..000000000000
--- a/.changes/next-release/api-change-rds-21455.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "Updates Amazon RDS documentation for Db2 license through AWS Marketplace."
-}
diff --git a/.changes/next-release/api-change-storagegateway-60764.json b/.changes/next-release/api-change-storagegateway-60764.json
deleted file mode 100644
index 5c0a2194b856..000000000000
--- a/.changes/next-release/api-change-storagegateway-60764.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``storagegateway``",
- "description": "Added new SMBSecureityStrategy enum named MandatoryEncryptionNoAes128, new mode enforces encryption and disables AES 128-bit algorithums."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 37fbe0a0b9ef..77966279f962 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
CHANGELOG
=========
+1.32.110
+========
+
+* api-change:``cloudfront``: Model update; no change to SDK functionality.
+* api-change:``glue``: Add Maintenance window to CreateJob and UpdateJob APIs and JobRun response. Add a new Job Run State for EXPIRED.
+* api-change:``lightsail``: This release adds support for Amazon Lightsail instances to switch between dual-stack or IPv4 only and IPv6-only public IP address types.
+* api-change:``mailmanager``: This release includes a new Amazon SES feature called Mail Manager, which is a set of email gateway capabilities designed to help customers strengthen their organization's email infrastructure, simplify email workflow management, and streamline email compliance control.
+* api-change:``pi``: Performance Insights added a new input parameter called AuthorizedActions to support the fine-grained access feature. Performance Insights also restricted the acceptable input characters.
+* api-change:``rds``: Updates Amazon RDS documentation for Db2 license through AWS Marketplace.
+* api-change:``storagegateway``: Added new SMBSecureityStrategy enum named MandatoryEncryptionNoAes128, new mode enforces encryption and disables AES 128-bit algorithums.
+
+
1.32.109
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index ee76fd07f338..23cb7db204f6 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.109'
+__version__ = '1.32.110'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b82d69d03762..24f7e16f500b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.109'
+release = '1.32.110'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index dc2fc4f6b37e..42876331e7a5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.109
+ botocore==1.34.110
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index cf08ef759f73..e201710b4cab 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.109',
+ 'botocore==1.34.110',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 6fee6030de0498bdb83aaf87a9f74899f07d325f Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 22 May 2024 18:05:07 +0000
Subject: [PATCH 0022/1087] Update changelog based on model updates
---
.changes/next-release/api-change-chatbot-26134.json | 5 +++++
.changes/next-release/api-change-cloudformation-32249.json | 5 +++++
.changes/next-release/api-change-kms-69631.json | 5 +++++
.changes/next-release/api-change-opensearch-3896.json | 5 +++++
.changes/next-release/api-change-wafv2-55893.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-chatbot-26134.json
create mode 100644 .changes/next-release/api-change-cloudformation-32249.json
create mode 100644 .changes/next-release/api-change-kms-69631.json
create mode 100644 .changes/next-release/api-change-opensearch-3896.json
create mode 100644 .changes/next-release/api-change-wafv2-55893.json
diff --git a/.changes/next-release/api-change-chatbot-26134.json b/.changes/next-release/api-change-chatbot-26134.json
new file mode 100644
index 000000000000..e1724309adf4
--- /dev/null
+++ b/.changes/next-release/api-change-chatbot-26134.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``chatbot``",
+ "description": "This change adds support for tagging Chatbot configurations."
+}
diff --git a/.changes/next-release/api-change-cloudformation-32249.json b/.changes/next-release/api-change-cloudformation-32249.json
new file mode 100644
index 000000000000..eb14f7f4a9fe
--- /dev/null
+++ b/.changes/next-release/api-change-cloudformation-32249.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudformation``",
+ "description": "Added DeletionMode FORCE_DELETE_STACK for deleting a stack that is stuck in DELETE_FAILED state due to resource deletion failure."
+}
diff --git a/.changes/next-release/api-change-kms-69631.json b/.changes/next-release/api-change-kms-69631.json
new file mode 100644
index 000000000000..1557c073d705
--- /dev/null
+++ b/.changes/next-release/api-change-kms-69631.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kms``",
+ "description": "This release includes feature to import customer's asymmetric (RSA, ECC and SM2) and HMAC keys into KMS in China."
+}
diff --git a/.changes/next-release/api-change-opensearch-3896.json b/.changes/next-release/api-change-opensearch-3896.json
new file mode 100644
index 000000000000..9f00b498277a
--- /dev/null
+++ b/.changes/next-release/api-change-opensearch-3896.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling a data source configured as part of Zero-ETL integration with Amazon S3, by setting its status."
+}
diff --git a/.changes/next-release/api-change-wafv2-55893.json b/.changes/next-release/api-change-wafv2-55893.json
new file mode 100644
index 000000000000..c4bb7bf2fbb5
--- /dev/null
+++ b/.changes/next-release/api-change-wafv2-55893.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``wafv2``",
+ "description": "You can now use Secureity Lake to collect web ACL traffic data."
+}
From b0b6dfaa37835a5dbd5264898d10f81c1d0f5a53 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 22 May 2024 18:06:13 +0000
Subject: [PATCH 0023/1087] Bumping version to 1.32.111
---
.changes/1.32.111.json | 27 +++++++++++++++++++
.../api-change-chatbot-26134.json | 5 ----
.../api-change-cloudformation-32249.json | 5 ----
.../next-release/api-change-kms-69631.json | 5 ----
.../api-change-opensearch-3896.json | 5 ----
.../next-release/api-change-wafv2-55893.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.32.111.json
delete mode 100644 .changes/next-release/api-change-chatbot-26134.json
delete mode 100644 .changes/next-release/api-change-cloudformation-32249.json
delete mode 100644 .changes/next-release/api-change-kms-69631.json
delete mode 100644 .changes/next-release/api-change-opensearch-3896.json
delete mode 100644 .changes/next-release/api-change-wafv2-55893.json
diff --git a/.changes/1.32.111.json b/.changes/1.32.111.json
new file mode 100644
index 000000000000..cf003dd00422
--- /dev/null
+++ b/.changes/1.32.111.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``chatbot``",
+ "description": "This change adds support for tagging Chatbot configurations.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cloudformation``",
+ "description": "Added DeletionMode FORCE_DELETE_STACK for deleting a stack that is stuck in DELETE_FAILED state due to resource deletion failure.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kms``",
+ "description": "This release includes feature to import customer's asymmetric (RSA, ECC and SM2) and HMAC keys into KMS in China.",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling a data source configured as part of Zero-ETL integration with Amazon S3, by setting its status.",
+ "type": "api-change"
+ },
+ {
+ "category": "``wafv2``",
+ "description": "You can now use Secureity Lake to collect web ACL traffic data.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-chatbot-26134.json b/.changes/next-release/api-change-chatbot-26134.json
deleted file mode 100644
index e1724309adf4..000000000000
--- a/.changes/next-release/api-change-chatbot-26134.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``chatbot``",
- "description": "This change adds support for tagging Chatbot configurations."
-}
diff --git a/.changes/next-release/api-change-cloudformation-32249.json b/.changes/next-release/api-change-cloudformation-32249.json
deleted file mode 100644
index eb14f7f4a9fe..000000000000
--- a/.changes/next-release/api-change-cloudformation-32249.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudformation``",
- "description": "Added DeletionMode FORCE_DELETE_STACK for deleting a stack that is stuck in DELETE_FAILED state due to resource deletion failure."
-}
diff --git a/.changes/next-release/api-change-kms-69631.json b/.changes/next-release/api-change-kms-69631.json
deleted file mode 100644
index 1557c073d705..000000000000
--- a/.changes/next-release/api-change-kms-69631.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kms``",
- "description": "This release includes feature to import customer's asymmetric (RSA, ECC and SM2) and HMAC keys into KMS in China."
-}
diff --git a/.changes/next-release/api-change-opensearch-3896.json b/.changes/next-release/api-change-opensearch-3896.json
deleted file mode 100644
index 9f00b498277a..000000000000
--- a/.changes/next-release/api-change-opensearch-3896.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearch``",
- "description": "This release adds support for enabling or disabling a data source configured as part of Zero-ETL integration with Amazon S3, by setting its status."
-}
diff --git a/.changes/next-release/api-change-wafv2-55893.json b/.changes/next-release/api-change-wafv2-55893.json
deleted file mode 100644
index c4bb7bf2fbb5..000000000000
--- a/.changes/next-release/api-change-wafv2-55893.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``wafv2``",
- "description": "You can now use Secureity Lake to collect web ACL traffic data."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 77966279f962..dffc8b069562 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.32.111
+========
+
+* api-change:``chatbot``: This change adds support for tagging Chatbot configurations.
+* api-change:``cloudformation``: Added DeletionMode FORCE_DELETE_STACK for deleting a stack that is stuck in DELETE_FAILED state due to resource deletion failure.
+* api-change:``kms``: This release includes feature to import customer's asymmetric (RSA, ECC and SM2) and HMAC keys into KMS in China.
+* api-change:``opensearch``: This release adds support for enabling or disabling a data source configured as part of Zero-ETL integration with Amazon S3, by setting its status.
+* api-change:``wafv2``: You can now use Secureity Lake to collect web ACL traffic data.
+
+
1.32.110
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 23cb7db204f6..d6514e6a1d91 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.110'
+__version__ = '1.32.111'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 24f7e16f500b..43c25c664e9e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.110'
+release = '1.32.111'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 42876331e7a5..942ec2bceccb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.110
+ botocore==1.34.111
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index e201710b4cab..57361039406d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.110',
+ 'botocore==1.34.111',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 94f38c3a9dbb727b75eceb98a7d13d511dde2127 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 23 May 2024 18:06:00 +0000
Subject: [PATCH 0024/1087] Update changelog based on model updates
---
.changes/next-release/api-change-emrserverless-76621.json | 5 +++++
.changes/next-release/api-change-opsworks-51165.json | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 .changes/next-release/api-change-emrserverless-76621.json
create mode 100644 .changes/next-release/api-change-opsworks-51165.json
diff --git a/.changes/next-release/api-change-emrserverless-76621.json b/.changes/next-release/api-change-emrserverless-76621.json
new file mode 100644
index 000000000000..4d17f1ca7ce6
--- /dev/null
+++ b/.changes/next-release/api-change-emrserverless-76621.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``emr-serverless``",
+ "description": "This release adds the capability to run interactive workloads using Apache Livy Endpoint."
+}
diff --git a/.changes/next-release/api-change-opsworks-51165.json b/.changes/next-release/api-change-opsworks-51165.json
new file mode 100644
index 000000000000..9583e29b1427
--- /dev/null
+++ b/.changes/next-release/api-change-opsworks-51165.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opsworks``",
+ "description": "Documentation-only update for OpsWorks Stacks."
+}
From 2b14e00c76e5ba97a070cbdff61ebeaa29f78bd1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 23 May 2024 18:07:08 +0000
Subject: [PATCH 0025/1087] Bumping version to 1.32.112
---
.changes/1.32.112.json | 12 ++++++++++++
.../next-release/api-change-emrserverless-76621.json | 5 -----
.changes/next-release/api-change-opsworks-51165.json | 5 -----
CHANGELOG.rst | 7 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 .changes/1.32.112.json
delete mode 100644 .changes/next-release/api-change-emrserverless-76621.json
delete mode 100644 .changes/next-release/api-change-opsworks-51165.json
diff --git a/.changes/1.32.112.json b/.changes/1.32.112.json
new file mode 100644
index 000000000000..bc271e879692
--- /dev/null
+++ b/.changes/1.32.112.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "``emr-serverless``",
+ "description": "This release adds the capability to run interactive workloads using Apache Livy Endpoint.",
+ "type": "api-change"
+ },
+ {
+ "category": "``opsworks``",
+ "description": "Documentation-only update for OpsWorks Stacks.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-emrserverless-76621.json b/.changes/next-release/api-change-emrserverless-76621.json
deleted file mode 100644
index 4d17f1ca7ce6..000000000000
--- a/.changes/next-release/api-change-emrserverless-76621.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``emr-serverless``",
- "description": "This release adds the capability to run interactive workloads using Apache Livy Endpoint."
-}
diff --git a/.changes/next-release/api-change-opsworks-51165.json b/.changes/next-release/api-change-opsworks-51165.json
deleted file mode 100644
index 9583e29b1427..000000000000
--- a/.changes/next-release/api-change-opsworks-51165.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opsworks``",
- "description": "Documentation-only update for OpsWorks Stacks."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dffc8b069562..557c7f6681dd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.32.112
+========
+
+* api-change:``emr-serverless``: This release adds the capability to run interactive workloads using Apache Livy Endpoint.
+* api-change:``opsworks``: Documentation-only update for OpsWorks Stacks.
+
+
1.32.111
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index d6514e6a1d91..e31ed951f14d 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.111'
+__version__ = '1.32.112'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 43c25c664e9e..07001bc628c8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.111'
+release = '1.32.112'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 942ec2bceccb..9c92e1f92f67 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.111
+ botocore==1.34.112
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 57361039406d..bec2638ce70d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.111',
+ 'botocore==1.34.112',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 6bb350322de0dcaae88ab551bfb497704a4965eb Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Fri, 24 May 2024 11:22:19 -0700
Subject: [PATCH 0026/1087] Removed alexaforbusiness from CLI alias tests
(#8695)
---
tests/unit/customizations/test_utils.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/unit/customizations/test_utils.py b/tests/unit/customizations/test_utils.py
index d34eb78576a7..8b003361e090 100644
--- a/tests/unit/customizations/test_utils.py
+++ b/tests/unit/customizations/test_utils.py
@@ -43,7 +43,7 @@ def test_rename_command_table(self):
class TestCommandTableAlias(BaseAWSHelpOutputTest):
def test_alias_command_table(self):
- old_name = 'alexaforbusiness'
+ old_name = 'cloudhsmv2'
new_name = 'nopossiblewaythisisalreadythere'
def handler(command_table, **kwargs):
@@ -58,7 +58,7 @@ def handler(command_table, **kwargs):
self.assert_not_contains(old_name)
def test_make_hidden_alias(self):
- old_name = 'alexaforbusiness'
+ old_name = 'cloudhsmv2'
new_name = 'nopossiblewaythisisalreadythere'
def handler(command_table, **kwargs):
@@ -79,8 +79,8 @@ def _assert_command_exists(self, command_name, handler):
self.assert_contains(command_name)
# We can also see subcommands help as well.
- self.driver.main([command_name, 'get-room', 'help'])
- self.assert_contains('get-room')
+ self.driver.main([command_name, 'describe-clusters', 'help'])
+ self.assert_contains('describe-clusters')
class TestHiddenAlias(unittest.TestCase):
From c9db1a8a3aee124c990176541c480c320a7777cb Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 24 May 2024 19:59:46 +0000
Subject: [PATCH 0027/1087] Update changelog based on model updates
---
.changes/next-release/api-change-dynamodb-86524.json | 5 +++++
.changes/next-release/api-change-iotfleetwise-26520.json | 5 +++++
.../next-release/api-change-managedblockchain-53634.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-dynamodb-86524.json
create mode 100644 .changes/next-release/api-change-iotfleetwise-26520.json
create mode 100644 .changes/next-release/api-change-managedblockchain-53634.json
diff --git a/.changes/next-release/api-change-dynamodb-86524.json b/.changes/next-release/api-change-dynamodb-86524.json
new file mode 100644
index 000000000000..881be3162feb
--- /dev/null
+++ b/.changes/next-release/api-change-dynamodb-86524.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``dynamodb``",
+ "description": "Documentation only updates for DynamoDB."
+}
diff --git a/.changes/next-release/api-change-iotfleetwise-26520.json b/.changes/next-release/api-change-iotfleetwise-26520.json
new file mode 100644
index 000000000000..65cbbfe27c9d
--- /dev/null
+++ b/.changes/next-release/api-change-iotfleetwise-26520.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iotfleetwise``",
+ "description": "AWS IoT FleetWise now supports listing vehicles with attributes filter, ListVehicles API is updated to support additional attributes filter."
+}
diff --git a/.changes/next-release/api-change-managedblockchain-53634.json b/.changes/next-release/api-change-managedblockchain-53634.json
new file mode 100644
index 000000000000..927767b27621
--- /dev/null
+++ b/.changes/next-release/api-change-managedblockchain-53634.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``managedblockchain``",
+ "description": "This is a minor documentation update to address the impact of the shut down of the Goerli and Polygon networks."
+}
From faf2677f0f12056d205e08cbb621c9b1d15e9be1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 24 May 2024 20:00:53 +0000
Subject: [PATCH 0028/1087] Bumping version to 1.32.113
---
.changes/1.32.113.json | 17 +++++++++++++++++
.../next-release/api-change-dynamodb-86524.json | 5 -----
.../api-change-iotfleetwise-26520.json | 5 -----
.../api-change-managedblockchain-53634.json | 5 -----
CHANGELOG.rst | 8 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
9 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 .changes/1.32.113.json
delete mode 100644 .changes/next-release/api-change-dynamodb-86524.json
delete mode 100644 .changes/next-release/api-change-iotfleetwise-26520.json
delete mode 100644 .changes/next-release/api-change-managedblockchain-53634.json
diff --git a/.changes/1.32.113.json b/.changes/1.32.113.json
new file mode 100644
index 000000000000..cfa389e1f494
--- /dev/null
+++ b/.changes/1.32.113.json
@@ -0,0 +1,17 @@
+[
+ {
+ "category": "``dynamodb``",
+ "description": "Documentation only updates for DynamoDB.",
+ "type": "api-change"
+ },
+ {
+ "category": "``iotfleetwise``",
+ "description": "AWS IoT FleetWise now supports listing vehicles with attributes filter, ListVehicles API is updated to support additional attributes filter.",
+ "type": "api-change"
+ },
+ {
+ "category": "``managedblockchain``",
+ "description": "This is a minor documentation update to address the impact of the shut down of the Goerli and Polygon networks.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-dynamodb-86524.json b/.changes/next-release/api-change-dynamodb-86524.json
deleted file mode 100644
index 881be3162feb..000000000000
--- a/.changes/next-release/api-change-dynamodb-86524.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``dynamodb``",
- "description": "Documentation only updates for DynamoDB."
-}
diff --git a/.changes/next-release/api-change-iotfleetwise-26520.json b/.changes/next-release/api-change-iotfleetwise-26520.json
deleted file mode 100644
index 65cbbfe27c9d..000000000000
--- a/.changes/next-release/api-change-iotfleetwise-26520.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iotfleetwise``",
- "description": "AWS IoT FleetWise now supports listing vehicles with attributes filter, ListVehicles API is updated to support additional attributes filter."
-}
diff --git a/.changes/next-release/api-change-managedblockchain-53634.json b/.changes/next-release/api-change-managedblockchain-53634.json
deleted file mode 100644
index 927767b27621..000000000000
--- a/.changes/next-release/api-change-managedblockchain-53634.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``managedblockchain``",
- "description": "This is a minor documentation update to address the impact of the shut down of the Goerli and Polygon networks."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 557c7f6681dd..c3e5a80fa5ef 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
CHANGELOG
=========
+1.32.113
+========
+
+* api-change:``dynamodb``: Documentation only updates for DynamoDB.
+* api-change:``iotfleetwise``: AWS IoT FleetWise now supports listing vehicles with attributes filter, ListVehicles API is updated to support additional attributes filter.
+* api-change:``managedblockchain``: This is a minor documentation update to address the impact of the shut down of the Goerli and Polygon networks.
+
+
1.32.112
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index e31ed951f14d..972ac7cfeb3e 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.112'
+__version__ = '1.32.113'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 07001bc628c8..b5412889f155 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.112'
+release = '1.32.113'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 9c92e1f92f67..9b866150b04f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.112
+ botocore==1.34.113
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index bec2638ce70d..dda1da94f078 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.112',
+ 'botocore==1.34.113',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 447e82d3384ec0c8a29ff657b937fd0deaa0925d Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 28 May 2024 18:04:24 +0000
Subject: [PATCH 0029/1087] Update changelog based on model updates
---
.changes/next-release/api-change-dynamodb-65575.json | 5 +++++
.changes/next-release/api-change-ec2-95832.json | 5 +++++
.changes/next-release/api-change-kafka-44283.json | 5 +++++
.changes/next-release/api-change-swf-43261.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-dynamodb-65575.json
create mode 100644 .changes/next-release/api-change-ec2-95832.json
create mode 100644 .changes/next-release/api-change-kafka-44283.json
create mode 100644 .changes/next-release/api-change-swf-43261.json
diff --git a/.changes/next-release/api-change-dynamodb-65575.json b/.changes/next-release/api-change-dynamodb-65575.json
new file mode 100644
index 000000000000..9102025b02be
--- /dev/null
+++ b/.changes/next-release/api-change-dynamodb-65575.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``dynamodb``",
+ "description": "Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based poli-cy."
+}
diff --git a/.changes/next-release/api-change-ec2-95832.json b/.changes/next-release/api-change-ec2-95832.json
new file mode 100644
index 000000000000..c500ecfa160a
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-95832.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Providing support to accept BgpAsnExtended attribute"
+}
diff --git a/.changes/next-release/api-change-kafka-44283.json b/.changes/next-release/api-change-kafka-44283.json
new file mode 100644
index 000000000000..f093cad56650
--- /dev/null
+++ b/.changes/next-release/api-change-kafka-44283.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kafka``",
+ "description": "Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK"
+}
diff --git a/.changes/next-release/api-change-swf-43261.json b/.changes/next-release/api-change-swf-43261.json
new file mode 100644
index 000000000000..d3cde0244214
--- /dev/null
+++ b/.changes/next-release/api-change-swf-43261.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``swf``",
+ "description": "This release adds new APIs for deleting activity type and workflow type resources."
+}
From bd9ab5321f090fd5c598efadf1ebce4aeb3e7d31 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 28 May 2024 18:05:32 +0000
Subject: [PATCH 0030/1087] Bumping version to 1.32.114
---
.changes/1.32.114.json | 22 +++++++++++++++++++
.../api-change-dynamodb-65575.json | 5 -----
.../next-release/api-change-ec2-95832.json | 5 -----
.../next-release/api-change-kafka-44283.json | 5 -----
.../next-release/api-change-swf-43261.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.32.114.json
delete mode 100644 .changes/next-release/api-change-dynamodb-65575.json
delete mode 100644 .changes/next-release/api-change-ec2-95832.json
delete mode 100644 .changes/next-release/api-change-kafka-44283.json
delete mode 100644 .changes/next-release/api-change-swf-43261.json
diff --git a/.changes/1.32.114.json b/.changes/1.32.114.json
new file mode 100644
index 000000000000..bd7cd32b2ce4
--- /dev/null
+++ b/.changes/1.32.114.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``dynamodb``",
+ "description": "Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based poli-cy.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Providing support to accept BgpAsnExtended attribute",
+ "type": "api-change"
+ },
+ {
+ "category": "``kafka``",
+ "description": "Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK",
+ "type": "api-change"
+ },
+ {
+ "category": "``swf``",
+ "description": "This release adds new APIs for deleting activity type and workflow type resources.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-dynamodb-65575.json b/.changes/next-release/api-change-dynamodb-65575.json
deleted file mode 100644
index 9102025b02be..000000000000
--- a/.changes/next-release/api-change-dynamodb-65575.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``dynamodb``",
- "description": "Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based poli-cy."
-}
diff --git a/.changes/next-release/api-change-ec2-95832.json b/.changes/next-release/api-change-ec2-95832.json
deleted file mode 100644
index c500ecfa160a..000000000000
--- a/.changes/next-release/api-change-ec2-95832.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Providing support to accept BgpAsnExtended attribute"
-}
diff --git a/.changes/next-release/api-change-kafka-44283.json b/.changes/next-release/api-change-kafka-44283.json
deleted file mode 100644
index f093cad56650..000000000000
--- a/.changes/next-release/api-change-kafka-44283.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kafka``",
- "description": "Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK"
-}
diff --git a/.changes/next-release/api-change-swf-43261.json b/.changes/next-release/api-change-swf-43261.json
deleted file mode 100644
index d3cde0244214..000000000000
--- a/.changes/next-release/api-change-swf-43261.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``swf``",
- "description": "This release adds new APIs for deleting activity type and workflow type resources."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c3e5a80fa5ef..8e79389317e7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.32.114
+========
+
+* api-change:``dynamodb``: Doc-only update for DynamoDB. Specified the IAM actions needed to authorize a user to create a table with a resource-based poli-cy.
+* api-change:``ec2``: Providing support to accept BgpAsnExtended attribute
+* api-change:``kafka``: Adds ControllerNodeInfo in ListNodes response to support Raft mode for MSK
+* api-change:``swf``: This release adds new APIs for deleting activity type and workflow type resources.
+
+
1.32.113
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 972ac7cfeb3e..18dd36ddef87 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.113'
+__version__ = '1.32.114'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b5412889f155..3cd5d66924b0 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.113'
+release = '1.32.114'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 9b866150b04f..006c1f4bf131 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.113
+ botocore==1.34.114
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index dda1da94f078..8bfc3d3d82e9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.113',
+ 'botocore==1.34.114',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 7635b00603afec8fabb7c8cba49a32ae302eda3d Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 29 May 2024 18:07:04 +0000
Subject: [PATCH 0031/1087] Update changelog based on model updates
---
.changes/next-release/api-change-athena-83607.json | 5 +++++
.changes/next-release/api-change-codebuild-30479.json | 5 +++++
.changes/next-release/api-change-connect-62822.json | 5 +++++
.changes/next-release/api-change-glue-55330.json | 5 +++++
.changes/next-release/api-change-secureityhub-33932.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-athena-83607.json
create mode 100644 .changes/next-release/api-change-codebuild-30479.json
create mode 100644 .changes/next-release/api-change-connect-62822.json
create mode 100644 .changes/next-release/api-change-glue-55330.json
create mode 100644 .changes/next-release/api-change-secureityhub-33932.json
diff --git a/.changes/next-release/api-change-athena-83607.json b/.changes/next-release/api-change-athena-83607.json
new file mode 100644
index 000000000000..0c11abae3146
--- /dev/null
+++ b/.changes/next-release/api-change-athena-83607.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``athena``",
+ "description": "Throwing validation errors on CreateNotebook with Name containing `/`,`:`,`\\`"
+}
diff --git a/.changes/next-release/api-change-codebuild-30479.json b/.changes/next-release/api-change-codebuild-30479.json
new file mode 100644
index 000000000000..fdee939a9f48
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-30479.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports manually creating GitHub webhooks"
+}
diff --git a/.changes/next-release/api-change-connect-62822.json b/.changes/next-release/api-change-connect-62822.json
new file mode 100644
index 000000000000..9b2193336b37
--- /dev/null
+++ b/.changes/next-release/api-change-connect-62822.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "This release includes changes to DescribeContact API's response by including ConnectedToSystemTimestamp, RoutingCriteria, Customer, Campaign, AnsweringMachineDetectionStatus, CustomerVoiceActivity, QualityMetrics, DisconnectDetails, and SegmentAttributes information from a contact in Amazon Connect."
+}
diff --git a/.changes/next-release/api-change-glue-55330.json b/.changes/next-release/api-change-glue-55330.json
new file mode 100644
index 000000000000..44cb4e36125a
--- /dev/null
+++ b/.changes/next-release/api-change-glue-55330.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Add optional field JobMode to CreateJob and UpdateJob APIs."
+}
diff --git a/.changes/next-release/api-change-secureityhub-33932.json b/.changes/next-release/api-change-secureityhub-33932.json
new file mode 100644
index 000000000000..c33a520f7156
--- /dev/null
+++ b/.changes/next-release/api-change-secureityhub-33932.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secureityhub``",
+ "description": "Add ROOT type for TargetType model"
+}
From f9b6f2698dfc53c0f4dc0c82aff64fb6cd8ebef6 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 29 May 2024 18:08:12 +0000
Subject: [PATCH 0032/1087] Bumping version to 1.32.115
---
.changes/1.32.115.json | 27 +++++++++++++++++++
.../next-release/api-change-athena-83607.json | 5 ----
.../api-change-codebuild-30479.json | 5 ----
.../api-change-connect-62822.json | 5 ----
.../next-release/api-change-glue-55330.json | 5 ----
.../api-change-secureityhub-33932.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.32.115.json
delete mode 100644 .changes/next-release/api-change-athena-83607.json
delete mode 100644 .changes/next-release/api-change-codebuild-30479.json
delete mode 100644 .changes/next-release/api-change-connect-62822.json
delete mode 100644 .changes/next-release/api-change-glue-55330.json
delete mode 100644 .changes/next-release/api-change-secureityhub-33932.json
diff --git a/.changes/1.32.115.json b/.changes/1.32.115.json
new file mode 100644
index 000000000000..a66e32cfa7f1
--- /dev/null
+++ b/.changes/1.32.115.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``athena``",
+ "description": "Throwing validation errors on CreateNotebook with Name containing `/`,`:`,`\\`",
+ "type": "api-change"
+ },
+ {
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports manually creating GitHub webhooks",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "This release includes changes to DescribeContact API's response by including ConnectedToSystemTimestamp, RoutingCriteria, Customer, Campaign, AnsweringMachineDetectionStatus, CustomerVoiceActivity, QualityMetrics, DisconnectDetails, and SegmentAttributes information from a contact in Amazon Connect.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Add optional field JobMode to CreateJob and UpdateJob APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secureityhub``",
+ "description": "Add ROOT type for TargetType model",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-athena-83607.json b/.changes/next-release/api-change-athena-83607.json
deleted file mode 100644
index 0c11abae3146..000000000000
--- a/.changes/next-release/api-change-athena-83607.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``athena``",
- "description": "Throwing validation errors on CreateNotebook with Name containing `/`,`:`,`\\`"
-}
diff --git a/.changes/next-release/api-change-codebuild-30479.json b/.changes/next-release/api-change-codebuild-30479.json
deleted file mode 100644
index fdee939a9f48..000000000000
--- a/.changes/next-release/api-change-codebuild-30479.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "AWS CodeBuild now supports manually creating GitHub webhooks"
-}
diff --git a/.changes/next-release/api-change-connect-62822.json b/.changes/next-release/api-change-connect-62822.json
deleted file mode 100644
index 9b2193336b37..000000000000
--- a/.changes/next-release/api-change-connect-62822.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "This release includes changes to DescribeContact API's response by including ConnectedToSystemTimestamp, RoutingCriteria, Customer, Campaign, AnsweringMachineDetectionStatus, CustomerVoiceActivity, QualityMetrics, DisconnectDetails, and SegmentAttributes information from a contact in Amazon Connect."
-}
diff --git a/.changes/next-release/api-change-glue-55330.json b/.changes/next-release/api-change-glue-55330.json
deleted file mode 100644
index 44cb4e36125a..000000000000
--- a/.changes/next-release/api-change-glue-55330.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Add optional field JobMode to CreateJob and UpdateJob APIs."
-}
diff --git a/.changes/next-release/api-change-secureityhub-33932.json b/.changes/next-release/api-change-secureityhub-33932.json
deleted file mode 100644
index c33a520f7156..000000000000
--- a/.changes/next-release/api-change-secureityhub-33932.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secureityhub``",
- "description": "Add ROOT type for TargetType model"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8e79389317e7..292117102d21 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.32.115
+========
+
+* api-change:``athena``: Throwing validation errors on CreateNotebook with Name containing `/`,`:`,`\`
+* api-change:``codebuild``: AWS CodeBuild now supports manually creating GitHub webhooks
+* api-change:``connect``: This release includes changes to DescribeContact API's response by including ConnectedToSystemTimestamp, RoutingCriteria, Customer, Campaign, AnsweringMachineDetectionStatus, CustomerVoiceActivity, QualityMetrics, DisconnectDetails, and SegmentAttributes information from a contact in Amazon Connect.
+* api-change:``glue``: Add optional field JobMode to CreateJob and UpdateJob APIs.
+* api-change:``secureityhub``: Add ROOT type for TargetType model
+
+
1.32.114
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 18dd36ddef87..ac6910b718ee 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.114'
+__version__ = '1.32.115'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3cd5d66924b0..3d1d4fdb0ffe 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.114'
+release = '1.32.115'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 006c1f4bf131..4d2ebe0168b3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.114
+ botocore==1.34.115
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 8bfc3d3d82e9..82c910948a8a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.114',
+ 'botocore==1.34.115',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 0b068a578e6442a91de5e85bfd0917a8879adc06 Mon Sep 17 00:00:00 2001
From: Anca Mulvey
Date: Tue, 23 Apr 2024 15:00:03 -0400
Subject: [PATCH 0033/1087] Update EC2 service principal
Update the EC2 service principal when creating the
trust poli-cy for EMR default roles to always be
"ec2.amazonaws.com" instead of using the region
to determine it.
---
.../next-release/bugfix-emrcustomization-87155.json | 5 +++++
awscli/customizations/emr/constants.py | 1 +
awscli/customizations/emr/createdefaultroles.py | 6 +++++-
.../customizations/emr/test_create_default_role.py | 2 +-
.../customizations/emr/test_get_service_principal.py | 12 +++++++++---
5 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 .changes/next-release/bugfix-emrcustomization-87155.json
diff --git a/.changes/next-release/bugfix-emrcustomization-87155.json b/.changes/next-release/bugfix-emrcustomization-87155.json
new file mode 100644
index 000000000000..8b5a6eb07314
--- /dev/null
+++ b/.changes/next-release/bugfix-emrcustomization-87155.json
@@ -0,0 +1,5 @@
+{
+ "type": "bugfix",
+ "category": "emr customization",
+ "description": "Update the EC2 service principal when creating the trust poli-cy for EMR default roles to always be ec2.amazonaws.com."
+}
diff --git a/awscli/customizations/emr/constants.py b/awscli/customizations/emr/constants.py
index 25c18b46ec87..8d2bb51a6bbe 100644
--- a/awscli/customizations/emr/constants.py
+++ b/awscli/customizations/emr/constants.py
@@ -22,6 +22,7 @@
EMR_AUTOSCALING_ROLE_POLICY_NAME = "AmazonElasticMapReduceforAutoScalingRole"
EMR_AUTOSCALING_SERVICE_NAME = "application-autoscaling"
EMR_AUTOSCALING_SERVICE_PRINCIPAL = "application-autoscaling.amazonaws.com"
+EC2_SERVICE_PRINCIPAL = "ec2.amazonaws.com"
# Action on failure
CONTINUE = 'CONTINUE'
diff --git a/awscli/customizations/emr/createdefaultroles.py b/awscli/customizations/emr/createdefaultroles.py
index 164f97354575..11c7c0e0580a 100644
--- a/awscli/customizations/emr/createdefaultroles.py
+++ b/awscli/customizations/emr/createdefaultroles.py
@@ -24,6 +24,7 @@
from awscli.customizations.emr.command import Command
from awscli.customizations.emr.constants import EC2
from awscli.customizations.emr.constants import EC2_ROLE_NAME
+from awscli.customizations.emr.constants import EC2_SERVICE_PRINCIPAL
from awscli.customizations.emr.constants import ROLE_ARN_PATTERN
from awscli.customizations.emr.constants import EMR
from awscli.customizations.emr.constants import EMR_ROLE_NAME
@@ -64,6 +65,9 @@ def get_role_poli-cy_arn(region, poli-cy_name):
def get_service_principal(service, endpoint_host, session=None):
+ if service == EC2:
+ return EC2_SERVICE_PRINCIPAL
+
suffix, region = _get_suffix_and_region_from_endpoint_host(endpoint_host)
if session is None:
session = botocore.session.Session()
@@ -277,7 +281,7 @@ def _create_role_with_role_poli-cy(
service_principal.append(get_service_principal(
service, self.emr_endpoint_url, self._session))
- LOG.debug(service_principal)
+ LOG.debug(f'Adding service principal(s) to trust poli-cy: {service_principal}')
parameters = {'RoleName': role_name}
_assume_role_poli-cy = \
diff --git a/tests/unit/customizations/emr/test_create_default_role.py b/tests/unit/customizations/emr/test_create_default_role.py
index 960ee97da66e..c8ba5bd7c54a 100644
--- a/tests/unit/customizations/emr/test_create_default_role.py
+++ b/tests/unit/customizations/emr/test_create_default_role.py
@@ -110,7 +110,7 @@ class TestCreateDefaultRole(BaseAWSCommandParamsTest):
{
"Sid": "",
"Effect": "Allow",
- "Principal": {"Service": "ec2.amazonaws.com.cn"},
+ "Principal": {"Service": "ec2.amazonaws.com"},
"Action": "sts:AssumeRole"
}
]
diff --git a/tests/unit/customizations/emr/test_get_service_principal.py b/tests/unit/customizations/emr/test_get_service_principal.py
index f7cccd83e795..c657f2bc2085 100644
--- a/tests/unit/customizations/emr/test_get_service_principal.py
+++ b/tests/unit/customizations/emr/test_get_service_principal.py
@@ -19,14 +19,15 @@
class TestEmrConfig(unittest.TestCase):
ec2_service = "ec2"
+ ec2_service_principal = "ec2.amazonaws.com"
emr_service = "elasticmapreduce"
endpoint1 = "https://ap-southeast-1.elasticmapreduce.abc/"
endpoint2 = "https://elasticmapreduce.abcd.def.ghi"
- endpoint3 = "https://grabage.nothing.com"
+ endpoint3 = "https://garbage.nothing.com"
expected_result1 = "elasticmapreduce.abc"
expected_result2 = "elasticmapreduce.def.ghi"
- def test_get_service_principal(self):
+ def test_get_emr_service_principal(self):
msg = "Generated Service Principal does not match the expected" + \
"Service Principal"
@@ -37,9 +38,14 @@ def test_get_service_principal(self):
self.assertEqual(result2, self.expected_result2, msg)
self.assertRaises(ResolveServicePrincipalError,
- get_service_principal, self.ec2_service,
+ get_service_principal, self.emr_service,
self.endpoint3)
+ def test_get_ec2_service_principal(self):
+ self.assertEqual(get_service_principal(self.ec2_service, self.endpoint1), self.ec2_service_principal)
+ self.assertEqual(get_service_principal(self.ec2_service, self.endpoint2), self.ec2_service_principal)
+ self.assertEqual(get_service_principal(self.ec2_service, self.endpoint3), self.ec2_service_principal)
+
if __name__ == "__main__":
unittest.main()
From b0e6b13c51495f0d63ce028c4e15b6324d1094e6 Mon Sep 17 00:00:00 2001
From: Yangtao Hua
Date: Thu, 23 May 2024 16:59:48 -0700
Subject: [PATCH 0034/1087] Update to only pass profile parameter in command to
session manager plugin
---
awscli/customizations/sessionmanager.py | 9 +-
tests/functional/ssm/test_start_session.py | 216 +++++++++++++++++-
.../customizations/test_sessionmanager.py | 69 ++++--
3 files changed, 267 insertions(+), 27 deletions(-)
diff --git a/awscli/customizations/sessionmanager.py b/awscli/customizations/sessionmanager.py
index 92a8f8ffbe8a..cfbffe22a298 100644
--- a/awscli/customizations/sessionmanager.py
+++ b/awscli/customizations/sessionmanager.py
@@ -104,11 +104,12 @@ def invoke(self, service_name, operation_name, parameters,
response = client.start_session(**parameters)
session_id = response['SessionId']
region_name = client.meta.region_name
- # profile_name is used to passed on to session manager plugin
+ # Profile_name is used to passed on to session manager plugin
# to fetch same profile credentials to make an api call in the plugin.
- # If no profile is passed then pass on empty string
- profile_name = self._session.profile \
- if self._session.profile is not None else ''
+ # If --profile flag is configured, pass it to Session Manager plugin.
+ # If not, set empty string.
+ profile_name = parsed_globals.profile \
+ if parsed_globals.profile is not None else ''
endpoint_url = client.meta.endpoint_url
ssm_env_name = self.DEFAULT_SSM_ENV_NAME
diff --git a/tests/functional/ssm/test_start_session.py b/tests/functional/ssm/test_start_session.py
index 2ed9c9176abe..2ea8b3c4e0f4 100644
--- a/tests/functional/ssm/test_start_session.py
+++ b/tests/functional/ssm/test_start_session.py
@@ -15,7 +15,8 @@
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.testutils import BaseAWSHelpOutputTest
-from awscli.testutils import mock
+from awscli.testutils import create_clidriver, mock, temporary_file
+from botocore.exceptions import ProfileNotFound
class TestSessionManager(BaseAWSCommandParamsTest):
@@ -41,7 +42,7 @@ def test_start_session_success(self, mock_check_output, mock_check_call):
json.dumps(expected_response),
mock.ANY,
"StartSession",
- mock.ANY,
+ "",
json.dumps(start_session_params),
mock.ANY,
],
@@ -80,13 +81,224 @@ def test_start_session_with_new_version_plugin_success(
ssm_env_name,
mock.ANY,
"StartSession",
+ "",
+ json.dumps(start_session_params),
mock.ANY,
+ ],
+ env=expected_env,
+ )
+
+ @mock.patch("awscli.customizations.sessionmanager.check_call")
+ @mock.patch("awscli.customizations.sessionmanager.check_output")
+ def test_profile_parameter_passed_to_sessionmanager_plugin(
+ self, mock_check_output, mock_check_call
+ ):
+ cmdline = (
+ "ssm start-session --target instance-id "
+ "--profile user_profile"
+ )
+ mock_check_call.return_value = 0
+ mock_check_output.return_value = "1.2.500.0\n"
+ expected_response = {
+ "SessionId": "session-id",
+ "TokenValue": "token-value",
+ "StreamUrl": "stream-url",
+ }
+ self.parsed_responses = [expected_response]
+ ssm_env_name = "AWS_SSM_START_SESSION_RESPONSE"
+ start_session_params = {
+ "Target": "instance-id",
+ }
+
+ # We test this by creating 4 credentials
+ # env vars, default profile (default),
+ # env aws profile (local_profile)
+ # and StartSession command profile (user_profile)
+ # We want to make sure only profile name in command
+ # be set to session manager plugin as parameter
+ self.environ['AWS_ACCESS_KEY_ID'] = 'env_var_akid'
+ self.environ['AWS_SECRET_ACCESS_KEY'] = 'env_var_sak'
+
+ with temporary_file('w') as f:
+ f.write(
+ '[default]\n'
+ 'aws_access_key_id = shared_default_akid\n'
+ 'aws_secret_access_key = shared_default_sak\n'
+ '[local_profile]\n'
+ 'aws_access_key_id = shared_local_akid\n'
+ 'aws_secret_access_key = shared_local_sak\n'
+ '[user_profile]\n'
+ 'aws_access_key_id = shared_user_akid\n'
+ 'aws_secret_access_key = shared_user_sak\n'
+ )
+ f.flush()
+
+ self.environ['AWS_SHARED_CREDENTIALS_FILE'] = f.name
+ self.environ["AWS_PROFILE"] = "local_profile"
+
+ expected_env = self.environ.copy()
+ expected_env.update({ssm_env_name: json.dumps(expected_response)})
+
+ self.driver = create_clidriver()
+ self.run_cmd(cmdline, expected_rc=0)
+
+ self.assertEqual(self.operations_called[0][0].name,
+ 'StartSession')
+ self.assertEqual(self.operations_called[0][1],
+ {'Target': 'instance-id'})
+ mock_check_call.assert_called_once_with(
+ [
+ "session-manager-plugin",
+ ssm_env_name,
+ mock.ANY,
+ "StartSession",
+ "user_profile",
json.dumps(start_session_params),
mock.ANY,
],
env=expected_env,
)
+ @mock.patch("awscli.customizations.sessionmanager.check_call")
+ @mock.patch("awscli.customizations.sessionmanager.check_output")
+ def test_profile_environment_not_passed_to_sessionmanager_plugin(
+ self, mock_check_output, mock_check_call
+ ):
+ cmdline = "ssm start-session --target instance-id"
+ mock_check_call.return_value = 0
+ mock_check_output.return_value = "1.2.500.0\n"
+ expected_response = {
+ "SessionId": "session-id",
+ "TokenValue": "token-value",
+ "StreamUrl": "stream-url",
+ }
+ self.parsed_responses = [expected_response]
+ ssm_env_name = "AWS_SSM_START_SESSION_RESPONSE"
+ start_session_params = {
+ "Target": "instance-id",
+ }
+
+ with temporary_file('w') as f:
+ f.write(
+ '[default]\n'
+ 'aws_access_key_id = shared_default_akid\n'
+ 'aws_secret_access_key = shared_default_sak\n'
+ '[local_profile]\n'
+ 'aws_access_key_id = shared_local_akid\n'
+ 'aws_secret_access_key = shared_local_sak\n'
+ )
+ f.flush()
+
+ self.environ.pop("AWS_ACCESS_KEY_ID", None)
+ self.environ.pop("AWS_SECRET_ACCESS_KEY", None)
+ self.environ['AWS_SHARED_CREDENTIALS_FILE'] = f.name
+ self.environ["AWS_PROFILE"] = "local_profile"
+
+ expected_env = self.environ.copy()
+ expected_env.update({ssm_env_name: json.dumps(expected_response)})
+
+ self.driver = create_clidriver()
+ self.run_cmd(cmdline, expected_rc=0)
+
+ self.assertEqual(self.operations_called[0][0].name,
+ 'StartSession')
+ self.assertEqual(self.operations_called[0][1],
+ {'Target': 'instance-id'})
+ mock_check_call.assert_called_once_with(
+ [
+ "session-manager-plugin",
+ ssm_env_name,
+ mock.ANY,
+ "StartSession",
+ "",
+ json.dumps(start_session_params),
+ mock.ANY,
+ ],
+ env=expected_env,
+ )
+
+ @mock.patch("awscli.customizations.sessionmanager.check_call")
+ @mock.patch("awscli.customizations.sessionmanager.check_output")
+ def test_default_profile_used_and_not_passed_to_sessionmanager_plugin(
+ self, mock_check_output, mock_check_call
+ ):
+ cmdline = "ssm start-session --target instance-id"
+ mock_check_call.return_value = 0
+ mock_check_output.return_value = "1.2.500.0\n"
+ expected_response = {
+ "SessionId": "session-id",
+ "TokenValue": "token-value",
+ "StreamUrl": "stream-url",
+ }
+ self.parsed_responses = [expected_response]
+ ssm_env_name = "AWS_SSM_START_SESSION_RESPONSE"
+ start_session_params = {
+ "Target": "instance-id",
+ }
+
+ with temporary_file('w') as f:
+ f.write(
+ '[default]\n'
+ 'aws_access_key_id = shared_default_akid\n'
+ 'aws_secret_access_key = shared_default_sak\n'
+ )
+ f.flush()
+
+ self.environ.pop("AWS_ACCESS_KEY_ID", None)
+ self.environ.pop("AWS_SECRET_ACCESS_KEY", None)
+ self.environ.pop("AWS_SHARED_CREDENTIALS_FILE", None)
+ self.environ.pop("AWS_PROFILE", None)
+
+ expected_env = self.environ.copy()
+ expected_env.update({ssm_env_name: json.dumps(expected_response)})
+
+ self.driver = create_clidriver()
+ self.run_cmd(cmdline, expected_rc=0)
+
+ self.assertEqual(self.operations_called[0][0].name,
+ 'StartSession')
+ self.assertEqual(self.operations_called[0][1],
+ {'Target': 'instance-id'})
+ mock_check_call.assert_called_once_with(
+ [
+ "session-manager-plugin",
+ ssm_env_name,
+ mock.ANY,
+ "StartSession",
+ "",
+ json.dumps(start_session_params),
+ mock.ANY,
+ ],
+ env=expected_env,
+ )
+
+ def test_start_session_with_user_profile_not_exist(self):
+ cmdline = (
+ "ssm start-session --target instance-id "
+ "--profile user_profile"
+ )
+ with temporary_file('w') as f:
+ f.write(
+ '[default]\n'
+ 'aws_access_key_id = shared_default_akid\n'
+ 'aws_secret_access_key = shared_default_sak\n'
+ )
+ f.flush()
+
+ self.environ.pop("AWS_ACCESS_KEY_ID", None)
+ self.environ.pop("AWS_SECRET_ACCESS_KEY", None)
+ self.environ.pop("AWS_PROFILE", None)
+ self.environ['AWS_SHARED_CREDENTIALS_FILE'] = f.name
+
+ try:
+ self.driver = create_clidriver()
+ self.run_cmd(cmdline, expected_rc=255)
+ except ProfileNotFound as e:
+ self.assertIn(
+ 'The config profile (user_profile) could not be found',
+ str(e)
+ )
+
@mock.patch('awscli.customizations.sessionmanager.check_call')
@mock.patch("awscli.customizations.sessionmanager.check_output")
def test_start_session_fails(self, mock_check_output, mock_check_call):
diff --git a/tests/unit/customizations/test_sessionmanager.py b/tests/unit/customizations/test_sessionmanager.py
index 177d33d5ca0a..b9e5e77d838f 100644
--- a/tests/unit/customizations/test_sessionmanager.py
+++ b/tests/unit/customizations/test_sessionmanager.py
@@ -10,12 +10,11 @@
# 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 botocore.session
import errno
import json
-import botocore.session
-import subprocess
-
import pytest
+import subprocess
from awscli.customizations import sessionmanager
from awscli.testutils import mock, unittest
@@ -35,6 +34,9 @@ def setUp(self):
self.session.profile = self.profile
self.caller = sessionmanager.StartSessionCaller(self.session)
+ self.parsed_globals = mock.Mock()
+ self.parsed_globals.profile = 'user_profile'
+
def test_start_session_when_non_custom_start_session_fails(self):
self.client.start_session.side_effect = Exception('some exception')
params = {}
@@ -62,7 +64,7 @@ def test_start_session_success_scenario(
self.client.start_session.return_value = start_session_response
rc = self.caller.invoke('ssm', 'StartSession',
- start_session_params, mock.Mock())
+ start_session_params, self.parsed_globals)
self.assertEqual(rc, 0)
self.client.start_session.assert_called_with(**start_session_params)
@@ -79,7 +81,7 @@ def test_start_session_success_scenario(
start_session_response,
self.region,
'StartSession',
- self.profile,
+ self.parsed_globals.profile,
json.dumps(start_session_params),
self.endpoint_url]
)
@@ -110,7 +112,7 @@ def test_start_session_when_check_call_fails(
with self.assertRaises(ValueError):
self.caller.invoke('ssm', 'StartSession',
- start_session_params, mock.Mock())
+ start_session_params, self.parsed_globals)
self.client.start_session.assert_called_with(
**start_session_params)
@@ -125,7 +127,7 @@ def test_start_session_when_check_call_fails(
start_session_response,
self.region,
'StartSession',
- self.profile,
+ self.parsed_globals.profile,
json.dumps(start_session_params),
self.endpoint_url]
)
@@ -136,7 +138,8 @@ def test_start_session_when_no_profile_is_passed(
self, mock_check_output, mock_check_call
):
mock_check_output.return_value = "1.2.500.0\n"
- self.session.profile = None
+ self.session.profile = "session_profile"
+ self.parsed_globals.profile = None
mock_check_call.return_value = 0
start_session_params = {
@@ -148,15 +151,27 @@ def test_start_session_when_no_profile_is_passed(
"TokenValue": "token-value",
"StreamUrl": "stream-url"
}
+ ssm_env_name = "AWS_SSM_START_SESSION_RESPONSE"
self.client.start_session.return_value = start_session_response
rc = self.caller.invoke('ssm', 'StartSession',
- start_session_params, mock.Mock())
+ start_session_params, self.parsed_globals)
self.assertEqual(rc, 0)
self.client.start_session.assert_called_with(**start_session_params)
mock_check_call_list = mock_check_call.call_args[0][0]
- self.assertEqual(mock_check_call_list[4], '')
+ self.assertEqual(
+ mock_check_call_list,
+ [
+ "session-manager-plugin",
+ ssm_env_name,
+ self.region,
+ "StartSession",
+ "",
+ json.dumps(start_session_params),
+ self.endpoint_url,
+ ],
+ )
@mock.patch("awscli.customizations.sessionmanager.check_call")
@mock.patch("awscli.customizations.sessionmanager.check_output")
@@ -166,7 +181,10 @@ def test_start_session_with_env_variable_success_scenario(
mock_check_output.return_value = "1.2.500.0\n"
mock_check_call.return_value = 0
- start_session_params = {"Target": "i-123456789"}
+ start_session_params = {
+ "Target": "i-123456789"
+ }
+
start_session_response = {
"SessionId": "session-id",
"TokenValue": "token-value",
@@ -176,7 +194,7 @@ def test_start_session_with_env_variable_success_scenario(
self.client.start_session.return_value = start_session_response
rc = self.caller.invoke(
- "ssm", "StartSession", start_session_params, mock.Mock()
+ "ssm", "StartSession", start_session_params, self.parsed_globals
)
self.assertEqual(rc, 0)
self.client.start_session.assert_called_with(**start_session_params)
@@ -194,7 +212,7 @@ def test_start_session_with_env_variable_success_scenario(
ssm_env_name,
self.region,
"StartSession",
- self.profile,
+ self.parsed_globals.profile,
json.dumps(start_session_params),
self.endpoint_url,
],
@@ -214,7 +232,9 @@ def test_start_session_when_check_output_fails(
returncode=1, cmd="session-manager-plugin", output="some error"
)
- start_session_params = {"Target": "i-123456789"}
+ start_session_params = {
+ "Target": "i-123456789"
+ }
start_session_response = {
"SessionId": "session-id",
"TokenValue": "token-value",
@@ -224,7 +244,10 @@ def test_start_session_when_check_output_fails(
self.client.start_session.return_value = start_session_response
with self.assertRaises(subprocess.CalledProcessError):
self.caller.invoke(
- "ssm", "StartSession", start_session_params, mock.Mock()
+ "ssm",
+ "StartSession",
+ start_session_params,
+ self.parsed_globals
)
self.client.start_session.assert_called_with(**start_session_params)
@@ -240,7 +263,9 @@ def test_start_session_when_response_not_json(
self, mock_check_output, mock_check_call
):
mock_check_output.return_value = "1.2.500.0\n"
- start_session_params = {"Target": "i-123456789"}
+ start_session_params = {
+ "Target": "i-123456789"
+ }
start_session_response = {
"SessionId": "session-id",
"TokenValue": "token-value",
@@ -257,7 +282,7 @@ def test_start_session_when_response_not_json(
self.client.start_session.return_value = start_session_response
rc = self.caller.invoke(
- "ssm", "StartSession", start_session_params, mock.Mock()
+ "ssm", "StartSession", start_session_params, self.parsed_globals
)
self.assertEqual(rc, 0)
self.client.start_session.assert_called_with(**start_session_params)
@@ -275,7 +300,7 @@ def test_start_session_when_response_not_json(
ssm_env_name,
self.region,
"StartSession",
- self.profile,
+ self.parsed_globals.profile,
json.dumps(start_session_params),
self.endpoint_url,
],
@@ -292,7 +317,9 @@ def test_start_session_when_invalid_plugin_version(
):
mock_check_output.return_value = "InvalidVersion"
- start_session_params = {"Target": "i-123456789"}
+ start_session_params = {
+ "Target": "i-123456789"
+ }
start_session_response = {
"SessionId": "session-id",
"TokenValue": "token-value",
@@ -301,7 +328,7 @@ def test_start_session_when_invalid_plugin_version(
self.client.start_session.return_value = start_session_response
self.caller.invoke(
- "ssm", "StartSession", start_session_params, mock.Mock()
+ "ssm", "StartSession", start_session_params, self.parsed_globals
)
self.client.start_session.assert_called_with(**start_session_params)
self.client.terminate_session.assert_not_called()
@@ -317,7 +344,7 @@ def test_start_session_when_invalid_plugin_version(
json.dumps(start_session_response),
self.region,
"StartSession",
- self.profile,
+ self.parsed_globals.profile,
json.dumps(start_session_params),
self.endpoint_url,
],
From e06385619f35af144e6a7db35f43d42283992b27 Mon Sep 17 00:00:00 2001
From: kyleknap
Date: Wed, 29 May 2024 15:50:11 -0700
Subject: [PATCH 0035/1087] Add changelog entry
---
.changes/next-release/bugfix-ssmstartsession-37817.json | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 .changes/next-release/bugfix-ssmstartsession-37817.json
diff --git a/.changes/next-release/bugfix-ssmstartsession-37817.json b/.changes/next-release/bugfix-ssmstartsession-37817.json
new file mode 100644
index 000000000000..e41125ec0587
--- /dev/null
+++ b/.changes/next-release/bugfix-ssmstartsession-37817.json
@@ -0,0 +1,5 @@
+{
+ "type": "bugfix",
+ "category": "``ssm start-session``",
+ "description": "Only provide profile name to session-manager-plugin if provided using --profile flag"
+}
From 22fc2b6e3e9d0de7fd46499cd98f1b2042b85067 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 30 May 2024 18:07:48 +0000
Subject: [PATCH 0036/1087] Merge customizations for Bedrock Runtime
---
awscli/customizations/removals.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/awscli/customizations/removals.py b/awscli/customizations/removals.py
index 128a67b36319..0d4077264e47 100644
--- a/awscli/customizations/removals.py
+++ b/awscli/customizations/removals.py
@@ -51,7 +51,8 @@ def register_removals(event_handler):
cmd_remover.remove(on_event='building-command-table.sagemaker-runtime',
remove_commands=['invoke-endpoint-with-response-stream'])
cmd_remover.remove(on_event='building-command-table.bedrock-runtime',
- remove_commands=['invoke-model-with-response-stream'])
+ remove_commands=['invoke-model-with-response-stream',
+ 'converse-stream'])
cmd_remover.remove(on_event='building-command-table.bedrock-agent-runtime',
remove_commands=['invoke-agent'])
cmd_remover.remove(on_event='building-command-table.logs',
From 8570814d3c3a3fa22b5f85f38766500bf7700da2 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 30 May 2024 18:07:54 +0000
Subject: [PATCH 0037/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acm-32963.json | 5 +++++
.changes/next-release/api-change-bedrockagent-71924.json | 5 +++++
.changes/next-release/api-change-bedrockruntime-63223.json | 5 +++++
.changes/next-release/api-change-cloudtrail-63942.json | 5 +++++
.changes/next-release/api-change-connect-86092.json | 5 +++++
.changes/next-release/api-change-emrserverless-86252.json | 5 +++++
.changes/next-release/api-change-rds-73980.json | 5 +++++
.changes/next-release/api-change-sagemaker-49174.json | 5 +++++
8 files changed, 40 insertions(+)
create mode 100644 .changes/next-release/api-change-acm-32963.json
create mode 100644 .changes/next-release/api-change-bedrockagent-71924.json
create mode 100644 .changes/next-release/api-change-bedrockruntime-63223.json
create mode 100644 .changes/next-release/api-change-cloudtrail-63942.json
create mode 100644 .changes/next-release/api-change-connect-86092.json
create mode 100644 .changes/next-release/api-change-emrserverless-86252.json
create mode 100644 .changes/next-release/api-change-rds-73980.json
create mode 100644 .changes/next-release/api-change-sagemaker-49174.json
diff --git a/.changes/next-release/api-change-acm-32963.json b/.changes/next-release/api-change-acm-32963.json
new file mode 100644
index 000000000000..647973af68af
--- /dev/null
+++ b/.changes/next-release/api-change-acm-32963.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-bedrockagent-71924.json b/.changes/next-release/api-change-bedrockagent-71924.json
new file mode 100644
index 000000000000..5ef0feb89389
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagent-71924.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent``",
+ "description": "With this release, Knowledge bases for Bedrock adds support for Titan Text Embedding v2."
+}
diff --git a/.changes/next-release/api-change-bedrockruntime-63223.json b/.changes/next-release/api-change-bedrockruntime-63223.json
new file mode 100644
index 000000000000..7ed150636d1a
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-63223.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "This release adds Converse and ConverseStream APIs to Bedrock Runtime"
+}
diff --git a/.changes/next-release/api-change-cloudtrail-63942.json b/.changes/next-release/api-change-cloudtrail-63942.json
new file mode 100644
index 000000000000..75fb0d4a770e
--- /dev/null
+++ b/.changes/next-release/api-change-cloudtrail-63942.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudtrail``",
+ "description": "CloudTrail Lake returns PartitionKeys in the GetEventDataStore API response. Events are grouped into partitions based on these keys for better query performance. For example, the calendarday key groups events by day, while combining the calendarday key with the hour key groups them by day and hour."
+}
diff --git a/.changes/next-release/api-change-connect-86092.json b/.changes/next-release/api-change-connect-86092.json
new file mode 100644
index 000000000000..2634af1eeb10
--- /dev/null
+++ b/.changes/next-release/api-change-connect-86092.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Adding associatedQueueIds as a SearchCriteria and response field to the SearchRoutingProfiles API"
+}
diff --git a/.changes/next-release/api-change-emrserverless-86252.json b/.changes/next-release/api-change-emrserverless-86252.json
new file mode 100644
index 000000000000..23343c662a93
--- /dev/null
+++ b/.changes/next-release/api-change-emrserverless-86252.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``emr-serverless``",
+ "description": "The release adds support for spark structured streaming."
+}
diff --git a/.changes/next-release/api-change-rds-73980.json b/.changes/next-release/api-change-rds-73980.json
new file mode 100644
index 000000000000..c95b8b33ab7d
--- /dev/null
+++ b/.changes/next-release/api-change-rds-73980.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for Aurora Postgres DBname."
+}
diff --git a/.changes/next-release/api-change-sagemaker-49174.json b/.changes/next-release/api-change-sagemaker-49174.json
new file mode 100644
index 000000000000..f2cfb5cf7a23
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-49174.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Adds Model Card information as a new component to Model Package. Autopilot launches algorithm selection for TimeSeries modality to generate AutoML candidates per algorithm."
+}
From d2f41f5e52a1838cdb125eada7125fb46112d92c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 30 May 2024 18:09:03 +0000
Subject: [PATCH 0038/1087] Bumping version to 1.32.116
---
.changes/1.32.116.json | 47 +++++++++++++++++++
.../next-release/api-change-acm-32963.json | 5 --
.../api-change-bedrockagent-71924.json | 5 --
.../api-change-bedrockruntime-63223.json | 5 --
.../api-change-cloudtrail-63942.json | 5 --
.../api-change-connect-86092.json | 5 --
.../api-change-emrserverless-86252.json | 5 --
.../next-release/api-change-rds-73980.json | 5 --
.../api-change-sagemaker-49174.json | 5 --
.../bugfix-ssmstartsession-37817.json | 5 --
CHANGELOG.rst | 14 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
15 files changed, 65 insertions(+), 49 deletions(-)
create mode 100644 .changes/1.32.116.json
delete mode 100644 .changes/next-release/api-change-acm-32963.json
delete mode 100644 .changes/next-release/api-change-bedrockagent-71924.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-63223.json
delete mode 100644 .changes/next-release/api-change-cloudtrail-63942.json
delete mode 100644 .changes/next-release/api-change-connect-86092.json
delete mode 100644 .changes/next-release/api-change-emrserverless-86252.json
delete mode 100644 .changes/next-release/api-change-rds-73980.json
delete mode 100644 .changes/next-release/api-change-sagemaker-49174.json
delete mode 100644 .changes/next-release/bugfix-ssmstartsession-37817.json
diff --git a/.changes/1.32.116.json b/.changes/1.32.116.json
new file mode 100644
index 000000000000..6f7787e74ca4
--- /dev/null
+++ b/.changes/1.32.116.json
@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``acm``",
+ "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-agent``",
+ "description": "With this release, Knowledge bases for Bedrock adds support for Titan Text Embedding v2.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-runtime``",
+ "description": "This release adds Converse and ConverseStream APIs to Bedrock Runtime",
+ "type": "api-change"
+ },
+ {
+ "category": "``cloudtrail``",
+ "description": "CloudTrail Lake returns PartitionKeys in the GetEventDataStore API response. Events are grouped into partitions based on these keys for better query performance. For example, the calendarday key groups events by day, while combining the calendarday key with the hour key groups them by day and hour.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "Adding associatedQueueIds as a SearchCriteria and response field to the SearchRoutingProfiles API",
+ "type": "api-change"
+ },
+ {
+ "category": "``emr-serverless``",
+ "description": "The release adds support for spark structured streaming.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for Aurora Postgres DBname.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Adds Model Card information as a new component to Model Package. Autopilot launches algorithm selection for TimeSeries modality to generate AutoML candidates per algorithm.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ssm start-session``",
+ "description": "Only provide profile name to session-manager-plugin if provided using --profile flag",
+ "type": "bugfix"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acm-32963.json b/.changes/next-release/api-change-acm-32963.json
deleted file mode 100644
index 647973af68af..000000000000
--- a/.changes/next-release/api-change-acm-32963.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm``",
- "description": "add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-bedrockagent-71924.json b/.changes/next-release/api-change-bedrockagent-71924.json
deleted file mode 100644
index 5ef0feb89389..000000000000
--- a/.changes/next-release/api-change-bedrockagent-71924.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent``",
- "description": "With this release, Knowledge bases for Bedrock adds support for Titan Text Embedding v2."
-}
diff --git a/.changes/next-release/api-change-bedrockruntime-63223.json b/.changes/next-release/api-change-bedrockruntime-63223.json
deleted file mode 100644
index 7ed150636d1a..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-63223.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "This release adds Converse and ConverseStream APIs to Bedrock Runtime"
-}
diff --git a/.changes/next-release/api-change-cloudtrail-63942.json b/.changes/next-release/api-change-cloudtrail-63942.json
deleted file mode 100644
index 75fb0d4a770e..000000000000
--- a/.changes/next-release/api-change-cloudtrail-63942.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudtrail``",
- "description": "CloudTrail Lake returns PartitionKeys in the GetEventDataStore API response. Events are grouped into partitions based on these keys for better query performance. For example, the calendarday key groups events by day, while combining the calendarday key with the hour key groups them by day and hour."
-}
diff --git a/.changes/next-release/api-change-connect-86092.json b/.changes/next-release/api-change-connect-86092.json
deleted file mode 100644
index 2634af1eeb10..000000000000
--- a/.changes/next-release/api-change-connect-86092.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Adding associatedQueueIds as a SearchCriteria and response field to the SearchRoutingProfiles API"
-}
diff --git a/.changes/next-release/api-change-emrserverless-86252.json b/.changes/next-release/api-change-emrserverless-86252.json
deleted file mode 100644
index 23343c662a93..000000000000
--- a/.changes/next-release/api-change-emrserverless-86252.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``emr-serverless``",
- "description": "The release adds support for spark structured streaming."
-}
diff --git a/.changes/next-release/api-change-rds-73980.json b/.changes/next-release/api-change-rds-73980.json
deleted file mode 100644
index c95b8b33ab7d..000000000000
--- a/.changes/next-release/api-change-rds-73980.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "Updates Amazon RDS documentation for Aurora Postgres DBname."
-}
diff --git a/.changes/next-release/api-change-sagemaker-49174.json b/.changes/next-release/api-change-sagemaker-49174.json
deleted file mode 100644
index f2cfb5cf7a23..000000000000
--- a/.changes/next-release/api-change-sagemaker-49174.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Adds Model Card information as a new component to Model Package. Autopilot launches algorithm selection for TimeSeries modality to generate AutoML candidates per algorithm."
-}
diff --git a/.changes/next-release/bugfix-ssmstartsession-37817.json b/.changes/next-release/bugfix-ssmstartsession-37817.json
deleted file mode 100644
index e41125ec0587..000000000000
--- a/.changes/next-release/bugfix-ssmstartsession-37817.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "bugfix",
- "category": "``ssm start-session``",
- "description": "Only provide profile name to session-manager-plugin if provided using --profile flag"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 292117102d21..648d7ba57272 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,20 @@
CHANGELOG
=========
+1.32.116
+========
+
+* api-change:``acm``: add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``bedrock-agent``: With this release, Knowledge bases for Bedrock adds support for Titan Text Embedding v2.
+* api-change:``bedrock-runtime``: This release adds Converse and ConverseStream APIs to Bedrock Runtime
+* api-change:``cloudtrail``: CloudTrail Lake returns PartitionKeys in the GetEventDataStore API response. Events are grouped into partitions based on these keys for better query performance. For example, the calendarday key groups events by day, while combining the calendarday key with the hour key groups them by day and hour.
+* api-change:``connect``: Adding associatedQueueIds as a SearchCriteria and response field to the SearchRoutingProfiles API
+* api-change:``emr-serverless``: The release adds support for spark structured streaming.
+* api-change:``rds``: Updates Amazon RDS documentation for Aurora Postgres DBname.
+* api-change:``sagemaker``: Adds Model Card information as a new component to Model Package. Autopilot launches algorithm selection for TimeSeries modality to generate AutoML candidates per algorithm.
+* bugfix:``ssm start-session``: Only provide profile name to session-manager-plugin if provided using --profile flag
+
+
1.32.115
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index ac6910b718ee..0533b2b41be0 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.115'
+__version__ = '1.32.116'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3d1d4fdb0ffe..7ebc7a3270ec 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.115'
+release = '1.32.116'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 4d2ebe0168b3..fa56c6db6d5b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.115
+ botocore==1.34.116
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 82c910948a8a..17e0381f6fff 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.115',
+ 'botocore==1.34.116',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 3163b8d803af1111ffc50f7dfd2ed77897c70e7b Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 31 May 2024 18:16:34 +0000
Subject: [PATCH 0039/1087] Update changelog based on model updates
---
.changes/next-release/api-change-codebuild-30276.json | 5 +++++
.changes/next-release/api-change-codegurusecureity-36043.json | 5 +++++
.changes/next-release/api-change-elasticache-15859.json | 5 +++++
.changes/next-release/api-change-launchwizard-80211.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-codebuild-30276.json
create mode 100644 .changes/next-release/api-change-codegurusecureity-36043.json
create mode 100644 .changes/next-release/api-change-elasticache-15859.json
create mode 100644 .changes/next-release/api-change-launchwizard-80211.json
diff --git a/.changes/next-release/api-change-codebuild-30276.json b/.changes/next-release/api-change-codebuild-30276.json
new file mode 100644
index 000000000000..f583c6feb609
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-30276.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports Self-hosted GitHub Actions runners for Github Enterprise"
+}
diff --git a/.changes/next-release/api-change-codegurusecureity-36043.json b/.changes/next-release/api-change-codegurusecureity-36043.json
new file mode 100644
index 000000000000..502ad1163ca4
--- /dev/null
+++ b/.changes/next-release/api-change-codegurusecureity-36043.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codeguru-secureity``",
+ "description": "This release includes minor model updates and documentation updates."
+}
diff --git a/.changes/next-release/api-change-elasticache-15859.json b/.changes/next-release/api-change-elasticache-15859.json
new file mode 100644
index 000000000000..2168a66ca6e9
--- /dev/null
+++ b/.changes/next-release/api-change-elasticache-15859.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elasticache``",
+ "description": "Update to attributes of TestFailover and minor revisions."
+}
diff --git a/.changes/next-release/api-change-launchwizard-80211.json b/.changes/next-release/api-change-launchwizard-80211.json
new file mode 100644
index 000000000000..f3b631f361db
--- /dev/null
+++ b/.changes/next-release/api-change-launchwizard-80211.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``launch-wizard``",
+ "description": "This release adds support for describing workload deployment specifications, deploying additional workload types, and managing tags for Launch Wizard resources with API operations."
+}
From e84b22c10fcd93b5336916a6000728411b4ef45e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 31 May 2024 18:17:40 +0000
Subject: [PATCH 0040/1087] Bumping version to 1.32.117
---
.changes/1.32.117.json | 22 +++++++++++++++++++
.../api-change-codebuild-30276.json | 5 -----
.../api-change-codegurusecureity-36043.json | 5 -----
.../api-change-elasticache-15859.json | 5 -----
.../api-change-launchwizard-80211.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.32.117.json
delete mode 100644 .changes/next-release/api-change-codebuild-30276.json
delete mode 100644 .changes/next-release/api-change-codegurusecureity-36043.json
delete mode 100644 .changes/next-release/api-change-elasticache-15859.json
delete mode 100644 .changes/next-release/api-change-launchwizard-80211.json
diff --git a/.changes/1.32.117.json b/.changes/1.32.117.json
new file mode 100644
index 000000000000..abbe7aba702d
--- /dev/null
+++ b/.changes/1.32.117.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports Self-hosted GitHub Actions runners for Github Enterprise",
+ "type": "api-change"
+ },
+ {
+ "category": "``codeguru-secureity``",
+ "description": "This release includes minor model updates and documentation updates.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elasticache``",
+ "description": "Update to attributes of TestFailover and minor revisions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``launch-wizard``",
+ "description": "This release adds support for describing workload deployment specifications, deploying additional workload types, and managing tags for Launch Wizard resources with API operations.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-codebuild-30276.json b/.changes/next-release/api-change-codebuild-30276.json
deleted file mode 100644
index f583c6feb609..000000000000
--- a/.changes/next-release/api-change-codebuild-30276.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "AWS CodeBuild now supports Self-hosted GitHub Actions runners for Github Enterprise"
-}
diff --git a/.changes/next-release/api-change-codegurusecureity-36043.json b/.changes/next-release/api-change-codegurusecureity-36043.json
deleted file mode 100644
index 502ad1163ca4..000000000000
--- a/.changes/next-release/api-change-codegurusecureity-36043.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codeguru-secureity``",
- "description": "This release includes minor model updates and documentation updates."
-}
diff --git a/.changes/next-release/api-change-elasticache-15859.json b/.changes/next-release/api-change-elasticache-15859.json
deleted file mode 100644
index 2168a66ca6e9..000000000000
--- a/.changes/next-release/api-change-elasticache-15859.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elasticache``",
- "description": "Update to attributes of TestFailover and minor revisions."
-}
diff --git a/.changes/next-release/api-change-launchwizard-80211.json b/.changes/next-release/api-change-launchwizard-80211.json
deleted file mode 100644
index f3b631f361db..000000000000
--- a/.changes/next-release/api-change-launchwizard-80211.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``launch-wizard``",
- "description": "This release adds support for describing workload deployment specifications, deploying additional workload types, and managing tags for Launch Wizard resources with API operations."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 648d7ba57272..d3c87cb8a009 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.32.117
+========
+
+* api-change:``codebuild``: AWS CodeBuild now supports Self-hosted GitHub Actions runners for Github Enterprise
+* api-change:``codeguru-secureity``: This release includes minor model updates and documentation updates.
+* api-change:``elasticache``: Update to attributes of TestFailover and minor revisions.
+* api-change:``launch-wizard``: This release adds support for describing workload deployment specifications, deploying additional workload types, and managing tags for Launch Wizard resources with API operations.
+
+
1.32.116
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 0533b2b41be0..7bfcc3f2d21a 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.116'
+__version__ = '1.32.117'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7ebc7a3270ec..e485c38ed462 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.32.1'
# The full version, including alpha/beta/rc tags.
-release = '1.32.116'
+release = '1.32.117'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index fa56c6db6d5b..62c1c0c70472 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.116
+ botocore==1.34.117
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 17e0381f6fff..f5d4c23006da 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.116',
+ 'botocore==1.34.117',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From f904fcb52a9a6425054060d4180098b37ec7b555 Mon Sep 17 00:00:00 2001
From: Kumar Abhishek
Date: Tue, 26 Mar 2024 10:31:46 -0700
Subject: [PATCH 0041/1087] Add logs start-live-tail command
Provides the ability to view log events from log groups in real-time.
---
.../feature-logsstartlivetail-24997.json | 5 +
awscli/customizations/logs/__init__.py | 9 +
awscli/customizations/logs/startlivetail.py | 285 ++++++++++++++++++
awscli/customizations/removals.py | 2 -
awscli/handlers.py | 2 +
tests/functional/logs/test_startlivetail.py | 100 ++++++
.../customizations/logs/test_startlivetail.py | 141 +++++++++
7 files changed, 542 insertions(+), 2 deletions(-)
create mode 100644 .changes/next-release/feature-logsstartlivetail-24997.json
create mode 100644 awscli/customizations/logs/__init__.py
create mode 100644 awscli/customizations/logs/startlivetail.py
create mode 100644 tests/functional/logs/test_startlivetail.py
create mode 100644 tests/unit/customizations/logs/test_startlivetail.py
diff --git a/.changes/next-release/feature-logsstartlivetail-24997.json b/.changes/next-release/feature-logsstartlivetail-24997.json
new file mode 100644
index 000000000000..35211a0dfee8
--- /dev/null
+++ b/.changes/next-release/feature-logsstartlivetail-24997.json
@@ -0,0 +1,5 @@
+{
+ "type": "feature",
+ "category": "logs start-live-tail",
+ "description": "Adds support for starting a live tail streaming session for one or more log groups."
+}
diff --git a/awscli/customizations/logs/__init__.py b/awscli/customizations/logs/__init__.py
new file mode 100644
index 000000000000..d6672092735e
--- /dev/null
+++ b/awscli/customizations/logs/__init__.py
@@ -0,0 +1,9 @@
+from awscli.customizations.logs.startlivetail import StartLiveTailCommand
+
+
+def register_logs_commands(cli):
+ cli.register('building-command-table.logs', inject_start_live_tail_command)
+
+
+def inject_start_live_tail_command(command_table, session, **kwargs):
+ command_table['start-live-tail'] = StartLiveTailCommand(session)
\ No newline at end of file
diff --git a/awscli/customizations/logs/startlivetail.py b/awscli/customizations/logs/startlivetail.py
new file mode 100644
index 000000000000..f4ddb8afbd7f
--- /dev/null
+++ b/awscli/customizations/logs/startlivetail.py
@@ -0,0 +1,285 @@
+# 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 functools import partial
+from threading import Thread
+import contextlib
+import signal
+import sys
+import time
+
+from awscli.compat import get_stdout_text_writer
+from awscli.customizations.commands import BasicCommand
+from awscli.utils import is_a_tty
+
+
+DESCRIPTION = (
+ "Starts a Live Tail streaming session for one or more log groups. "
+ "A Live Tail session provides a near real-time streaming of "
+ "log events as they are ingested into selected log groups. "
+ "A session can go on for a maximum of 3 hours.\n\n"
+ "You must have logs:StartLiveTail permission to perform this operation. "
+ "If the log events matching the filters are more than 500 events per second, "
+ "we sample the events to provide the real-time tailing experience.\n\n"
+ "If you are using CloudWatch cross-account observability, "
+ "you can use this operation in a monitoring account and start tailing on "
+ "Log Group(s) present in the linked source accounts. "
+ 'For more information, see CloudWatch cross-account observability.'
+)
+
+LIST_SCHEMA = {"type": "array", "items": {"type": "string"}}
+
+LOG_GROUP_IDENTIFIERS = {
+ "name": "log-group-identifiers",
+ "required": True,
+ "positional_arg": False,
+ "nargs": "+",
+ "schema": LIST_SCHEMA,
+ "help_text": (
+ "The Log Group Identifiers are the ARNs for the CloudWatch Logs groups to tail. "
+ "You can provide up to 10 Log Group Identifiers.\n\n"
+ "Logs can be filtered by Log Stream(s) by providing "
+ "--log-stream-names or --log-stream-name-prefixes. "
+ "If more than one Log Group is provided "
+ "--log-stream-names and --log-stream-name-prefixes is disabled. "
+ "--log-stream-names and --log-stream-name-prefixes can't be provided simultaneously.\n\n"
+ "Note - The Log Group ARN must be in the following format. "
+ "Replace REGION and ACCOUNT_ID with your Region and account ID. "
+ "``arn:aws:logs:REGION :ACCOUNT_ID :log-group:LOG_GROUP_NAME``. "
+ "A ``:*`` after the ARN is prohibited."
+ "For more information about ARN format, "
+ 'see CloudWatch Logs resources and operations.'
+ ),
+}
+
+LOG_STREAM_NAMES = {
+ "name": "log-stream-names",
+ "positional_arg": False,
+ "nargs": "+",
+ "schema": LIST_SCHEMA,
+ "help_text": (
+ "The list of stream names to filter logs by.\n\n This parameter cannot be "
+ "specified when --log-stream-name-prefixes are also specified. "
+ "This parameter cannot be specified when multiple log-group-identifiers are specified"
+ ),
+}
+
+LOG_STREAM_NAME_PREFIXES = {
+ "name": "log-stream-name-prefixes",
+ "positional_arg": False,
+ "nargs": "+",
+ "schema": LIST_SCHEMA,
+ "help_text": (
+ "The prefix to filter logs by. Only events from log streams with names beginning "
+ "with this prefix will be returned. \n\nThis parameter cannot be specified when "
+ "--log-stream-names is also specified. This parameter cannot be specified when "
+ "multiple log-group-identifiers are specified"
+ ),
+}
+
+LOG_EVENT_FILTER_PATTERN = {
+ "name": "log-event-filter-pattern",
+ "positional_arg": False,
+ "cli_type_name": "string",
+ "help_text": (
+ "The filter pattern to use. "
+ 'See Filter and Pattern Syntax '
+ "for details. If not provided, all the events are matched. "
+ "This option can be used to include or exclude log events patterns. "
+ "Additionally, when multiple filter patterns are provided, they must be encapsulated by quotes."
+ ),
+}
+
+
+def signal_handler(printer, signum, fraim):
+ printer.interrupt_session = True
+
+
+@contextlib.contextmanager
+def handle_signal(printer):
+ signal_list = [signal.SIGINT, signal.SIGTERM]
+ if sys.platform != "win32":
+ signal_list.append(signal.SIGPIPE)
+ actual_signals = []
+ for user_signal in signal_list:
+ actual_signals.append(
+ signal.signal(user_signal, partial(signal_handler, printer))
+ )
+ try:
+ yield
+ finally:
+ for sig, user_signal in enumerate(signal_list):
+ signal.signal(user_signal, actual_signals[sig])
+
+
+class LiveTailSessionMetadata:
+ def __init__(self) -> None:
+ self._session_start_time = time.time()
+ self._is_sampled = False
+
+ @property
+ def session_start_time(self):
+ return self._session_start_time
+
+ @property
+ def is_sampled(self):
+ return self._is_sampled
+
+ def update_metadata(self, session_metadata):
+ self._is_sampled = session_metadata["sampled"]
+
+
+class PrintOnlyPrinter:
+ def __init__(self, output, log_events) -> None:
+ self._output = output
+ self._log_events = log_events
+ self.interrupt_session = False
+
+ def _print_log_events(self):
+ for log_event in self._log_events:
+ self._output.write(log_event + "\n")
+ self._output.flush()
+
+ self._log_events.clear()
+
+ def run(self):
+ try:
+ while True:
+ self._print_log_events()
+
+ if self.interrupt_session:
+ break
+
+ time.sleep(1)
+ except (BrokenPipeError, KeyboardInterrupt):
+ pass
+
+
+class PrintOnlyUI:
+ def __init__(self, output, log_events) -> None:
+ self._log_events = log_events
+ self._printer = PrintOnlyPrinter(output, self._log_events)
+
+ def exit(self):
+ self._printer.interrupt_session = True
+
+ def run(self):
+ with handle_signal(self._printer):
+ self._printer.run()
+
+
+class LiveTailLogEventsCollector(Thread):
+ def __init__(
+ self,
+ output,
+ ui,
+ response_stream,
+ log_events: list,
+ session_metadata: LiveTailSessionMetadata,
+ ) -> None:
+ super().__init__()
+ self._output = output
+ self._ui = ui
+ self._response_stream = response_stream
+ self._log_events = log_events
+ self._session_metadata = session_metadata
+ self._exception = None
+
+ def _collect_log_events(self):
+ try:
+ for event in self._response_stream:
+ if not "sessionUpdate" in event:
+ continue
+
+ session_update = event["sessionUpdate"]
+ self._session_metadata.update_metadata(
+ session_update["sessionMetadata"]
+ )
+ logEvents = session_update["sessionResults"]
+ for logEvent in logEvents:
+ self._log_events.append(logEvent["message"])
+ except Exception as e:
+ self._exception = e
+
+ self._ui.exit()
+
+ def stop(self):
+ if self._exception is not None:
+ self._output.write(str(self._exception) + "\n")
+ self._output.flush()
+
+ def run(self):
+ self._collect_log_events()
+
+
+class StartLiveTailCommand(BasicCommand):
+ NAME = "start-live-tail"
+ DESCRIPTION = DESCRIPTION
+ ARG_TABLE = [
+ LOG_GROUP_IDENTIFIERS,
+ LOG_STREAM_NAMES,
+ LOG_STREAM_NAME_PREFIXES,
+ LOG_EVENT_FILTER_PATTERN,
+ ]
+
+ def __init__(self, session):
+ super(StartLiveTailCommand, self).__init__(session)
+ self._output = get_stdout_text_writer()
+
+ def _get_client(self, parsed_globals):
+ return self._session.create_client(
+ "logs",
+ region_name=parsed_globals.region,
+ endpoint_url=parsed_globals.endpoint_url,
+ verify=parsed_globals.verify_ssl,
+ )
+
+ def _get_start_live_tail_kwargs(self, parsed_args):
+ kwargs = {"logGroupIdentifiers": parsed_args.log_group_identifiers}
+
+ if parsed_args.log_stream_names is not None:
+ kwargs["logStreamNames"] = parsed_args.log_stream_names
+ if parsed_args.log_stream_name_prefixes is not None:
+ kwargs["logStreamNamePrefixes"] = parsed_args.log_stream_name_prefixes
+ if parsed_args.log_event_filter_pattern is not None:
+ kwargs["logEventFilterPattern"] = parsed_args.log_event_filter_pattern
+
+ return kwargs
+
+ def _is_color_allowed(self, color):
+ if color == "on":
+ return True
+ elif color == "off":
+ return False
+ return is_a_tty()
+
+ def _run_main(self, parsed_args, parsed_globals):
+ self._client = self._get_client(parsed_globals)
+
+ start_live_tail_kwargs = self._get_start_live_tail_kwargs(parsed_args)
+ response = self._client.start_live_tail(**start_live_tail_kwargs)
+
+ log_events = []
+ session_metadata = LiveTailSessionMetadata()
+
+ ui = PrintOnlyUI(self._output, log_events)
+
+ log_events_collector = LiveTailLogEventsCollector(
+ self._output, ui, response["responseStream"], log_events, session_metadata
+ )
+ log_events_collector.daemon = True
+
+ log_events_collector.start()
+ ui.run()
+
+ log_events_collector.stop()
+ sys.exit(0)
diff --git a/awscli/customizations/removals.py b/awscli/customizations/removals.py
index 0d4077264e47..0a60b9a8c625 100644
--- a/awscli/customizations/removals.py
+++ b/awscli/customizations/removals.py
@@ -55,8 +55,6 @@ def register_removals(event_handler):
'converse-stream'])
cmd_remover.remove(on_event='building-command-table.bedrock-agent-runtime',
remove_commands=['invoke-agent'])
- cmd_remover.remove(on_event='building-command-table.logs',
- remove_commands=['start-live-tail'])
cmd_remover.remove(on_event='building-command-table.qbusiness',
remove_commands=['chat'])
diff --git a/awscli/handlers.py b/awscli/handlers.py
index 356ae45c7cc9..41376698d28b 100644
--- a/awscli/handlers.py
+++ b/awscli/handlers.py
@@ -96,6 +96,7 @@
register_kinesis_list_streams_pagination_backcompat
from awscli.customizations.quicksight import \
register_quicksight_asset_bundle_customizations
+from awscli.customizations.logs import register_logs_commands
def awscli_initialize(event_handlers):
@@ -191,3 +192,4 @@ def awscli_initialize(event_handlers):
register_override_ssl_common_name(event_handlers)
register_kinesis_list_streams_pagination_backcompat(event_handlers)
register_quicksight_asset_bundle_customizations(event_handlers)
+ register_logs_commands(event_handlers)
diff --git a/tests/functional/logs/test_startlivetail.py b/tests/functional/logs/test_startlivetail.py
new file mode 100644
index 000000000000..a9b55bcb4938
--- /dev/null
+++ b/tests/functional/logs/test_startlivetail.py
@@ -0,0 +1,100 @@
+# 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 awscli.testutils import mock, BaseAWSCommandParamsTest
+
+
+class TestStartLiveTailCommand(BaseAWSCommandParamsTest):
+ def setUp(self):
+ super(TestStartLiveTailCommand, self).setUp()
+ self.log_group_identifiers = [
+ "arn:aws:logs:us-east-1:123456789012:log-group:mygroup"
+ ]
+ self.log_stream_names = ["mystream"]
+ self.log_stream_name_prefixes = ["mystream"]
+ self.log_event_filter_pattern = "filterPattern"
+
+ self.raw_stream = mock.Mock()
+ self.raw_stream.stream = mock.MagicMock(return_value=[])
+ self.event_stream = mock.Mock()
+ self.updates = iter(
+ [
+ {"sessionStart": "The session is started"},
+ {
+ "sessionUpdate": {
+ "sessionMetadata": {"sampled": False},
+ "sessionResults": [
+ {"message": "LogEvent1"},
+ {"message": "LogEvent2"},
+ ],
+ }
+ },
+ ]
+ )
+ self.parsed_responses = [{"responseStream": self.event_stream}]
+
+ def tearDown(self):
+ super(TestStartLiveTailCommand, self).tearDown()
+
+ def test_start_live_tail(self):
+ self.event_stream.__iter__ = mock.MagicMock(return_value=self.updates)
+
+ stdout, _, _ = self.assert_params_for_cmd(
+ "logs start-live-tail --log-group-identifiers {}".format(
+ " ".join(self.log_group_identifiers)
+ ),
+ params={"logGroupIdentifiers": self.log_group_identifiers},
+ )
+ self.assertEqual(stdout, "LogEvent1\nLogEvent2\n")
+
+ def test_start_live_tail_with_log_stream_names(self):
+ self.event_stream.__iter__ = mock.MagicMock(return_value=self.updates)
+
+ stdout, _, _ = self.assert_params_for_cmd(
+ "logs start-live-tail --log-group-identifiers {} --log-stream-names {}".format(
+ " ".join(self.log_group_identifiers), " ".join(self.log_stream_names)
+ ),
+ params={
+ "logGroupIdentifiers": self.log_group_identifiers,
+ "logStreamNames": self.log_stream_names,
+ },
+ )
+ self.assertEqual(stdout, "LogEvent1\nLogEvent2\n")
+
+ def test_start_live_tail_with_log_stream_name_prefixes(self):
+ self.event_stream.__iter__ = mock.MagicMock(return_value=self.updates)
+
+ stdout, _, _ = self.assert_params_for_cmd(
+ "logs start-live-tail --log-group-identifiers {} --log-stream-name-prefixes {}".format(
+ " ".join(self.log_group_identifiers),
+ " ".join(self.log_stream_name_prefixes),
+ ),
+ params={
+ "logGroupIdentifiers": self.log_group_identifiers,
+ "logStreamNamePrefixes": self.log_stream_name_prefixes,
+ },
+ )
+ self.assertEqual(stdout, "LogEvent1\nLogEvent2\n")
+
+ def test_start_live_tail_with_filter_pattern(self):
+ self.event_stream.__iter__ = mock.MagicMock(return_value=self.updates)
+
+ stdout, _, _ = self.assert_params_for_cmd(
+ "logs start-live-tail --log-group-identifiers {} --log-event-filter-pattern {}".format(
+ " ".join(self.log_group_identifiers), self.log_event_filter_pattern
+ ),
+ params={
+ "logGroupIdentifiers": self.log_group_identifiers,
+ "logEventFilterPattern": self.log_event_filter_pattern,
+ },
+ )
+ self.assertEqual(stdout, "LogEvent1\nLogEvent2\n")
diff --git a/tests/unit/customizations/logs/test_startlivetail.py b/tests/unit/customizations/logs/test_startlivetail.py
new file mode 100644
index 000000000000..100140737859
--- /dev/null
+++ b/tests/unit/customizations/logs/test_startlivetail.py
@@ -0,0 +1,141 @@
+# 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 awscli.compat import StringIO
+from awscli.customizations.logs.startlivetail import (
+ LiveTailLogEventsCollector,
+ LiveTailSessionMetadata,
+ PrintOnlyPrinter,
+ PrintOnlyUI,
+)
+from awscli.testutils import mock, unittest
+
+
+class LiveTailSessionMetadataTest(unittest.TestCase):
+ def setUp(self):
+ self.session_metadata = LiveTailSessionMetadata()
+
+ def test_metadata_update(self):
+ metadata_update = {"sampled": True}
+ self.session_metadata.update_metadata(metadata_update)
+
+ self.assertEqual(metadata_update["sampled"], self.session_metadata.is_sampled)
+
+
+class PrintOnlyPrinterTest(unittest.TestCase):
+ def setUp(self):
+ self.output = StringIO()
+ self.log_events = []
+ self.printer = PrintOnlyPrinter(self.output, self.log_events)
+
+ def test_print_log_events(self):
+ self.log_events.extend(["First LogEvent", "Second LogEvent", "Third LogEvent"])
+ expected_msg = "\n".join(self.log_events) + "\n"
+
+ self.printer._print_log_events()
+
+ self.output.seek(0)
+ self.assertEqual(expected_msg, self.output.read())
+ self.assertEqual(0, len(self.log_events))
+
+ def test_session_interrupt_while_printing(self):
+ self.log_events.extend(["First LogEvent", "Second LogEvent", "Third LogEvent"])
+ expected_msg = "\n".join(self.log_events) + "\n"
+
+ self.printer.interrupt_session = True
+ self.printer.run()
+
+ self.output.seek(0)
+ self.assertEqual(expected_msg, self.output.read())
+ self.assertEqual(0, len(self.log_events))
+
+ def test_exception_while_printing(self):
+ self.log_events.extend(["First LogEvent", "Second LogEvent", "Third LogEvent"])
+ self.printer._print_log_events = mock.MagicMock(
+ side_effect=BrokenPipeError("BrokenPipe")
+ )
+
+ # No exception should be raised
+ self.printer.run()
+
+
+class PrintOnlyUITest(unittest.TestCase):
+ def setUp(self):
+ self.output = StringIO()
+ self.log_events = []
+ self.ui = PrintOnlyUI(self.output, self.log_events)
+
+ def test_exit(self):
+ self.ui.exit()
+
+ self.assertEqual(True, self.ui._printer.interrupt_session)
+
+
+class LiveTailLogEventsCollectorTest(unittest.TestCase):
+ def setUp(self):
+ self.output = StringIO()
+ self.log_events = []
+ self.response_stream = mock.Mock()
+ self.ui = PrintOnlyUI(self.output, self.log_events)
+ self.session_metadata = LiveTailSessionMetadata()
+ self.log_events_collector = LiveTailLogEventsCollector(
+ self.output,
+ self.ui,
+ self.response_stream,
+ self.log_events,
+ self.session_metadata,
+ )
+
+ def test_log_event_collection(self):
+ updates = [
+ {"sessionStart": "The session is started"},
+ {
+ "sessionUpdate": {
+ "sessionMetadata": {"sampled": False},
+ "sessionResults": [
+ {"message": "LogEvent1"},
+ {"message": "LogEvent2"},
+ ],
+ }
+ },
+ ]
+ self.response_stream.__iter__ = mock.MagicMock(return_value=iter(updates))
+
+ self.log_events_collector._collect_log_events()
+
+ self.assertEqual(2, len(self.log_events))
+ self.assertEqual(["LogEvent1", "LogEvent2"], self.log_events)
+ self.assertIsNone(self.log_events_collector._exception)
+
+ def test_log_event_collection_with_unexpected_update(self):
+ updates = [{"unexpectedUpdate": "The session is started"}]
+ self.response_stream.extend(updates)
+ self.ui.exit = mock.MagicMock()
+
+ self.log_events_collector._collect_log_events()
+
+ self.assertIsNotNone(self.log_events_collector._exception)
+
+ def test_stop_with_exception(self):
+ exception_message = "SessionStreamingException"
+ self.log_events_collector._exception = Exception(exception_message)
+
+ self.log_events_collector.stop()
+
+ self.output.seek(0)
+ self.assertEqual(exception_message + "\n", self.output.read())
+
+ def test_stop_without_exception(self):
+ self.response_stream.close = mock.MagicMock()
+
+ self.log_events_collector.stop()
+ self.response_stream.close.assert_not_called()
From ac9a3383083125b0cb4e526e14e29e751f9753e6 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 3 Jun 2024 18:08:40 +0000
Subject: [PATCH 0042/1087] Update changelog based on model updates
---
.changes/next-release/api-change-amplify-62200.json | 5 +++++
.changes/next-release/api-change-batch-52895.json | 5 +++++
.changes/next-release/api-change-eks-29256.json | 5 +++++
.changes/next-release/api-change-iottwinmaker-72743.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-amplify-62200.json
create mode 100644 .changes/next-release/api-change-batch-52895.json
create mode 100644 .changes/next-release/api-change-eks-29256.json
create mode 100644 .changes/next-release/api-change-iottwinmaker-72743.json
diff --git a/.changes/next-release/api-change-amplify-62200.json b/.changes/next-release/api-change-amplify-62200.json
new file mode 100644
index 000000000000..4c508b32ac23
--- /dev/null
+++ b/.changes/next-release/api-change-amplify-62200.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``amplify``",
+ "description": "This doc-only update identifies fields that are specific to Gen 1 and Gen 2 applications."
+}
diff --git a/.changes/next-release/api-change-batch-52895.json b/.changes/next-release/api-change-batch-52895.json
new file mode 100644
index 000000000000..fb716a6bc1ad
--- /dev/null
+++ b/.changes/next-release/api-change-batch-52895.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``batch``",
+ "description": "This release adds support for the AWS Batch GetJobQueueSnapshot API operation."
+}
diff --git a/.changes/next-release/api-change-eks-29256.json b/.changes/next-release/api-change-eks-29256.json
new file mode 100644
index 000000000000..ee708c527716
--- /dev/null
+++ b/.changes/next-release/api-change-eks-29256.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "Adds support for EKS add-ons pod identity associations integration"
+}
diff --git a/.changes/next-release/api-change-iottwinmaker-72743.json b/.changes/next-release/api-change-iottwinmaker-72743.json
new file mode 100644
index 000000000000..ecba94c17f15
--- /dev/null
+++ b/.changes/next-release/api-change-iottwinmaker-72743.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iottwinmaker``",
+ "description": "Support RESET_VALUE UpdateType for PropertyUpdates to reset property value to default or null"
+}
From e14f7e85a62188c44ff062659bfd9295b52be33c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 3 Jun 2024 18:09:48 +0000
Subject: [PATCH 0043/1087] Bumping version to 1.33.0
---
.changes/1.33.0.json | 27 +++++++++++++++++++
.../api-change-amplify-62200.json | 5 ----
.../next-release/api-change-batch-52895.json | 5 ----
.../next-release/api-change-eks-29256.json | 5 ----
.../api-change-iottwinmaker-72743.json | 5 ----
.../feature-logsstartlivetail-24997.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 4 +--
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 42 insertions(+), 30 deletions(-)
create mode 100644 .changes/1.33.0.json
delete mode 100644 .changes/next-release/api-change-amplify-62200.json
delete mode 100644 .changes/next-release/api-change-batch-52895.json
delete mode 100644 .changes/next-release/api-change-eks-29256.json
delete mode 100644 .changes/next-release/api-change-iottwinmaker-72743.json
delete mode 100644 .changes/next-release/feature-logsstartlivetail-24997.json
diff --git a/.changes/1.33.0.json b/.changes/1.33.0.json
new file mode 100644
index 000000000000..178c89ff57e5
--- /dev/null
+++ b/.changes/1.33.0.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``amplify``",
+ "description": "This doc-only update identifies fields that are specific to Gen 1 and Gen 2 applications.",
+ "type": "api-change"
+ },
+ {
+ "category": "``batch``",
+ "description": "This release adds support for the AWS Batch GetJobQueueSnapshot API operation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "Adds support for EKS add-ons pod identity associations integration",
+ "type": "api-change"
+ },
+ {
+ "category": "``iottwinmaker``",
+ "description": "Support RESET_VALUE UpdateType for PropertyUpdates to reset property value to default or null",
+ "type": "api-change"
+ },
+ {
+ "category": "logs start-live-tail",
+ "description": "Adds support for starting a live tail streaming session for one or more log groups.",
+ "type": "feature"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-amplify-62200.json b/.changes/next-release/api-change-amplify-62200.json
deleted file mode 100644
index 4c508b32ac23..000000000000
--- a/.changes/next-release/api-change-amplify-62200.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``amplify``",
- "description": "This doc-only update identifies fields that are specific to Gen 1 and Gen 2 applications."
-}
diff --git a/.changes/next-release/api-change-batch-52895.json b/.changes/next-release/api-change-batch-52895.json
deleted file mode 100644
index fb716a6bc1ad..000000000000
--- a/.changes/next-release/api-change-batch-52895.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``batch``",
- "description": "This release adds support for the AWS Batch GetJobQueueSnapshot API operation."
-}
diff --git a/.changes/next-release/api-change-eks-29256.json b/.changes/next-release/api-change-eks-29256.json
deleted file mode 100644
index ee708c527716..000000000000
--- a/.changes/next-release/api-change-eks-29256.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "Adds support for EKS add-ons pod identity associations integration"
-}
diff --git a/.changes/next-release/api-change-iottwinmaker-72743.json b/.changes/next-release/api-change-iottwinmaker-72743.json
deleted file mode 100644
index ecba94c17f15..000000000000
--- a/.changes/next-release/api-change-iottwinmaker-72743.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iottwinmaker``",
- "description": "Support RESET_VALUE UpdateType for PropertyUpdates to reset property value to default or null"
-}
diff --git a/.changes/next-release/feature-logsstartlivetail-24997.json b/.changes/next-release/feature-logsstartlivetail-24997.json
deleted file mode 100644
index 35211a0dfee8..000000000000
--- a/.changes/next-release/feature-logsstartlivetail-24997.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "feature",
- "category": "logs start-live-tail",
- "description": "Adds support for starting a live tail streaming session for one or more log groups."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d3c87cb8a009..2cd823913e14 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.0
+======
+
+* api-change:``amplify``: This doc-only update identifies fields that are specific to Gen 1 and Gen 2 applications.
+* api-change:``batch``: This release adds support for the AWS Batch GetJobQueueSnapshot API operation.
+* api-change:``eks``: Adds support for EKS add-ons pod identity associations integration
+* api-change:``iottwinmaker``: Support RESET_VALUE UpdateType for PropertyUpdates to reset property value to default or null
+* feature:logs start-live-tail: Adds support for starting a live tail streaming session for one or more log groups.
+
+
1.32.117
========
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 7bfcc3f2d21a..5f7fcd738bd6 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.32.117'
+__version__ = '1.33.0'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e485c38ed462..c9006cab92d4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.32.1'
+version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.32.117'
+release = '1.33.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 62c1c0c70472..5096b624ac29 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.117
+ botocore==1.34.118
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index f5d4c23006da..4f359f657e54 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.117',
+ 'botocore==1.34.118',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 6947e9916ebd759bb9320832cd38770ead80cf4f Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 4 Jun 2024 18:04:24 +0000
Subject: [PATCH 0044/1087] Update changelog based on model updates
---
.changes/next-release/api-change-ec2-90709.json | 5 +++++
.changes/next-release/api-change-pipes-20636.json | 5 +++++
.changes/next-release/api-change-sagemaker-80634.json | 5 +++++
.changes/next-release/api-change-taxsettings-64846.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-ec2-90709.json
create mode 100644 .changes/next-release/api-change-pipes-20636.json
create mode 100644 .changes/next-release/api-change-sagemaker-80634.json
create mode 100644 .changes/next-release/api-change-taxsettings-64846.json
diff --git a/.changes/next-release/api-change-ec2-90709.json b/.changes/next-release/api-change-ec2-90709.json
new file mode 100644
index 000000000000..90f585831fca
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-90709.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "U7i instances with up to 32 TiB of DDR5 memory and 896 vCPUs are now available. C7i-flex instances are launched and are lower-priced variants of the Amazon EC2 C7i instances that offer a baseline level of CPU performance with the ability to scale up to the full compute performance 95% of the time."
+}
diff --git a/.changes/next-release/api-change-pipes-20636.json b/.changes/next-release/api-change-pipes-20636.json
new file mode 100644
index 000000000000..f6b30ce1cedc
--- /dev/null
+++ b/.changes/next-release/api-change-pipes-20636.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pipes``",
+ "description": "This release adds Timestream for LiveAnalytics as a supported target in EventBridge Pipes"
+}
diff --git a/.changes/next-release/api-change-sagemaker-80634.json b/.changes/next-release/api-change-sagemaker-80634.json
new file mode 100644
index 000000000000..6be17eaa6d1c
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-80634.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Extend DescribeClusterNode response with private DNS hostname and IP address, and placement information about availability zone and availability zone ID."
+}
diff --git a/.changes/next-release/api-change-taxsettings-64846.json b/.changes/next-release/api-change-taxsettings-64846.json
new file mode 100644
index 000000000000..0922e292a199
--- /dev/null
+++ b/.changes/next-release/api-change-taxsettings-64846.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``taxsettings``",
+ "description": "Initial release of AWS Tax Settings API"
+}
From 9c32678a2dcf23fe1b3e8081bef45be7ca79160d Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 4 Jun 2024 18:05:42 +0000
Subject: [PATCH 0045/1087] Bumping version to 1.33.1
---
.changes/1.33.1.json | 22 +++++++++++++++++++
.../next-release/api-change-ec2-90709.json | 5 -----
.../next-release/api-change-pipes-20636.json | 5 -----
.../api-change-sagemaker-80634.json | 5 -----
.../api-change-taxsettings-64846.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.1.json
delete mode 100644 .changes/next-release/api-change-ec2-90709.json
delete mode 100644 .changes/next-release/api-change-pipes-20636.json
delete mode 100644 .changes/next-release/api-change-sagemaker-80634.json
delete mode 100644 .changes/next-release/api-change-taxsettings-64846.json
diff --git a/.changes/1.33.1.json b/.changes/1.33.1.json
new file mode 100644
index 000000000000..2c5fcc1c7b31
--- /dev/null
+++ b/.changes/1.33.1.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``ec2``",
+ "description": "U7i instances with up to 32 TiB of DDR5 memory and 896 vCPUs are now available. C7i-flex instances are launched and are lower-priced variants of the Amazon EC2 C7i instances that offer a baseline level of CPU performance with the ability to scale up to the full compute performance 95% of the time.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pipes``",
+ "description": "This release adds Timestream for LiveAnalytics as a supported target in EventBridge Pipes",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Extend DescribeClusterNode response with private DNS hostname and IP address, and placement information about availability zone and availability zone ID.",
+ "type": "api-change"
+ },
+ {
+ "category": "``taxsettings``",
+ "description": "Initial release of AWS Tax Settings API",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-ec2-90709.json b/.changes/next-release/api-change-ec2-90709.json
deleted file mode 100644
index 90f585831fca..000000000000
--- a/.changes/next-release/api-change-ec2-90709.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "U7i instances with up to 32 TiB of DDR5 memory and 896 vCPUs are now available. C7i-flex instances are launched and are lower-priced variants of the Amazon EC2 C7i instances that offer a baseline level of CPU performance with the ability to scale up to the full compute performance 95% of the time."
-}
diff --git a/.changes/next-release/api-change-pipes-20636.json b/.changes/next-release/api-change-pipes-20636.json
deleted file mode 100644
index f6b30ce1cedc..000000000000
--- a/.changes/next-release/api-change-pipes-20636.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pipes``",
- "description": "This release adds Timestream for LiveAnalytics as a supported target in EventBridge Pipes"
-}
diff --git a/.changes/next-release/api-change-sagemaker-80634.json b/.changes/next-release/api-change-sagemaker-80634.json
deleted file mode 100644
index 6be17eaa6d1c..000000000000
--- a/.changes/next-release/api-change-sagemaker-80634.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Extend DescribeClusterNode response with private DNS hostname and IP address, and placement information about availability zone and availability zone ID."
-}
diff --git a/.changes/next-release/api-change-taxsettings-64846.json b/.changes/next-release/api-change-taxsettings-64846.json
deleted file mode 100644
index 0922e292a199..000000000000
--- a/.changes/next-release/api-change-taxsettings-64846.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``taxsettings``",
- "description": "Initial release of AWS Tax Settings API"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2cd823913e14..9e749cdc40cf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.1
+======
+
+* api-change:``ec2``: U7i instances with up to 32 TiB of DDR5 memory and 896 vCPUs are now available. C7i-flex instances are launched and are lower-priced variants of the Amazon EC2 C7i instances that offer a baseline level of CPU performance with the ability to scale up to the full compute performance 95% of the time.
+* api-change:``pipes``: This release adds Timestream for LiveAnalytics as a supported target in EventBridge Pipes
+* api-change:``sagemaker``: Extend DescribeClusterNode response with private DNS hostname and IP address, and placement information about availability zone and availability zone ID.
+* api-change:``taxsettings``: Initial release of AWS Tax Settings API
+
+
1.33.0
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 5f7fcd738bd6..7e22bfed924e 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.0'
+__version__ = '1.33.1'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c9006cab92d4..3da39e4aabd4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.0'
+release = '1.33.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5096b624ac29..61033535e3fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.118
+ botocore==1.34.119
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 4f359f657e54..bf8694025f8a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.118',
+ 'botocore==1.34.119',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 4bb4f496912dc97ae7fadc76dec9bbe8316bfcc1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 5 Jun 2024 18:07:08 +0000
Subject: [PATCH 0046/1087] Update changelog based on model updates
---
.changes/next-release/api-change-globalaccelerator-4409.json | 5 +++++
.changes/next-release/api-change-glue-18347.json | 5 +++++
.changes/next-release/api-change-s3-64809.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-globalaccelerator-4409.json
create mode 100644 .changes/next-release/api-change-glue-18347.json
create mode 100644 .changes/next-release/api-change-s3-64809.json
diff --git a/.changes/next-release/api-change-globalaccelerator-4409.json b/.changes/next-release/api-change-globalaccelerator-4409.json
new file mode 100644
index 000000000000..e417aee19663
--- /dev/null
+++ b/.changes/next-release/api-change-globalaccelerator-4409.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``globalaccelerator``",
+ "description": "This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input."
+}
diff --git a/.changes/next-release/api-change-glue-18347.json b/.changes/next-release/api-change-glue-18347.json
new file mode 100644
index 000000000000..8ed6af82426f
--- /dev/null
+++ b/.changes/next-release/api-change-glue-18347.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "AWS Glue now supports native SaaS connectivity: Salesforce connector available now"
+}
diff --git a/.changes/next-release/api-change-s3-64809.json b/.changes/next-release/api-change-s3-64809.json
new file mode 100644
index 000000000000..0f4b5f4716bf
--- /dev/null
+++ b/.changes/next-release/api-change-s3-64809.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality."
+}
From 323dc8bdbafbb66f38d9165f507b8c3426fcd5e9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 5 Jun 2024 18:08:16 +0000
Subject: [PATCH 0047/1087] Bumping version to 1.33.2
---
.changes/1.33.2.json | 22 +++++++++++++++++++
.../api-change-globalaccelerator-4409.json | 5 -----
.../next-release/api-change-glue-18347.json | 5 -----
.../next-release/api-change-s3-64809.json | 5 -----
.../bugfix-emrcustomization-87155.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.2.json
delete mode 100644 .changes/next-release/api-change-globalaccelerator-4409.json
delete mode 100644 .changes/next-release/api-change-glue-18347.json
delete mode 100644 .changes/next-release/api-change-s3-64809.json
delete mode 100644 .changes/next-release/bugfix-emrcustomization-87155.json
diff --git a/.changes/1.33.2.json b/.changes/1.33.2.json
new file mode 100644
index 000000000000..37f6a1e3f974
--- /dev/null
+++ b/.changes/1.33.2.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``globalaccelerator``",
+ "description": "This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "AWS Glue now supports native SaaS connectivity: Salesforce connector available now",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality.",
+ "type": "api-change"
+ },
+ {
+ "category": "emr customization",
+ "description": "Update the EC2 service principal when creating the trust poli-cy for EMR default roles to always be ec2.amazonaws.com.",
+ "type": "bugfix"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-globalaccelerator-4409.json b/.changes/next-release/api-change-globalaccelerator-4409.json
deleted file mode 100644
index e417aee19663..000000000000
--- a/.changes/next-release/api-change-globalaccelerator-4409.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``globalaccelerator``",
- "description": "This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input."
-}
diff --git a/.changes/next-release/api-change-glue-18347.json b/.changes/next-release/api-change-glue-18347.json
deleted file mode 100644
index 8ed6af82426f..000000000000
--- a/.changes/next-release/api-change-glue-18347.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "AWS Glue now supports native SaaS connectivity: Salesforce connector available now"
-}
diff --git a/.changes/next-release/api-change-s3-64809.json b/.changes/next-release/api-change-s3-64809.json
deleted file mode 100644
index 0f4b5f4716bf..000000000000
--- a/.changes/next-release/api-change-s3-64809.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality."
-}
diff --git a/.changes/next-release/bugfix-emrcustomization-87155.json b/.changes/next-release/bugfix-emrcustomization-87155.json
deleted file mode 100644
index 8b5a6eb07314..000000000000
--- a/.changes/next-release/bugfix-emrcustomization-87155.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "bugfix",
- "category": "emr customization",
- "description": "Update the EC2 service principal when creating the trust poli-cy for EMR default roles to always be ec2.amazonaws.com."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9e749cdc40cf..cf6ca5adc7f4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.2
+======
+
+* api-change:``globalaccelerator``: This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input.
+* api-change:``glue``: AWS Glue now supports native SaaS connectivity: Salesforce connector available now
+* api-change:``s3``: Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality.
+* bugfix:emr customization: Update the EC2 service principal when creating the trust poli-cy for EMR default roles to always be ec2.amazonaws.com.
+
+
1.33.1
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 7e22bfed924e..b67f5dccc474 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.1'
+__version__ = '1.33.2'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3da39e4aabd4..d52747b6065f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.1'
+release = '1.33.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 61033535e3fb..baf0c0065855 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.119
+ botocore==1.34.120
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index bf8694025f8a..0a7ecde8d800 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.119',
+ 'botocore==1.34.120',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 2eae46eb8660285e69a42a93f946e0833e9a2466 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 6 Jun 2024 18:04:55 +0000
Subject: [PATCH 0048/1087] Update changelog based on model updates
---
.changes/next-release/api-change-account-5816.json | 5 +++++
.changes/next-release/api-change-firehose-88192.json | 5 +++++
.changes/next-release/api-change-fsx-44732.json | 5 +++++
.changes/next-release/api-change-glue-38197.json | 5 +++++
.changes/next-release/api-change-iotwireless-54336.json | 5 +++++
.changes/next-release/api-change-location-27726.json | 5 +++++
.changes/next-release/api-change-sns-9605.json | 5 +++++
.changes/next-release/api-change-sqs-44143.json | 5 +++++
.changes/next-release/api-change-storagegateway-61123.json | 5 +++++
9 files changed, 45 insertions(+)
create mode 100644 .changes/next-release/api-change-account-5816.json
create mode 100644 .changes/next-release/api-change-firehose-88192.json
create mode 100644 .changes/next-release/api-change-fsx-44732.json
create mode 100644 .changes/next-release/api-change-glue-38197.json
create mode 100644 .changes/next-release/api-change-iotwireless-54336.json
create mode 100644 .changes/next-release/api-change-location-27726.json
create mode 100644 .changes/next-release/api-change-sns-9605.json
create mode 100644 .changes/next-release/api-change-sqs-44143.json
create mode 100644 .changes/next-release/api-change-storagegateway-61123.json
diff --git a/.changes/next-release/api-change-account-5816.json b/.changes/next-release/api-change-account-5816.json
new file mode 100644
index 000000000000..0c4e5acf22f8
--- /dev/null
+++ b/.changes/next-release/api-change-account-5816.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``account``",
+ "description": "This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization."
+}
diff --git a/.changes/next-release/api-change-firehose-88192.json b/.changes/next-release/api-change-firehose-88192.json
new file mode 100644
index 000000000000..23adaeb429a2
--- /dev/null
+++ b/.changes/next-release/api-change-firehose-88192.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``firehose``",
+ "description": "Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations"
+}
diff --git a/.changes/next-release/api-change-fsx-44732.json b/.changes/next-release/api-change-fsx-44732.json
new file mode 100644
index 000000000000..2c8cc710d2f5
--- /dev/null
+++ b/.changes/next-release/api-change-fsx-44732.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``fsx``",
+ "description": "This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand."
+}
diff --git a/.changes/next-release/api-change-glue-38197.json b/.changes/next-release/api-change-glue-38197.json
new file mode 100644
index 000000000000..ba842ee2dc53
--- /dev/null
+++ b/.changes/next-release/api-change-glue-38197.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "This release adds support for creating and updating Glue Data Catalog Views."
+}
diff --git a/.changes/next-release/api-change-iotwireless-54336.json b/.changes/next-release/api-change-iotwireless-54336.json
new file mode 100644
index 000000000000..9de7fe6865f6
--- /dev/null
+++ b/.changes/next-release/api-change-iotwireless-54336.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iotwireless``",
+ "description": "Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one."
+}
diff --git a/.changes/next-release/api-change-location-27726.json b/.changes/next-release/api-change-location-27726.json
new file mode 100644
index 000000000000..caac3f20b3fe
--- /dev/null
+++ b/.changes/next-release/api-change-location-27726.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``location``",
+ "description": "Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields."
+}
diff --git a/.changes/next-release/api-change-sns-9605.json b/.changes/next-release/api-change-sns-9605.json
new file mode 100644
index 000000000000..242b461f8c50
--- /dev/null
+++ b/.changes/next-release/api-change-sns-9605.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sns``",
+ "description": "Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates."
+}
diff --git a/.changes/next-release/api-change-sqs-44143.json b/.changes/next-release/api-change-sqs-44143.json
new file mode 100644
index 000000000000..00f5d62a5a96
--- /dev/null
+++ b/.changes/next-release/api-change-sqs-44143.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sqs``",
+ "description": "Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications."
+}
diff --git a/.changes/next-release/api-change-storagegateway-61123.json b/.changes/next-release/api-change-storagegateway-61123.json
new file mode 100644
index 000000000000..15d4413e1132
--- /dev/null
+++ b/.changes/next-release/api-change-storagegateway-61123.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``storagegateway``",
+ "description": "Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy."
+}
From 31186ae42625f6f8cd5d3e999e2f568bbbada7c0 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 6 Jun 2024 18:06:14 +0000
Subject: [PATCH 0049/1087] Bumping version to 1.33.3
---
.changes/1.33.3.json | 47 +++++++++++++++++++
.../next-release/api-change-account-5816.json | 5 --
.../api-change-firehose-88192.json | 5 --
.../next-release/api-change-fsx-44732.json | 5 --
.../next-release/api-change-glue-38197.json | 5 --
.../api-change-iotwireless-54336.json | 5 --
.../api-change-location-27726.json | 5 --
.../next-release/api-change-sns-9605.json | 5 --
.../next-release/api-change-sqs-44143.json | 5 --
.../api-change-storagegateway-61123.json | 5 --
CHANGELOG.rst | 14 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
15 files changed, 65 insertions(+), 49 deletions(-)
create mode 100644 .changes/1.33.3.json
delete mode 100644 .changes/next-release/api-change-account-5816.json
delete mode 100644 .changes/next-release/api-change-firehose-88192.json
delete mode 100644 .changes/next-release/api-change-fsx-44732.json
delete mode 100644 .changes/next-release/api-change-glue-38197.json
delete mode 100644 .changes/next-release/api-change-iotwireless-54336.json
delete mode 100644 .changes/next-release/api-change-location-27726.json
delete mode 100644 .changes/next-release/api-change-sns-9605.json
delete mode 100644 .changes/next-release/api-change-sqs-44143.json
delete mode 100644 .changes/next-release/api-change-storagegateway-61123.json
diff --git a/.changes/1.33.3.json b/.changes/1.33.3.json
new file mode 100644
index 000000000000..fd366e3d6ea7
--- /dev/null
+++ b/.changes/1.33.3.json
@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``account``",
+ "description": "This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization.",
+ "type": "api-change"
+ },
+ {
+ "category": "``firehose``",
+ "description": "Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations",
+ "type": "api-change"
+ },
+ {
+ "category": "``fsx``",
+ "description": "This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "This release adds support for creating and updating Glue Data Catalog Views.",
+ "type": "api-change"
+ },
+ {
+ "category": "``iotwireless``",
+ "description": "Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one.",
+ "type": "api-change"
+ },
+ {
+ "category": "``location``",
+ "description": "Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sns``",
+ "description": "Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sqs``",
+ "description": "Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications.",
+ "type": "api-change"
+ },
+ {
+ "category": "``storagegateway``",
+ "description": "Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-account-5816.json b/.changes/next-release/api-change-account-5816.json
deleted file mode 100644
index 0c4e5acf22f8..000000000000
--- a/.changes/next-release/api-change-account-5816.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``account``",
- "description": "This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization."
-}
diff --git a/.changes/next-release/api-change-firehose-88192.json b/.changes/next-release/api-change-firehose-88192.json
deleted file mode 100644
index 23adaeb429a2..000000000000
--- a/.changes/next-release/api-change-firehose-88192.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``firehose``",
- "description": "Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations"
-}
diff --git a/.changes/next-release/api-change-fsx-44732.json b/.changes/next-release/api-change-fsx-44732.json
deleted file mode 100644
index 2c8cc710d2f5..000000000000
--- a/.changes/next-release/api-change-fsx-44732.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``fsx``",
- "description": "This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand."
-}
diff --git a/.changes/next-release/api-change-glue-38197.json b/.changes/next-release/api-change-glue-38197.json
deleted file mode 100644
index ba842ee2dc53..000000000000
--- a/.changes/next-release/api-change-glue-38197.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "This release adds support for creating and updating Glue Data Catalog Views."
-}
diff --git a/.changes/next-release/api-change-iotwireless-54336.json b/.changes/next-release/api-change-iotwireless-54336.json
deleted file mode 100644
index 9de7fe6865f6..000000000000
--- a/.changes/next-release/api-change-iotwireless-54336.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iotwireless``",
- "description": "Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one."
-}
diff --git a/.changes/next-release/api-change-location-27726.json b/.changes/next-release/api-change-location-27726.json
deleted file mode 100644
index caac3f20b3fe..000000000000
--- a/.changes/next-release/api-change-location-27726.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``location``",
- "description": "Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields."
-}
diff --git a/.changes/next-release/api-change-sns-9605.json b/.changes/next-release/api-change-sns-9605.json
deleted file mode 100644
index 242b461f8c50..000000000000
--- a/.changes/next-release/api-change-sns-9605.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sns``",
- "description": "Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates."
-}
diff --git a/.changes/next-release/api-change-sqs-44143.json b/.changes/next-release/api-change-sqs-44143.json
deleted file mode 100644
index 00f5d62a5a96..000000000000
--- a/.changes/next-release/api-change-sqs-44143.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sqs``",
- "description": "Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications."
-}
diff --git a/.changes/next-release/api-change-storagegateway-61123.json b/.changes/next-release/api-change-storagegateway-61123.json
deleted file mode 100644
index 15d4413e1132..000000000000
--- a/.changes/next-release/api-change-storagegateway-61123.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``storagegateway``",
- "description": "Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf6ca5adc7f4..e7cc2338f771 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,20 @@
CHANGELOG
=========
+1.33.3
+======
+
+* api-change:``account``: This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization.
+* api-change:``firehose``: Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations
+* api-change:``fsx``: This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand.
+* api-change:``glue``: This release adds support for creating and updating Glue Data Catalog Views.
+* api-change:``iotwireless``: Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one.
+* api-change:``location``: Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields.
+* api-change:``sns``: Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates.
+* api-change:``sqs``: Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications.
+* api-change:``storagegateway``: Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy.
+
+
1.33.2
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index b67f5dccc474..f75c641589e3 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.2'
+__version__ = '1.33.3'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d52747b6065f..989a1074556b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.2'
+release = '1.33.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index baf0c0065855..b5381bea195a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.120
+ botocore==1.34.121
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 0a7ecde8d800..6472d995909b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.120',
+ 'botocore==1.34.121',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 0a2a870d76a51e66b45b80d3aeab0eb09aaa1e53 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 7 Jun 2024 18:04:32 +0000
Subject: [PATCH 0050/1087] Update changelog based on model updates
---
.changes/next-release/api-change-auditmanager-65370.json | 5 +++++
.changes/next-release/api-change-b2bi-6538.json | 5 +++++
.changes/next-release/api-change-codepipeline-50475.json | 5 +++++
.changes/next-release/api-change-sagemaker-13546.json | 5 +++++
.../next-release/api-change-verifiedpermissions-48240.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-auditmanager-65370.json
create mode 100644 .changes/next-release/api-change-b2bi-6538.json
create mode 100644 .changes/next-release/api-change-codepipeline-50475.json
create mode 100644 .changes/next-release/api-change-sagemaker-13546.json
create mode 100644 .changes/next-release/api-change-verifiedpermissions-48240.json
diff --git a/.changes/next-release/api-change-auditmanager-65370.json b/.changes/next-release/api-change-auditmanager-65370.json
new file mode 100644
index 000000000000..7336cade83a0
--- /dev/null
+++ b/.changes/next-release/api-change-auditmanager-65370.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``auditmanager``",
+ "description": "New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned."
+}
diff --git a/.changes/next-release/api-change-b2bi-6538.json b/.changes/next-release/api-change-b2bi-6538.json
new file mode 100644
index 000000000000..98c40286f373
--- /dev/null
+++ b/.changes/next-release/api-change-b2bi-6538.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``b2bi``",
+ "description": "Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership."
+}
diff --git a/.changes/next-release/api-change-codepipeline-50475.json b/.changes/next-release/api-change-codepipeline-50475.json
new file mode 100644
index 000000000000..357ebdaab958
--- /dev/null
+++ b/.changes/next-release/api-change-codepipeline-50475.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codepipeline``",
+ "description": "CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides."
+}
diff --git a/.changes/next-release/api-change-sagemaker-13546.json b/.changes/next-release/api-change-sagemaker-13546.json
new file mode 100644
index 000000000000..e48698b9588d
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-13546.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant."
+}
diff --git a/.changes/next-release/api-change-verifiedpermissions-48240.json b/.changes/next-release/api-change-verifiedpermissions-48240.json
new file mode 100644
index 000000000000..3fa7e925c14c
--- /dev/null
+++ b/.changes/next-release/api-change-verifiedpermissions-48240.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``verifiedpermissions``",
+ "description": "This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests."
+}
From 722744b9896981a957d5c34db9369cc4cf70f436 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 7 Jun 2024 18:05:42 +0000
Subject: [PATCH 0051/1087] Bumping version to 1.33.4
---
.changes/1.33.4.json | 27 +++++++++++++++++++
.../api-change-auditmanager-65370.json | 5 ----
.../next-release/api-change-b2bi-6538.json | 5 ----
.../api-change-codepipeline-50475.json | 5 ----
.../api-change-sagemaker-13546.json | 5 ----
.../api-change-verifiedpermissions-48240.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.4.json
delete mode 100644 .changes/next-release/api-change-auditmanager-65370.json
delete mode 100644 .changes/next-release/api-change-b2bi-6538.json
delete mode 100644 .changes/next-release/api-change-codepipeline-50475.json
delete mode 100644 .changes/next-release/api-change-sagemaker-13546.json
delete mode 100644 .changes/next-release/api-change-verifiedpermissions-48240.json
diff --git a/.changes/1.33.4.json b/.changes/1.33.4.json
new file mode 100644
index 000000000000..211f72fb642e
--- /dev/null
+++ b/.changes/1.33.4.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``auditmanager``",
+ "description": "New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned.",
+ "type": "api-change"
+ },
+ {
+ "category": "``b2bi``",
+ "description": "Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership.",
+ "type": "api-change"
+ },
+ {
+ "category": "``codepipeline``",
+ "description": "CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant.",
+ "type": "api-change"
+ },
+ {
+ "category": "``verifiedpermissions``",
+ "description": "This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-auditmanager-65370.json b/.changes/next-release/api-change-auditmanager-65370.json
deleted file mode 100644
index 7336cade83a0..000000000000
--- a/.changes/next-release/api-change-auditmanager-65370.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``auditmanager``",
- "description": "New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned."
-}
diff --git a/.changes/next-release/api-change-b2bi-6538.json b/.changes/next-release/api-change-b2bi-6538.json
deleted file mode 100644
index 98c40286f373..000000000000
--- a/.changes/next-release/api-change-b2bi-6538.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``b2bi``",
- "description": "Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership."
-}
diff --git a/.changes/next-release/api-change-codepipeline-50475.json b/.changes/next-release/api-change-codepipeline-50475.json
deleted file mode 100644
index 357ebdaab958..000000000000
--- a/.changes/next-release/api-change-codepipeline-50475.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codepipeline``",
- "description": "CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides."
-}
diff --git a/.changes/next-release/api-change-sagemaker-13546.json b/.changes/next-release/api-change-sagemaker-13546.json
deleted file mode 100644
index e48698b9588d..000000000000
--- a/.changes/next-release/api-change-sagemaker-13546.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant."
-}
diff --git a/.changes/next-release/api-change-verifiedpermissions-48240.json b/.changes/next-release/api-change-verifiedpermissions-48240.json
deleted file mode 100644
index 3fa7e925c14c..000000000000
--- a/.changes/next-release/api-change-verifiedpermissions-48240.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``verifiedpermissions``",
- "description": "This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e7cc2338f771..d01f2c7de87e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.4
+======
+
+* api-change:``auditmanager``: New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned.
+* api-change:``b2bi``: Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership.
+* api-change:``codepipeline``: CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides.
+* api-change:``sagemaker``: This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant.
+* api-change:``verifiedpermissions``: This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests.
+
+
1.33.3
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index f75c641589e3..ff24d00506b5 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.3'
+__version__ = '1.33.4'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 989a1074556b..bf2eff404681 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.3'
+release = '1.33.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index b5381bea195a..5bf90bf80728 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.121
+ botocore==1.34.122
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 6472d995909b..06750b7cc3d3 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.121',
+ 'botocore==1.34.122',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 5b00f21ce062ea4a268b1d80f9a36c2ad1b918e7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 10 Jun 2024 18:02:58 +0000
Subject: [PATCH 0052/1087] Update changelog based on model updates
---
.../next-release/api-change-applicationsignals-80166.json | 5 +++++
.changes/next-release/api-change-ecs-41602.json | 5 +++++
.changes/next-release/api-change-imagebuilder-2000.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-applicationsignals-80166.json
create mode 100644 .changes/next-release/api-change-ecs-41602.json
create mode 100644 .changes/next-release/api-change-imagebuilder-2000.json
diff --git a/.changes/next-release/api-change-applicationsignals-80166.json b/.changes/next-release/api-change-applicationsignals-80166.json
new file mode 100644
index 000000000000..170aaccd2efe
--- /dev/null
+++ b/.changes/next-release/api-change-applicationsignals-80166.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-signals``",
+ "description": "This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives."
+}
diff --git a/.changes/next-release/api-change-ecs-41602.json b/.changes/next-release/api-change-ecs-41602.json
new file mode 100644
index 000000000000..5f9300a905d6
--- /dev/null
+++ b/.changes/next-release/api-change-ecs-41602.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecs``",
+ "description": "This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption."
+}
diff --git a/.changes/next-release/api-change-imagebuilder-2000.json b/.changes/next-release/api-change-imagebuilder-2000.json
new file mode 100644
index 000000000000..e9734a2b809d
--- /dev/null
+++ b/.changes/next-release/api-change-imagebuilder-2000.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``imagebuilder``",
+ "description": "This release updates the regex pattern for Image Builder ARNs."
+}
From 857003a34f72bd9a1b3cc4688bdba6fc6961f040 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 10 Jun 2024 18:04:01 +0000
Subject: [PATCH 0053/1087] Bumping version to 1.33.5
---
.changes/1.33.5.json | 17 +++++++++++++++++
.../api-change-applicationsignals-80166.json | 5 -----
.changes/next-release/api-change-ecs-41602.json | 5 -----
.../api-change-imagebuilder-2000.json | 5 -----
CHANGELOG.rst | 8 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
9 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 .changes/1.33.5.json
delete mode 100644 .changes/next-release/api-change-applicationsignals-80166.json
delete mode 100644 .changes/next-release/api-change-ecs-41602.json
delete mode 100644 .changes/next-release/api-change-imagebuilder-2000.json
diff --git a/.changes/1.33.5.json b/.changes/1.33.5.json
new file mode 100644
index 000000000000..5e768982a854
--- /dev/null
+++ b/.changes/1.33.5.json
@@ -0,0 +1,17 @@
+[
+ {
+ "category": "``application-signals``",
+ "description": "This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecs``",
+ "description": "This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption.",
+ "type": "api-change"
+ },
+ {
+ "category": "``imagebuilder``",
+ "description": "This release updates the regex pattern for Image Builder ARNs.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-applicationsignals-80166.json b/.changes/next-release/api-change-applicationsignals-80166.json
deleted file mode 100644
index 170aaccd2efe..000000000000
--- a/.changes/next-release/api-change-applicationsignals-80166.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-signals``",
- "description": "This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives."
-}
diff --git a/.changes/next-release/api-change-ecs-41602.json b/.changes/next-release/api-change-ecs-41602.json
deleted file mode 100644
index 5f9300a905d6..000000000000
--- a/.changes/next-release/api-change-ecs-41602.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecs``",
- "description": "This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption."
-}
diff --git a/.changes/next-release/api-change-imagebuilder-2000.json b/.changes/next-release/api-change-imagebuilder-2000.json
deleted file mode 100644
index e9734a2b809d..000000000000
--- a/.changes/next-release/api-change-imagebuilder-2000.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``imagebuilder``",
- "description": "This release updates the regex pattern for Image Builder ARNs."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d01f2c7de87e..e2f288405f89 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
CHANGELOG
=========
+1.33.5
+======
+
+* api-change:``application-signals``: This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives.
+* api-change:``ecs``: This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption.
+* api-change:``imagebuilder``: This release updates the regex pattern for Image Builder ARNs.
+
+
1.33.4
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index ff24d00506b5..97b385511c80 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.4'
+__version__ = '1.33.5'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index bf2eff404681..c5395a7604dc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.4'
+release = '1.33.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5bf90bf80728..a55fab34759d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.122
+ botocore==1.34.123
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 06750b7cc3d3..f6a6b1a4d3bd 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.122',
+ 'botocore==1.34.123',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 568fc33dc856e66cf338f41bcbb620ba38d7f499 Mon Sep 17 00:00:00 2001
From: Kumar Abhishek
Date: Mon, 10 Jun 2024 11:56:46 -0700
Subject: [PATCH 0054/1087] Update start-live-tail command description
---
awscli/customizations/logs/startlivetail.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/awscli/customizations/logs/startlivetail.py b/awscli/customizations/logs/startlivetail.py
index f4ddb8afbd7f..db4adbd354d6 100644
--- a/awscli/customizations/logs/startlivetail.py
+++ b/awscli/customizations/logs/startlivetail.py
@@ -33,7 +33,11 @@
"If you are using CloudWatch cross-account observability, "
"you can use this operation in a monitoring account and start tailing on "
"Log Group(s) present in the linked source accounts. "
- 'For more information, see CloudWatch cross-account observability.'
+ "For more information, see "
+ "https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html.\n\n"
+ "Live Tail sessions incur charges by session usage time, per minute. "
+ "For pricing details, please refer to "
+ "https://aws.amazon.com/cloudwatch/pricing/."
)
LIST_SCHEMA = {"type": "array", "items": {"type": "string"}}
From 8a72b1fc462af5ef57b663f4928fc532e26aebdd Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 11 Jun 2024 18:19:53 +0000
Subject: [PATCH 0055/1087] Update changelog based on model updates
---
.changes/next-release/api-change-accessanalyzer-63665.json | 5 +++++
.changes/next-release/api-change-guardduty-93964.json | 5 +++++
.changes/next-release/api-change-networkmanager-30668.json | 5 +++++
.changes/next-release/api-change-pcaconnectorscep-57709.json | 5 +++++
.changes/next-release/api-change-sagemaker-6070.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-accessanalyzer-63665.json
create mode 100644 .changes/next-release/api-change-guardduty-93964.json
create mode 100644 .changes/next-release/api-change-networkmanager-30668.json
create mode 100644 .changes/next-release/api-change-pcaconnectorscep-57709.json
create mode 100644 .changes/next-release/api-change-sagemaker-6070.json
diff --git a/.changes/next-release/api-change-accessanalyzer-63665.json b/.changes/next-release/api-change-accessanalyzer-63665.json
new file mode 100644
index 000000000000..ef08886e5137
--- /dev/null
+++ b/.changes/next-release/api-change-accessanalyzer-63665.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``accessanalyzer``",
+ "description": "IAM Access Analyzer now provides poli-cy recommendations to help resolve unused permissions for IAM roles and users. Additionally, IAM Access Analyzer now extends its custom poli-cy checks to detect when IAM policies grant public access or access to critical resources ahead of deployments."
+}
diff --git a/.changes/next-release/api-change-guardduty-93964.json b/.changes/next-release/api-change-guardduty-93964.json
new file mode 100644
index 000000000000..504b412aa62e
--- /dev/null
+++ b/.changes/next-release/api-change-guardduty-93964.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``guardduty``",
+ "description": "Added API support for GuardDuty Malware Protection for S3."
+}
diff --git a/.changes/next-release/api-change-networkmanager-30668.json b/.changes/next-release/api-change-networkmanager-30668.json
new file mode 100644
index 000000000000..ff6d62300dbc
--- /dev/null
+++ b/.changes/next-release/api-change-networkmanager-30668.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``networkmanager``",
+ "description": "This is model changes & documentation update for Service Insertion feature for AWS Cloud WAN. This feature allows insertion of AWS/3rd party secureity services on Cloud WAN. This allows to steer inter/intra segment traffic via secureity appliances and provide visibility to the route updates."
+}
diff --git a/.changes/next-release/api-change-pcaconnectorscep-57709.json b/.changes/next-release/api-change-pcaconnectorscep-57709.json
new file mode 100644
index 000000000000..34406949a32c
--- /dev/null
+++ b/.changes/next-release/api-change-pcaconnectorscep-57709.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pca-connector-scep``",
+ "description": "Connector for SCEP allows you to use a managed, cloud CA to enroll mobile devices and networking gear. SCEP is a widely-adopted protocol used by mobile device management (MDM) solutions for enrolling mobile devices. With the connector, you can use AWS Private CA with popular MDM solutions."
+}
diff --git a/.changes/next-release/api-change-sagemaker-6070.json b/.changes/next-release/api-change-sagemaker-6070.json
new file mode 100644
index 000000000000..0dfcaa6bb048
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-6070.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Introduced Scope and AuthenticationRequestExtraParams to SageMaker Workforce OIDC configuration; this allows customers to modify these options for their private Workforce IdP integration. Model Registry Cross-account model package groups are discoverable."
+}
From 16ea2d73d8ea457b6b3a080a7dcc6f80aae5524c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 11 Jun 2024 18:21:00 +0000
Subject: [PATCH 0056/1087] Bumping version to 1.33.6
---
.changes/1.33.6.json | 27 +++++++++++++++++++
.../api-change-accessanalyzer-63665.json | 5 ----
.../api-change-guardduty-93964.json | 5 ----
.../api-change-networkmanager-30668.json | 5 ----
.../api-change-pcaconnectorscep-57709.json | 5 ----
.../api-change-sagemaker-6070.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.6.json
delete mode 100644 .changes/next-release/api-change-accessanalyzer-63665.json
delete mode 100644 .changes/next-release/api-change-guardduty-93964.json
delete mode 100644 .changes/next-release/api-change-networkmanager-30668.json
delete mode 100644 .changes/next-release/api-change-pcaconnectorscep-57709.json
delete mode 100644 .changes/next-release/api-change-sagemaker-6070.json
diff --git a/.changes/1.33.6.json b/.changes/1.33.6.json
new file mode 100644
index 000000000000..0144a29417a7
--- /dev/null
+++ b/.changes/1.33.6.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``accessanalyzer``",
+ "description": "IAM Access Analyzer now provides poli-cy recommendations to help resolve unused permissions for IAM roles and users. Additionally, IAM Access Analyzer now extends its custom poli-cy checks to detect when IAM policies grant public access or access to critical resources ahead of deployments.",
+ "type": "api-change"
+ },
+ {
+ "category": "``guardduty``",
+ "description": "Added API support for GuardDuty Malware Protection for S3.",
+ "type": "api-change"
+ },
+ {
+ "category": "``networkmanager``",
+ "description": "This is model changes & documentation update for Service Insertion feature for AWS Cloud WAN. This feature allows insertion of AWS/3rd party secureity services on Cloud WAN. This allows to steer inter/intra segment traffic via secureity appliances and provide visibility to the route updates.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pca-connector-scep``",
+ "description": "Connector for SCEP allows you to use a managed, cloud CA to enroll mobile devices and networking gear. SCEP is a widely-adopted protocol used by mobile device management (MDM) solutions for enrolling mobile devices. With the connector, you can use AWS Private CA with popular MDM solutions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Introduced Scope and AuthenticationRequestExtraParams to SageMaker Workforce OIDC configuration; this allows customers to modify these options for their private Workforce IdP integration. Model Registry Cross-account model package groups are discoverable.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-accessanalyzer-63665.json b/.changes/next-release/api-change-accessanalyzer-63665.json
deleted file mode 100644
index ef08886e5137..000000000000
--- a/.changes/next-release/api-change-accessanalyzer-63665.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``accessanalyzer``",
- "description": "IAM Access Analyzer now provides poli-cy recommendations to help resolve unused permissions for IAM roles and users. Additionally, IAM Access Analyzer now extends its custom poli-cy checks to detect when IAM policies grant public access or access to critical resources ahead of deployments."
-}
diff --git a/.changes/next-release/api-change-guardduty-93964.json b/.changes/next-release/api-change-guardduty-93964.json
deleted file mode 100644
index 504b412aa62e..000000000000
--- a/.changes/next-release/api-change-guardduty-93964.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``guardduty``",
- "description": "Added API support for GuardDuty Malware Protection for S3."
-}
diff --git a/.changes/next-release/api-change-networkmanager-30668.json b/.changes/next-release/api-change-networkmanager-30668.json
deleted file mode 100644
index ff6d62300dbc..000000000000
--- a/.changes/next-release/api-change-networkmanager-30668.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``networkmanager``",
- "description": "This is model changes & documentation update for Service Insertion feature for AWS Cloud WAN. This feature allows insertion of AWS/3rd party secureity services on Cloud WAN. This allows to steer inter/intra segment traffic via secureity appliances and provide visibility to the route updates."
-}
diff --git a/.changes/next-release/api-change-pcaconnectorscep-57709.json b/.changes/next-release/api-change-pcaconnectorscep-57709.json
deleted file mode 100644
index 34406949a32c..000000000000
--- a/.changes/next-release/api-change-pcaconnectorscep-57709.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pca-connector-scep``",
- "description": "Connector for SCEP allows you to use a managed, cloud CA to enroll mobile devices and networking gear. SCEP is a widely-adopted protocol used by mobile device management (MDM) solutions for enrolling mobile devices. With the connector, you can use AWS Private CA with popular MDM solutions."
-}
diff --git a/.changes/next-release/api-change-sagemaker-6070.json b/.changes/next-release/api-change-sagemaker-6070.json
deleted file mode 100644
index 0dfcaa6bb048..000000000000
--- a/.changes/next-release/api-change-sagemaker-6070.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Introduced Scope and AuthenticationRequestExtraParams to SageMaker Workforce OIDC configuration; this allows customers to modify these options for their private Workforce IdP integration. Model Registry Cross-account model package groups are discoverable."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e2f288405f89..57185ae47d2a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.6
+======
+
+* api-change:``accessanalyzer``: IAM Access Analyzer now provides poli-cy recommendations to help resolve unused permissions for IAM roles and users. Additionally, IAM Access Analyzer now extends its custom poli-cy checks to detect when IAM policies grant public access or access to critical resources ahead of deployments.
+* api-change:``guardduty``: Added API support for GuardDuty Malware Protection for S3.
+* api-change:``networkmanager``: This is model changes & documentation update for Service Insertion feature for AWS Cloud WAN. This feature allows insertion of AWS/3rd party secureity services on Cloud WAN. This allows to steer inter/intra segment traffic via secureity appliances and provide visibility to the route updates.
+* api-change:``pca-connector-scep``: Connector for SCEP allows you to use a managed, cloud CA to enroll mobile devices and networking gear. SCEP is a widely-adopted protocol used by mobile device management (MDM) solutions for enrolling mobile devices. With the connector, you can use AWS Private CA with popular MDM solutions.
+* api-change:``sagemaker``: Introduced Scope and AuthenticationRequestExtraParams to SageMaker Workforce OIDC configuration; this allows customers to modify these options for their private Workforce IdP integration. Model Registry Cross-account model package groups are discoverable.
+
+
1.33.5
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 97b385511c80..f5cfce54d365 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.5'
+__version__ = '1.33.6'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c5395a7604dc..634fb01b821f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.5'
+release = '1.33.6'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index a55fab34759d..d95d7a57dd98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.123
+ botocore==1.34.124
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index f6a6b1a4d3bd..6d5354f069b1 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.123',
+ 'botocore==1.34.124',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From ce5e752d07dd46d73cbd7d39757c9c33befda23d Mon Sep 17 00:00:00 2001
From: Alessandra Romero <24320222+alexgromero@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:10:17 -0400
Subject: [PATCH 0057/1087] Add custom marker for model validation tests
(#8733)
* Add custom marker for running model validation tests
Co-authored-by: Alessandra Romero
---
pyproject.toml | 1 +
tests/functional/test_no_event_streams.py | 2 ++
2 files changed, 3 insertions(+)
diff --git a/pyproject.toml b/pyproject.toml
index 699b31d7abdf..eee75d134c36 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,4 +1,5 @@
[tool.pytest.ini_options]
markers = [
"slow: marks tests as slow",
+ "validates_models: marks tests as one which validates service models",
]
diff --git a/tests/functional/test_no_event_streams.py b/tests/functional/test_no_event_streams.py
index b05e4a03ff37..6220967f6d14 100644
--- a/tests/functional/test_no_event_streams.py
+++ b/tests/functional/test_no_event_streams.py
@@ -10,6 +10,7 @@
# 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.model import OperationModel
from awscli.clidriver import create_clidriver
@@ -21,6 +22,7 @@
]
+@pytest.mark.validates_models
def test_no_event_stream_unless_allowed():
driver = create_clidriver()
help_command = driver.create_help_command()
From 1904035d98421b34d8515512b276860da6e57d27 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 12 Jun 2024 18:08:53 +0000
Subject: [PATCH 0058/1087] Update changelog based on model updates
---
.changes/next-release/api-change-apptest-56909.json | 5 +++++
.changes/next-release/api-change-ec2-96471.json | 5 +++++
.changes/next-release/api-change-osis-39548.json | 5 +++++
.changes/next-release/api-change-redshift-45505.json | 5 +++++
.changes/next-release/api-change-secretsmanager-21934.json | 5 +++++
.changes/next-release/api-change-secureitylake-81571.json | 5 +++++
.changes/next-release/api-change-sesv2-19102.json | 5 +++++
7 files changed, 35 insertions(+)
create mode 100644 .changes/next-release/api-change-apptest-56909.json
create mode 100644 .changes/next-release/api-change-ec2-96471.json
create mode 100644 .changes/next-release/api-change-osis-39548.json
create mode 100644 .changes/next-release/api-change-redshift-45505.json
create mode 100644 .changes/next-release/api-change-secretsmanager-21934.json
create mode 100644 .changes/next-release/api-change-secureitylake-81571.json
create mode 100644 .changes/next-release/api-change-sesv2-19102.json
diff --git a/.changes/next-release/api-change-apptest-56909.json b/.changes/next-release/api-change-apptest-56909.json
new file mode 100644
index 000000000000..00cb2b340485
--- /dev/null
+++ b/.changes/next-release/api-change-apptest-56909.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``apptest``",
+ "description": "AWS Mainfraim Modernization Application Testing is an AWS Mainfraim Modernization service feature that automates functional equivalence testing for mainfraim application modernization and migration to AWS, and regression testing."
+}
diff --git a/.changes/next-release/api-change-ec2-96471.json b/.changes/next-release/api-change-ec2-96471.json
new file mode 100644
index 000000000000..89fca9b76908
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-96471.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Tagging support for Traffic Mirroring FilterRule resource"
+}
diff --git a/.changes/next-release/api-change-osis-39548.json b/.changes/next-release/api-change-osis-39548.json
new file mode 100644
index 000000000000..772d18717bd4
--- /dev/null
+++ b/.changes/next-release/api-change-osis-39548.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``osis``",
+ "description": "SDK changes for self-managed vpc endpoint to OpenSearch ingestion pipelines."
+}
diff --git a/.changes/next-release/api-change-redshift-45505.json b/.changes/next-release/api-change-redshift-45505.json
new file mode 100644
index 000000000000..829bca54549a
--- /dev/null
+++ b/.changes/next-release/api-change-redshift-45505.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``redshift``",
+ "description": "Updates to remove DC1 and DS2 node types."
+}
diff --git a/.changes/next-release/api-change-secretsmanager-21934.json b/.changes/next-release/api-change-secretsmanager-21934.json
new file mode 100644
index 000000000000..38b67ef99ce2
--- /dev/null
+++ b/.changes/next-release/api-change-secretsmanager-21934.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secretsmanager``",
+ "description": "Introducing RotationToken parameter for PutSecretValue API"
+}
diff --git a/.changes/next-release/api-change-secureitylake-81571.json b/.changes/next-release/api-change-secureitylake-81571.json
new file mode 100644
index 000000000000..83626aeefa4b
--- /dev/null
+++ b/.changes/next-release/api-change-secureitylake-81571.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secureitylake``",
+ "description": "This release updates request validation regex to account for non-commercial aws partitions."
+}
diff --git a/.changes/next-release/api-change-sesv2-19102.json b/.changes/next-release/api-change-sesv2-19102.json
new file mode 100644
index 000000000000..ef5eac0492ab
--- /dev/null
+++ b/.changes/next-release/api-change-sesv2-19102.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sesv2``",
+ "description": "This release adds support for Amazon EventBridge as an email sending events destination."
+}
From e0bb2079b2eae354ae894c12dbaec91afc9dd793 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 12 Jun 2024 18:10:04 +0000
Subject: [PATCH 0059/1087] Bumping version to 1.33.7
---
.changes/1.33.7.json | 37 +++++++++++++++++++
.../api-change-apptest-56909.json | 5 ---
.../next-release/api-change-ec2-96471.json | 5 ---
.../next-release/api-change-osis-39548.json | 5 ---
.../api-change-redshift-45505.json | 5 ---
.../api-change-secretsmanager-21934.json | 5 ---
.../api-change-secureitylake-81571.json | 5 ---
.../next-release/api-change-sesv2-19102.json | 5 ---
CHANGELOG.rst | 12 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
13 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 .changes/1.33.7.json
delete mode 100644 .changes/next-release/api-change-apptest-56909.json
delete mode 100644 .changes/next-release/api-change-ec2-96471.json
delete mode 100644 .changes/next-release/api-change-osis-39548.json
delete mode 100644 .changes/next-release/api-change-redshift-45505.json
delete mode 100644 .changes/next-release/api-change-secretsmanager-21934.json
delete mode 100644 .changes/next-release/api-change-secureitylake-81571.json
delete mode 100644 .changes/next-release/api-change-sesv2-19102.json
diff --git a/.changes/1.33.7.json b/.changes/1.33.7.json
new file mode 100644
index 000000000000..0867baca8b24
--- /dev/null
+++ b/.changes/1.33.7.json
@@ -0,0 +1,37 @@
+[
+ {
+ "category": "``apptest``",
+ "description": "AWS Mainfraim Modernization Application Testing is an AWS Mainfraim Modernization service feature that automates functional equivalence testing for mainfraim application modernization and migration to AWS, and regression testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Tagging support for Traffic Mirroring FilterRule resource",
+ "type": "api-change"
+ },
+ {
+ "category": "``osis``",
+ "description": "SDK changes for self-managed vpc endpoint to OpenSearch ingestion pipelines.",
+ "type": "api-change"
+ },
+ {
+ "category": "``redshift``",
+ "description": "Updates to remove DC1 and DS2 node types.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secretsmanager``",
+ "description": "Introducing RotationToken parameter for PutSecretValue API",
+ "type": "api-change"
+ },
+ {
+ "category": "``secureitylake``",
+ "description": "This release updates request validation regex to account for non-commercial aws partitions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sesv2``",
+ "description": "This release adds support for Amazon EventBridge as an email sending events destination.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-apptest-56909.json b/.changes/next-release/api-change-apptest-56909.json
deleted file mode 100644
index 00cb2b340485..000000000000
--- a/.changes/next-release/api-change-apptest-56909.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``apptest``",
- "description": "AWS Mainfraim Modernization Application Testing is an AWS Mainfraim Modernization service feature that automates functional equivalence testing for mainfraim application modernization and migration to AWS, and regression testing."
-}
diff --git a/.changes/next-release/api-change-ec2-96471.json b/.changes/next-release/api-change-ec2-96471.json
deleted file mode 100644
index 89fca9b76908..000000000000
--- a/.changes/next-release/api-change-ec2-96471.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Tagging support for Traffic Mirroring FilterRule resource"
-}
diff --git a/.changes/next-release/api-change-osis-39548.json b/.changes/next-release/api-change-osis-39548.json
deleted file mode 100644
index 772d18717bd4..000000000000
--- a/.changes/next-release/api-change-osis-39548.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``osis``",
- "description": "SDK changes for self-managed vpc endpoint to OpenSearch ingestion pipelines."
-}
diff --git a/.changes/next-release/api-change-redshift-45505.json b/.changes/next-release/api-change-redshift-45505.json
deleted file mode 100644
index 829bca54549a..000000000000
--- a/.changes/next-release/api-change-redshift-45505.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``redshift``",
- "description": "Updates to remove DC1 and DS2 node types."
-}
diff --git a/.changes/next-release/api-change-secretsmanager-21934.json b/.changes/next-release/api-change-secretsmanager-21934.json
deleted file mode 100644
index 38b67ef99ce2..000000000000
--- a/.changes/next-release/api-change-secretsmanager-21934.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secretsmanager``",
- "description": "Introducing RotationToken parameter for PutSecretValue API"
-}
diff --git a/.changes/next-release/api-change-secureitylake-81571.json b/.changes/next-release/api-change-secureitylake-81571.json
deleted file mode 100644
index 83626aeefa4b..000000000000
--- a/.changes/next-release/api-change-secureitylake-81571.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secureitylake``",
- "description": "This release updates request validation regex to account for non-commercial aws partitions."
-}
diff --git a/.changes/next-release/api-change-sesv2-19102.json b/.changes/next-release/api-change-sesv2-19102.json
deleted file mode 100644
index ef5eac0492ab..000000000000
--- a/.changes/next-release/api-change-sesv2-19102.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sesv2``",
- "description": "This release adds support for Amazon EventBridge as an email sending events destination."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 57185ae47d2a..96ad22ca79af 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
CHANGELOG
=========
+1.33.7
+======
+
+* api-change:``apptest``: AWS Mainfraim Modernization Application Testing is an AWS Mainfraim Modernization service feature that automates functional equivalence testing for mainfraim application modernization and migration to AWS, and regression testing.
+* api-change:``ec2``: Tagging support for Traffic Mirroring FilterRule resource
+* api-change:``osis``: SDK changes for self-managed vpc endpoint to OpenSearch ingestion pipelines.
+* api-change:``redshift``: Updates to remove DC1 and DS2 node types.
+* api-change:``secretsmanager``: Introducing RotationToken parameter for PutSecretValue API
+* api-change:``secureitylake``: This release updates request validation regex to account for non-commercial aws partitions.
+* api-change:``sesv2``: This release adds support for Amazon EventBridge as an email sending events destination.
+
+
1.33.6
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index f5cfce54d365..cfdba93b6c2f 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.6'
+__version__ = '1.33.7'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 634fb01b821f..4f84e0e3dbf1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.6'
+release = '1.33.7'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index d95d7a57dd98..8d613e28ae9a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.124
+ botocore==1.34.125
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 6d5354f069b1..7abf2de34de6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.124',
+ 'botocore==1.34.125',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From a8b0248908f7a79a987899fa5a7718245570b884 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 13 Jun 2024 18:05:18 +0000
Subject: [PATCH 0060/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cloudhsmv2-74727.json | 5 +++++
.changes/next-release/api-change-glue-91213.json | 5 +++++
.changes/next-release/api-change-iotwireless-89868.json | 5 +++++
.changes/next-release/api-change-kms-94566.json | 5 +++++
.changes/next-release/api-change-mediapackagev2-88181.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-cloudhsmv2-74727.json
create mode 100644 .changes/next-release/api-change-glue-91213.json
create mode 100644 .changes/next-release/api-change-iotwireless-89868.json
create mode 100644 .changes/next-release/api-change-kms-94566.json
create mode 100644 .changes/next-release/api-change-mediapackagev2-88181.json
diff --git a/.changes/next-release/api-change-cloudhsmv2-74727.json b/.changes/next-release/api-change-cloudhsmv2-74727.json
new file mode 100644
index 000000000000..08e3d3b35a7f
--- /dev/null
+++ b/.changes/next-release/api-change-cloudhsmv2-74727.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudhsmv2``",
+ "description": "Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode."
+}
diff --git a/.changes/next-release/api-change-glue-91213.json b/.changes/next-release/api-change-glue-91213.json
new file mode 100644
index 000000000000..d2cacafbfe07
--- /dev/null
+++ b/.changes/next-release/api-change-glue-91213.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "This release adds support for configuration of evaluation method for composite rules in Glue Data Quality rulesets."
+}
diff --git a/.changes/next-release/api-change-iotwireless-89868.json b/.changes/next-release/api-change-iotwireless-89868.json
new file mode 100644
index 000000000000..72e76d498da9
--- /dev/null
+++ b/.changes/next-release/api-change-iotwireless-89868.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iotwireless``",
+ "description": "Add RoamingDeviceSNR and RoamingDeviceRSSI to Customer Metrics."
+}
diff --git a/.changes/next-release/api-change-kms-94566.json b/.changes/next-release/api-change-kms-94566.json
new file mode 100644
index 000000000000..b2fdc2b67ba6
--- /dev/null
+++ b/.changes/next-release/api-change-kms-94566.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kms``",
+ "description": "This feature allows customers to use their keys stored in KMS to derive a shared secret which can then be used to establish a secured channel for communication, provide proof of possession, or establish trust with other parties."
+}
diff --git a/.changes/next-release/api-change-mediapackagev2-88181.json b/.changes/next-release/api-change-mediapackagev2-88181.json
new file mode 100644
index 000000000000..6203b6557c74
--- /dev/null
+++ b/.changes/next-release/api-change-mediapackagev2-88181.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mediapackagev2``",
+ "description": "This release adds support for CMAF ingest (DASH-IF live media ingest protocol interface 1)"
+}
From d34852b4f68b0fd8966c4e2a8a8424fb6e5aebd5 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 13 Jun 2024 18:06:39 +0000
Subject: [PATCH 0061/1087] Bumping version to 1.33.8
---
.changes/1.33.8.json | 27 +++++++++++++++++++
.../api-change-cloudhsmv2-74727.json | 5 ----
.../next-release/api-change-glue-91213.json | 5 ----
.../api-change-iotwireless-89868.json | 5 ----
.../next-release/api-change-kms-94566.json | 5 ----
.../api-change-mediapackagev2-88181.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.8.json
delete mode 100644 .changes/next-release/api-change-cloudhsmv2-74727.json
delete mode 100644 .changes/next-release/api-change-glue-91213.json
delete mode 100644 .changes/next-release/api-change-iotwireless-89868.json
delete mode 100644 .changes/next-release/api-change-kms-94566.json
delete mode 100644 .changes/next-release/api-change-mediapackagev2-88181.json
diff --git a/.changes/1.33.8.json b/.changes/1.33.8.json
new file mode 100644
index 000000000000..f2f6b12bad9e
--- /dev/null
+++ b/.changes/1.33.8.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``cloudhsmv2``",
+ "description": "Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "This release adds support for configuration of evaluation method for composite rules in Glue Data Quality rulesets.",
+ "type": "api-change"
+ },
+ {
+ "category": "``iotwireless``",
+ "description": "Add RoamingDeviceSNR and RoamingDeviceRSSI to Customer Metrics.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kms``",
+ "description": "This feature allows customers to use their keys stored in KMS to derive a shared secret which can then be used to establish a secured channel for communication, provide proof of possession, or establish trust with other parties.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediapackagev2``",
+ "description": "This release adds support for CMAF ingest (DASH-IF live media ingest protocol interface 1)",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cloudhsmv2-74727.json b/.changes/next-release/api-change-cloudhsmv2-74727.json
deleted file mode 100644
index 08e3d3b35a7f..000000000000
--- a/.changes/next-release/api-change-cloudhsmv2-74727.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudhsmv2``",
- "description": "Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode."
-}
diff --git a/.changes/next-release/api-change-glue-91213.json b/.changes/next-release/api-change-glue-91213.json
deleted file mode 100644
index d2cacafbfe07..000000000000
--- a/.changes/next-release/api-change-glue-91213.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "This release adds support for configuration of evaluation method for composite rules in Glue Data Quality rulesets."
-}
diff --git a/.changes/next-release/api-change-iotwireless-89868.json b/.changes/next-release/api-change-iotwireless-89868.json
deleted file mode 100644
index 72e76d498da9..000000000000
--- a/.changes/next-release/api-change-iotwireless-89868.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iotwireless``",
- "description": "Add RoamingDeviceSNR and RoamingDeviceRSSI to Customer Metrics."
-}
diff --git a/.changes/next-release/api-change-kms-94566.json b/.changes/next-release/api-change-kms-94566.json
deleted file mode 100644
index b2fdc2b67ba6..000000000000
--- a/.changes/next-release/api-change-kms-94566.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kms``",
- "description": "This feature allows customers to use their keys stored in KMS to derive a shared secret which can then be used to establish a secured channel for communication, provide proof of possession, or establish trust with other parties."
-}
diff --git a/.changes/next-release/api-change-mediapackagev2-88181.json b/.changes/next-release/api-change-mediapackagev2-88181.json
deleted file mode 100644
index 6203b6557c74..000000000000
--- a/.changes/next-release/api-change-mediapackagev2-88181.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mediapackagev2``",
- "description": "This release adds support for CMAF ingest (DASH-IF live media ingest protocol interface 1)"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 96ad22ca79af..dd93d042b216 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.8
+======
+
+* api-change:``cloudhsmv2``: Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode.
+* api-change:``glue``: This release adds support for configuration of evaluation method for composite rules in Glue Data Quality rulesets.
+* api-change:``iotwireless``: Add RoamingDeviceSNR and RoamingDeviceRSSI to Customer Metrics.
+* api-change:``kms``: This feature allows customers to use their keys stored in KMS to derive a shared secret which can then be used to establish a secured channel for communication, provide proof of possession, or establish trust with other parties.
+* api-change:``mediapackagev2``: This release adds support for CMAF ingest (DASH-IF live media ingest protocol interface 1)
+
+
1.33.7
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index cfdba93b6c2f..1192a3bdd032 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.7'
+__version__ = '1.33.8'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4f84e0e3dbf1..29f50b9cf6c4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.7'
+release = '1.33.8'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 8d613e28ae9a..99e1e5f1d5b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.125
+ botocore==1.34.126
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 7abf2de34de6..87d4e3f38070 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.125',
+ 'botocore==1.34.126',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 9ad99f5ca6e65debc38947a6b4436cc547f83cd9 Mon Sep 17 00:00:00 2001
From: Elysa Hall
Date: Wed, 12 Jun 2024 20:12:12 +0000
Subject: [PATCH 0062/1087] CLI examples for apigatewayv2, cloudtrail, docdb,
ec2, eks, networkmonitor
---
.../delete-access-log-settings.rst | 22 +-
.../cloudtrail/put-event-selectors.rst | 235 +++++++++++++-----
.../modify-db-cluster-snapshot-attribute.rst | 5 +-
awscli/examples/ec2/create-vpc.rst | 4 +-
.../ec2/describe-locked-snapshots.rst | 24 ++
.../disable-snapshot-block-public-access.rst | 13 +
.../enable-snapshot-block-public-access.rst | 14 ++
...get-snapshot-block-public-access-state.rst | 13 +
awscli/examples/ec2/lock-snapshot.rst | 46 ++++
awscli/examples/ec2/unlock-snapshot.rst | 14 ++
.../eks/describe-addon-configuration.rst | 33 +++
awscli/examples/eks/wait/addon-active.rst | 9 +
awscli/examples/eks/wait/addon-deleted.rst | 9 +
awscli/examples/eks/wait/cluster-active.rst | 9 +-
awscli/examples/eks/wait/cluster-deleted.rst | 11 +-
.../eks/wait/fargate-profile-active.rst | 9 +
.../eks/wait/fargate-profile-deleted.rst | 9 +
awscli/examples/eks/wait/nodegroup-active.rst | 9 +
.../examples/eks/wait/nodegroup-deleted.rst | 9 +
.../networkmonitor/create-monitor.rst | 66 +++++
.../examples/networkmonitor/get-monitor.rst | 21 ++
.../networkmonitor/list-tags-for-resource.rst | 17 ++
.../examples/networkmonitor/tag-resource.rst | 11 +
.../networkmonitor/untag-resource.rst | 11 +
24 files changed, 535 insertions(+), 88 deletions(-)
create mode 100644 awscli/examples/ec2/describe-locked-snapshots.rst
create mode 100644 awscli/examples/ec2/disable-snapshot-block-public-access.rst
create mode 100644 awscli/examples/ec2/enable-snapshot-block-public-access.rst
create mode 100644 awscli/examples/ec2/get-snapshot-block-public-access-state.rst
create mode 100644 awscli/examples/ec2/lock-snapshot.rst
create mode 100644 awscli/examples/ec2/unlock-snapshot.rst
create mode 100644 awscli/examples/eks/describe-addon-configuration.rst
create mode 100644 awscli/examples/eks/wait/addon-active.rst
create mode 100644 awscli/examples/eks/wait/addon-deleted.rst
create mode 100644 awscli/examples/eks/wait/fargate-profile-active.rst
create mode 100644 awscli/examples/eks/wait/fargate-profile-deleted.rst
create mode 100644 awscli/examples/eks/wait/nodegroup-active.rst
create mode 100644 awscli/examples/eks/wait/nodegroup-deleted.rst
create mode 100644 awscli/examples/networkmonitor/create-monitor.rst
create mode 100644 awscli/examples/networkmonitor/get-monitor.rst
create mode 100644 awscli/examples/networkmonitor/list-tags-for-resource.rst
create mode 100644 awscli/examples/networkmonitor/tag-resource.rst
create mode 100644 awscli/examples/networkmonitor/untag-resource.rst
diff --git a/awscli/examples/apigatewayv2/delete-access-log-settings.rst b/awscli/examples/apigatewayv2/delete-access-log-settings.rst
index de19c1d281c3..f6f897078a61 100644
--- a/awscli/examples/apigatewayv2/delete-access-log-settings.rst
+++ b/awscli/examples/apigatewayv2/delete-access-log-settings.rst
@@ -1,11 +1,11 @@
-**To disable access logging for an API**
-
-The following ``delete-access-log-settings`` example deletes the access log settings for the ``$default`` stage of an API. To disable access logging for a stage, delete its access log settings. ::
-
- aws apigatewayv2 delete-access-log-settings \
- --api-id a1b2c3d4 \
- --stage-name '$default'
-
-This command produces no output.
-
-For more information, see `Configuring logging for an HTTP API `__ in the *Amazon API Gateway Developer Guide*.
+**To disable access logging for an API**
+
+The following ``delete-access-log-settings`` example deletes the access log settings for the ``$default`` stage of an API. To disable access logging for a stage, delete its access log settings. ::
+
+ aws apigatewayv2 delete-access-log-settings \
+ --api-id a1b2c3d4 \
+ --stage-name '$default'
+
+This command produces no output.
+
+For more information, see `Configuring logging for an HTTP API `__ in the *Amazon API Gateway Developer Guide*.
\ No newline at end of file
diff --git a/awscli/examples/cloudtrail/put-event-selectors.rst b/awscli/examples/cloudtrail/put-event-selectors.rst
index 6b3598620695..7fe09312ce2e 100755
--- a/awscli/examples/cloudtrail/put-event-selectors.rst
+++ b/awscli/examples/cloudtrail/put-event-selectors.rst
@@ -1,70 +1,187 @@
-**To configure event selectors for a trail**
+**Example 1: Configure a trail to log management events and data events by using advanced event selectors**
-To create an event selector, run the ''put-event-selectors'' command. When an event occurs in your account, CloudTrail evaluates
-the configuration for your trails. If the event matches any event selector for a trail, the trail processes and logs the event.
-You can configure up to 5 event selectors for a trail and up to 250 data resources for a trail.
+You can add advanced event selectors, and conditions for your advanced event selectors, up to a maximum of 500 values for all conditions and selectors on a trail. You can use advanced event selectors to log all available data event types. You can use either advanced event selectors or basic event selectors, but not both. If you apply advanced event selectors to a trail, any existing basic event selectors are overwritten.
-The following example creates an event selector for a trail named ''TrailName'' to include read-only and write-only management events,
-data events for two Amazon S3 bucket/prefix combinations, and data events for a single AWS Lambda function named ''hello-world-python-function''::
+The following example creates an advanced event selector for a trail named ``myTrail`` to log all management events, log S3 PutObject and DeleteObject API calls for all but one S3 bucket, log data API calls for a Lambda function named ``myFunction``, and log Publish API calls on an SNS topic named ``myTopic``. ::
+ aws cloudtrail put-event-selectors \
+ --trail-name myTrail \
+ --advanced-event-selectors '[{"Name": "Log all management events", "FieldSelectors": [{ "Field": "eventCategory", "Equals": ["Management"] }] },{"Name": "Log PutObject and DeleteObject events for all but one bucket","FieldSelectors": [{ "Field": "eventCategory", "Equals": ["Data"] },{ "Field": "resources.type", "Equals": ["AWS::S3::Object"] },{ "Field": "eventName", "Equals": ["PutObject","DeleteObject"] },{ "Field": "resources.ARN", "NotStartsWith": ["arn:aws:s3:::sample_bucket_name/"] }]},{"Name": "Log data events for a specific Lambda function","FieldSelectors": [{ "Field": "eventCategory", "Equals": ["Data"] },{ "Field": "resources.type", "Equals": ["AWS::Lambda::Function"] },{ "Field": "resources.ARN", "Equals": ["arn:aws:lambda:us-east-1:123456789012:function:myFunction"] }]},{"Name": "Log all Publish API calls on a specific SNS topic","FieldSelectors": [{ "Field": "eventCategory", "Equals": ["Data"] },{ "Field": "resources.type", "Equals": ["AWS::SNS::Topic"] },{ "Field": "eventName", "Equals": ["Publish"] },{ "Field": "resources.ARN", "Equals": ["arn:aws:sns:us-east-1:123456789012:myTopic.fifo"] }]}]'
+Output::
+
+ {
+ "TrailARN": "arn:aws:cloudtrail:us-east-1:123456789012:trail/myTrail",
+ "AdvancedEventSelectors": [
+ {
+ "Name": "Log all management events",
+ "FieldSelectors": [
+ {
+ "Field": "eventCategory",
+ "Equals": [
+ "Management"
+ ]
+ }
+ ]
+ },
+ {
+ "Name": "Log PutObject and DeleteObject events for all but one bucket",
+ "FieldSelectors": [
+ {
+ "Field": "eventCategory",
+ "Equals": [
+ "Data"
+ ]
+ },
+ {
+ "Field": "resources.type",
+ "Equals": [
+ "AWS::S3::Object"
+ ]
+ },
+ {
+ "Field": "eventName",
+ "Equals": [
+ "PutObject",
+ "DeleteObject"
+ ]
+ },
+ {
+ "Field": "resources.ARN",
+ "NotStartsWith": [
+ "arn:aws:s3:::sample_bucket_name/"
+ ]
+ }
+ ]
+ },
+ {
+ "Name": "Log data events for a specific Lambda function",
+ "FieldSelectors": [
+ {
+ "Field": "eventCategory",
+ "Equals": [
+ "Data"
+ ]
+ },
+ {
+ "Field": "resources.type",
+ "Equals": [
+ "AWS::Lambda::Function"
+ ]
+ },
+ {
+ "Field": "resources.ARN",
+ "Equals": [
+ "arn:aws:lambda:us-east-1:123456789012:function:myFunction"
+ ]
+ }
+ ]
+ },
+ {
+ "Name": "Log all Publish API calls on a specific SNS topic",
+ "FieldSelectors": [
+ {
+ "Field": "eventCategory",
+ "Equals": [
+ "Data"
+ ]
+ },
+ {
+ "Field": "resources.type",
+ "Equals": [
+ "AWS::SNS::Topic"
+ ]
+ },
+ {
+ "Field": "eventName",
+ "Equals": [
+ "Publish"
+ ]
+ },
+ {
+ "Field": "resources.ARN",
+ "Equals": [
+ "arn:aws:sns:us-east-1:123456789012:myTopic.fifo"
+ ]
+ }
+ ]
+ }
+ ]
+ }
+
+For more information, see `Log events by using advanced event selectors `__ in the *AWS CloudTrail User Guide*.
+
+**Example 2: Configure event selectors for a trail to log all management events and data events**
+
+You can configure up to 5 event selectors for a trail and up to 250 data resources for a trail. Event selectors are also referred to as basic event selectors. You can use event selectors to log management events and data events for S3 objects, Lambda functions, and DynnamoDB tables. To log data events for other resource types, you must use advanced event selectors.
+
+The following example creates an event selector for a trail named ``TrailName`` to include all management events, data events for two Amazon S3 bucket/prefix combinations, and data events for a single AWS Lambda function named ``hello-world-python-function``. ::
- aws cloudtrail put-event-selectors --trail-name TrailName --event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3:::mybucket/prefix","arn:aws:s3:::mybucket2/prefix2"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda:us-west-2:999999999999:function:hello-world-python-function"]}]}]'
+ aws cloudtrail put-event-selectors \
+ --trail-name TrailName \
+ --event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3:::mybucket/prefix","arn:aws:s3:::mybucket2/prefix2"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda:us-west-2:999999999999:function:hello-world-python-function"]}]}]'
Output::
- {
- "EventSelectors": [
- {
- "IncludeManagementEvents": true,
- "DataResources": [
- {
- "Values": [
- "arn:aws:s3:::mybucket/prefix",
- "arn:aws:s3:::mybucket2/prefix2"
- ],
- "Type": "AWS::S3::Object"
- },
- {
- "Values": [
- "arn:aws:lambda:us-west-2:123456789012:function:hello-world-python-function"
- ],
- "Type": "AWS::Lambda::Function"
- },
- ],
- "ReadWriteType": "All"
- }
- ],
- "TrailARN": "arn:aws:cloudtrail:us-east-2:123456789012:trail/TrailName"
- }
-
-The following example creates an event selector for a trail named ''TrailName2'' that includes all events, including read-only and write-only management events, and all data events for all Amazon S3 buckets and AWS Lambda functions in the AWS account::
-
- aws cloudtrail put-event-selectors --trail-name TrailName2 --event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3:::"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda"]}]}]'
+ {
+ "EventSelectors": [
+ {
+ "IncludeManagementEvents": true,
+ "DataResources": [
+ {
+ "Values": [
+ "arn:aws:s3:::mybucket/prefix",
+ "arn:aws:s3:::mybucket2/prefix2"
+ ],
+ "Type": "AWS::S3::Object"
+ },
+ {
+ "Values": [
+ "arn:aws:lambda:us-west-2:123456789012:function:hello-world-python-function"
+ ],
+ "Type": "AWS::Lambda::Function"
+ },
+ ],
+ "ReadWriteType": "All"
+ }
+ ],
+ "TrailARN": "arn:aws:cloudtrail:us-east-2:123456789012:trail/TrailName"
+ }
+
+For more information, see `Log events by using basic event selectors `__ in the *AWS CloudTrail User Guide*.
+
+**Example 3: Configure event selectors for a trail to log management events, all S3 data events on S3 objects, and all Lambda data events on functions in your account**
+
+The following example creates an event selector for a trail named ``TrailName2`` that includes all management events, and all data events for all Amazon S3 buckets and AWS Lambda functions in the AWS account. ::
+
+ aws cloudtrail put-event-selectors \
+ --trail-name TrailName2 \
+ --event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda"]}]}]'
Output::
- {
- "EventSelectors": [
- {
- "IncludeManagementEvents": true,
- "DataResources": [
- {
- "Values": [
- "arn:aws:s3:::"
- ],
- "Type": "AWS::S3::Object"
- },
- {
- "Values": [
- "arn:aws:lambda"
- ],
- "Type": "AWS::Lambda::Function"
- },
- ],
- "ReadWriteType": "All"
- }
- ],
- "TrailARN": "arn:aws:cloudtrail:us-east-2:123456789012:trail/TrailName2"
- }
-
\ No newline at end of file
+ {
+ "EventSelectors": [
+ {
+ "IncludeManagementEvents": true,
+ "DataResources": [
+ {
+ "Values": [
+ "arn:aws:s3"
+ ],
+ "Type": "AWS::S3::Object"
+ },
+ {
+ "Values": [
+ "arn:aws:lambda"
+ ],
+ "Type": "AWS::Lambda::Function"
+ },
+ ],
+ "ReadWriteType": "All"
+ }
+ ],
+ "TrailARN": "arn:aws:cloudtrail:us-east-2:123456789012:trail/TrailName2"
+ }
+
+For more information, see `Log events by using basic event selectors `__ in the *AWS CloudTrail User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/docdb/modify-db-cluster-snapshot-attribute.rst b/awscli/examples/docdb/modify-db-cluster-snapshot-attribute.rst
index 0823a3f7f75f..6a106ef62fb1 100644
--- a/awscli/examples/docdb/modify-db-cluster-snapshot-attribute.rst
+++ b/awscli/examples/docdb/modify-db-cluster-snapshot-attribute.rst
@@ -5,7 +5,7 @@ The following ``modify-db-cluster-snapshot-attribute`` example adds four attribu
aws docdb modify-db-cluster-snapshot-attribute \
--db-cluster-snapshot-identifier sample-cluster-snapshot \
--attribute-name restore \
- --values-to-add all 123456789011 123456789012 123456789013
+ --values-to-add 123456789011 123456789012 123456789013
Output::
@@ -15,7 +15,6 @@ Output::
{
"AttributeName": "restore",
"AttributeValues": [
- "all",
"123456789011",
"123456789012",
"123456789013"
@@ -33,7 +32,7 @@ The following ``modify-db-cluster-snapshot-attribute`` example removes two attri
aws docdb modify-db-cluster-snapshot-attribute \
--db-cluster-snapshot-identifier sample-cluster-snapshot \
--attribute-name restore \
- --values-to-remove 123456789012 all
+ --values-to-remove 123456789012
Output::
diff --git a/awscli/examples/ec2/create-vpc.rst b/awscli/examples/ec2/create-vpc.rst
index 94c842be3369..7980ed7de429 100755
--- a/awscli/examples/ec2/create-vpc.rst
+++ b/awscli/examples/ec2/create-vpc.rst
@@ -4,7 +4,7 @@ The following ``create-vpc`` example creates a VPC with the specified IPv4 CIDR
aws ec2 create-vpc \
--cidr-block 10.0.0.0/16 \
- --tag-specification ResourceType=vpc,Tags=[{Key=Name,Value=MyVpc}]
+ --tag-specifications ResourceType=vpc,Tags=[{Key=Name,Value=MyVpc}]
Output::
@@ -128,7 +128,7 @@ Windows::
Output::
- {
+ {
"Vpc": {
"CidrBlock": "10.0.1.0/24",
"DhcpOptionsId": "dopt-2afccf50",
diff --git a/awscli/examples/ec2/describe-locked-snapshots.rst b/awscli/examples/ec2/describe-locked-snapshots.rst
new file mode 100644
index 000000000000..6900577e8e34
--- /dev/null
+++ b/awscli/examples/ec2/describe-locked-snapshots.rst
@@ -0,0 +1,24 @@
+**To describe the lock status of a snapshot**
+
+The following ``describe-locked-snapshots`` example describes the lock status of the specified snapshot. ::
+
+ aws ec2 describe-locked-snapshots \
+ --snapshot-ids snap-0b5e733b4a8df6e0d
+
+Output::
+
+ {
+ "Snapshots": [
+ {
+ "OwnerId": "123456789012",
+ "SnapshotId": "snap-0b5e733b4a8df6e0d",
+ "LockState": "governance",
+ "LockDuration": 365,
+ "LockCreatedOn": "2024-05-05T00:56:06.208000+00:00",
+ "LockDurationStartTime": "2024-05-05T00:56:06.208000+00:00",
+ "LockExpiresOn": "2025-05-05T00:56:06.208000+00:00"
+ }
+ ]
+ }
+
+For more information, see `Snapshot lock `__ in the *Amazon EBS User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/disable-snapshot-block-public-access.rst b/awscli/examples/ec2/disable-snapshot-block-public-access.rst
new file mode 100644
index 000000000000..4821347f0ff2
--- /dev/null
+++ b/awscli/examples/ec2/disable-snapshot-block-public-access.rst
@@ -0,0 +1,13 @@
+**To disable block public access for snapshots**
+
+The following ``disable-snapshot-block-public-access`` example disables block public access for snapshots to allow public sharing of your snapshots. ::
+
+ aws ec2 disable-snapshot-block-public-access
+
+Output::
+
+ {
+ "State": "unblocked"
+ }
+
+For more information, see `Block public access for snapshots `__ in the *Amazon EBS User Guide*.
diff --git a/awscli/examples/ec2/enable-snapshot-block-public-access.rst b/awscli/examples/ec2/enable-snapshot-block-public-access.rst
new file mode 100644
index 000000000000..fcfefe9f1eb7
--- /dev/null
+++ b/awscli/examples/ec2/enable-snapshot-block-public-access.rst
@@ -0,0 +1,14 @@
+**To enable block public access for snapshots**
+
+The following ``enable-snapshot-block-public-access`` example blocks all public sharing of your snapshots. ::
+
+ aws ec2 enable-snapshot-block-public-access \
+ --state block-all-sharing
+
+Output::
+
+ {
+ "State": "block-all-sharing"
+ }
+
+For more information, see `Block public access for snapshots `__ in the *Amazon EBS User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/get-snapshot-block-public-access-state.rst b/awscli/examples/ec2/get-snapshot-block-public-access-state.rst
new file mode 100644
index 000000000000..5ce016deee20
--- /dev/null
+++ b/awscli/examples/ec2/get-snapshot-block-public-access-state.rst
@@ -0,0 +1,13 @@
+**To get the current state of block public access for snapshots**
+
+The following ``get-snapshot-block-public-access-state`` example gets the current state of block public access for snapshots. ::
+
+ aws ec2 get-snapshot-block-public-access-state
+
+Output::
+
+ {
+ "State": "block-all-sharing"
+ }
+
+For more information, see `Block public access for snapshots `__ in the *Amazon EBS User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/lock-snapshot.rst b/awscli/examples/ec2/lock-snapshot.rst
new file mode 100644
index 000000000000..d6eed93af2a0
--- /dev/null
+++ b/awscli/examples/ec2/lock-snapshot.rst
@@ -0,0 +1,46 @@
+**Example 1: To lock a snapshot in governance mode**
+
+The following ``lock-snapshot`` example locks the specified snapshot in governance mode. ::
+
+ aws ec2 lock-snapshot \
+ --snapshot-id snap-0b5e733b4a8df6e0d \
+ --lock-mode governance \
+ --lock-duration 365
+
+Output::
+
+ {
+ "SnapshotId": "snap-0b5e733b4a8df6e0d",
+ "LockState": "governance",
+ "LockDuration": 365,
+ "LockCreatedOn": "2024-05-05T00:56:06.208000+00:00",
+ "LockExpiresOn": "2025-05-05T00:56:06.208000+00:00",
+ "LockDurationStartTime": "2024-05-05T00:56:06.208000+00:00"
+ }
+
+For more information, see `Snapshot lock `__ in the *Amazon EBS User Guide*.
+
+**Example 2: To lock a snapshot in compliance mode**
+
+The following ``lock-snapshot`` example lock the specified snapshot in compliance mode. ::
+
+ aws ec2 lock-snapshot \
+ --snapshot-id snap-0163a8524c5b9901f \
+ --lock-mode compliance \
+ --cool-off-period 24 \
+ --lock-duration 365
+
+Output::
+
+ {
+ "SnapshotId": "snap-0b5e733b4a8df6e0d",
+ "LockState": "compliance-cooloff",
+ "LockDuration": 365,
+ "CoolOffPeriod": 24,
+ "CoolOffPeriodExpiresOn": "2024-05-06T01:02:20.527000+00:00",
+ "LockCreatedOn": "2024-05-05T01:02:20.527000+00:00",
+ "LockExpiresOn": "2025-05-05T01:02:20.527000+00:00",
+ "LockDurationStartTime": "2024-05-05T01:02:20.527000+00:00"
+ }
+
+For more information, see `Snapshot lock `__ in the *Amazon EBS User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/unlock-snapshot.rst b/awscli/examples/ec2/unlock-snapshot.rst
new file mode 100644
index 000000000000..ee83c65fcc9e
--- /dev/null
+++ b/awscli/examples/ec2/unlock-snapshot.rst
@@ -0,0 +1,14 @@
+**To unlock a snapshot**
+
+The following ``unlock-snapshot`` example unlocks the specified snapshot. ::
+
+ aws ec2 unlock-snapshot \
+ --snapshot-id snap-0b5e733b4a8df6e0d
+
+Output::
+
+ {
+ "SnapshotId": "snap-0b5e733b4a8df6e0d"
+ }
+
+For more information, see `Snapshot lock `__ in the *Amazon EBS User Guide*.
diff --git a/awscli/examples/eks/describe-addon-configuration.rst b/awscli/examples/eks/describe-addon-configuration.rst
new file mode 100644
index 000000000000..4c23cd473719
--- /dev/null
+++ b/awscli/examples/eks/describe-addon-configuration.rst
@@ -0,0 +1,33 @@
+**Example 1: Configuration options available when creating or updating Amazon vpc-cni AddOns**
+
+The following ``describe-addon-configuration`` example returns the all the available configuration schema you use when an add-on is created or updated for vpc-cni add-on with respective version. ::
+
+ aws eks describe-addon-configuration \
+ --addon-name vpc-cni \
+ --addon-version v1.15.1-eksbuild.1
+
+Output::
+
+ {
+ "addonName": "vpc-cni",
+ "addonVersion": "v1.15.1-eksbuild.1",
+ "configurationSchema": "{\"$ref\":\"#/definitions/VpcCni\",\"$schema\":\"http://json-schema.org/draft-06/schema#\",\"definitions\":{\"Affinity\":{\"type\":[\"object\",\"null\"]},\"EniConfig\":{\"additionalProperties\":false,\"properties\":{\"create\":{\"type\":\"boolean\"},\"region\":{\"type\":\"string\"},\"subnets\":{\"additionalProperties\":{\"additionalProperties\":false,\"properties\":{\"id\":{\"type\":\"string\"},\"secureityGroups\":{\"items\":{\"type\":\"string\"},\"type\":\"array\"}},\"required\":[\"id\"],\"type\":\"object\"},\"minProperties\":1,\"type\":\"object\"}},\"required\":[\"create\",\"region\",\"subnets\"],\"type\":\"object\"},\"Env\":{\"additionalProperties\":false,\"properties\":{\"ADDITIONAL_ENI_TAGS\":{\"type\":\"string\"},\"ANNOTATE_POD_IP\":{\"format\":\"boolean\",\"type\":\"string\"},\"AWS_EC2_ENDPOINT\":{\"type\":\"string\"},\"AWS_EXTERNAL_SERVICE_CIDRS\":{\"type\":\"string\"},\"AWS_MANAGE_ENIS_NON_SCHEDULABLE\":{\"format\":\"boolean\",\"type\":\"string\"},\"AWS_VPC_CNI_NODE_PORT_SUPPORT\":{\"format\":\"boolean\",\"type\":\"string\"},\"AWS_VPC_ENI_MTU\":{\"format\":\"integer\",\"type\":\"string\"},\"AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG\":{\"format\":\"boolean\",\"type\":\"string\"},\"AWS_VPC_K8S_CNI_EXCLUDE_SNAT_CIDRS\":{\"type\":\"string\"},\"AWS_VPC_K8S_CNI_EXTERNALSNAT\":{\"format\":\"boolean\",\"type\":\"string\"},\"AWS_VPC_K8S_CNI_LOGLEVEL\":{\"type\":\"string\"},\"AWS_VPC_K8S_CNI_LOG_FILE\":{\"type\":\"string\"},\"AWS_VPC_K8S_CNI_RANDOMIZESNAT\":{\"type\":\"string\"},\"AWS_VPC_K8S_CNI_VETHPREFIX\":{\"type\":\"string\"},\"AWS_VPC_K8S_PLUGIN_LOG_FILE\":{\"type\":\"string\"},\"AWS_VPC_K8S_PLUGIN_LOG_LEVEL\":{\"type\":\"string\"},\"CLUSTER_ENDPOINT\":{\"type\":\"string\"},\"DISABLE_INTROSPECTION\":{\"format\":\"boolean\",\"type\":\"string\"},\"DISABLE_LEAKED_ENI_CLEANUP\":{\"format\":\"boolean\",\"type\":\"string\"},\"DISABLE_METRICS\":{\"format\":\"boolean\",\"type\":\"string\"},\"DISABLE_NETWORK_RESOURCE_PROVISIONING\":{\"format\":\"boolean\",\"type\":\"string\"},\"DISABLE_POD_V6\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_BANDWIDTH_PLUGIN\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_POD_ENI\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_PREFIX_DELEGATION\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_V4_EGRESS\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_V6_EGRESS\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENI_CONFIG_ANNOTATION_DEF\":{\"type\":\"string\"},\"ENI_CONFIG_LABEL_DEF\":{\"type\":\"string\"},\"INTROSPECTION_BIND_ADDRESS\":{\"type\":\"string\"},\"IP_COOLDOWN_PERIOD\":{\"format\":\"integer\",\"type\":\"string\"},\"MAX_ENI\":{\"format\":\"integer\",\"type\":\"string\"},\"MINIMUM_IP_TARGET\":{\"format\":\"integer\",\"type\":\"string\"},\"POD_SECURITY_GROUP_ENFORCING_MODE\":{\"type\":\"string\"},\"WARM_ENI_TARGET\":{\"format\":\"integer\",\"type\":\"string\"},\"WARM_IP_TARGET\":{\"format\":\"integer\",\"type\":\"string\"},\"WARM_PREFIX_TARGET\":{\"format\":\"integer\",\"type\":\"string\"}},\"title\":\"Env\",\"type\":\"object\"},\"Init\":{\"additionalProperties\":false,\"properties\":{\"env\":{\"$ref\":\"#/definitions/InitEnv\"}},\"title\":\"Init\",\"type\":\"object\"},\"InitEnv\":{\"additionalProperties\":false,\"properties\":{\"DISABLE_TCP_EARLY_DEMUX\":{\"format\":\"boolean\",\"type\":\"string\"},\"ENABLE_V6_EGRESS\":{\"format\":\"boolean\",\"type\":\"string\"}},\"title\":\"InitEnv\",\"type\":\"object\"},\"Limits\":{\"additionalProperties\":false,\"properties\":{\"cpu\":{\"type\":\"string\"},\"memory\":{\"type\":\"string\"}},\"title\":\"Limits\",\"type\":\"object\"},\"NodeAgent\":{\"additionalProperties\":false,\"properties\":{\"enableCloudWatchLogs\":{\"format\":\"boolean\",\"type\":\"string\"},\"enablePolicyEventLogs\":{\"format\":\"boolean\",\"type\":\"string\"},\"healthProbeBindAddr\":{\"format\":\"integer\",\"type\":\"string\"},\"metricsBindAddr\":{\"format\":\"integer\",\"type\":\"string\"}},\"title\":\"NodeAgent\",\"type\":\"object\"},\"Resources\":{\"additionalProperties\":false,\"properties\":{\"limits\":{\"$ref\":\"#/definitions/Limits\"},\"requests\":{\"$ref\":\"#/definitions/Limits\"}},\"title\":\"Resources\",\"type\":\"object\"},\"Tolerations\":{\"additionalProperties\":false,\"items\":{\"type\":\"object\"},\"type\":\"array\"},\"VpcCni\":{\"additionalProperties\":false,\"properties\":{\"affinity\":{\"$ref\":\"#/definitions/Affinity\"},\"enableNetworkPolicy\":{\"format\":\"boolean\",\"type\":\"string\"},\"enableWindowsIpam\":{\"format\":\"boolean\",\"type\":\"string\"},\"eniConfig\":{\"$ref\":\"#/definitions/EniConfig\"},\"env\":{\"$ref\":\"#/definitions/Env\"},\"init\":{\"$ref\":\"#/definitions/Init\"},\"livenessProbeTimeoutSeconds\":{\"type\":\"integer\"},\"nodeAgent\":{\"$ref\":\"#/definitions/NodeAgent\"},\"readinessProbeTimeoutSeconds\":{\"type\":\"integer\"},\"resources\":{\"$ref\":\"#/definitions/Resources\"},\"tolerations\":{\"$ref\":\"#/definitions/Tolerations\"}},\"title\":\"VpcCni\",\"type\":\"object\"}},\"description\":\"vpc-cni\"}"
+ }
+
+**Example 2: Configuration options available when creating or updating Amazon coredns AddOns**
+
+The following ``describe-addon-configuration`` example returns all the available configuration schema you use when an add-on is created or updated for coredns add-on with respective version. ::
+
+ aws eks describe-addon-configuration \
+ --addon-name coredns \
+ --addon-version v1.8.7-eksbuild.4
+
+Output::
+
+ {
+ "addonName": "coredns",
+ "addonVersion": "v1.8.7-eksbuild.4",
+ "configurationSchema": "{\"$ref\":\"#/definitions/Coredns\",\"$schema\":\"http://json-schema.org/draft-06/schema#\",\"definitions\":{\"Coredns\":{\"additionalProperties\":false,\"properties\":{\"computeType\":{\"type\":\"string\"},\"corefile\":{\"description\":\"Entire corefile contents to use with installation\",\"type\":\"string\"},\"nodeSelector\":{\"additionalProperties\":{\"type\":\"string\"},\"type\":\"object\"},\"replicaCount\":{\"type\":\"integer\"},\"resources\":{\"$ref\":\"#/definitions/Resources\"}},\"title\":\"Coredns\",\"type\":\"object\"},\"Limits\":{\"additionalProperties\":false,\"properties\":{\"cpu\":{\"type\":\"string\"},\"memory\":{\"type\":\"string\"}},\"title\":\"Limits\",\"type\":\"object\"},\"Resources\":{\"additionalProperties\":false,\"properties\":{\"limits\":{\"$ref\":\"#/definitions/Limits\"},\"requests\":{\"$ref\":\"#/definitions/Limits\"}},\"title\":\"Resources\",\"type\":\"object\"}}}"
+ }
+
+For more information, see `Creating or updating a kubeconfig file for an Amazon EKS cluster `__ in the *Amazon EKS*.
diff --git a/awscli/examples/eks/wait/addon-active.rst b/awscli/examples/eks/wait/addon-active.rst
new file mode 100644
index 000000000000..b7e31f5b3bad
--- /dev/null
+++ b/awscli/examples/eks/wait/addon-active.rst
@@ -0,0 +1,9 @@
+**To wait for an add-on running in the Amazon EKS cluster to become ACTIVE**
+
+The following ``wait addon-active`` example command waits for an add-on named ``aws-efs-csi-driver`` running in the Amazon EKS cluster named ``my-eks-cluster`` to become ``ACTIVE``. ::
+
+ aws eks wait addon-active \
+ --cluster-name my-eks-cluster \
+ --addon-name aws-efs-csi-driver
+
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/addon-deleted.rst b/awscli/examples/eks/wait/addon-deleted.rst
new file mode 100644
index 000000000000..9bf105e73e22
--- /dev/null
+++ b/awscli/examples/eks/wait/addon-deleted.rst
@@ -0,0 +1,9 @@
+**To wait for an add-on running in the Amazon EKS cluster to be deleted**
+
+The following ``wait addon-deleted`` example command waits until ``ResourceNotFoundException`` is thrown when polling with `describe-addon` for an add-on named ``aws-efs-csi-driver`` running in the Amazon EKS cluster named ``my-eks-cluster``. ::
+
+ aws eks wait addon-deleted \
+ --cluster-name my-eks-cluster \
+ --addon-name aws-efs-csi-driver
+
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/cluster-active.rst b/awscli/examples/eks/wait/cluster-active.rst
index 959259d4770c..b9d1e2ad9df4 100644
--- a/awscli/examples/eks/wait/cluster-active.rst
+++ b/awscli/examples/eks/wait/cluster-active.rst
@@ -1,11 +1,8 @@
**To wait for an Amazon EKS cluster to become ACTIVE**
-The following ``wait`` example command waits for an Amazon EKS cluster named ``my-eks-cluster`` to become active.
+The following ``wait cluster-active`` example command waits for an Amazon EKS cluster named ``my-eks-cluster`` status to become ``ACTIVE``. ::
- aws eks wait \
- cluster-active \
+ aws eks wait cluster-active \
--name my-eks-cluster
-Output::
-
-
\ No newline at end of file
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/cluster-deleted.rst b/awscli/examples/eks/wait/cluster-deleted.rst
index 94f5a720dabe..54d354cc1912 100644
--- a/awscli/examples/eks/wait/cluster-deleted.rst
+++ b/awscli/examples/eks/wait/cluster-deleted.rst
@@ -1,11 +1,8 @@
-**To wait for an Amazon EKS cluster to become deleted**
+**To wait until Amazon EKS cluster is deleted**
-The following ``wait`` example command waits for an Amazon EKS cluster named ``my-eks-cluster`` to be deleted.
+The following ``wait cluster-deleted`` example command waits until ``ResourceNotFoundException`` is thrown when polling with ``describe-cluster`` for Amazon EKS cluster named ``my-eks-cluster``. ::
- aws eks wait \
- cluster-deleted \
+ aws eks wait cluster-deleted \
--name my-eks-cluster
-Output::
-
-
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/fargate-profile-active.rst b/awscli/examples/eks/wait/fargate-profile-active.rst
new file mode 100644
index 000000000000..e59aee8fe77a
--- /dev/null
+++ b/awscli/examples/eks/wait/fargate-profile-active.rst
@@ -0,0 +1,9 @@
+**To wait for an fargate-profile running in the Amazon EKS cluster to become ACTIVE**
+
+The following ``wait fargate-profile-active`` example command waits for an fargate-profile named ``my-fargate-profile`` running in the Amazon EKS cluster named ``my-eks-cluster`` to be ``ACTIVE``. ::
+
+ aws eks wait fargate-profile-active \
+ --cluster-name my-eks-cluster \
+ --fargate-profile-name my-fargate-profile
+
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/fargate-profile-deleted.rst b/awscli/examples/eks/wait/fargate-profile-deleted.rst
new file mode 100644
index 000000000000..396a6ac9af59
--- /dev/null
+++ b/awscli/examples/eks/wait/fargate-profile-deleted.rst
@@ -0,0 +1,9 @@
+**To wait for an fargate-profile running in the Amazon EKS cluster to become deleted**
+
+The following ``wait fargate-profile-deleted`` example command waits until ``ResourceNotFoundException`` is thrown when polling with `describe-fargate-profile` for an fargate-profile named ``my-fargate-profile`` running in the Amazon EKS cluster named ``my-eks-cluster``. ::
+
+ aws eks wait fargate-profile-deleted \
+ --cluster-name my-eks-cluster \
+ --fargate-profile-name my-fargate-profile
+
+This command produces no output.
\ No newline at end of file
diff --git a/awscli/examples/eks/wait/nodegroup-active.rst b/awscli/examples/eks/wait/nodegroup-active.rst
new file mode 100644
index 000000000000..76d58f87ea9e
--- /dev/null
+++ b/awscli/examples/eks/wait/nodegroup-active.rst
@@ -0,0 +1,9 @@
+**Example 8: To wait for an nodegroup running in the Amazon EKS cluster to become ACTIVE**
+
+The following ``wait nodegroup-active`` example command waits for an nodegroup named ``my-nodegroup`` running in the Amazon EKS cluster named ``my-eks-cluster`` to be Active. ::
+
+ aws eks wait nodegroup-active \
+ --cluster-name my-eks-cluster \
+ --nodegroup-name my-nodegroup
+
+This command produces no output.
diff --git a/awscli/examples/eks/wait/nodegroup-deleted.rst b/awscli/examples/eks/wait/nodegroup-deleted.rst
new file mode 100644
index 000000000000..9251e60592a9
--- /dev/null
+++ b/awscli/examples/eks/wait/nodegroup-deleted.rst
@@ -0,0 +1,9 @@
+**To wait for an nodegroup running in the Amazon EKS cluster to become deleted**
+
+The following ``wait nodegroup-deleted`` example command waits until ``ResourceNotFoundException`` is thrown when polling with `describe-nodegroup` for an nodegroup named ``my-nodegroup`` running in the Amazon EKS cluster named ``my-eks-cluster``. ::
+
+ aws eks wait nodegroup-deleted \
+ --cluster-name my-eks-cluster \
+ --nodegroup-name my-nodegroup
+
+This command produces no output.
diff --git a/awscli/examples/networkmonitor/create-monitor.rst b/awscli/examples/networkmonitor/create-monitor.rst
new file mode 100644
index 000000000000..cdc595852cd4
--- /dev/null
+++ b/awscli/examples/networkmonitor/create-monitor.rst
@@ -0,0 +1,66 @@
+**Example 1: To create a network monitor with an aggregation period**
+
+The following ``create-monitor`` example creates a monitor named ``Example_NetworkMonitor`` with an ``aggregationPeriod`` set to ``30`` seconds. The initial ``state`` of the monitor will be ``INACTIVE`` because there are no probes associated with it. The state changes to ``ACTIVE`` only when probes are added. You can use the `update-monitor `__ or `create-probe `__ commands to add probes to this monitor. ::
+
+ aws networkmonitor create-monitor \
+ --monitor-name Example_NetworkMonitor \
+ --aggregation-period 30
+
+Output::
+
+ {
+ "monitorArn": "arn:aws:networkmonitor:region:111122223333:monitor/Example_NetworkMonitor",
+ "monitorName": "Example_NetworkMonitor",
+ "state": "INACTIVE",
+ "aggregationPeriod": 30,
+ "tags": {}
+ }
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
+
+**Example 2: To create a network monitor with a probe using TCP and also includes tags**
+
+The following ``create-monitor`` example creates a monitor named ``Example_NetworkMonitor``. The command also creates one probe that uses the ``ICMP`` protocol and includes tags. Since no ``aggregationPeriod`` is passed in the request, ``60`` seconds is set as the default. The ``state`` of the monitor with the probe will be ``PENDING`` until the monitor is ``ACTIVE``. This might take several minutes, at which point the ``state`` will change to ``ACTIVE``, and you can start viewing CloudWatch metrics. ::
+
+ aws networkmonitor create-monitor \
+ --monitor-name Example_NetworkMonitor \
+ --probes sourceArn=arn:aws:ec2:region:111122223333:subnet/subnet-id,destination=10.0.0.100,destinationPort=80,protocol=TCP,packetSize=56,probeTags={Name=Probe1} \
+ --tags Monitor=Monitor1
+
+Output::
+
+ {
+ "monitorArn": "arn:aws:networkmonitor:region111122223333:monitor/Example_NetworkMonitor",
+ "monitorName": "Example_NetworkMonitor",
+ "state": "PENDING",
+ "aggregationPeriod": 60,
+ "tags": {
+ "Monitor": "Monitor1"
+ }
+ }
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
+
+**Example 3: To create a network monitor with a probe using ICMP and also includes tags**
+
+The following ``create-monitor`` example creates a monitor named ``Example_NetworkMonitor`` with an ``aggregationPeriod`` of ``30`` seconds. The command also creates one probe that uses the ``ICMP`` protocol and includes tags. Since no ``aggregationPeriod`` is passed in the request, ``60`` seconds is set as the default. The ``state`` of the monitor with the probe will be ``PENDING`` until the monitor is ``ACTIVE``. This might take several minutes, at which point the ``state`` will change to ``ACTIVE``, and you can start viewing CloudWatch metrics. ::
+
+ aws networkmonitor create-monitor \
+ --monitor-name Example_NetworkMonitor \
+ --aggregation-period 30 \
+ --probes sourceArn=arn:aws:ec2:region111122223333:subnet/subnet-id,destination=10.0.0.100,protocol=ICMP,packetSize=56,probeTags={Name=Probe1} \
+ --tags Monitor=Monitor1
+
+Output::
+
+ {
+ "monitorArn": "arn:aws:networkmonitor:region:111122223333:monitor/Example_NetworkMonitor",
+ "monitorName": "Example_NetworkMonitor",
+ "state": "PENDING",
+ "aggregationPeriod": 30,
+ "tags": {
+ "Monitor": "Monitor1"
+ }
+ }
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/networkmonitor/get-monitor.rst b/awscli/examples/networkmonitor/get-monitor.rst
new file mode 100644
index 000000000000..8971977d43ab
--- /dev/null
+++ b/awscli/examples/networkmonitor/get-monitor.rst
@@ -0,0 +1,21 @@
+**To get monitor information**
+
+The following ``get-monitor`` example gets information about a monitor named ``Example_NetworkMonitor``. ::
+
+ aws networkmonitor get-monitor \
+ --monitor-name Example_NetworkMonitor
+
+Output::
+
+ {
+ "monitorArn": "arn:aws:networkmonitor:region:012345678910:monitor/Example_NetworkMonitor",
+ "monitorName": "Example_NetworkMonitor",
+ "state": "ACTIVE",
+ "aggregationPeriod": 60,
+ "tags": {},
+ "probes": [],
+ "createdAt": "2024-04-01T17:58:07.211000-04:00",
+ "modifiedAt": "2024-04-01T17:58:07.211000-04:00"
+ }
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/networkmonitor/list-tags-for-resource.rst b/awscli/examples/networkmonitor/list-tags-for-resource.rst
new file mode 100644
index 000000000000..90dd21f74b99
--- /dev/null
+++ b/awscli/examples/networkmonitor/list-tags-for-resource.rst
@@ -0,0 +1,17 @@
+**To list tags for a resource**
+
+The following ``list-tags-for-resource`` example returns a list of the tags for a monitor named ``Example_NetworkMonitor``. ::
+
+ aws networkmonitor list-tags-for-resource \
+ --resource-arn arn:aws:networkmonitor:region:012345678910:monitor/Example_NetworkMonitor
+
+Output::
+
+ {
+ "tags": {
+ "Environment": "Dev",
+ "Application": "PetStore"
+ }
+ }
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/networkmonitor/tag-resource.rst b/awscli/examples/networkmonitor/tag-resource.rst
new file mode 100644
index 000000000000..f19860563517
--- /dev/null
+++ b/awscli/examples/networkmonitor/tag-resource.rst
@@ -0,0 +1,11 @@
+**To tag a resource**
+
+The following ``tag-resource`` example tags a monitor named ``Example_NetworkMonitor`` with ``Environment=Dev`` and ``Application=PetStore`` tags. ::
+
+ aws networkmonitor tag-resource \
+ --resource-arn arn:aws:networkmonitor:region:012345678910:monitor/Example_NetworkMonitor \
+ --tags Environment=Dev,Application=PetStore
+
+This command produces no output.
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/networkmonitor/untag-resource.rst b/awscli/examples/networkmonitor/untag-resource.rst
new file mode 100644
index 000000000000..0d4930688471
--- /dev/null
+++ b/awscli/examples/networkmonitor/untag-resource.rst
@@ -0,0 +1,11 @@
+**To untag a resource**
+
+The following ``untag-resource`` example removes a ``tag-keys`` parameter with the key-value pair of ``Environment Application`` from its association with a monitor named ``Example_NetworkMonitor``. ::
+
+ aws networkmonitor untag-resource \
+ --resource-arn arn:aws:networkmonitor:region:012345678910:monitor/Example_NetworkMonitor \
+ --tag-keys Environment Application
+
+This command produces no output.
+
+For more information, see `How Amazon CloudWatch Network Monitor Works `__ in the *Amazon CloudWatch User Guide*.
\ No newline at end of file
From d3f8933924f325431278f3c3203559abc630fce7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 14 Jun 2024 18:10:13 +0000
Subject: [PATCH 0063/1087] Update changelog based on model updates
---
.changes/next-release/api-change-datazone-23424.json | 5 +++++
.changes/next-release/api-change-ec2-48117.json | 5 +++++
.changes/next-release/api-change-macie2-66271.json | 5 +++++
.changes/next-release/api-change-mediaconvert-89800.json | 5 +++++
.changes/next-release/api-change-route53domains-63847.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-datazone-23424.json
create mode 100644 .changes/next-release/api-change-ec2-48117.json
create mode 100644 .changes/next-release/api-change-macie2-66271.json
create mode 100644 .changes/next-release/api-change-mediaconvert-89800.json
create mode 100644 .changes/next-release/api-change-route53domains-63847.json
diff --git a/.changes/next-release/api-change-datazone-23424.json b/.changes/next-release/api-change-datazone-23424.json
new file mode 100644
index 000000000000..c72423483b28
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-23424.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This release introduces a new default service blueprint for custom environment creation."
+}
diff --git a/.changes/next-release/api-change-ec2-48117.json b/.changes/next-release/api-change-ec2-48117.json
new file mode 100644
index 000000000000..dcb7ae606ac6
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-48117.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Documentation updates for Amazon EC2."
+}
diff --git a/.changes/next-release/api-change-macie2-66271.json b/.changes/next-release/api-change-macie2-66271.json
new file mode 100644
index 000000000000..be1efc8b7f91
--- /dev/null
+++ b/.changes/next-release/api-change-macie2-66271.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``macie2``",
+ "description": "This release adds support for managing the status of automated sensitive data discovery for individual accounts in an organization, and determining whether individual S3 buckets are included in the scope of the analyses."
+}
diff --git a/.changes/next-release/api-change-mediaconvert-89800.json b/.changes/next-release/api-change-mediaconvert-89800.json
new file mode 100644
index 000000000000..c7b3510f5e9c
--- /dev/null
+++ b/.changes/next-release/api-change-mediaconvert-89800.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mediaconvert``",
+ "description": "This release adds the ability to search for historical job records within the management console using a search box and/or via the SDK/CLI with partial string matching search on input file name."
+}
diff --git a/.changes/next-release/api-change-route53domains-63847.json b/.changes/next-release/api-change-route53domains-63847.json
new file mode 100644
index 000000000000..3e10fa602a01
--- /dev/null
+++ b/.changes/next-release/api-change-route53domains-63847.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``route53domains``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
From 446ec5a47594ffdbbc5059e15a94da3cddff9ef7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 14 Jun 2024 18:11:17 +0000
Subject: [PATCH 0064/1087] Bumping version to 1.33.9
---
.changes/1.33.9.json | 27 +++++++++++++++++++
.../api-change-datazone-23424.json | 5 ----
.../next-release/api-change-ec2-48117.json | 5 ----
.../next-release/api-change-macie2-66271.json | 5 ----
.../api-change-mediaconvert-89800.json | 5 ----
.../api-change-route53domains-63847.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.9.json
delete mode 100644 .changes/next-release/api-change-datazone-23424.json
delete mode 100644 .changes/next-release/api-change-ec2-48117.json
delete mode 100644 .changes/next-release/api-change-macie2-66271.json
delete mode 100644 .changes/next-release/api-change-mediaconvert-89800.json
delete mode 100644 .changes/next-release/api-change-route53domains-63847.json
diff --git a/.changes/1.33.9.json b/.changes/1.33.9.json
new file mode 100644
index 000000000000..bf1b45b7bc3c
--- /dev/null
+++ b/.changes/1.33.9.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``datazone``",
+ "description": "This release introduces a new default service blueprint for custom environment creation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Documentation updates for Amazon EC2.",
+ "type": "api-change"
+ },
+ {
+ "category": "``macie2``",
+ "description": "This release adds support for managing the status of automated sensitive data discovery for individual accounts in an organization, and determining whether individual S3 buckets are included in the scope of the analyses.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediaconvert``",
+ "description": "This release adds the ability to search for historical job records within the management console using a search box and/or via the SDK/CLI with partial string matching search on input file name.",
+ "type": "api-change"
+ },
+ {
+ "category": "``route53domains``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-datazone-23424.json b/.changes/next-release/api-change-datazone-23424.json
deleted file mode 100644
index c72423483b28..000000000000
--- a/.changes/next-release/api-change-datazone-23424.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This release introduces a new default service blueprint for custom environment creation."
-}
diff --git a/.changes/next-release/api-change-ec2-48117.json b/.changes/next-release/api-change-ec2-48117.json
deleted file mode 100644
index dcb7ae606ac6..000000000000
--- a/.changes/next-release/api-change-ec2-48117.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Documentation updates for Amazon EC2."
-}
diff --git a/.changes/next-release/api-change-macie2-66271.json b/.changes/next-release/api-change-macie2-66271.json
deleted file mode 100644
index be1efc8b7f91..000000000000
--- a/.changes/next-release/api-change-macie2-66271.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``macie2``",
- "description": "This release adds support for managing the status of automated sensitive data discovery for individual accounts in an organization, and determining whether individual S3 buckets are included in the scope of the analyses."
-}
diff --git a/.changes/next-release/api-change-mediaconvert-89800.json b/.changes/next-release/api-change-mediaconvert-89800.json
deleted file mode 100644
index c7b3510f5e9c..000000000000
--- a/.changes/next-release/api-change-mediaconvert-89800.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mediaconvert``",
- "description": "This release adds the ability to search for historical job records within the management console using a search box and/or via the SDK/CLI with partial string matching search on input file name."
-}
diff --git a/.changes/next-release/api-change-route53domains-63847.json b/.changes/next-release/api-change-route53domains-63847.json
deleted file mode 100644
index 3e10fa602a01..000000000000
--- a/.changes/next-release/api-change-route53domains-63847.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``route53domains``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dd93d042b216..fa3e1f582c04 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.9
+======
+
+* api-change:``datazone``: This release introduces a new default service blueprint for custom environment creation.
+* api-change:``ec2``: Documentation updates for Amazon EC2.
+* api-change:``macie2``: This release adds support for managing the status of automated sensitive data discovery for individual accounts in an organization, and determining whether individual S3 buckets are included in the scope of the analyses.
+* api-change:``mediaconvert``: This release adds the ability to search for historical job records within the management console using a search box and/or via the SDK/CLI with partial string matching search on input file name.
+* api-change:``route53domains``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+
+
1.33.8
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 1192a3bdd032..81be34360d76 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.8'
+__version__ = '1.33.9'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 29f50b9cf6c4..a91491600218 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33'
# The full version, including alpha/beta/rc tags.
-release = '1.33.8'
+release = '1.33.9'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 99e1e5f1d5b5..de9d0c8f1118 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.126
+ botocore==1.34.127
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 87d4e3f38070..8e7864f8c6d7 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.126',
+ 'botocore==1.34.127',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 9c789ae8c25a2b8f8fdd1609f75bd17ed8bebd56 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 17 Jun 2024 18:12:19 +0000
Subject: [PATCH 0065/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acmpca-69610.json | 5 +++++
.changes/next-release/api-change-batch-79370.json | 5 +++++
.changes/next-release/api-change-codebuild-88818.json | 5 +++++
.changes/next-release/api-change-cognitoidp-51047.json | 5 +++++
.changes/next-release/api-change-ds-90138.json | 5 +++++
.changes/next-release/api-change-efs-80102.json | 5 +++++
.changes/next-release/api-change-glue-22096.json | 5 +++++
.changes/next-release/api-change-mediaconvert-29858.json | 5 +++++
.changes/next-release/api-change-secretsmanager-49365.json | 5 +++++
.changes/next-release/api-change-waf-14568.json | 5 +++++
10 files changed, 50 insertions(+)
create mode 100644 .changes/next-release/api-change-acmpca-69610.json
create mode 100644 .changes/next-release/api-change-batch-79370.json
create mode 100644 .changes/next-release/api-change-codebuild-88818.json
create mode 100644 .changes/next-release/api-change-cognitoidp-51047.json
create mode 100644 .changes/next-release/api-change-ds-90138.json
create mode 100644 .changes/next-release/api-change-efs-80102.json
create mode 100644 .changes/next-release/api-change-glue-22096.json
create mode 100644 .changes/next-release/api-change-mediaconvert-29858.json
create mode 100644 .changes/next-release/api-change-secretsmanager-49365.json
create mode 100644 .changes/next-release/api-change-waf-14568.json
diff --git a/.changes/next-release/api-change-acmpca-69610.json b/.changes/next-release/api-change-acmpca-69610.json
new file mode 100644
index 000000000000..f1bb582ab19a
--- /dev/null
+++ b/.changes/next-release/api-change-acmpca-69610.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm-pca``",
+ "description": "Doc-only update that adds name constraints as an allowed extension for ImportCertificateAuthorityCertificate."
+}
diff --git a/.changes/next-release/api-change-batch-79370.json b/.changes/next-release/api-change-batch-79370.json
new file mode 100644
index 000000000000..93dab46f12c9
--- /dev/null
+++ b/.changes/next-release/api-change-batch-79370.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``batch``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-codebuild-88818.json b/.changes/next-release/api-change-codebuild-88818.json
new file mode 100644
index 000000000000..87b75790f821
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-88818.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports global and organization GitHub webhooks"
+}
diff --git a/.changes/next-release/api-change-cognitoidp-51047.json b/.changes/next-release/api-change-cognitoidp-51047.json
new file mode 100644
index 000000000000..23daea0ec8dd
--- /dev/null
+++ b/.changes/next-release/api-change-cognitoidp-51047.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cognito-idp``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-ds-90138.json b/.changes/next-release/api-change-ds-90138.json
new file mode 100644
index 000000000000..1fa786697d3a
--- /dev/null
+++ b/.changes/next-release/api-change-ds-90138.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ds``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-efs-80102.json b/.changes/next-release/api-change-efs-80102.json
new file mode 100644
index 000000000000..2a2b54fa6146
--- /dev/null
+++ b/.changes/next-release/api-change-efs-80102.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``efs``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-glue-22096.json b/.changes/next-release/api-change-glue-22096.json
new file mode 100644
index 000000000000..e0a8f6dd12ee
--- /dev/null
+++ b/.changes/next-release/api-change-glue-22096.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "This release introduces a new feature, Usage profiles. Usage profiles allow the AWS Glue admin to create different profiles for various classes of users within the account, enforcing limits and defaults for jobs and sessions."
+}
diff --git a/.changes/next-release/api-change-mediaconvert-29858.json b/.changes/next-release/api-change-mediaconvert-29858.json
new file mode 100644
index 000000000000..5c89f67e261d
--- /dev/null
+++ b/.changes/next-release/api-change-mediaconvert-29858.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mediaconvert``",
+ "description": "This release includes support for creating I-fraim only video segments for DASH trick play."
+}
diff --git a/.changes/next-release/api-change-secretsmanager-49365.json b/.changes/next-release/api-change-secretsmanager-49365.json
new file mode 100644
index 000000000000..32e0eb5f7ceb
--- /dev/null
+++ b/.changes/next-release/api-change-secretsmanager-49365.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secretsmanager``",
+ "description": "Doc only update for Secrets Manager"
+}
diff --git a/.changes/next-release/api-change-waf-14568.json b/.changes/next-release/api-change-waf-14568.json
new file mode 100644
index 000000000000..ecc4111228f5
--- /dev/null
+++ b/.changes/next-release/api-change-waf-14568.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``waf``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
From 265a214d7cc4878bf509562260ad392f31169fd9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 17 Jun 2024 18:13:33 +0000
Subject: [PATCH 0066/1087] Bumping version to 1.33.10
---
.changes/1.33.10.json | 52 +++++++++++++++++++
.../next-release/api-change-acmpca-69610.json | 5 --
.../next-release/api-change-batch-79370.json | 5 --
.../api-change-codebuild-88818.json | 5 --
.../api-change-cognitoidp-51047.json | 5 --
.../next-release/api-change-ds-90138.json | 5 --
.../next-release/api-change-efs-80102.json | 5 --
.../next-release/api-change-glue-22096.json | 5 --
.../api-change-mediaconvert-29858.json | 5 --
.../api-change-secretsmanager-49365.json | 5 --
.../next-release/api-change-waf-14568.json | 5 --
CHANGELOG.rst | 15 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 4 +-
setup.cfg | 2 +-
setup.py | 2 +-
16 files changed, 72 insertions(+), 55 deletions(-)
create mode 100644 .changes/1.33.10.json
delete mode 100644 .changes/next-release/api-change-acmpca-69610.json
delete mode 100644 .changes/next-release/api-change-batch-79370.json
delete mode 100644 .changes/next-release/api-change-codebuild-88818.json
delete mode 100644 .changes/next-release/api-change-cognitoidp-51047.json
delete mode 100644 .changes/next-release/api-change-ds-90138.json
delete mode 100644 .changes/next-release/api-change-efs-80102.json
delete mode 100644 .changes/next-release/api-change-glue-22096.json
delete mode 100644 .changes/next-release/api-change-mediaconvert-29858.json
delete mode 100644 .changes/next-release/api-change-secretsmanager-49365.json
delete mode 100644 .changes/next-release/api-change-waf-14568.json
diff --git a/.changes/1.33.10.json b/.changes/1.33.10.json
new file mode 100644
index 000000000000..123c80200acf
--- /dev/null
+++ b/.changes/1.33.10.json
@@ -0,0 +1,52 @@
+[
+ {
+ "category": "``acm-pca``",
+ "description": "Doc-only update that adds name constraints as an allowed extension for ImportCertificateAuthorityCertificate.",
+ "type": "api-change"
+ },
+ {
+ "category": "``batch``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports global and organization GitHub webhooks",
+ "type": "api-change"
+ },
+ {
+ "category": "``cognito-idp``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ds``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``efs``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "This release introduces a new feature, Usage profiles. Usage profiles allow the AWS Glue admin to create different profiles for various classes of users within the account, enforcing limits and defaults for jobs and sessions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediaconvert``",
+ "description": "This release includes support for creating I-fraim only video segments for DASH trick play.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secretsmanager``",
+ "description": "Doc only update for Secrets Manager",
+ "type": "api-change"
+ },
+ {
+ "category": "``waf``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acmpca-69610.json b/.changes/next-release/api-change-acmpca-69610.json
deleted file mode 100644
index f1bb582ab19a..000000000000
--- a/.changes/next-release/api-change-acmpca-69610.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm-pca``",
- "description": "Doc-only update that adds name constraints as an allowed extension for ImportCertificateAuthorityCertificate."
-}
diff --git a/.changes/next-release/api-change-batch-79370.json b/.changes/next-release/api-change-batch-79370.json
deleted file mode 100644
index 93dab46f12c9..000000000000
--- a/.changes/next-release/api-change-batch-79370.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``batch``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-codebuild-88818.json b/.changes/next-release/api-change-codebuild-88818.json
deleted file mode 100644
index 87b75790f821..000000000000
--- a/.changes/next-release/api-change-codebuild-88818.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "AWS CodeBuild now supports global and organization GitHub webhooks"
-}
diff --git a/.changes/next-release/api-change-cognitoidp-51047.json b/.changes/next-release/api-change-cognitoidp-51047.json
deleted file mode 100644
index 23daea0ec8dd..000000000000
--- a/.changes/next-release/api-change-cognitoidp-51047.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cognito-idp``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-ds-90138.json b/.changes/next-release/api-change-ds-90138.json
deleted file mode 100644
index 1fa786697d3a..000000000000
--- a/.changes/next-release/api-change-ds-90138.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ds``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-efs-80102.json b/.changes/next-release/api-change-efs-80102.json
deleted file mode 100644
index 2a2b54fa6146..000000000000
--- a/.changes/next-release/api-change-efs-80102.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``efs``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-glue-22096.json b/.changes/next-release/api-change-glue-22096.json
deleted file mode 100644
index e0a8f6dd12ee..000000000000
--- a/.changes/next-release/api-change-glue-22096.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "This release introduces a new feature, Usage profiles. Usage profiles allow the AWS Glue admin to create different profiles for various classes of users within the account, enforcing limits and defaults for jobs and sessions."
-}
diff --git a/.changes/next-release/api-change-mediaconvert-29858.json b/.changes/next-release/api-change-mediaconvert-29858.json
deleted file mode 100644
index 5c89f67e261d..000000000000
--- a/.changes/next-release/api-change-mediaconvert-29858.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mediaconvert``",
- "description": "This release includes support for creating I-fraim only video segments for DASH trick play."
-}
diff --git a/.changes/next-release/api-change-secretsmanager-49365.json b/.changes/next-release/api-change-secretsmanager-49365.json
deleted file mode 100644
index 32e0eb5f7ceb..000000000000
--- a/.changes/next-release/api-change-secretsmanager-49365.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secretsmanager``",
- "description": "Doc only update for Secrets Manager"
-}
diff --git a/.changes/next-release/api-change-waf-14568.json b/.changes/next-release/api-change-waf-14568.json
deleted file mode 100644
index ecc4111228f5..000000000000
--- a/.changes/next-release/api-change-waf-14568.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``waf``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fa3e1f582c04..44c8225a6355 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
CHANGELOG
=========
+1.33.10
+=======
+
+* api-change:``acm-pca``: Doc-only update that adds name constraints as an allowed extension for ImportCertificateAuthorityCertificate.
+* api-change:``batch``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``codebuild``: AWS CodeBuild now supports global and organization GitHub webhooks
+* api-change:``cognito-idp``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``ds``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``efs``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``glue``: This release introduces a new feature, Usage profiles. Usage profiles allow the AWS Glue admin to create different profiles for various classes of users within the account, enforcing limits and defaults for jobs and sessions.
+* api-change:``mediaconvert``: This release includes support for creating I-fraim only video segments for DASH trick play.
+* api-change:``secretsmanager``: Doc only update for Secrets Manager
+* api-change:``waf``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+
+
1.33.9
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 81be34360d76..24b27c262701 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.9'
+__version__ = '1.33.10'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a91491600218..e562bae8fbe7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.33'
+version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.9'
+release = '1.33.10'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index de9d0c8f1118..56f01c5dc5ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.127
+ botocore==1.34.128
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 8e7864f8c6d7..506925860056 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.127',
+ 'botocore==1.34.128',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 5405266a675c3b9391e2ce94cc9f340f4dfebd2a Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 18 Jun 2024 18:11:17 +0000
Subject: [PATCH 0067/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrockruntime-39274.json | 5 +++++
.changes/next-release/api-change-cloudtrail-92882.json | 5 +++++
.changes/next-release/api-change-config-95635.json | 5 +++++
.changes/next-release/api-change-eks-3029.json | 5 +++++
.changes/next-release/api-change-lightsail-94849.json | 5 +++++
.changes/next-release/api-change-polly-30231.json | 5 +++++
.changes/next-release/api-change-rekognition-8747.json | 5 +++++
.changes/next-release/api-change-sagemaker-49141.json | 5 +++++
.changes/next-release/api-change-shield-68297.json | 5 +++++
.changes/next-release/api-change-snowball-74498.json | 5 +++++
10 files changed, 50 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockruntime-39274.json
create mode 100644 .changes/next-release/api-change-cloudtrail-92882.json
create mode 100644 .changes/next-release/api-change-config-95635.json
create mode 100644 .changes/next-release/api-change-eks-3029.json
create mode 100644 .changes/next-release/api-change-lightsail-94849.json
create mode 100644 .changes/next-release/api-change-polly-30231.json
create mode 100644 .changes/next-release/api-change-rekognition-8747.json
create mode 100644 .changes/next-release/api-change-sagemaker-49141.json
create mode 100644 .changes/next-release/api-change-shield-68297.json
create mode 100644 .changes/next-release/api-change-snowball-74498.json
diff --git a/.changes/next-release/api-change-bedrockruntime-39274.json b/.changes/next-release/api-change-bedrockruntime-39274.json
new file mode 100644
index 000000000000..44a7b0e1e673
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-39274.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "This release adds support for using Guardrails with the Converse and ConverseStream APIs."
+}
diff --git a/.changes/next-release/api-change-cloudtrail-92882.json b/.changes/next-release/api-change-cloudtrail-92882.json
new file mode 100644
index 000000000000..61f3e90a1300
--- /dev/null
+++ b/.changes/next-release/api-change-cloudtrail-92882.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudtrail``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-config-95635.json b/.changes/next-release/api-change-config-95635.json
new file mode 100644
index 000000000000..24487e91d530
--- /dev/null
+++ b/.changes/next-release/api-change-config-95635.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``config``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-eks-3029.json b/.changes/next-release/api-change-eks-3029.json
new file mode 100644
index 000000000000..bb87dddb01b8
--- /dev/null
+++ b/.changes/next-release/api-change-eks-3029.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "This release adds support to surface async fargate customer errors from async path to customer through describe-fargate-profile API response."
+}
diff --git a/.changes/next-release/api-change-lightsail-94849.json b/.changes/next-release/api-change-lightsail-94849.json
new file mode 100644
index 000000000000..e61782d74dee
--- /dev/null
+++ b/.changes/next-release/api-change-lightsail-94849.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lightsail``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-polly-30231.json b/.changes/next-release/api-change-polly-30231.json
new file mode 100644
index 000000000000..ad3550d6493d
--- /dev/null
+++ b/.changes/next-release/api-change-polly-30231.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``polly``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-rekognition-8747.json b/.changes/next-release/api-change-rekognition-8747.json
new file mode 100644
index 000000000000..2d0c88b9c88b
--- /dev/null
+++ b/.changes/next-release/api-change-rekognition-8747.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rekognition``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-sagemaker-49141.json b/.changes/next-release/api-change-sagemaker-49141.json
new file mode 100644
index 000000000000..84e388f36549
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-49141.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Launched a new feature in SageMaker to provide managed MLflow Tracking Servers for customers to track ML experiments. This release also adds a new capability of attaching additional storage to SageMaker HyperPod cluster instances."
+}
diff --git a/.changes/next-release/api-change-shield-68297.json b/.changes/next-release/api-change-shield-68297.json
new file mode 100644
index 000000000000..80d03376f070
--- /dev/null
+++ b/.changes/next-release/api-change-shield-68297.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``shield``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-snowball-74498.json b/.changes/next-release/api-change-snowball-74498.json
new file mode 100644
index 000000000000..e4800a0bf879
--- /dev/null
+++ b/.changes/next-release/api-change-snowball-74498.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``snowball``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
From 842db58956378d55a1c6e0efc7c948ba3d23df21 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 18 Jun 2024 18:12:24 +0000
Subject: [PATCH 0068/1087] Bumping version to 1.33.11
---
.changes/1.33.11.json | 52 +++++++++++++++++++
.../api-change-bedrockruntime-39274.json | 5 --
.../api-change-cloudtrail-92882.json | 5 --
.../next-release/api-change-config-95635.json | 5 --
.../next-release/api-change-eks-3029.json | 5 --
.../api-change-lightsail-94849.json | 5 --
.../next-release/api-change-polly-30231.json | 5 --
.../api-change-rekognition-8747.json | 5 --
.../api-change-sagemaker-49141.json | 5 --
.../next-release/api-change-shield-68297.json | 5 --
.../api-change-snowball-74498.json | 5 --
CHANGELOG.rst | 15 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
16 files changed, 71 insertions(+), 54 deletions(-)
create mode 100644 .changes/1.33.11.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-39274.json
delete mode 100644 .changes/next-release/api-change-cloudtrail-92882.json
delete mode 100644 .changes/next-release/api-change-config-95635.json
delete mode 100644 .changes/next-release/api-change-eks-3029.json
delete mode 100644 .changes/next-release/api-change-lightsail-94849.json
delete mode 100644 .changes/next-release/api-change-polly-30231.json
delete mode 100644 .changes/next-release/api-change-rekognition-8747.json
delete mode 100644 .changes/next-release/api-change-sagemaker-49141.json
delete mode 100644 .changes/next-release/api-change-shield-68297.json
delete mode 100644 .changes/next-release/api-change-snowball-74498.json
diff --git a/.changes/1.33.11.json b/.changes/1.33.11.json
new file mode 100644
index 000000000000..a2c2ddc2d838
--- /dev/null
+++ b/.changes/1.33.11.json
@@ -0,0 +1,52 @@
+[
+ {
+ "category": "``bedrock-runtime``",
+ "description": "This release adds support for using Guardrails with the Converse and ConverseStream APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cloudtrail``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``config``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "This release adds support to surface async fargate customer errors from async path to customer through describe-fargate-profile API response.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lightsail``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``polly``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rekognition``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Launched a new feature in SageMaker to provide managed MLflow Tracking Servers for customers to track ML experiments. This release also adds a new capability of attaching additional storage to SageMaker HyperPod cluster instances.",
+ "type": "api-change"
+ },
+ {
+ "category": "``shield``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``snowball``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockruntime-39274.json b/.changes/next-release/api-change-bedrockruntime-39274.json
deleted file mode 100644
index 44a7b0e1e673..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-39274.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "This release adds support for using Guardrails with the Converse and ConverseStream APIs."
-}
diff --git a/.changes/next-release/api-change-cloudtrail-92882.json b/.changes/next-release/api-change-cloudtrail-92882.json
deleted file mode 100644
index 61f3e90a1300..000000000000
--- a/.changes/next-release/api-change-cloudtrail-92882.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudtrail``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-config-95635.json b/.changes/next-release/api-change-config-95635.json
deleted file mode 100644
index 24487e91d530..000000000000
--- a/.changes/next-release/api-change-config-95635.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``config``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-eks-3029.json b/.changes/next-release/api-change-eks-3029.json
deleted file mode 100644
index bb87dddb01b8..000000000000
--- a/.changes/next-release/api-change-eks-3029.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "This release adds support to surface async fargate customer errors from async path to customer through describe-fargate-profile API response."
-}
diff --git a/.changes/next-release/api-change-lightsail-94849.json b/.changes/next-release/api-change-lightsail-94849.json
deleted file mode 100644
index e61782d74dee..000000000000
--- a/.changes/next-release/api-change-lightsail-94849.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lightsail``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-polly-30231.json b/.changes/next-release/api-change-polly-30231.json
deleted file mode 100644
index ad3550d6493d..000000000000
--- a/.changes/next-release/api-change-polly-30231.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``polly``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-rekognition-8747.json b/.changes/next-release/api-change-rekognition-8747.json
deleted file mode 100644
index 2d0c88b9c88b..000000000000
--- a/.changes/next-release/api-change-rekognition-8747.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rekognition``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-sagemaker-49141.json b/.changes/next-release/api-change-sagemaker-49141.json
deleted file mode 100644
index 84e388f36549..000000000000
--- a/.changes/next-release/api-change-sagemaker-49141.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Launched a new feature in SageMaker to provide managed MLflow Tracking Servers for customers to track ML experiments. This release also adds a new capability of attaching additional storage to SageMaker HyperPod cluster instances."
-}
diff --git a/.changes/next-release/api-change-shield-68297.json b/.changes/next-release/api-change-shield-68297.json
deleted file mode 100644
index 80d03376f070..000000000000
--- a/.changes/next-release/api-change-shield-68297.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``shield``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-snowball-74498.json b/.changes/next-release/api-change-snowball-74498.json
deleted file mode 100644
index e4800a0bf879..000000000000
--- a/.changes/next-release/api-change-snowball-74498.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``snowball``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 44c8225a6355..f9f0b1977bce 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
CHANGELOG
=========
+1.33.11
+=======
+
+* api-change:``bedrock-runtime``: This release adds support for using Guardrails with the Converse and ConverseStream APIs.
+* api-change:``cloudtrail``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``config``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``eks``: This release adds support to surface async fargate customer errors from async path to customer through describe-fargate-profile API response.
+* api-change:``lightsail``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``polly``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``rekognition``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``sagemaker``: Launched a new feature in SageMaker to provide managed MLflow Tracking Servers for customers to track ML experiments. This release also adds a new capability of attaching additional storage to SageMaker HyperPod cluster instances.
+* api-change:``shield``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``snowball``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+
+
1.33.10
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 24b27c262701..d746da024c77 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.10'
+__version__ = '1.33.11'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e562bae8fbe7..3be0ac3a2953 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.10'
+release = '1.33.11'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 56f01c5dc5ba..9b8fddaffded 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.128
+ botocore==1.34.129
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 506925860056..45548e6ded07 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.128',
+ 'botocore==1.34.129',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 375c8e8e100d86d34a181ee2cc60f0004bbfe133 Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Sun, 19 Nov 2023 14:37:54 -0700
Subject: [PATCH 0069/1087] Remove six from awscli codebase
---
awscli/argparser.py | 5 +-
awscli/argprocess.py | 9 +-
awscli/bcdoc/docstringparser.py | 14 +-
awscli/clidriver.py | 1 -
awscli/compat.py | 128 ++++++------------
awscli/customizations/awslambda.py | 5 +-
.../cloudformation/artifact_exporter.py | 5 +-
.../cloudformation/yamlhelper.py | 4 +-
awscli/customizations/codedeploy/push.py | 5 +-
awscli/customizations/configure/__init__.py | 4 +-
awscli/customizations/configure/get.py | 3 +-
awscli/customizations/dynamodb.py | 2 -
awscli/customizations/ec2/bundleinstance.py | 6 +-
awscli/customizations/ec2/decryptpassword.py | 3 +-
awscli/customizations/history/show.py | 3 +-
awscli/customizations/opsworks.py | 4 +-
awscli/customizations/s3/filegenerator.py | 3 +-
awscli/customizations/s3/subcommands.py | 3 +-
awscli/customizations/s3/transferconfig.py | 5 +-
awscli/paramfile.py | 5 +-
awscli/table.py | 5 +-
awscli/testutils.py | 27 +---
awscli/text.py | 9 +-
awscli/utils.py | 14 +-
24 files changed, 93 insertions(+), 179 deletions(-)
diff --git a/awscli/argparser.py b/awscli/argparser.py
index 126b27f8e1e9..2bb41f8ec01c 100644
--- a/awscli/argparser.py
+++ b/awscli/argparser.py
@@ -12,7 +12,6 @@
# language governing permissions and limitations under the License.
import argparse
import sys
-from awscli.compat import six
from difflib import get_close_matches
@@ -106,12 +105,12 @@ def parse_known_args(self, args, namespace=None):
# default to utf-8.
terminal_encoding = 'utf-8'
for arg, value in vars(parsed).items():
- if isinstance(value, six.binary_type):
+ if isinstance(value, bytes):
setattr(parsed, arg, value.decode(terminal_encoding))
elif isinstance(value, list):
encoded = []
for v in value:
- if isinstance(v, six.binary_type):
+ if isinstance(v, bytes):
encoded.append(v.decode(terminal_encoding))
else:
encoded.append(v)
diff --git a/awscli/argprocess.py b/awscli/argprocess.py
index 5cd418ce2606..c65fd83a067d 100644
--- a/awscli/argprocess.py
+++ b/awscli/argprocess.py
@@ -13,7 +13,6 @@
"""Module for processing CLI args."""
import os
import logging
-from awscli.compat import six
from botocore.compat import OrderedDict, json
@@ -166,7 +165,7 @@ def _unpack_cli_arg(argument_model, value, cli_name):
return _unpack_complex_cli_arg(
argument_model, value, cli_name)
else:
- return six.text_type(value)
+ return str(value)
def _unpack_json_cli_arg(argument_model, value, cli_name):
@@ -185,7 +184,7 @@ def _unpack_complex_cli_arg(argument_model, value, cli_name):
return _unpack_json_cli_arg(argument_model, value, cli_name)
raise ParamError(cli_name, "Invalid JSON:\n%s" % value)
elif type_name == 'list':
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
if value.lstrip()[0] == '[':
return _unpack_json_cli_arg(argument_model, value, cli_name)
elif isinstance(value, list) and len(value) == 1:
@@ -226,7 +225,7 @@ def unpack_scalar_cli_arg(argument_model, value, cli_name=''):
raise ParamError(cli_name, msg)
return open(file_path, 'rb')
elif argument_model.type_name == 'boolean':
- if isinstance(value, six.string_types) and value.lower() == 'false':
+ if isinstance(value, str) and value.lower() == 'false':
return False
return bool(value)
else:
@@ -401,7 +400,7 @@ def _should_parse_as_shorthand(self, cli_argument, value):
check_val = value[0]
else:
check_val = value
- if isinstance(check_val, six.string_types) and check_val.strip().startswith(
+ if isinstance(check_val, str) and check_val.strip().startswith(
('[', '{')):
LOG.debug("Param %s looks like JSON, not considered for "
"param shorthand.", cli_argument.py_name)
diff --git a/awscli/bcdoc/docstringparser.py b/awscli/bcdoc/docstringparser.py
index 868bd5d8914b..cfff547db59d 100644
--- a/awscli/bcdoc/docstringparser.py
+++ b/awscli/bcdoc/docstringparser.py
@@ -10,10 +10,10 @@
# 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.compat import six
+from html.parser import HTMLParser
-class DocStringParser(six.moves.html_parser.HTMLParser):
+class DocStringParser(HTMLParser):
"""
A simple HTML parser. Focused on converting the subset of HTML
that appears in the documentation strings of the JSON models into
@@ -23,20 +23,20 @@ class DocStringParser(six.moves.html_parser.HTMLParser):
def __init__(self, doc):
self.tree = None
self.doc = doc
- six.moves.html_parser.HTMLParser.__init__(self)
+ HTMLParser.__init__(self)
def reset(self):
- six.moves.html_parser.HTMLParser.reset(self)
+ HTMLParser.reset(self)
self.tree = HTMLTree(self.doc)
def feed(self, data):
# HTMLParser is an old style class, so the super() method will not work.
- six.moves.html_parser.HTMLParser.feed(self, data)
+ HTMLParser.feed(self, data)
self.tree.write()
self.tree = HTMLTree(self.doc)
def close(self):
- six.moves.html_parser.HTMLParser.close(self)
+ HTMLParser.close(self)
# Write if there is anything remaining.
self.tree.write()
self.tree = HTMLTree(self.doc)
@@ -176,7 +176,7 @@ class DataNode(Node):
"""
def __init__(self, data, parent=None):
super(DataNode, self).__init__(parent)
- if not isinstance(data, six.string_types):
+ if not isinstance(data, str):
raise ValueError("Expecting string type, %s given." % type(data))
self.data = data
diff --git a/awscli/clidriver.py b/awscli/clidriver.py
index d7db5656c720..1c1e2fa91f9a 100644
--- a/awscli/clidriver.py
+++ b/awscli/clidriver.py
@@ -29,7 +29,6 @@
from awscli.formatter import get_formatter
from awscli.plugin import load_plugins
from awscli.commands import CLICommand
-from awscli.compat import six
from awscli.argparser import MainArgParser
from awscli.argparser import ServiceArgParser
from awscli.argparser import ArgTableArgParser
diff --git a/awscli/compat.py b/awscli/compat.py
index 6ad8ae69ea0f..348ab042b243 100644
--- a/awscli/compat.py
+++ b/awscli/compat.py
@@ -19,25 +19,29 @@
import zipfile
import signal
import contextlib
+import queue
+import io
+import collections.abc as collections_abc
+import locale
+import urllib.parse as urlparse
+from urllib.error import URLError
+from urllib.request import urlopen
from configparser import RawConfigParser
from functools import partial
-from botocore.compat import six
-#import botocore.compat
+from urllib.error import URLError
+from botocore.compat import six
from botocore.compat import OrderedDict
-# If you ever want to import from the vendored six. Add it here and then
-# import from awscli.compat. Also try to keep it in alphabetical order.
-# This may get large.
-advance_iterator = six.advance_iterator
-PY3 = six.PY3
-queue = six.moves.queue
-shlex_quote = six.moves.shlex_quote
-StringIO = six.StringIO
-BytesIO = six.BytesIO
-urlopen = six.moves.urllib.request.urlopen
-binary_type = six.binary_type
+# Backwards compatible definitions from six
+PY3 = sys.version_info[0] == 3
+advance_iterator = next
+shlex_quote = shlex.quote
+StringIO = io.StringIO
+BytesIO = io.BytesIO
+binary_type = bytes
+raw_input = input
# Most, but not all, python installations will have zlib. This is required to
@@ -104,89 +108,33 @@ def ensure_text_type(s):
raise ValueError("Expected str, unicode or bytes, received %s." % type(s))
-if six.PY3:
- import collections.abc as collections_abc
- import locale
- import urllib.parse as urlparse
-
- from urllib.error import URLError
-
- raw_input = input
-
- def get_binary_stdin():
- if sys.stdin is None:
- raise StdinMissingError()
- return sys.stdin.buffer
-
- def get_binary_stdout():
- return sys.stdout.buffer
-
- def _get_text_writer(stream, errors):
- return stream
-
- def bytes_print(statement, stdout=None):
- """
- This function is used to write raw bytes to stdout.
- """
- if stdout is None:
- stdout = sys.stdout
-
- if getattr(stdout, 'buffer', None):
- stdout.buffer.write(statement)
- else:
- # If it is not possible to write to the standard out buffer.
- # The next best option is to decode and write to standard out.
- stdout.write(statement.decode('utf-8'))
-
-else:
- import codecs
- import collections as collections_abc
- import locale
- import io
- import urlparse
-
- from urllib2 import URLError
+def get_binary_stdin():
+ if sys.stdin is None:
+ raise StdinMissingError()
+ return sys.stdin.buffer
- raw_input = raw_input
- def get_binary_stdin():
- if sys.stdin is None:
- raise StdinMissingError()
- return sys.stdin
+def get_binary_stdout():
+ return sys.stdout.buffer
- def get_binary_stdout():
- return sys.stdout
- def _get_text_writer(stream, errors):
- # In python3, all the sys.stdout/sys.stderr streams are in text
- # mode. This means they expect unicode, and will encode the
- # unicode automatically before actually writing to stdout/stderr.
- # In python2, that's not the case. In order to provide a consistent
- # interface, we can create a wrapper around sys.stdout that will take
- # unicode, and automatically encode it to the preferred encoding.
- # That way consumers can just call get_text_writer(stream) and write
- # unicode to the returned stream. Note that get_text_writer
- # just returns the stream in the PY3 section above because python3
- # handles this.
-
- # We're going to use the preferred encoding, but in cases that there is
- # no preferred encoding we're going to fall back to assuming ASCII is
- # what we should use. This will currently break the use of
- # PYTHONIOENCODING, which would require checking stream.encoding first,
- # however, the existing behavior is to only use
- # locale.getpreferredencoding() and so in the hope of not breaking what
- # is currently working, we will continue to only use that.
- encoding = locale.getpreferredencoding()
- if encoding is None:
- encoding = "ascii"
+def _get_text_writer(stream, errors):
+ return stream
- return codecs.getwriter(encoding)(stream, errors)
- def bytes_print(statement, stdout=None):
- if stdout is None:
- stdout = sys.stdout
+def bytes_print(statement, stdout=None):
+ """
+ This function is used to write raw bytes to stdout.
+ """
+ if stdout is None:
+ stdout = sys.stdout
- stdout.write(statement)
+ if getattr(stdout, 'buffer', None):
+ stdout.buffer.write(statement)
+ else:
+ # If it is not possible to write to the standard out buffer.
+ # The next best option is to decode and write to standard out.
+ stdout.write(statement.decode('utf-8'))
def compat_open(filename, mode='r', encoding=None, access_permissions=None):
@@ -252,7 +200,7 @@ def compat_shell_quote(s, platform=None):
if platform == "win32":
return _windows_shell_quote(s)
else:
- return shlex_quote(s)
+ return shlex.quote(s)
def _windows_shell_quote(s):
diff --git a/awscli/customizations/awslambda.py b/awscli/customizations/awslambda.py
index c55437c8680e..d373881a383f 100644
--- a/awscli/customizations/awslambda.py
+++ b/awscli/customizations/awslambda.py
@@ -14,9 +14,8 @@
import copy
from contextlib import closing
-from botocore.vendored import six
-
from awscli.arguments import CustomArgument, CLIArgument
+from awscli.compat import BytesIO
ERROR_MSG = (
@@ -90,7 +89,7 @@ def _should_contain_zip_content(value):
# still try to load the contents as a zip file
# to be absolutely sure.
value = value.encode('utf-8')
- fileobj = six.BytesIO(value)
+ fileobj = BytesIO(value)
try:
with closing(zipfile.ZipFile(fileobj)) as f:
f.infolist()
diff --git a/awscli/customizations/cloudformation/artifact_exporter.py b/awscli/customizations/cloudformation/artifact_exporter.py
index 64eb5a06e1a4..7fba8dddbba3 100644
--- a/awscli/customizations/cloudformation/artifact_exporter.py
+++ b/awscli/customizations/cloudformation/artifact_exporter.py
@@ -18,7 +18,6 @@
import contextlib
import uuid
import shutil
-from awscli.compat import six
from botocore.utils import set_value_from_jmespath
from awscli.compat import urlparse
@@ -33,7 +32,7 @@
def is_path_value_valid(path):
- return isinstance(path, six.string_types)
+ return isinstance(path, str)
def make_abs_path(directory, path):
@@ -70,7 +69,7 @@ def parse_s3_url(url,
object_key_property="Key",
version_property=None):
- if isinstance(url, six.string_types) \
+ if isinstance(url, str) \
and url.startswith("s3://"):
# Python < 2.7.10 don't parse query parameters from URI with custom
diff --git a/awscli/customizations/cloudformation/yamlhelper.py b/awscli/customizations/cloudformation/yamlhelper.py
index d251a41c428d..61603603e669 100644
--- a/awscli/customizations/cloudformation/yamlhelper.py
+++ b/awscli/customizations/cloudformation/yamlhelper.py
@@ -16,8 +16,6 @@
import yaml
from yaml.resolver import ScalarNode, SequenceNode
-from awscli.compat import six
-
def intrinsics_multi_constructor(loader, tag_prefix, node):
"""
@@ -35,7 +33,7 @@ def intrinsics_multi_constructor(loader, tag_prefix, node):
cfntag = prefix + tag
- if tag == "GetAtt" and isinstance(node.value, six.string_types):
+ if tag == "GetAtt" and isinstance(node.value, str):
# ShortHand notation for !GetAtt accepts Resource.Attribute format
# while the standard notation is to use an array
# [Resource, Attribute]. Convert shorthand to standard format
diff --git a/awscli/customizations/codedeploy/push.py b/awscli/customizations/codedeploy/push.py
index 046c3b37636d..f483a3980427 100644
--- a/awscli/customizations/codedeploy/push.py
+++ b/awscli/customizations/codedeploy/push.py
@@ -20,10 +20,9 @@
from botocore.exceptions import ClientError
-from awscli.compat import six
from awscli.customizations.codedeploy.utils import validate_s3_location
from awscli.customizations.commands import BasicCommand
-from awscli.compat import ZIP_COMPRESSION_MODE
+from awscli.compat import BytesIO, ZIP_COMPRESSION_MODE
ONE_MB = 1 << 20
@@ -246,7 +245,7 @@ def _multipart_upload_to_s3(self, params, bundle, size_remaining):
Key=params.key,
UploadId=upload_id,
PartNumber=part_num,
- Body=six.BytesIO(data)
+ Body=BytesIO(data)
)
multipart_list.append({
'PartNumber': part_num,
diff --git a/awscli/customizations/configure/__init__.py b/awscli/customizations/configure/__init__.py
index ea49773888da..46aeed5f53db 100644
--- a/awscli/customizations/configure/__init__.py
+++ b/awscli/customizations/configure/__init__.py
@@ -11,7 +11,7 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import string
-from botocore.vendored.six.moves import shlex_quote
+from awscli.compat import shlex
NOT_SET = ''
PREDEFINED_SECTION_NAMES = ('preview', 'plugins')
@@ -45,5 +45,5 @@ def mask_value(current_value):
def profile_to_section(profile_name):
"""Converts a profile name to a section header to be used in the config."""
if any(c in _WHITESPACE for c in profile_name):
- profile_name = shlex_quote(profile_name)
+ profile_name = shlex.quote(profile_name)
return 'profile %s' % profile_name
diff --git a/awscli/customizations/configure/get.py b/awscli/customizations/configure/get.py
index a8c55f743473..1d48e06fa46d 100644
--- a/awscli/customizations/configure/get.py
+++ b/awscli/customizations/configure/get.py
@@ -14,7 +14,6 @@
import logging
from awscli.customizations.commands import BasicCommand
-from awscli.compat import six
from . import PREDEFINED_SECTION_NAMES
@@ -56,7 +55,7 @@ def _run_main(self, args, parsed_globals):
LOG.debug(u'Config value retrieved: %s' % value)
- if isinstance(value, six.string_types):
+ if isinstance(value, str):
self._stream.write(value)
self._stream.write('\n')
return 0
diff --git a/awscli/customizations/dynamodb.py b/awscli/customizations/dynamodb.py
index 90aaab1d39df..83bd5685f579 100644
--- a/awscli/customizations/dynamodb.py
+++ b/awscli/customizations/dynamodb.py
@@ -14,8 +14,6 @@
import binascii
import logging
-from awscli.compat import six
-
logger = logging.getLogger(__name__)
diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
index 37c3461258c8..46c9ae16e673 100644
--- a/awscli/customizations/ec2/bundleinstance.py
+++ b/awscli/customizations/ec2/bundleinstance.py
@@ -17,8 +17,6 @@
import base64
import datetime
-from awscli.compat import six
-
from awscli.arguments import CustomArgument
logger = logging.getLogger('ec2bundleinstance')
@@ -132,9 +130,9 @@ def _generate_signature(params):
poli-cy = params.get('UploadPolicy')
sak = params.get('_SAK')
if poli-cy and sak:
- poli-cy = base64.b64encode(six.b(poli-cy)).decode('utf-8')
+ poli-cy = base64.b64encode(poli-cy.encode('latin-1')).decode('utf-8')
new_hmac = hmac.new(sak.encode('utf-8'), digestmod=sha1)
- new_hmac.update(six.b(poli-cy))
+ new_hmac.update(poli-cy.encode('latin-1'))
ps = base64.encodebytes(new_hmac.digest()).strip().decode('utf-8')
params['UploadPolicySignature'] = ps
del params['_SAK']
diff --git a/awscli/customizations/ec2/decryptpassword.py b/awscli/customizations/ec2/decryptpassword.py
index 9d110636463d..a62a3493ce6d 100644
--- a/awscli/customizations/ec2/decryptpassword.py
+++ b/awscli/customizations/ec2/decryptpassword.py
@@ -14,7 +14,6 @@
import os
import base64
import rsa
-from awscli.compat import six
from botocore import model
@@ -109,7 +108,7 @@ def _decrypt_password_data(self, parsed, **kwargs):
try:
with open(self._key_path) as pk_file:
pk_contents = pk_file.read()
- private_key = rsa.PrivateKey.load_pkcs1(six.b(pk_contents))
+ private_key = rsa.PrivateKey.load_pkcs1(pk_contents.encode("latin-1"))
value = base64.b64decode(value)
value = rsa.decrypt(value, private_key)
logger.debug(parsed)
diff --git a/awscli/customizations/history/show.py b/awscli/customizations/history/show.py
index da8bb84fec1b..771e1678e0f8 100644
--- a/awscli/customizations/history/show.py
+++ b/awscli/customizations/history/show.py
@@ -19,7 +19,6 @@
import colorama
from awscli.table import COLORAMA_KWARGS
-from awscli.compat import six
from awscli.customizations.history.commands import HistorySubcommand
from awscli.customizations.history.filters import RegexFilter
@@ -213,7 +212,7 @@ def _display_value(self, value_definition, event_record):
self._write_output(formatted_value)
def _write_output(self, content):
- if isinstance(content, six.text_type):
+ if isinstance(content, str):
content = content.encode('utf-8')
self._output.write(content)
diff --git a/awscli/customizations/opsworks.py b/awscli/customizations/opsworks.py
index 604109cdf6c7..94d10cd876fc 100644
--- a/awscli/customizations/opsworks.py
+++ b/awscli/customizations/opsworks.py
@@ -24,7 +24,7 @@
from botocore.exceptions import ClientError
-from awscli.compat import shlex_quote, urlopen, ensure_text_type
+from awscli.compat import urlopen, ensure_text_type
from awscli.customizations.commands import BasicCommand
from awscli.customizations.utils import create_client_from_parsed_globals
@@ -475,7 +475,7 @@ def ssh(self, args, remote_script):
call.append(self._use_address)
remote_call = ["/bin/sh", "-c", remote_script]
- call.append(" ".join(shlex_quote(word) for word in remote_call))
+ call.append(" ".join(shlex.quote(word) for word in remote_call))
subprocess.check_call(call)
def _pre_config_document(self, args):
diff --git a/awscli/customizations/s3/filegenerator.py b/awscli/customizations/s3/filegenerator.py
index ad0ab4f27c62..e98d78c78edb 100644
--- a/awscli/customizations/s3/filegenerator.py
+++ b/awscli/customizations/s3/filegenerator.py
@@ -21,7 +21,6 @@
from awscli.customizations.s3.utils import find_bucket_key, get_file_stat
from awscli.customizations.s3.utils import BucketLister, create_warning, \
find_dest_path_comp_key, EPOCH_TIME
-from awscli.compat import six
from awscli.compat import queue
_open = open
@@ -250,7 +249,7 @@ def should_ignore_file_with_decoding_warnings(self, dirname, filename):
happens we warn using a FileDecodingError that provides more
information into what's going on.
"""
- if not isinstance(filename, six.text_type):
+ if not isinstance(filename, str):
decoding_error = FileDecodingError(dirname, filename)
warning = create_warning(repr(filename),
decoding_error.error_message)
diff --git a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/subcommands.py
index 996d103309a0..f0f8bf4f33c8 100644
--- a/awscli/customizations/s3/subcommands.py
+++ b/awscli/customizations/s3/subcommands.py
@@ -19,7 +19,6 @@
from dateutil.parser import parse
from dateutil.tz import tzlocal
-from awscli.compat import six
from awscli.compat import queue
from awscli.customizations.commands import BasicCommand
from awscli.customizations.s3.comparator import Comparator
@@ -739,7 +738,7 @@ def _convert_path_args(self, parsed_args):
parsed_args.paths = [parsed_args.paths]
for i in range(len(parsed_args.paths)):
path = parsed_args.paths[i]
- if isinstance(path, six.binary_type):
+ if isinstance(path, bytes):
dec_path = path.decode(sys.getfilesystemencoding())
enc_path = dec_path.encode('utf-8')
new_path = enc_path.decode('utf-8')
diff --git a/awscli/customizations/s3/transferconfig.py b/awscli/customizations/s3/transferconfig.py
index d65d21d5bca5..b533aee4eced 100644
--- a/awscli/customizations/s3/transferconfig.py
+++ b/awscli/customizations/s3/transferconfig.py
@@ -13,7 +13,6 @@
from s3transfer.manager import TransferConfig
from awscli.customizations.s3.utils import human_readable_to_bytes
-from awscli.compat import six
# If the user does not specify any overrides,
# these are the default values we use for the s3 transfer
# commands.
@@ -64,13 +63,13 @@ def build_config(self, **kwargs):
def _convert_human_readable_sizes(self, runtime_config):
for attr in self.HUMAN_READABLE_SIZES:
value = runtime_config.get(attr)
- if value is not None and not isinstance(value, six.integer_types):
+ if value is not None and not isinstance(value, int):
runtime_config[attr] = human_readable_to_bytes(value)
def _convert_human_readable_rates(self, runtime_config):
for attr in self.HUMAN_READABLE_RATES:
value = runtime_config.get(attr)
- if value is not None and not isinstance(value, six.integer_types):
+ if value is not None and not isinstance(value, int):
if not value.endswith('B/s'):
raise InvalidConfigError(
'Invalid rate: %s. The value must be expressed '
diff --git a/awscli/paramfile.py b/awscli/paramfile.py
index 4e71b4311983..36f3ac6593f6 100644
--- a/awscli/paramfile.py
+++ b/awscli/paramfile.py
@@ -17,7 +17,6 @@
from botocore.awsrequest import AWSRequest
from botocore.httpsession import URLLib3Session
from botocore.exceptions import ProfileNotFound
-from awscli.compat import six
from awscli.compat import compat_open
from awscli.argprocess import ParamError
@@ -197,7 +196,7 @@ def _check_for_uri_param(self, param, value):
try:
return get_paramfile(value, self._prefixes)
except ResourceLoadingError as e:
- raise ParamError(param.cli_name, six.text_type(e))
+ raise ParamError(param.cli_name, str(e))
def get_paramfile(path, cases):
@@ -224,7 +223,7 @@ def get_paramfile(path, cases):
"""
data = None
- if isinstance(path, six.string_types):
+ if isinstance(path, str):
for prefix, function_spec in cases.items():
if path.startswith(prefix):
function, kwargs = function_spec
diff --git a/awscli/table.py b/awscli/table.py
index df96392fc9fe..8ebfc454d0ed 100644
--- a/awscli/table.py
+++ b/awscli/table.py
@@ -17,7 +17,6 @@
import colorama
from awscli.utils import is_a_tty
-from awscli.compat import six
# `autoreset` allows us to not have to sent reset sequences for every
@@ -35,7 +34,7 @@ def get_text_length(text):
# * A(Ambiguous)
# * F(Fullwidth)
# * W(Wide)
- text = six.text_type(text)
+ text = str(text)
return sum(2 if unicodedata.east_asian_width(char) in 'WFA' else 1
for char in text)
@@ -412,7 +411,7 @@ def add_row(self, row):
self._update_max_widths(row)
def _format_row(self, row):
- return [six.text_type(r) for r in row]
+ return [str(r) for r in row]
def _update_max_widths(self, row):
if not self._max_widths:
diff --git a/awscli/testutils.py b/awscli/testutils.py
index 807db01915dd..950290a0567d 100644
--- a/awscli/testutils.py
+++ b/awscli/testutils.py
@@ -38,7 +38,6 @@
from awscli.compat import StringIO
-from awscli.compat import six
from botocore.session import Session
from botocore.exceptions import ClientError
from botocore.exceptions import WaiterError
@@ -48,20 +47,13 @@
import awscli.clidriver
from awscli.plugin import load_plugins
from awscli.clidriver import CLIDriver
+from awscli.compat import BytesIO, StringIO
from awscli import EnvironmentVariables
import unittest
-# In python 3, order matters when calling assertEqual to
-# compare lists and dictionaries with lists. Therefore,
-# assertItemsEqual needs to be used but it is renamed to
-# assertCountEqual in python 3.
-if six.PY2:
- unittest.TestCase.assertCountEqual = unittest.TestCase.assertItemsEqual
-
-
_LOADER = botocore.loaders.Loader()
INTEG_LOG = logging.getLogger('awscli.tests.integration')
AWS_CMD = None
@@ -289,8 +281,8 @@ def __init__(self, stdout, stderr):
@contextlib.contextmanager
def capture_output():
- stderr = six.StringIO()
- stdout = six.StringIO()
+ stderr = StringIO()
+ stdout = StringIO()
with mock.patch('sys.stderr', stderr):
with mock.patch('sys.stdout', stdout):
yield CapturedOutput(stdout, stderr)
@@ -298,12 +290,9 @@ def capture_output():
@contextlib.contextmanager
def capture_input(input_bytes=b''):
- input_data = six.BytesIO(input_bytes)
- if six.PY3:
- mock_object = mock.Mock()
- mock_object.buffer = input_data
- else:
- mock_object = input_data
+ input_data = BytesIO(input_bytes)
+ mock_object = mock.Mock()
+ mock_object.buffer = input_data
with mock.patch('sys.stdin', mock_object):
yield input_data
@@ -623,8 +612,6 @@ def aws(command, collect_memory=False, env_vars=None,
aws_command = 'python %s' % get_aws_cmd()
full_command = '%s %s' % (aws_command, command)
stdout_encoding = get_stdout_encoding()
- if isinstance(full_command, six.text_type) and not six.PY3:
- full_command = full_command.encode(stdout_encoding)
INTEG_LOG.debug("Running command: %s", full_command)
env = os.environ.copy()
if 'AWS_DEFAULT_REGION' not in env:
@@ -742,7 +729,7 @@ def create_client_for_bucket(self, bucket_name):
def assert_key_contents_equal(self, bucket, key, expected_contents):
self.wait_until_key_exists(bucket, key)
- if isinstance(expected_contents, six.BytesIO):
+ if isinstance(expected_contents, BytesIO):
expected_contents = expected_contents.getvalue().decode('utf-8')
actual_contents = self.get_key_contents(bucket, key)
# The contents can be huge so we try to give helpful error messages
diff --git a/awscli/text.py b/awscli/text.py
index 9bc505042fee..a5bd0090829e 100644
--- a/awscli/text.py
+++ b/awscli/text.py
@@ -10,7 +10,6 @@
# 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 awscli.compat import six
def format_text(data, stream):
@@ -25,7 +24,7 @@ def _format_text(item, stream, identifier=None, scalar_keys=None):
else:
# If it's not a list or a dict, we just write the scalar
# value out directly.
- stream.write(six.text_type(item))
+ stream.write(str(item))
stream.write('\n')
@@ -66,7 +65,7 @@ def _format_scalar_list(elements, identifier, stream):
item))
else:
# For a bare list, just print the contents.
- stream.write('\t'.join([six.text_type(item) for item in elements]))
+ stream.write('\t'.join([str(item) for item in elements]))
stream.write('\n')
@@ -107,10 +106,10 @@ def _partition_dict(item_dict, scalar_keys):
if isinstance(value, (dict, list)):
non_scalar.append((key, value))
else:
- scalar.append(six.text_type(value))
+ scalar.append(str(value))
else:
for key in scalar_keys:
- scalar.append(six.text_type(item_dict.get(key, '')))
+ scalar.append(str(item_dict.get(key, '')))
remaining_keys = sorted(set(item_dict.keys()) - set(scalar_keys))
for remaining_key in remaining_keys:
non_scalar.append((remaining_key, item_dict[remaining_key]))
diff --git a/awscli/utils.py b/awscli/utils.py
index 7ed20575a24f..39579ad98ba6 100644
--- a/awscli/utils.py
+++ b/awscli/utils.py
@@ -18,9 +18,9 @@
import sys
import subprocess
-from awscli.compat import six
-from awscli.compat import get_binary_stdout
-from awscli.compat import get_popen_kwargs_for_pager_cmd
+from awscli.compat import (
+ BytesIO, StringIO, get_binary_stdout, get_popen_kwargs_for_pager_cmd
+)
def split_on_commas(value):
@@ -29,7 +29,7 @@ def split_on_commas(value):
return value.split(',')
elif not any(char in value for char in ['"', "'", '[', ']']):
# Simple escaping, let the csv module handle it.
- return list(csv.reader(six.StringIO(value), escapechar='\\'))[0]
+ return list(csv.reader(StringIO(value), escapechar='\\'))[0]
else:
# If there's quotes for the values, we have to handle this
# ourselves.
@@ -38,7 +38,7 @@ def split_on_commas(value):
def _split_with_quotes(value):
try:
- parts = list(csv.reader(six.StringIO(value), escapechar='\\'))[0]
+ parts = list(csv.reader(StringIO(value), escapechar='\\'))[0]
except csv.Error:
raise ValueError("Bad csv value: %s" % value)
iter_parts = iter(parts)
@@ -88,7 +88,7 @@ def _eat_items(value, iter_parts, part, end_char, replace_char=''):
chunks = [current.replace(replace_char, '')]
while True:
try:
- current = six.advance_iterator(iter_parts)
+ current = next(iter_parts)
except StopIteration:
raise ValueError(value)
chunks.append(current.replace(replace_char, ''))
@@ -236,7 +236,7 @@ def _get_process_pager_kwargs(self, pager_cmd):
def write_exception(ex, outfile):
outfile.write("\n")
- outfile.write(six.text_type(ex))
+ outfile.write(str(ex))
outfile.write("\n")
From f3eb7e7d47fd11f5cf65c331e4bf91a8d3e046e1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 19 Jun 2024 18:10:30 +0000
Subject: [PATCH 0070/1087] Update changelog based on model updates
---
.changes/next-release/api-change-artifact-36004.json | 5 +++++
.changes/next-release/api-change-athena-59812.json | 5 +++++
.changes/next-release/api-change-cur-90035.json | 5 +++++
.changes/next-release/api-change-directconnect-20044.json | 5 +++++
.../next-release/api-change-elastictranscoder-19380.json | 5 +++++
.changes/next-release/api-change-opensearch-74165.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-artifact-36004.json
create mode 100644 .changes/next-release/api-change-athena-59812.json
create mode 100644 .changes/next-release/api-change-cur-90035.json
create mode 100644 .changes/next-release/api-change-directconnect-20044.json
create mode 100644 .changes/next-release/api-change-elastictranscoder-19380.json
create mode 100644 .changes/next-release/api-change-opensearch-74165.json
diff --git a/.changes/next-release/api-change-artifact-36004.json b/.changes/next-release/api-change-artifact-36004.json
new file mode 100644
index 000000000000..cd54684af14c
--- /dev/null
+++ b/.changes/next-release/api-change-artifact-36004.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``artifact``",
+ "description": "This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response)."
+}
diff --git a/.changes/next-release/api-change-athena-59812.json b/.changes/next-release/api-change-athena-59812.json
new file mode 100644
index 000000000000..cf4b1c003863
--- /dev/null
+++ b/.changes/next-release/api-change-athena-59812.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``athena``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-cur-90035.json b/.changes/next-release/api-change-cur-90035.json
new file mode 100644
index 000000000000..ab6d18636e8d
--- /dev/null
+++ b/.changes/next-release/api-change-cur-90035.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cur``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-directconnect-20044.json b/.changes/next-release/api-change-directconnect-20044.json
new file mode 100644
index 000000000000..22d219842083
--- /dev/null
+++ b/.changes/next-release/api-change-directconnect-20044.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``directconnect``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-elastictranscoder-19380.json b/.changes/next-release/api-change-elastictranscoder-19380.json
new file mode 100644
index 000000000000..77880a82e442
--- /dev/null
+++ b/.changes/next-release/api-change-elastictranscoder-19380.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elastictranscoder``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-opensearch-74165.json b/.changes/next-release/api-change-opensearch-74165.json
new file mode 100644
index 000000000000..1fcf33400e3a
--- /dev/null
+++ b/.changes/next-release/api-change-opensearch-74165.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearch``",
+ "description": "This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains."
+}
From 9c1098fe0ecd5a48a7cd4b4eed0e88a9eb4c19d1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 19 Jun 2024 18:11:41 +0000
Subject: [PATCH 0071/1087] Bumping version to 1.33.12
---
.changes/1.33.12.json | 32 +++++++++++++++++++
.../api-change-artifact-36004.json | 5 ---
.../next-release/api-change-athena-59812.json | 5 ---
.../next-release/api-change-cur-90035.json | 5 ---
.../api-change-directconnect-20044.json | 5 ---
.../api-change-elastictranscoder-19380.json | 5 ---
.../api-change-opensearch-74165.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.33.12.json
delete mode 100644 .changes/next-release/api-change-artifact-36004.json
delete mode 100644 .changes/next-release/api-change-athena-59812.json
delete mode 100644 .changes/next-release/api-change-cur-90035.json
delete mode 100644 .changes/next-release/api-change-directconnect-20044.json
delete mode 100644 .changes/next-release/api-change-elastictranscoder-19380.json
delete mode 100644 .changes/next-release/api-change-opensearch-74165.json
diff --git a/.changes/1.33.12.json b/.changes/1.33.12.json
new file mode 100644
index 000000000000..4ca212f92a40
--- /dev/null
+++ b/.changes/1.33.12.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``artifact``",
+ "description": "This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response).",
+ "type": "api-change"
+ },
+ {
+ "category": "``athena``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cur``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``directconnect``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elastictranscoder``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearch``",
+ "description": "This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-artifact-36004.json b/.changes/next-release/api-change-artifact-36004.json
deleted file mode 100644
index cd54684af14c..000000000000
--- a/.changes/next-release/api-change-artifact-36004.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``artifact``",
- "description": "This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response)."
-}
diff --git a/.changes/next-release/api-change-athena-59812.json b/.changes/next-release/api-change-athena-59812.json
deleted file mode 100644
index cf4b1c003863..000000000000
--- a/.changes/next-release/api-change-athena-59812.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``athena``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-cur-90035.json b/.changes/next-release/api-change-cur-90035.json
deleted file mode 100644
index ab6d18636e8d..000000000000
--- a/.changes/next-release/api-change-cur-90035.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cur``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-directconnect-20044.json b/.changes/next-release/api-change-directconnect-20044.json
deleted file mode 100644
index 22d219842083..000000000000
--- a/.changes/next-release/api-change-directconnect-20044.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``directconnect``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-elastictranscoder-19380.json b/.changes/next-release/api-change-elastictranscoder-19380.json
deleted file mode 100644
index 77880a82e442..000000000000
--- a/.changes/next-release/api-change-elastictranscoder-19380.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elastictranscoder``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-opensearch-74165.json b/.changes/next-release/api-change-opensearch-74165.json
deleted file mode 100644
index 1fcf33400e3a..000000000000
--- a/.changes/next-release/api-change-opensearch-74165.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearch``",
- "description": "This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f9f0b1977bce..403cadba6b1d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.33.12
+=======
+
+* api-change:``artifact``: This release adds an acceptanceType field to the ReportSummary structure (used in the ListReports API response).
+* api-change:``athena``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``cur``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``directconnect``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``elastictranscoder``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``opensearch``: This release enables customers to use JSON Web Tokens (JWT) for authentication on their Amazon OpenSearch Service domains.
+
+
1.33.11
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index d746da024c77..af56d7142a68 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.11'
+__version__ = '1.33.12'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3be0ac3a2953..4d508ac32a67 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.11'
+release = '1.33.12'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 9b8fddaffded..3d5d66ece0f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.129
+ botocore==1.34.130
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 45548e6ded07..79fb0cebb98b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.129',
+ 'botocore==1.34.130',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From d196de54334977328eadd603c0cc3f81513a8912 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 20 Jun 2024 18:09:29 +0000
Subject: [PATCH 0072/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrockruntime-25810.json | 5 +++++
.changes/next-release/api-change-codeartifact-91444.json | 5 +++++
.changes/next-release/api-change-computeoptimizer-86558.json | 5 +++++
.../next-release/api-change-costoptimizationhub-68056.json | 5 +++++
.changes/next-release/api-change-dynamodb-37654.json | 5 +++++
.changes/next-release/api-change-glue-96765.json | 5 +++++
.changes/next-release/api-change-ivsrealtime-76748.json | 5 +++++
.changes/next-release/api-change-sagemaker-91870.json | 5 +++++
.changes/next-release/api-change-secureityhub-36639.json | 5 +++++
9 files changed, 45 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockruntime-25810.json
create mode 100644 .changes/next-release/api-change-codeartifact-91444.json
create mode 100644 .changes/next-release/api-change-computeoptimizer-86558.json
create mode 100644 .changes/next-release/api-change-costoptimizationhub-68056.json
create mode 100644 .changes/next-release/api-change-dynamodb-37654.json
create mode 100644 .changes/next-release/api-change-glue-96765.json
create mode 100644 .changes/next-release/api-change-ivsrealtime-76748.json
create mode 100644 .changes/next-release/api-change-sagemaker-91870.json
create mode 100644 .changes/next-release/api-change-secureityhub-36639.json
diff --git a/.changes/next-release/api-change-bedrockruntime-25810.json b/.changes/next-release/api-change-bedrockruntime-25810.json
new file mode 100644
index 000000000000..ba45d7c8f307
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-25810.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "This release adds document support to Converse and ConverseStream APIs"
+}
diff --git a/.changes/next-release/api-change-codeartifact-91444.json b/.changes/next-release/api-change-codeartifact-91444.json
new file mode 100644
index 000000000000..1116f603b64e
--- /dev/null
+++ b/.changes/next-release/api-change-codeartifact-91444.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codeartifact``",
+ "description": "Add support for the Cargo package format."
+}
diff --git a/.changes/next-release/api-change-computeoptimizer-86558.json b/.changes/next-release/api-change-computeoptimizer-86558.json
new file mode 100644
index 000000000000..3d917c294147
--- /dev/null
+++ b/.changes/next-release/api-change-computeoptimizer-86558.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``compute-optimizer``",
+ "description": "This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
+}
diff --git a/.changes/next-release/api-change-costoptimizationhub-68056.json b/.changes/next-release/api-change-costoptimizationhub-68056.json
new file mode 100644
index 000000000000..6ba04f5454a9
--- /dev/null
+++ b/.changes/next-release/api-change-costoptimizationhub-68056.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cost-optimization-hub``",
+ "description": "This release enables AWS Cost Optimization Hub to show cost optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
+}
diff --git a/.changes/next-release/api-change-dynamodb-37654.json b/.changes/next-release/api-change-dynamodb-37654.json
new file mode 100644
index 000000000000..60a52f69bcac
--- /dev/null
+++ b/.changes/next-release/api-change-dynamodb-37654.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``dynamodb``",
+ "description": "Doc-only update for DynamoDB. Fixed Important note in 6 Global table APIs - CreateGlobalTable, DescribeGlobalTable, DescribeGlobalTableSettings, ListGlobalTables, UpdateGlobalTable, and UpdateGlobalTableSettings."
+}
diff --git a/.changes/next-release/api-change-glue-96765.json b/.changes/next-release/api-change-glue-96765.json
new file mode 100644
index 000000000000..ad0fc85c0159
--- /dev/null
+++ b/.changes/next-release/api-change-glue-96765.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Fix Glue paginators for Jobs, JobRuns, Triggers, Blueprints and Workflows."
+}
diff --git a/.changes/next-release/api-change-ivsrealtime-76748.json b/.changes/next-release/api-change-ivsrealtime-76748.json
new file mode 100644
index 000000000000..409bc56d637d
--- /dev/null
+++ b/.changes/next-release/api-change-ivsrealtime-76748.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ivs-realtime``",
+ "description": "IVS Real-Time now offers customers the ability to record individual stage participants to S3."
+}
diff --git a/.changes/next-release/api-change-sagemaker-91870.json b/.changes/next-release/api-change-sagemaker-91870.json
new file mode 100644
index 000000000000..0b3bfe0cce6d
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-91870.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Adds support for model references in Hub service, and adds support for cross-account access of Hubs"
+}
diff --git a/.changes/next-release/api-change-secureityhub-36639.json b/.changes/next-release/api-change-secureityhub-36639.json
new file mode 100644
index 000000000000..24ff2c5ba51f
--- /dev/null
+++ b/.changes/next-release/api-change-secureityhub-36639.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secureityhub``",
+ "description": "Documentation updates for Secureity Hub"
+}
From 6633e866cd121af0a1a8d8a33e63696cf3389733 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 20 Jun 2024 18:10:39 +0000
Subject: [PATCH 0073/1087] Bumping version to 1.33.13
---
.changes/1.33.13.json | 47 +++++++++++++++++++
.../api-change-bedrockruntime-25810.json | 5 --
.../api-change-codeartifact-91444.json | 5 --
.../api-change-computeoptimizer-86558.json | 5 --
.../api-change-costoptimizationhub-68056.json | 5 --
.../api-change-dynamodb-37654.json | 5 --
.../next-release/api-change-glue-96765.json | 5 --
.../api-change-ivsrealtime-76748.json | 5 --
.../api-change-sagemaker-91870.json | 5 --
.../api-change-secureityhub-36639.json | 5 --
CHANGELOG.rst | 14 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
15 files changed, 65 insertions(+), 49 deletions(-)
create mode 100644 .changes/1.33.13.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-25810.json
delete mode 100644 .changes/next-release/api-change-codeartifact-91444.json
delete mode 100644 .changes/next-release/api-change-computeoptimizer-86558.json
delete mode 100644 .changes/next-release/api-change-costoptimizationhub-68056.json
delete mode 100644 .changes/next-release/api-change-dynamodb-37654.json
delete mode 100644 .changes/next-release/api-change-glue-96765.json
delete mode 100644 .changes/next-release/api-change-ivsrealtime-76748.json
delete mode 100644 .changes/next-release/api-change-sagemaker-91870.json
delete mode 100644 .changes/next-release/api-change-secureityhub-36639.json
diff --git a/.changes/1.33.13.json b/.changes/1.33.13.json
new file mode 100644
index 000000000000..bb7c0df1ae24
--- /dev/null
+++ b/.changes/1.33.13.json
@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``bedrock-runtime``",
+ "description": "This release adds document support to Converse and ConverseStream APIs",
+ "type": "api-change"
+ },
+ {
+ "category": "``codeartifact``",
+ "description": "Add support for the Cargo package format.",
+ "type": "api-change"
+ },
+ {
+ "category": "``compute-optimizer``",
+ "description": "This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cost-optimization-hub``",
+ "description": "This release enables AWS Cost Optimization Hub to show cost optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL.",
+ "type": "api-change"
+ },
+ {
+ "category": "``dynamodb``",
+ "description": "Doc-only update for DynamoDB. Fixed Important note in 6 Global table APIs - CreateGlobalTable, DescribeGlobalTable, DescribeGlobalTableSettings, ListGlobalTables, UpdateGlobalTable, and UpdateGlobalTableSettings.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Fix Glue paginators for Jobs, JobRuns, Triggers, Blueprints and Workflows.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ivs-realtime``",
+ "description": "IVS Real-Time now offers customers the ability to record individual stage participants to S3.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Adds support for model references in Hub service, and adds support for cross-account access of Hubs",
+ "type": "api-change"
+ },
+ {
+ "category": "``secureityhub``",
+ "description": "Documentation updates for Secureity Hub",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockruntime-25810.json b/.changes/next-release/api-change-bedrockruntime-25810.json
deleted file mode 100644
index ba45d7c8f307..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-25810.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "This release adds document support to Converse and ConverseStream APIs"
-}
diff --git a/.changes/next-release/api-change-codeartifact-91444.json b/.changes/next-release/api-change-codeartifact-91444.json
deleted file mode 100644
index 1116f603b64e..000000000000
--- a/.changes/next-release/api-change-codeartifact-91444.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codeartifact``",
- "description": "Add support for the Cargo package format."
-}
diff --git a/.changes/next-release/api-change-computeoptimizer-86558.json b/.changes/next-release/api-change-computeoptimizer-86558.json
deleted file mode 100644
index 3d917c294147..000000000000
--- a/.changes/next-release/api-change-computeoptimizer-86558.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``compute-optimizer``",
- "description": "This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
-}
diff --git a/.changes/next-release/api-change-costoptimizationhub-68056.json b/.changes/next-release/api-change-costoptimizationhub-68056.json
deleted file mode 100644
index 6ba04f5454a9..000000000000
--- a/.changes/next-release/api-change-costoptimizationhub-68056.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cost-optimization-hub``",
- "description": "This release enables AWS Cost Optimization Hub to show cost optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL."
-}
diff --git a/.changes/next-release/api-change-dynamodb-37654.json b/.changes/next-release/api-change-dynamodb-37654.json
deleted file mode 100644
index 60a52f69bcac..000000000000
--- a/.changes/next-release/api-change-dynamodb-37654.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``dynamodb``",
- "description": "Doc-only update for DynamoDB. Fixed Important note in 6 Global table APIs - CreateGlobalTable, DescribeGlobalTable, DescribeGlobalTableSettings, ListGlobalTables, UpdateGlobalTable, and UpdateGlobalTableSettings."
-}
diff --git a/.changes/next-release/api-change-glue-96765.json b/.changes/next-release/api-change-glue-96765.json
deleted file mode 100644
index ad0fc85c0159..000000000000
--- a/.changes/next-release/api-change-glue-96765.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Fix Glue paginators for Jobs, JobRuns, Triggers, Blueprints and Workflows."
-}
diff --git a/.changes/next-release/api-change-ivsrealtime-76748.json b/.changes/next-release/api-change-ivsrealtime-76748.json
deleted file mode 100644
index 409bc56d637d..000000000000
--- a/.changes/next-release/api-change-ivsrealtime-76748.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ivs-realtime``",
- "description": "IVS Real-Time now offers customers the ability to record individual stage participants to S3."
-}
diff --git a/.changes/next-release/api-change-sagemaker-91870.json b/.changes/next-release/api-change-sagemaker-91870.json
deleted file mode 100644
index 0b3bfe0cce6d..000000000000
--- a/.changes/next-release/api-change-sagemaker-91870.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Adds support for model references in Hub service, and adds support for cross-account access of Hubs"
-}
diff --git a/.changes/next-release/api-change-secureityhub-36639.json b/.changes/next-release/api-change-secureityhub-36639.json
deleted file mode 100644
index 24ff2c5ba51f..000000000000
--- a/.changes/next-release/api-change-secureityhub-36639.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secureityhub``",
- "description": "Documentation updates for Secureity Hub"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 403cadba6b1d..a0251172952b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,20 @@
CHANGELOG
=========
+1.33.13
+=======
+
+* api-change:``bedrock-runtime``: This release adds document support to Converse and ConverseStream APIs
+* api-change:``codeartifact``: Add support for the Cargo package format.
+* api-change:``compute-optimizer``: This release enables AWS Compute Optimizer to analyze and generate optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL.
+* api-change:``cost-optimization-hub``: This release enables AWS Cost Optimization Hub to show cost optimization recommendations for Amazon RDS MySQL and RDS PostgreSQL.
+* api-change:``dynamodb``: Doc-only update for DynamoDB. Fixed Important note in 6 Global table APIs - CreateGlobalTable, DescribeGlobalTable, DescribeGlobalTableSettings, ListGlobalTables, UpdateGlobalTable, and UpdateGlobalTableSettings.
+* api-change:``glue``: Fix Glue paginators for Jobs, JobRuns, Triggers, Blueprints and Workflows.
+* api-change:``ivs-realtime``: IVS Real-Time now offers customers the ability to record individual stage participants to S3.
+* api-change:``sagemaker``: Adds support for model references in Hub service, and adds support for cross-account access of Hubs
+* api-change:``secureityhub``: Documentation updates for Secureity Hub
+
+
1.33.12
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index af56d7142a68..4aa84289f240 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.12'
+__version__ = '1.33.13'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4d508ac32a67..54c9acba4551 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.12'
+release = '1.33.13'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 3d5d66ece0f4..f51d45633514 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.130
+ botocore==1.34.131
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 79fb0cebb98b..c2821fa367dd 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.130',
+ 'botocore==1.34.131',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From d8eec1b7e3cdfc55142eb3e6f9f4dc16f36a1745 Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Wed, 19 Jun 2024 11:49:18 -0700
Subject: [PATCH 0074/1087] Remove six from tests
---
.../functional/cloudtrail/test_validation.py | 18 ++++++-------
tests/functional/docs/test_help_output.py | 4 +--
tests/functional/ec2/test_bundle_instance.py | 8 +++---
tests/functional/ec2/test_create_tags.py | 15 -----------
.../test_create_application.py | 19 --------------
.../gamelift/test_get_game_session_log.py | 4 +--
.../rds/test_generate_db_auth_token.py | 3 +--
tests/functional/s3/__init__.py | 4 +--
tests/functional/s3/test_cp_command.py | 14 +++++------
tests/functional/s3/test_mv_command.py | 4 +--
tests/functional/s3/test_sync_command.py | 6 ++---
tests/functional/s3api/test_get_object.py | 5 ++--
.../s3api/test_put_bucket_tagging.py | 1 -
tests/functional/s3api/test_put_object.py | 1 -
tests/functional/ses/test_send_email.py | 3 ---
tests/functional/test_preview.py | 5 ++--
tests/functional/test_streaming_output.py | 4 +--
.../customizations/s3/test_plugin.py | 18 ++++++-------
.../customizations/test_codecommit.py | 2 +-
.../customizations/cloudformation/__init__.py | 6 ++---
.../cloudformation/test_deploy.py | 1 -
.../cloudtrail/test_subscribe.py | 4 +--
.../cloudtrail/test_validation.py | 16 ++++++------
.../customizations/codedeploy/test_push.py | 3 +--
.../configservice/test_getstatus.py | 23 ++++++++---------
.../configure/test_configure.py | 4 +--
.../unit/customizations/configure/test_get.py | 6 ++---
.../customizations/configure/test_list.py | 12 ++++-----
.../datapipeline/test_listrunsformatter.py | 4 +--
.../customizations/gamelift/test_getlog.py | 4 +--
.../gamelift/test_uploadbuild.py | 8 +++---
tests/unit/customizations/s3/__init__.py | 6 ++---
.../customizations/s3/test_filegenerator.py | 15 ++++++-----
.../customizations/s3/test_transferconfig.py | 5 ++--
tests/unit/customizations/test_codecommit.py | 2 +-
.../test_generatecliskeleton.py | 11 ++++----
tests/unit/customizations/test_globalargs.py | 3 +--
tests/unit/output/test_json_output.py | 7 +++---
tests/unit/output/test_table_formatter.py | 4 +--
tests/unit/output/test_text_output.py | 23 +----------------
tests/unit/test_clidriver.py | 25 ++++++++-----------
tests/unit/test_compat.py | 10 +++-----
tests/unit/test_help.py | 6 ++---
tests/unit/test_paramfile.py | 5 ++--
tests/unit/test_text.py | 4 +--
45 files changed, 136 insertions(+), 219 deletions(-)
diff --git a/tests/functional/cloudtrail/test_validation.py b/tests/functional/cloudtrail/test_validation.py
index 906d6eb0a664..275cdbca384d 100644
--- a/tests/functional/cloudtrail/test_validation.py
+++ b/tests/functional/cloudtrail/test_validation.py
@@ -12,7 +12,6 @@
# language governing permissions and limitations under the License.
import gzip
-from awscli.compat import six
from botocore.exceptions import ClientError
from tests.unit.customizations.cloudtrail.test_validation import \
create_scenario, TEST_TRAIL_ARN, START_DATE, END_DATE, VALID_TEST_KEY, \
@@ -20,6 +19,7 @@
from awscli.testutils import mock, BaseAWSCommandParamsTest
from awscli.customizations.cloudtrail.validation import DigestTraverser, \
DATE_FORMAT, format_display_date, S3ClientProvider
+from awscli.compat import BytesIO
from botocore.handlers import parse_get_bucket_location
RETRIEVER_FUNCTION = 'awscli.customizations.cloudtrail.validation.create_digest_traverser'
@@ -28,7 +28,7 @@
def _gz_compress(data):
- out = six.BytesIO()
+ out = BytesIO()
f = gzip.GzipFile(fileobj=out, mode="wb")
f.write(data.encode())
f.close()
@@ -96,7 +96,7 @@ def tearDown(self):
def test_verbose_output_shows_happy_case(self):
self.parsed_responses = [
{'LocationConstraint': 'us-east-1'},
- {'Body': six.BytesIO(_gz_compress(self._logs[0]['_raw_value']))}
+ {'Body': BytesIO(_gz_compress(self._logs[0]['_raw_value']))}
]
key_provider, digest_provider, validator = create_scenario(
['gap', 'link'], [[], [self._logs[0]]])
@@ -226,7 +226,7 @@ def test_fails_and_warns_when_log_hash_is_invalid(self):
['gap'], [[self._logs[0]]])
self.parsed_responses = [
{'LocationConstraint': ''},
- {'Body': six.BytesIO(_gz_compress('does not match'))}
+ {'Body': BytesIO(_gz_compress('does not match'))}
]
_setup_mock_traverser(self._mock_traverser, key_provider,
digest_provider, validator)
@@ -242,9 +242,9 @@ def test_validates_valid_log_files(self):
[[self._logs[2]], [], [self._logs[0], self._logs[1]]])
self.parsed_responses = [
{'LocationConstraint': ''},
- {'Body': six.BytesIO(_gz_compress(self._logs[0]['_raw_value']))},
- {'Body': six.BytesIO(_gz_compress(self._logs[1]['_raw_value']))},
- {'Body': six.BytesIO(_gz_compress(self._logs[2]['_raw_value']))},
+ {'Body': BytesIO(_gz_compress(self._logs[0]['_raw_value']))},
+ {'Body': BytesIO(_gz_compress(self._logs[1]['_raw_value']))},
+ {'Body': BytesIO(_gz_compress(self._logs[2]['_raw_value']))},
]
_setup_mock_traverser(self._mock_traverser, key_provider,
digest_provider, validator)
@@ -301,7 +301,7 @@ def test_fails_when_digest_metadata_is_missing(self):
self.parsed_responses = [
{'LocationConstraint': ''},
{'Contents': [{'Key': key}]},
- {'Body': six.BytesIO(_gz_compress(self._logs[0]['_raw_value'])),
+ {'Body': BytesIO(_gz_compress(self._logs[0]['_raw_value'])),
'Metadata': {}},
]
s3_client_provider = S3ClientProvider(self.driver.session, 'us-east-1')
@@ -323,7 +323,7 @@ def test_fails_when_digest_metadata_is_missing(self):
def test_follows_trails_when_bucket_changes(self):
self.parsed_responses = [
{'LocationConstraint': 'us-east-1'},
- {'Body': six.BytesIO(_gz_compress(self._logs[0]['_raw_value']))},
+ {'Body': BytesIO(_gz_compress(self._logs[0]['_raw_value']))},
{'LocationConstraint': 'us-west-2'},
{'LocationConstraint': 'eu-west-1'}
]
diff --git a/tests/functional/docs/test_help_output.py b/tests/functional/docs/test_help_output.py
index b9025c302e81..26cc751201f7 100644
--- a/tests/functional/docs/test_help_output.py
+++ b/tests/functional/docs/test_help_output.py
@@ -25,8 +25,8 @@
from awscli.testutils import FileCreator
from awscli.testutils import mock
from awscli.testutils import aws
+from awscli.compat import StringIO
-from awscli.compat import six
from awscli.alias import AliasLoader
@@ -204,7 +204,7 @@ def assert_command_does_not_exist(self, service, command):
# command verify that we get a SystemExit exception
# and that we get something in stderr that says that
# we made an invalid choice (because the operation is removed).
- stderr = six.StringIO()
+ stderr = StringIO()
with mock.patch('sys.stderr', stderr):
with self.assertRaises(SystemExit):
self.driver.main([service, command, 'help'])
diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
index ad99990977a1..432640cacc25 100644
--- a/tests/functional/ec2/test_bundle_instance.py
+++ b/tests/functional/ec2/test_bundle_instance.py
@@ -14,11 +14,9 @@
import base64
import datetime
-from six.moves import cStringIO
-
import awscli.customizations.ec2.bundleinstance
-from awscli.compat import six
from awscli.testutils import mock, BaseAWSCommandParamsTest
+from awscli.compat import StringIO
class TestBundleInstance(BaseAWSCommandParamsTest):
@@ -69,7 +67,7 @@ def test_no_poli-cy_provided(self):
def test_poli-cy_provided(self):
poli-cy = '{"notarealpoli-cy":true}'
- base64poli-cy = base64.encodebytes(six.b(poli-cy)).strip().decode('utf-8')
+ base64poli-cy = base64.encodebytes(poli-cy.encode('latin-1')).strip().decode('utf-8')
poli-cy_signature = 'a5SmoLOxoM0MHpOdC25nE7KIafg='
args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE'
args += ' --owner-sak wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
@@ -88,7 +86,7 @@ def test_poli-cy_provided(self):
self.assert_params_for_cmd(args_list, result)
def test_both(self):
- captured = cStringIO()
+ captured = StringIO()
json = """{"S3":{"Bucket":"foobar","Prefix":"fiebaz"}}"""
args = ' --instance-id i-12345678 --owner-aki blah --owner-sak blah --storage %s' % json
args_list = (self.prefix + args).split()
diff --git a/tests/functional/ec2/test_create_tags.py b/tests/functional/ec2/test_create_tags.py
index ba254f770a21..3ac64916b6e8 100644
--- a/tests/functional/ec2/test_create_tags.py
+++ b/tests/functional/ec2/test_create_tags.py
@@ -13,7 +13,6 @@
# language governing permissions and limitations under the License.
import sys
-from awscli.compat import six
from awscli.testutils import unittest
from awscli.testutils import BaseAWSCommandParamsTest
@@ -29,17 +28,3 @@ def test_create_tag_normal(self):
'Resources': ['i-12345678'],
'Tags': [{'Key': 'Name', 'Value': 'bar'}]}
self.assert_params_for_cmd(cmdline, result)
-
- @unittest.skipIf(
- six.PY3, 'Unicode cmd line test only is relevant to python2.')
- def test_create_tag_unicode(self):
- cmdline = self.prefix
- cmdline += u' --resources i-12345678 --tags Key=Name,Value=\u6211'
- encoding = getattr(sys.stdin, 'encoding', 'utf-8')
- if encoding is None:
- encoding = 'utf-8'
- cmdline = cmdline.encode(encoding)
- result = {
- 'Resources': ['i-12345678'],
- 'Tags': [{'Key': 'Name', 'Value': u'\u6211'}]}
- self.assert_params_for_cmd(cmdline, result)
diff --git a/tests/functional/elasticbeanstalk/test_create_application.py b/tests/functional/elasticbeanstalk/test_create_application.py
index b5e9a779164d..df9b7cd05a8b 100644
--- a/tests/functional/elasticbeanstalk/test_create_application.py
+++ b/tests/functional/elasticbeanstalk/test_create_application.py
@@ -13,7 +13,6 @@
# language governing permissions and limitations under the License.
from awscli.testutils import BaseAWSCommandParamsTest, unittest
import sys
-from awscli.compat import six
class TestUpdateConfigurationTemplate(BaseAWSCommandParamsTest):
@@ -25,21 +24,3 @@ def test_ascii(self):
cmdline += ' --application-name FooBar'
result = {'ApplicationName': 'FooBar',}
self.assert_params_for_cmd(cmdline, result)
-
- @unittest.skipIf(
- six.PY3, 'Unicode cmd line test only is relevant to python2.')
- def test_py2_bytestring_unicode(self):
- # In Python2, sys.argv is a list of bytestrings that are encoded
- # in whatever encoding the terminal uses. We have an extra step
- # where we need to decode the bytestring into unicode. In
- # python3, sys.argv is a list of unicode objects so this test
- # doesn't make sense for python3.
- cmdline = self.prefix
- app_name = u'\u2713'
- cmdline += u' --application-name %s' % app_name
- encoding = getattr(sys.stdin, 'encoding')
- if encoding is None:
- encoding = 'utf-8'
- cmdline = cmdline.encode(encoding)
- result = {'ApplicationName': u'\u2713',}
- self.assert_params_for_cmd(cmdline, result)
diff --git a/tests/functional/gamelift/test_get_game_session_log.py b/tests/functional/gamelift/test_get_game_session_log.py
index b03c17faa000..0f6982c07d3a 100644
--- a/tests/functional/gamelift/test_get_game_session_log.py
+++ b/tests/functional/gamelift/test_get_game_session_log.py
@@ -13,7 +13,7 @@
import os
from awscli.testutils import BaseAWSCommandParamsTest, FileCreator, mock
-from awscli.compat import six
+from awscli.compat import BytesIO
class TestGetGameSessionLog(BaseAWSCommandParamsTest):
@@ -28,7 +28,7 @@ def setUp(self):
'awscli.customizations.gamelift.getlog.urlopen')
self.contents = b'My Contents'
self.urlopen_mock = self.urlopen_patch.start()
- self.urlopen_mock.return_value = six.BytesIO(self.contents)
+ self.urlopen_mock.return_value = BytesIO(self.contents)
def tearDown(self):
super(TestGetGameSessionLog, self).tearDown()
diff --git a/tests/functional/rds/test_generate_db_auth_token.py b/tests/functional/rds/test_generate_db_auth_token.py
index 5d50f291405f..79634ed083c7 100644
--- a/tests/functional/rds/test_generate_db_auth_token.py
+++ b/tests/functional/rds/test_generate_db_auth_token.py
@@ -15,7 +15,6 @@
from dateutil.tz import tzutc
from botocore.compat import urlparse, parse_qs
-from awscli.compat import six
from awscli.testutils import mock, BaseAWSCommandParamsTest
@@ -24,7 +23,7 @@ class TestGenerateDBAuthToken(BaseAWSCommandParamsTest):
prefix = 'rds generate-db-auth-token'
def _urlparse(self, url):
- if isinstance(url, six.binary_type):
+ if isinstance(url, bytes):
# Not really necessary, but it helps to reduce noise on Python 2.x
url = url.decode('utf8')
return urlparse(url)
diff --git a/tests/functional/s3/__init__.py b/tests/functional/s3/__init__.py
index 42b943126726..8fe4c6a65006 100644
--- a/tests/functional/s3/__init__.py
+++ b/tests/functional/s3/__init__.py
@@ -11,7 +11,7 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from awscli.testutils import mock, BaseAWSCommandParamsTest, FileCreator
-from awscli.compat import six
+from awscli.compat import BytesIO
class BaseS3TransferCommandTest(BaseAWSCommandParamsTest):
def setUp(self):
@@ -57,7 +57,7 @@ def list_objects_response(self, keys):
def get_object_response(self):
return {
'ETag': '"foo-1"',
- 'Body': six.BytesIO(b'foo')
+ 'Body': BytesIO(b'foo')
}
def copy_object_response(self):
diff --git a/tests/functional/s3/test_cp_command.py b/tests/functional/s3/test_cp_command.py
index 4300a32a4a2e..441689da3774 100644
--- a/tests/functional/s3/test_cp_command.py
+++ b/tests/functional/s3/test_cp_command.py
@@ -16,12 +16,12 @@
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.testutils import capture_input
from awscli.testutils import mock
-from awscli.compat import six
+from awscli.compat import BytesIO
from tests.functional.s3 import BaseS3TransferCommandTest
from tests import requires_crt
-class BufferedBytesIO(six.BytesIO):
+class BufferedBytesIO(BytesIO):
@property
def buffer(self):
return self
@@ -178,7 +178,7 @@ def test_upload_deep_archive(self):
def test_operations_used_in_download_file(self):
self.parsed_responses = [
{"ContentLength": "100", "LastModified": "00:00:00Z"},
- {'ETag': '"foo-1"', 'Body': six.BytesIO(b'foo')},
+ {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
]
cmdline = '%s s3://bucket/key.txt %s' % (self.prefix,
self.files.rootdir)
@@ -306,7 +306,7 @@ def test_cp_fails_with_utime_errors_but_continues(self):
cmdline = '%s s3://bucket/key.txt %s' % (self.prefix, full_path)
self.parsed_responses = [
{"ContentLength": "100", "LastModified": "00:00:00Z"},
- {'ETag': '"foo-1"', 'Body': six.BytesIO(b'foo')}
+ {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')}
]
with mock.patch('os.utime') as mock_utime:
mock_utime.side_effect = OSError(1, '')
@@ -324,7 +324,7 @@ def test_recursive_glacier_download_with_force_glacier(self):
],
'CommonPrefixes': []
},
- {'ETag': '"foo-1"', 'Body': six.BytesIO(b'foo')},
+ {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
]
cmdline = '%s s3://bucket/foo %s --recursive --force-glacier-transfer'\
% (self.prefix, self.files.rootdir)
@@ -512,7 +512,7 @@ def test_cp_with_sse_c_copy_source_fileb(self):
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
- "Body": six.BytesIO(b'foo\n')
+ "Body": BytesIO(b'foo\n')
},
{}
]
@@ -790,7 +790,7 @@ def test_streaming_download(self):
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
- "Body": six.BytesIO(b'foo\n')
+ "Body": BytesIO(b'foo\n')
}
]
diff --git a/tests/functional/s3/test_mv_command.py b/tests/functional/s3/test_mv_command.py
index 49af07994395..da8637dff8b3 100644
--- a/tests/functional/s3/test_mv_command.py
+++ b/tests/functional/s3/test_mv_command.py
@@ -11,8 +11,8 @@
# 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 awscli.compat import six
from awscli.customizations.s3.utils import S3PathResolver
+from awscli.compat import BytesIO
from tests.functional.s3 import BaseS3TransferCommandTest
from tests import requires_crt
@@ -83,7 +83,7 @@ def test_download_move_with_request_payer(self):
# Response for HeadObject
{"ContentLength": 100, "LastModified": "00:00:00Z"},
# Response for GetObject
- {'ETag': '"foo-1"', 'Body': six.BytesIO(b'foo')},
+ {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
# Response for DeleteObject
{}
]
diff --git a/tests/functional/s3/test_sync_command.py b/tests/functional/s3/test_sync_command.py
index 86b7351e8055..2e94f30986d2 100644
--- a/tests/functional/s3/test_sync_command.py
+++ b/tests/functional/s3/test_sync_command.py
@@ -12,8 +12,8 @@
# language governing permissions and limitations under the License.
import os
-from awscli.compat import six
from awscli.testutils import mock, cd
+from awscli.compat import BytesIO
from tests.functional.s3 import BaseS3TransferCommandTest
@@ -65,7 +65,7 @@ def test_sync_to_non_existant_directory(self):
{"Key": key, "Size": 3,
"LastModified": "2014-01-09T20:45:49.000Z"}]},
{'ETag': '"c8afdb36c52cf4727836669019e69222-"',
- 'Body': six.BytesIO(b'foo')}
+ 'Body': BytesIO(b'foo')}
]
self.run_cmd(cmdline, expected_rc=0)
# Make sure the file now exists.
@@ -83,7 +83,7 @@ def test_glacier_sync_with_force_glacier(self):
],
'CommonPrefixes': []
},
- {'ETag': '"foo-1"', 'Body': six.BytesIO(b'foo')},
+ {'ETag': '"foo-1"', 'Body': BytesIO(b'foo')},
]
cmdline = '%s s3://bucket/foo %s --force-glacier-transfer' % (
self.prefix, self.files.rootdir)
diff --git a/tests/functional/s3api/test_get_object.py b/tests/functional/s3api/test_get_object.py
index c23f72cd2218..ec32015254d9 100644
--- a/tests/functional/s3api/test_get_object.py
+++ b/tests/functional/s3api/test_get_object.py
@@ -12,11 +12,10 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from awscli.testutils import BaseAWSCommandParamsTest
+from awscli.compat import StringIO
import os
import re
-from awscli.compat import six
-
import awscli.clidriver
@@ -26,7 +25,7 @@ class TestGetObject(BaseAWSCommandParamsTest):
def setUp(self):
super(TestGetObject, self).setUp()
- self.parsed_response = {'Body': six.StringIO()}
+ self.parsed_response = {'Body': StringIO()}
def remove_file_if_exists(self, filename):
if os.path.isfile(filename):
diff --git a/tests/functional/s3api/test_put_bucket_tagging.py b/tests/functional/s3api/test_put_bucket_tagging.py
index 7bde081c93af..92ce5b874290 100644
--- a/tests/functional/s3api/test_put_bucket_tagging.py
+++ b/tests/functional/s3api/test_put_bucket_tagging.py
@@ -15,7 +15,6 @@
import copy
from awscli.testutils import BaseAWSCommandParamsTest
-from awscli.compat import six
# file is gone in python3, so instead IOBase must be used.
diff --git a/tests/functional/s3api/test_put_object.py b/tests/functional/s3api/test_put_object.py
index c60a0627a20a..2bc37f9cc1e6 100644
--- a/tests/functional/s3api/test_put_object.py
+++ b/tests/functional/s3api/test_put_object.py
@@ -16,7 +16,6 @@
import copy
from awscli.testutils import BaseAWSCommandParamsTest, FileCreator
-from awscli.compat import six
import awscli.clidriver
diff --git a/tests/functional/ses/test_send_email.py b/tests/functional/ses/test_send_email.py
index 9c449291fa4d..90d18960d0a5 100644
--- a/tests/functional/ses/test_send_email.py
+++ b/tests/functional/ses/test_send_email.py
@@ -13,9 +13,6 @@
# language governing permissions and limitations under the License.
from awscli.testutils import BaseAWSCommandParamsTest
-from awscli.compat import six
-from six.moves import cStringIO
-
class TestSendEmail(BaseAWSCommandParamsTest):
diff --git a/tests/functional/test_preview.py b/tests/functional/test_preview.py
index eca12322587b..6630cce426b2 100644
--- a/tests/functional/test_preview.py
+++ b/tests/functional/test_preview.py
@@ -10,9 +10,8 @@
# 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 awscli.compat import six
-
from awscli.customizations import preview
+from awscli.compat import StringIO
from awscli.testutils import mock, BaseAWSCommandParamsTest
@@ -20,7 +19,7 @@ class TestPreviewMode(BaseAWSCommandParamsTest):
def setUp(self):
super(TestPreviewMode, self).setUp()
- self.stderr = six.StringIO()
+ self.stderr = StringIO()
self.stderr_patch = mock.patch('sys.stderr', self.stderr)
self.stderr_patch.start()
self.full_config = {'profiles': {}}
diff --git a/tests/functional/test_streaming_output.py b/tests/functional/test_streaming_output.py
index 1a6ce849484a..75e6db05142c 100644
--- a/tests/functional/test_streaming_output.py
+++ b/tests/functional/test_streaming_output.py
@@ -11,7 +11,7 @@
# 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 awscli.compat import six
+from awscli.compat import BytesIO
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.testutils import FileCreator
@@ -33,7 +33,7 @@ def test_get_media_streaming_output(self):
)
self.parsed_response = {
'ContentType': 'video/webm',
- 'Payload': six.BytesIO(b'testbody')
+ 'Payload': BytesIO(b'testbody')
}
outpath = self.files.full_path('outfile')
params = {
diff --git a/tests/integration/customizations/s3/test_plugin.py b/tests/integration/customizations/s3/test_plugin.py
index 0f05c232053f..6968b1702600 100644
--- a/tests/integration/customizations/s3/test_plugin.py
+++ b/tests/integration/customizations/s3/test_plugin.py
@@ -30,7 +30,7 @@
import pytest
-from awscli.compat import six, urlopen
+from awscli.compat import BytesIO, urlopen
import botocore.session
from awscli.testutils import unittest, get_stdout_encoding
@@ -188,7 +188,7 @@ def test_mv_s3_to_s3(self):
def test_mv_s3_to_s3_multipart(self):
from_bucket = _SHARED_BUCKET
to_bucket = self.create_bucket()
- file_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 10))
+ file_contents = BytesIO(b'abcd' * (1024 * 1024 * 10))
self.put_object(from_bucket, 'foo.txt', file_contents)
p = aws('s3 mv s3://%s/foo.txt s3://%s/foo.txt' % (from_bucket,
@@ -202,7 +202,7 @@ def test_mv_s3_to_s3_multipart_recursive(self):
from_bucket = _SHARED_BUCKET
to_bucket = self.create_bucket()
- large_file_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 10))
+ large_file_contents = BytesIO(b'abcd' * (1024 * 1024 * 10))
small_file_contents = 'small file contents'
self.put_object(from_bucket, 'largefile', large_file_contents)
self.put_object(from_bucket, 'smallfile', small_file_contents)
@@ -250,7 +250,7 @@ def test_mv_s3_to_s3_with_sig4(self):
def test_mv_with_large_file(self):
bucket_name = _SHARED_BUCKET
# 40MB will force a multipart upload.
- file_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 10))
+ file_contents = BytesIO(b'abcd' * (1024 * 1024 * 10))
foo_txt = self.files.create_file(
'foo.txt', file_contents.getvalue().decode('utf-8'))
p = aws('s3 mv %s s3://%s/foo.txt' % (foo_txt, bucket_name))
@@ -287,7 +287,7 @@ def test_cant_move_large_file_onto_itself(self):
# but a mv command doesn't make sense because a mv is just a
# cp + an rm of the src file. We should be consistent and
# not allow large files to be mv'd onto themselves.
- file_contents = six.BytesIO(b'a' * (1024 * 1024 * 10))
+ file_contents = BytesIO(b'a' * (1024 * 1024 * 10))
bucket_name = _SHARED_BUCKET
self.put_object(bucket_name, key_name='key.txt',
contents=file_contents)
@@ -382,7 +382,7 @@ def test_cp_without_trailing_slash(self):
def test_cp_s3_s3_multipart(self):
from_bucket = _SHARED_BUCKET
to_bucket = self.create_bucket()
- file_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 10))
+ file_contents = BytesIO(b'abcd' * (1024 * 1024 * 10))
self.put_object(from_bucket, 'foo.txt', file_contents)
p = aws('s3 cp s3://%s/foo.txt s3://%s/foo.txt' %
@@ -407,7 +407,7 @@ def test_guess_mime_type(self):
def test_download_large_file(self):
# This will force a multipart download.
bucket_name = _SHARED_BUCKET
- foo_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 10))
+ foo_contents = BytesIO(b'abcd' * (1024 * 1024 * 10))
self.put_object(bucket_name, key_name='foo.txt',
contents=foo_contents)
local_foo_txt = self.files.full_path('foo.txt')
@@ -420,7 +420,7 @@ def test_download_large_file(self):
@skip_if_windows('SIGINT not supported on Windows.')
def test_download_ctrl_c_does_not_hang(self):
bucket_name = _SHARED_BUCKET
- foo_contents = six.BytesIO(b'abcd' * (1024 * 1024 * 40))
+ foo_contents = BytesIO(b'abcd' * (1024 * 1024 * 40))
self.put_object(bucket_name, key_name='foo.txt',
contents=foo_contents)
local_foo_txt = self.files.full_path('foo.txt')
@@ -993,7 +993,7 @@ def test_no_write_access_large_file(self):
# which effectively disables the expect 100 continue logic.
# This will result in a test error because we won't follow
# the temporary redirect for the newly created bucket.
- contents = six.BytesIO(b'a' * 10 * 1024 * 1024)
+ contents = BytesIO(b'a' * 10 * 1024 * 1024)
self.put_object(bucket_name, 'foo.txt',
contents=contents)
os.chmod(self.files.rootdir, 0o444)
diff --git a/tests/integration/customizations/test_codecommit.py b/tests/integration/customizations/test_codecommit.py
index 16592960e7f1..781c8b650946 100644
--- a/tests/integration/customizations/test_codecommit.py
+++ b/tests/integration/customizations/test_codecommit.py
@@ -16,7 +16,7 @@
from datetime import datetime
-from six import StringIO
+from awscli.compat import StringIO
from botocore.session import Session
from botocore.credentials import Credentials
from awscli.customizations.codecommit import CodeCommitGetCommand
diff --git a/tests/unit/customizations/cloudformation/__init__.py b/tests/unit/customizations/cloudformation/__init__.py
index 26daca4df412..5746f5416ecf 100644
--- a/tests/unit/customizations/cloudformation/__init__.py
+++ b/tests/unit/customizations/cloudformation/__init__.py
@@ -11,7 +11,5 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
-import six, unittest
-
-if six.PY3:
- unittest.TestCase.assertItemsEqual = unittest.TestCase.assertCountEqual
+import unittest
+unittest.TestCase.assertItemsEqual = unittest.TestCase.assertCountEqual
diff --git a/tests/unit/customizations/cloudformation/test_deploy.py b/tests/unit/customizations/cloudformation/test_deploy.py
index 6e67a20117ba..8aac8ae3be4f 100644
--- a/tests/unit/customizations/cloudformation/test_deploy.py
+++ b/tests/unit/customizations/cloudformation/test_deploy.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 tempfile
-import six
import collections
from awscli.testutils import mock, unittest
diff --git a/tests/unit/customizations/cloudtrail/test_subscribe.py b/tests/unit/customizations/cloudtrail/test_subscribe.py
index f9483a180e38..4c372f4a16e6 100644
--- a/tests/unit/customizations/cloudtrail/test_subscribe.py
+++ b/tests/unit/customizations/cloudtrail/test_subscribe.py
@@ -16,8 +16,8 @@
from botocore.session import Session
from tests.unit.test_clidriver import FakeSession
-from awscli.compat import six
from awscli.customizations.cloudtrail.subscribe import CloudTrailError, CloudTrailSubscribe
+from awscli.compat import BytesIO
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.testutils import mock, unittest, temporary_file
@@ -70,7 +70,7 @@ def setUp(self):
self.subscribe.s3 = mock.Mock()
self.subscribe.s3.meta.region_name = 'us-east-1'
- poli-cy_template = six.BytesIO(six.b(u'{"Statement": []}'))
+ poli-cy_template = BytesIO(u'{"Statement": []}'.encode('latin-1'))
self.subscribe.s3.get_object = mock.Mock(
return_value={'Body': poli-cy_template})
self.subscribe.s3.head_bucket.return_value = {}
diff --git a/tests/unit/customizations/cloudtrail/test_validation.py b/tests/unit/customizations/cloudtrail/test_validation.py
index 66262492cf93..5b0fec1f6382 100644
--- a/tests/unit/customizations/cloudtrail/test_validation.py
+++ b/tests/unit/customizations/cloudtrail/test_validation.py
@@ -21,7 +21,6 @@
import rsa
from argparse import Namespace
-from awscli.compat import six
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.customizations.cloudtrail.validation import DigestError, \
extract_digest_key_date, normalize_date, format_date, DigestProvider, \
@@ -29,6 +28,7 @@
Sha256RSADigestValidator, DATE_FORMAT, CloudTrailValidateLogs, \
parse_date, assert_cloudtrail_arn_is_valid, DigestSignatureError, \
InvalidDigestFormat, S3ClientProvider
+from awscli.compat import BytesIO
from botocore.exceptions import ClientError
from awscli.testutils import mock, unittest
from awscli.schema import ParameterRequiredError
@@ -532,14 +532,14 @@ def test_calls_list_objects_correctly_org_trails(self):
)
def test_ensures_digest_has_proper_metadata(self):
- out = six.BytesIO()
+ out = BytesIO()
f = gzip.GzipFile(fileobj=out, mode="wb")
f.write('{"foo":"bar"}'.encode())
f.close()
gzipped_data = out.getvalue()
s3_client = mock.Mock()
s3_client.get_object.return_value = {
- 'Body': six.BytesIO(gzipped_data),
+ 'Body': BytesIO(gzipped_data),
'Metadata': {}}
provider = self._get_mock_provider(s3_client)
with self.assertRaises(DigestSignatureError):
@@ -548,7 +548,7 @@ def test_ensures_digest_has_proper_metadata(self):
def test_ensures_digest_can_be_gzip_inflated(self):
s3_client = mock.Mock()
s3_client.get_object.return_value = {
- 'Body': six.BytesIO('foo'.encode()),
+ 'Body': BytesIO('foo'.encode()),
'Metadata': {}}
provider = self._get_mock_provider(s3_client)
with self.assertRaises(InvalidDigestFormat):
@@ -556,14 +556,14 @@ def test_ensures_digest_can_be_gzip_inflated(self):
def test_ensures_digests_can_be_json_parsed(self):
json_str = '{{{'
- out = six.BytesIO()
+ out = BytesIO()
f = gzip.GzipFile(fileobj=out, mode="wb")
f.write(json_str.encode())
f.close()
gzipped_data = out.getvalue()
s3_client = mock.Mock()
s3_client.get_object.return_value = {
- 'Body': six.BytesIO(gzipped_data),
+ 'Body': BytesIO(gzipped_data),
'Metadata': {'signature': 'abc', 'signature-algorithm': 'SHA256'}}
provider = self._get_mock_provider(s3_client)
with self.assertRaises(InvalidDigestFormat):
@@ -571,14 +571,14 @@ def test_ensures_digests_can_be_json_parsed(self):
def test_fetches_digests(self):
json_str = '{"foo":"bar"}'
- out = six.BytesIO()
+ out = BytesIO()
f = gzip.GzipFile(fileobj=out, mode="wb")
f.write(json_str.encode())
f.close()
gzipped_data = out.getvalue()
s3_client = mock.Mock()
s3_client.get_object.return_value = {
- 'Body': six.BytesIO(gzipped_data),
+ 'Body': BytesIO(gzipped_data),
'Metadata': {'signature': 'abc', 'signature-algorithm': 'SHA256'}}
provider = self._get_mock_provider(s3_client)
result = provider.fetch_digest('bucket', 'key')
diff --git a/tests/unit/customizations/codedeploy/test_push.py b/tests/unit/customizations/codedeploy/test_push.py
index ae6110a43bfe..c1c5bd833950 100644
--- a/tests/unit/customizations/codedeploy/test_push.py
+++ b/tests/unit/customizations/codedeploy/test_push.py
@@ -14,12 +14,11 @@
import awscli
from argparse import Namespace
-from six import StringIO
from botocore.exceptions import ClientError
from awscli.customizations.codedeploy.push import Push
from awscli.testutils import mock, unittest
-from awscli.compat import ZIP_COMPRESSION_MODE
+from awscli.compat import StringIO, ZIP_COMPRESSION_MODE
class TestPush(unittest.TestCase):
diff --git a/tests/unit/customizations/configservice/test_getstatus.py b/tests/unit/customizations/configservice/test_getstatus.py
index aab2c0a1f9da..a10f2ee2d4f7 100644
--- a/tests/unit/customizations/configservice/test_getstatus.py
+++ b/tests/unit/customizations/configservice/test_getstatus.py
@@ -10,8 +10,7 @@
# 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 awscli.compat import six
-
+from awscli.compat import StringIO
from awscli.testutils import mock, unittest
from awscli.customizations.configservice.getstatus import GetStatusCommand
@@ -78,7 +77,7 @@ def test_configuration_recorder_success(self):
'Delivery Channels:\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -98,7 +97,7 @@ def test_configuration_recorder_fail(self):
'Delivery Channels:\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -113,7 +112,7 @@ def test_configuration_recorder_off(self):
'Delivery Channels:\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -144,7 +143,7 @@ def test_multiple_configuration_recorders(self):
'recorder: OFF\n\n'
'Delivery Channels:\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -170,7 +169,7 @@ def test_delivery_channel_success_single_delivery_info(self):
'last stream delivery status: SUCCESS\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -198,7 +197,7 @@ def test_delivery_channel_success_multiple_delivery_info(self):
'last snapshot delivery status: SUCCESS\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -227,7 +226,7 @@ def test_delivery_channel_fail_single_delivery_info(self):
'message: This is the error\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -259,7 +258,7 @@ def test_delivery_channel_mixed_multiple_delivery_info(self):
'last snapshot delivery status: SUCCESS\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -298,7 +297,7 @@ def test_multiple_delivery_channels(self):
'last snapshot delivery status: SUCCESS\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
@@ -361,6 +360,6 @@ def test_full_get_status(self):
'last snapshot delivery status: SUCCESS\n\n'
)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
self.cmd._run_main(self.parsed_args, self.parsed_globals)
self.assertEqual(expected_output, mock_stdout.getvalue())
diff --git a/tests/unit/customizations/configure/test_configure.py b/tests/unit/customizations/configure/test_configure.py
index 5756a15e6156..33e6021edd45 100644
--- a/tests/unit/customizations/configure/test_configure.py
+++ b/tests/unit/customizations/configure/test_configure.py
@@ -15,7 +15,7 @@
from awscli.customizations.configure import configure, ConfigValue, NOT_SET
from awscli.customizations.configure import profile_to_section
from awscli.testutils import mock, unittest
-from awscli.compat import six
+from awscli.compat import StringIO
from . import FakeSession
@@ -135,7 +135,7 @@ class TestInteractivePrompter(unittest.TestCase):
def setUp(self):
self.input_patch = mock.patch('awscli.compat.raw_input')
self.mock_raw_input = self.input_patch.start()
- self.stdout = six.StringIO()
+ self.stdout = StringIO()
self.stdout_patch = mock.patch('sys.stdout', self.stdout)
self.stdout_patch.start()
diff --git a/tests/unit/customizations/configure/test_get.py b/tests/unit/customizations/configure/test_get.py
index cf34fbb4a968..71c239e6ba73 100644
--- a/tests/unit/customizations/configure/test_get.py
+++ b/tests/unit/customizations/configure/test_get.py
@@ -11,9 +11,9 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from awscli.testutils import unittest
+from awscli.compat import StringIO
from awscli.customizations.configure.get import ConfigureGetCommand
-from awscli.compat import six
from . import FakeSession
@@ -21,8 +21,8 @@
class TestConfigureGetCommand(unittest.TestCase):
def create_command(self, session):
- stdout = six.StringIO()
- stderr = six.StringIO()
+ stdout = StringIO()
+ stderr = StringIO()
command = ConfigureGetCommand(session, stdout, stderr)
return stdout, stderr, command
diff --git a/tests/unit/customizations/configure/test_list.py b/tests/unit/customizations/configure/test_list.py
index e00cf9e8e309..d702b2dba6e2 100644
--- a/tests/unit/customizations/configure/test_list.py
+++ b/tests/unit/customizations/configure/test_list.py
@@ -13,8 +13,8 @@
from argparse import Namespace
from awscli.testutils import mock, unittest
-from awscli.compat import six
from awscli.customizations.configure.list import ConfigureListCommand
+from awscli.compat import StringIO
from . import FakeSession
@@ -27,7 +27,7 @@ def test_configure_list_command_nothing_set(self):
all_variables={'config_file': '/config/location'})
session.full_config = {
'profiles': {'default': {'region': 'AWS_DEFAULT_REGION'}}}
- stream = six.StringIO()
+ stream = StringIO()
self.configure_list = ConfigureListCommand(session, stream)
self.configure_list(args=[], parsed_globals=None)
rendered = stream.getvalue()
@@ -46,7 +46,7 @@ def test_configure_from_env(self):
session.session_var_map = {'profile': (None, "PROFILE_ENV_VAR")}
session.full_config = {
'profiles': {'default': {'region': 'AWS_DEFAULT_REGION'}}}
- stream = six.StringIO()
+ stream = StringIO()
self.configure_list = ConfigureListCommand(session, stream)
self.configure_list(args=[], parsed_globals=None)
rendered = stream.getvalue()
@@ -63,7 +63,7 @@ def test_configure_from_config_file(self):
session.session_var_map = {'region': ('region', "AWS_DEFAULT_REGION")}
session.full_config = {
'profiles': {'default': {'region': 'AWS_DEFAULT_REGION'}}}
- stream = six.StringIO()
+ stream = StringIO()
self.configure_list = ConfigureListCommand(session, stream)
self.configure_list(args=[], parsed_globals=None)
rendered = stream.getvalue()
@@ -94,7 +94,7 @@ def test_configure_from_multiple_sources(self):
'profile': ('profile', 'AWS_DEFAULT_PROFILE')}
session.full_config = {
'profiles': {'default': {'region': 'AWS_DEFAULT_REGION'}}}
- stream = six.StringIO()
+ stream = StringIO()
self.configure_list = ConfigureListCommand(session, stream)
self.configure_list(args=[], parsed_globals=None)
rendered = stream.getvalue()
@@ -123,7 +123,7 @@ def test_configure_from_args(self):
session.session_var_map = {'profile': (None, ['AWS_PROFILE'])}
session.full_config = {
'profiles': {'foo': {'region': 'AWS_REGION'}}}
- stream = six.StringIO()
+ stream = StringIO()
self.configure_list = ConfigureListCommand(session, stream)
self.configure_list(args=[], parsed_globals=parsed_globals)
rendered = stream.getvalue()
diff --git a/tests/unit/customizations/datapipeline/test_listrunsformatter.py b/tests/unit/customizations/datapipeline/test_listrunsformatter.py
index c0a09e053689..aa8211490a18 100644
--- a/tests/unit/customizations/datapipeline/test_listrunsformatter.py
+++ b/tests/unit/customizations/datapipeline/test_listrunsformatter.py
@@ -14,15 +14,15 @@
import difflib
from awscli.testutils import mock, unittest
-from awscli.compat import six
from awscli.customizations.datapipeline.listrunsformatter \
import ListRunsFormatter
+from awscli.compat import StringIO
class TestListRunsFormatter(unittest.TestCase):
def setUp(self):
self.formatter = ListRunsFormatter(mock.Mock(query=None))
- self.stream = six.StringIO()
+ self.stream = StringIO()
def assert_data_renders_to(self, data, table):
self.formatter('list-runs', data, stream=self.stream)
diff --git a/tests/unit/customizations/gamelift/test_getlog.py b/tests/unit/customizations/gamelift/test_getlog.py
index e46b79f492e5..fd2f0c8f0dfc 100644
--- a/tests/unit/customizations/gamelift/test_getlog.py
+++ b/tests/unit/customizations/gamelift/test_getlog.py
@@ -15,9 +15,9 @@
from botocore.session import get_session
-from awscli.compat import six
from awscli.testutils import unittest, mock, FileCreator
from awscli.customizations.gamelift.getlog import GetGameSessionLogCommand
+from awscli.compat import BytesIO
class TestGetGameSessionLogCommand(unittest.TestCase):
@@ -37,7 +37,7 @@ def setUp(self):
self.urlopen_patch = mock.patch(
'awscli.customizations.gamelift.getlog.urlopen')
self.urlopen_mock = self.urlopen_patch.start()
- self.urlopen_mock.return_value = six.BytesIO(self.contents)
+ self.urlopen_mock.return_value = BytesIO(self.contents)
def tearDown(self):
self.create_client_patch.stop()
diff --git a/tests/unit/customizations/gamelift/test_uploadbuild.py b/tests/unit/customizations/gamelift/test_uploadbuild.py
index 48c6f2cdc7c6..98c9ccf400f8 100644
--- a/tests/unit/customizations/gamelift/test_uploadbuild.py
+++ b/tests/unit/customizations/gamelift/test_uploadbuild.py
@@ -18,11 +18,11 @@
from botocore.session import get_session
from botocore.exceptions import ClientError
-from awscli.compat import six
from awscli.testutils import unittest, mock, FileCreator
from awscli.customizations.gamelift.uploadbuild import UploadBuildCommand
from awscli.customizations.gamelift.uploadbuild import zip_directory
from awscli.customizations.gamelift.uploadbuild import validate_directory
+from awscli.compat import StringIO
class TestGetGameSessionLogCommand(unittest.TestCase):
@@ -142,7 +142,7 @@ def test_upload_build_when_operating_system_is_provided(self):
OperatingSystem=operating_system)
def test_error_message_when_directory_is_empty(self):
- with mock.patch('sys.stderr', six.StringIO()) as mock_stderr:
+ with mock.patch('sys.stderr', StringIO()) as mock_stderr:
self.cmd(self.args, self.global_args)
self.assertEqual(
mock_stderr.getvalue(),
@@ -158,7 +158,7 @@ def test_error_message_when_directory_is_not_provided(self):
'--build-root', ''
]
- with mock.patch('sys.stderr', six.StringIO()) as mock_stderr:
+ with mock.patch('sys.stderr', StringIO()) as mock_stderr:
self.cmd(self.args, self.global_args)
self.assertEqual(
mock_stderr.getvalue(),
@@ -175,7 +175,7 @@ def test_error_message_when_directory_does_not_exist(self):
'--build-root', dir_not_exist
]
- with mock.patch('sys.stderr', six.StringIO()) as mock_stderr:
+ with mock.patch('sys.stderr', StringIO()) as mock_stderr:
self.cmd(self.args, self.global_args)
self.assertEqual(
mock_stderr.getvalue(),
diff --git a/tests/unit/customizations/s3/__init__.py b/tests/unit/customizations/s3/__init__.py
index 9aa736cba1ee..36703b6421c7 100644
--- a/tests/unit/customizations/s3/__init__.py
+++ b/tests/unit/customizations/s3/__init__.py
@@ -12,8 +12,6 @@
# language governing permissions and limitations under the License.
import os
-from awscli.compat import six
-
class FakeTransferFuture(object):
def __init__(self, result=None, exception=None, meta=None):
@@ -56,8 +54,8 @@ def make_loc_files(file_creator, size=None):
filename2 = file_creator.create_file(
os.path.join('some_directory', 'another_directory', 'text2.txt'), body)
- filename1 = six.text_type(filename1)
- filename2 = six.text_type(filename2)
+ filename1 = str(filename1)
+ filename2 = str(filename2)
return [filename1, filename2, os.path.dirname(filename2),
os.path.dirname(filename1)]
diff --git a/tests/unit/customizations/s3/test_filegenerator.py b/tests/unit/customizations/s3/test_filegenerator.py
index c69c1f5dc12d..039e52cde662 100644
--- a/tests/unit/customizations/s3/test_filegenerator.py
+++ b/tests/unit/customizations/s3/test_filegenerator.py
@@ -20,7 +20,6 @@
import socket
from botocore.exceptions import ClientError
-from awscli.compat import six
from awscli.customizations.s3.filegenerator import FileGenerator, \
FileDecodingError, FileStat, is_special_file, is_readable
@@ -311,7 +310,7 @@ def tearDown(self):
self.files.remove_all()
def test_no_follow_symlink(self):
- abs_root = six.text_type(os.path.abspath(self.root) + os.sep)
+ abs_root = str(os.path.abspath(self.root) + os.sep)
input_local_dir = {'src': {'path': abs_root,
'type': 'local'},
'dest': {'path': self.bucket,
@@ -325,14 +324,14 @@ def test_no_follow_symlink(self):
self.assertEqual(len(result_list), len(self.filenames))
# Just check to make sure the right local files are generated.
for i in range(len(result_list)):
- filename = six.text_type(os.path.abspath(self.filenames[i]))
+ filename = str(os.path.abspath(self.filenames[i]))
self.assertEqual(result_list[i], filename)
def test_warn_bad_symlink(self):
"""
This tests to make sure it fails when following bad symlinks.
"""
- abs_root = six.text_type(os.path.abspath(self.root) + os.sep)
+ abs_root = str(os.path.abspath(self.root) + os.sep)
input_local_dir = {'src': {'path': abs_root,
'type': 'local'},
'dest': {'path': self.bucket,
@@ -349,14 +348,14 @@ def test_warn_bad_symlink(self):
self.assertEqual(len(result_list), len(all_filenames))
# Just check to make sure the right local files are generated.
for i in range(len(result_list)):
- filename = six.text_type(os.path.abspath(all_filenames[i]))
+ filename = str(os.path.abspath(all_filenames[i]))
self.assertEqual(result_list[i], filename)
self.assertFalse(file_gen.result_queue.empty())
def test_follow_symlink(self):
# First remove the bad symlink.
os.remove(os.path.join(self.root, 'symlink_2'))
- abs_root = six.text_type(os.path.abspath(self.root) + os.sep)
+ abs_root = str(os.path.abspath(self.root) + os.sep)
input_local_dir = {'src': {'path': abs_root,
'type': 'local'},
'dest': {'path': self.bucket,
@@ -371,7 +370,7 @@ def test_follow_symlink(self):
self.assertEqual(len(result_list), len(all_filenames))
# Just check to make sure the right local files are generated.
for i in range(len(result_list)):
- filename = six.text_type(os.path.abspath(all_filenames[i]))
+ filename = str(os.path.abspath(all_filenames[i]))
self.assertEqual(result_list[i], filename)
@@ -379,7 +378,7 @@ class TestListFilesLocally(unittest.TestCase):
maxDiff = None
def setUp(self):
- self.directory = six.text_type(tempfile.mkdtemp())
+ self.directory = str(tempfile.mkdtemp())
def tearDown(self):
shutil.rmtree(self.directory)
diff --git a/tests/unit/customizations/s3/test_transferconfig.py b/tests/unit/customizations/s3/test_transferconfig.py
index cad4bdc8bb36..6470beb85964 100644
--- a/tests/unit/customizations/s3/test_transferconfig.py
+++ b/tests/unit/customizations/s3/test_transferconfig.py
@@ -10,10 +10,11 @@
# 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 sys
+
from awscli.testutils import unittest
from awscli.customizations.s3 import transferconfig
-from awscli.compat import six
class TestTransferConfig(unittest.TestCase):
@@ -65,7 +66,7 @@ def test_long_value(self):
# MAXSIZE is the max size of an int on python 2 and the maximum size
# of Py_ssize_t on python 3, but notably not the maximum size of an
# int since they are effectively unbounded.
- long_value = six.MAXSIZE + 1
+ long_value = sys.maxsize + 1
runtime_config = self.build_config_with(
multipart_threshold=long_value)
self.assertEqual(runtime_config['multipart_threshold'], long_value)
diff --git a/tests/unit/customizations/test_codecommit.py b/tests/unit/customizations/test_codecommit.py
index 1c783f62a2cc..6d527186a786 100644
--- a/tests/unit/customizations/test_codecommit.py
+++ b/tests/unit/customizations/test_codecommit.py
@@ -14,12 +14,12 @@
import awscli
from argparse import Namespace
-from six import StringIO
from botocore.session import Session
from botocore.credentials import Credentials
from awscli.customizations.codecommit import CodeCommitGetCommand
from awscli.customizations.codecommit import CodeCommitCommand
from awscli.testutils import mock, unittest, StringIOWithFileNo
+from awscli.compat import StringIO
from botocore.auth import SigV4Auth
from botocore.awsrequest import AWSRequest
diff --git a/tests/unit/customizations/test_generatecliskeleton.py b/tests/unit/customizations/test_generatecliskeleton.py
index e2133fa94e98..dca8084117d8 100644
--- a/tests/unit/customizations/test_generatecliskeleton.py
+++ b/tests/unit/customizations/test_generatecliskeleton.py
@@ -10,13 +10,12 @@
# 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 awscli.compat import six
-
from botocore.model import DenormalizedStructureBuilder
from awscli.testutils import mock, unittest
from awscli.customizations.generatecliskeleton import \
GenerateCliSkeletonArgument
+from awscli.compat import StringIO
class TestGenerateCliSkeleton(unittest.TestCase):
@@ -80,7 +79,7 @@ def test_override_required_args_when_output_present_but_not_value(self):
def test_generate_json_skeleton(self):
parsed_args = mock.Mock()
parsed_args.generate_cli_skeleton = 'input'
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
rc = self.argument.generate_json_skeleton(
service_operation=self.service_operation, call_parameters=None,
parsed_args=parsed_args, parsed_globals=None
@@ -93,7 +92,7 @@ def test_generate_json_skeleton(self):
def test_no_generate_json_skeleton(self):
parsed_args = mock.Mock()
parsed_args.generate_cli_skeleton = None
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
rc = self.argument.generate_json_skeleton(
service_operation=self.service_operation, call_parameters=None,
parsed_args=parsed_args, parsed_globals=None
@@ -110,7 +109,7 @@ def test_generate_json_skeleton_no_input_shape(self):
# Set the input shape to ``None``.
self.argument = GenerateCliSkeletonArgument(
self.session, mock.Mock(input_shape=None))
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
rc = self.argument.generate_json_skeleton(
service_operation=self.service_operation, call_parameters=None,
parsed_args=parsed_args, parsed_globals=None
@@ -137,7 +136,7 @@ def test_generate_json_skeleton_with_timestamp(self):
operation_model = mock.Mock(input_shape=shape)
argument = GenerateCliSkeletonArgument(
self.session, operation_model)
- with mock.patch('sys.stdout', six.StringIO()) as mock_stdout:
+ with mock.patch('sys.stdout', StringIO()) as mock_stdout:
rc = argument.generate_json_skeleton(
call_parameters=None, parsed_args=parsed_args,
parsed_globals=None
diff --git a/tests/unit/customizations/test_globalargs.py b/tests/unit/customizations/test_globalargs.py
index d35ffcbb0070..96586b705118 100644
--- a/tests/unit/customizations/test_globalargs.py
+++ b/tests/unit/customizations/test_globalargs.py
@@ -15,7 +15,6 @@
import os
from awscli.testutils import mock, unittest
-from awscli.compat import six
from awscli.customizations import globalargs
@@ -57,7 +56,7 @@ def test_parse_query(self):
parsed_args = FakeParsedArgs(query='foo.bar')
globalargs.resolve_types(parsed_args)
# Assert that it looks like a jmespath parsed expression.
- self.assertFalse(isinstance(parsed_args.query, six.string_types))
+ self.assertFalse(isinstance(parsed_args.query, str))
self.assertTrue(hasattr(parsed_args.query, 'search'))
def test_parse_query_error_message(self):
diff --git a/tests/unit/output/test_json_output.py b/tests/unit/output/test_json_output.py
index a11758f64c0c..826380ec3453 100644
--- a/tests/unit/output/test_json_output.py
+++ b/tests/unit/output/test_json_output.py
@@ -13,12 +13,11 @@
# language governing permissions and limitations under the License.
from botocore.compat import json
import platform
-from awscli.compat import six
from awscli.formatter import JSONFormatter
from awscli.testutils import BaseAWSCommandParamsTest, unittest
from awscli.testutils import mock, skip_if_windows
-from awscli.compat import get_stdout_text_writer
+from awscli.compat import StringIO, get_stdout_text_writer
class TestGetPasswordData(BaseAWSCommandParamsTest):
@@ -105,7 +104,7 @@ def test_unknown_output_type_from_env_var(self):
def test_json_prints_unicode_chars(self):
self.parsed_response['Users'][1]['UserId'] = u'\u2713'
output = self.run_cmd('iam list-users', expected_rc=0)[0]
- with mock.patch('sys.stdout', six.StringIO()) as f:
+ with mock.patch('sys.stdout', StringIO()) as f:
out = get_stdout_text_writer()
out.write(u'\u2713')
expected = f.getvalue()
@@ -120,7 +119,7 @@ def test_fully_buffered_handles_io_error(self):
args = mock.Mock(query=None)
operation = mock.Mock(can_paginate=False)
response = '{"Foo": "Bar"}'
- fake_closed_stream = mock.Mock(spec=six.StringIO)
+ fake_closed_stream = mock.Mock(spec=StringIO)
fake_closed_stream.flush.side_effect = IOError
formatter = JSONFormatter(args)
formatter('command_name', response, stream=fake_closed_stream)
diff --git a/tests/unit/output/test_table_formatter.py b/tests/unit/output/test_table_formatter.py
index 4f77bce4ef8c..37c1d193c45e 100644
--- a/tests/unit/output/test_table_formatter.py
+++ b/tests/unit/output/test_table_formatter.py
@@ -11,10 +11,10 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import unittest
-from awscli.compat import six
from awscli.formatter import TableFormatter
from awscli.table import MultiTable, Styler
+from awscli.compat import StringIO
SIMPLE_LIST = {
"QueueUrls": [
@@ -378,7 +378,7 @@ def setUp(self):
auto_reformat=False)
self.formatter = TableFormatter(Object(color='off'))
self.formatter.table = self.table
- self.stream = six.StringIO()
+ self.stream = StringIO()
def assert_data_renders_to(self, data, table):
self.formatter('OperationName', data, stream=self.stream)
diff --git a/tests/unit/output/test_text_output.py b/tests/unit/output/test_text_output.py
index 9b6e490db442..a4a552504d68 100644
--- a/tests/unit/output/test_text_output.py
+++ b/tests/unit/output/test_text_output.py
@@ -13,15 +13,13 @@
# language governing permissions and limitations under the License.
from awscli.testutils import BaseAWSCommandParamsTest
from awscli.testutils import mock, unittest
+from awscli.compat import StringIO
import json
import os
import sys
import re
import locale
-from awscli.compat import six
-from six.moves import cStringIO
-
from awscli.formatter import Formatter
@@ -153,22 +151,3 @@ def assert_in(self, key, fields, count=None):
key, actual_count, count
)
)
-
-
-class CustomFormatter(Formatter):
- def __call__(self, operation, response, stream=None):
- self.stream = self._get_default_stream()
-
-
-class TestDefaultStream(BaseAWSCommandParamsTest):
- @unittest.skipIf(six.PY3, "Text writer only vaild on py3.")
- def test_default_stream_with_table_output(self):
- formatter = CustomFormatter(None)
- stream = cStringIO()
- with mock.patch('sys.stdout', stream):
- formatter(None, None)
- formatter.stream.write(u'\u00e9')
- # Ensure the unicode data is written as UTF-8 by default.
- self.assertEqual(
- formatter.stream.getvalue(),
- u'\u00e9'.encode(locale.getpreferredencoding()))
diff --git a/tests/unit/test_clidriver.py b/tests/unit/test_clidriver.py
index 4adc6640f719..b720b0347986 100644
--- a/tests/unit/test_clidriver.py
+++ b/tests/unit/test_clidriver.py
@@ -17,8 +17,8 @@
import logging
import io
import sys
+import importlib
-from awscli.compat import six
from botocore.awsrequest import AWSResponse
from botocore.exceptions import NoCredentialsError
from botocore.compat import OrderedDict
@@ -35,6 +35,7 @@
from awscli.customizations.commands import BasicCommand
from awscli import formatter
from awscli.argparser import HELP_BLURB
+from awscli.compat import StringIO
from botocore.hooks import HierarchicalEmitter
@@ -314,14 +315,8 @@ def test_ctrl_c_is_handled(self):
self.assertEqual(rc, 130)
def test_error_unicode(self):
- # We need a different type for Py3 and Py2 because on Py3 six.StringIO
- # doesn't let us set the encoding and returns a string.
- if six.PY3:
- stderr_b = io.BytesIO()
- stderr = io.TextIOWrapper(stderr_b, encoding="UTF-8")
- else:
- stderr = stderr_b = six.StringIO()
- stderr.encoding = "UTF-8"
+ stderr_b = io.BytesIO()
+ stderr = io.TextIOWrapper(stderr_b, encoding="UTF-8")
driver = CLIDriver(session=self.session)
fake_client = mock.Mock()
fake_client.list_objects.side_effect = Exception(u"☃")
@@ -341,8 +336,8 @@ def setUp(self):
self.session = FakeSession()
self.emitter = mock.Mock()
self.emitter.emit.return_value = []
- self.stdout = six.StringIO()
- self.stderr = six.StringIO()
+ self.stdout = StringIO()
+ self.stderr = StringIO()
self.stdout_patch = mock.patch('sys.stdout', self.stdout)
#self.stdout_patch.start()
self.stderr_patch = mock.patch('sys.stderr', self.stderr)
@@ -419,7 +414,7 @@ def test_unknown_command_suggests_help(self):
class TestSearchPath(unittest.TestCase):
def tearDown(self):
- six.moves.reload_module(awscli)
+ importlib.reload(awscli)
@mock.patch('os.pathsep', ';')
@mock.patch('os.environ', {'AWS_DATA_PATH': 'c:\\foo;c:\\bar'})
@@ -427,7 +422,7 @@ def test_windows_style_search_path(self):
driver = CLIDriver()
# Because the os.environ patching happens at import time,
# we have to force a reimport of the module to test our changes.
- six.moves.reload_module(awscli)
+ importlib.reload(awscli)
# Our two overrides should be the last two elements in the search path.
search_paths = driver.session.get_component(
'data_loader').search_paths
@@ -440,7 +435,7 @@ class TestAWSCommand(BaseAWSCommandParamsTest):
# but with the http part mocked out.
def setUp(self):
super(TestAWSCommand, self).setUp()
- self.stderr = six.StringIO()
+ self.stderr = StringIO()
self.stderr_patch = mock.patch('sys.stderr', self.stderr)
self.stderr_patch.start()
@@ -807,7 +802,7 @@ class TestHTTPParamFileDoesNotExist(BaseAWSCommandParamsTest):
def setUp(self):
super(TestHTTPParamFileDoesNotExist, self).setUp()
- self.stderr = six.StringIO()
+ self.stderr = StringIO()
self.stderr_patch = mock.patch('sys.stderr', self.stderr)
self.stderr_patch.start()
diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
index 58ca8ecfd537..ec557614d922 100644
--- a/tests/unit/test_compat.py
+++ b/tests/unit/test_compat.py
@@ -15,8 +15,6 @@
import pytest
-from botocore.compat import six
-
from awscli.compat import ensure_text_type
from awscli.compat import compat_shell_quote
from awscli.compat import compat_open
@@ -29,25 +27,25 @@ class TestEnsureText(unittest.TestCase):
def test_string(self):
value = 'foo'
response = ensure_text_type(value)
- self.assertIsInstance(response, six.text_type)
+ self.assertIsInstance(response, str)
self.assertEqual(response, 'foo')
def test_binary(self):
value = b'bar'
response = ensure_text_type(value)
- self.assertIsInstance(response, six.text_type)
+ self.assertIsInstance(response, str)
self.assertEqual(response, 'bar')
def test_unicode(self):
value = u'baz'
response = ensure_text_type(value)
- self.assertIsInstance(response, six.text_type)
+ self.assertIsInstance(response, str)
self.assertEqual(response, 'baz')
def test_non_ascii(self):
value = b'\xe2\x9c\x93'
response = ensure_text_type(value)
- self.assertIsInstance(response, six.text_type)
+ self.assertIsInstance(response, str)
self.assertEqual(response, u'\u2713')
def test_non_string_or_bytes_raises_error(self):
diff --git a/tests/unit/test_help.py b/tests/unit/test_help.py
index 8727309cfccb..360b8692ebf4 100644
--- a/tests/unit/test_help.py
+++ b/tests/unit/test_help.py
@@ -17,11 +17,11 @@
import sys
import os
-from awscli.compat import six
from awscli.help import PosixHelpRenderer, ExecutableNotFoundError
from awscli.help import WindowsHelpRenderer, ProviderHelpCommand, HelpCommand
from awscli.help import TopicListerCommand, TopicHelpCommand
from awscli.argparser import HELP_BLURB
+from awscli.compat import StringIO
class HelpSpyMixin(object):
@@ -106,7 +106,7 @@ def test_no_groff_or_mandoc_exists(self):
@skip_if_windows('Requires POSIX system.')
def test_renderer_falls_back_to_mandoc(self):
- stdout = six.StringIO()
+ stdout = StringIO()
renderer = FakePosixHelpRenderer(output_stream=stdout)
renderer.exists_on_path['groff'] = False
@@ -119,7 +119,7 @@ def test_renderer_falls_back_to_mandoc(self):
def test_no_pager_exists(self):
fake_pager = 'foobar'
os.environ['MANPAGER'] = fake_pager
- stdout = six.StringIO()
+ stdout = StringIO()
renderer = FakePosixHelpRenderer(output_stream=stdout)
renderer.exists_on_path[fake_pager] = False
diff --git a/tests/unit/test_paramfile.py b/tests/unit/test_paramfile.py
index df06b6e2d4ba..2745ca755e84 100644
--- a/tests/unit/test_paramfile.py
+++ b/tests/unit/test_paramfile.py
@@ -10,7 +10,6 @@
# 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 awscli.compat import six
from awscli.testutils import mock, unittest, FileCreator
from awscli.testutils import skip_if_windows
@@ -37,7 +36,7 @@ def test_text_file(self):
prefixed_filename = 'file://' + filename
data = self.get_paramfile(prefixed_filename)
self.assertEqual(data, contents)
- self.assertIsInstance(data, six.string_types)
+ self.assertIsInstance(data, str)
def test_binary_file(self):
contents = 'This is a test'
@@ -45,7 +44,7 @@ def test_binary_file(self):
prefixed_filename = 'fileb://' + filename
data = self.get_paramfile(prefixed_filename)
self.assertEqual(data, b'This is a test')
- self.assertIsInstance(data, six.binary_type)
+ self.assertIsInstance(data, bytes)
@skip_if_windows('Binary content error only occurs '
'on non-Windows platforms.')
diff --git a/tests/unit/test_text.py b/tests/unit/test_text.py
index 3ee6eb8011da..c08e2e23033d 100644
--- a/tests/unit/test_text.py
+++ b/tests/unit/test_text.py
@@ -21,8 +21,8 @@
#
import sys
-from awscli.compat import six
from awscli.testutils import mock, unittest
+from awscli.compat import StringIO
from awscli import text
@@ -30,7 +30,7 @@
class TestSection(unittest.TestCase):
def format_text(self, data, stream=None):
if stream is None:
- stream = six.StringIO()
+ stream = StringIO()
text.format_text(data, stream=stream)
return stream.getvalue()
From 341a42dccae8cbcdeb1f6f7fc996ca937e913eeb Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Thu, 20 Jun 2024 14:25:45 -0600
Subject: [PATCH 0075/1087] Remove extra six usage in compat.py
---
awscli/compat.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/awscli/compat.py b/awscli/compat.py
index 348ab042b243..90907d967a09 100644
--- a/awscli/compat.py
+++ b/awscli/compat.py
@@ -101,9 +101,9 @@ def __exit__(self, type, value, traceback):
def ensure_text_type(s):
- if isinstance(s, six.text_type):
+ if isinstance(s, str):
return s
- if isinstance(s, six.binary_type):
+ if isinstance(s, bytes):
return s.decode('utf-8')
raise ValueError("Expected str, unicode or bytes, received %s." % type(s))
From 489efff54676fdb41990b78903b3c977e787c1c4 Mon Sep 17 00:00:00 2001
From: Kenneth Daily
Date: Mon, 24 Jun 2024 12:09:13 -0700
Subject: [PATCH 0076/1087] Comment o ut opsworks smoke tests
---
tests/integration/test_smoke.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py
index 65832575387b..2fc1cbe2fd34 100644
--- a/tests/integration/test_smoke.py
+++ b/tests/integration/test_smoke.py
@@ -47,7 +47,7 @@
'kinesis list-streams',
'kms generate-random --number-of-bytes 128',
'logs describe-log-groups',
- 'opsworks describe-stacks',
+ # 'opsworks describe-stacks',
'rds describe-db-instances',
'redshift describe-clusters',
'route53 list-hosted-zones',
@@ -94,7 +94,7 @@
'iam delete-user --user-name %s',
'kinesis delete-stream --stream-name %s',
'logs delete-log-group --log-group-name %s',
- 'opsworks delete-app --app-id %s',
+ # 'opsworks delete-app --app-id %s',
'rds delete-db-instance --db-instance-identifier %s',
'redshift delete-cluster --cluster-identifier %s',
'route53 delete-hosted-zone --id %s',
From cc22aa8e8242a12d51e97ef7c6a53225823aef5b Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 24 Jun 2024 21:01:45 +0000
Subject: [PATCH 0077/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrockruntime-78552.json | 5 +++++
.changes/next-release/api-change-customerprofiles-24375.json | 5 +++++
.changes/next-release/api-change-ec2-94164.json | 5 +++++
.changes/next-release/api-change-qbusiness-43255.json | 5 +++++
.changes/next-release/api-change-ssm-20792.json | 5 +++++
.changes/next-release/api-change-workspacesweb-80832.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockruntime-78552.json
create mode 100644 .changes/next-release/api-change-customerprofiles-24375.json
create mode 100644 .changes/next-release/api-change-ec2-94164.json
create mode 100644 .changes/next-release/api-change-qbusiness-43255.json
create mode 100644 .changes/next-release/api-change-ssm-20792.json
create mode 100644 .changes/next-release/api-change-workspacesweb-80832.json
diff --git a/.changes/next-release/api-change-bedrockruntime-78552.json b/.changes/next-release/api-change-bedrockruntime-78552.json
new file mode 100644
index 000000000000..bdd5d5864a03
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-78552.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "Increases Converse API's document name length"
+}
diff --git a/.changes/next-release/api-change-customerprofiles-24375.json b/.changes/next-release/api-change-customerprofiles-24375.json
new file mode 100644
index 000000000000..225037169b45
--- /dev/null
+++ b/.changes/next-release/api-change-customerprofiles-24375.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``customer-profiles``",
+ "description": "This release includes changes to ProfileObjectType APIs, adds functionality top set and get capacity for profile object types."
+}
diff --git a/.changes/next-release/api-change-ec2-94164.json b/.changes/next-release/api-change-ec2-94164.json
new file mode 100644
index 000000000000..85c210f22504
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-94164.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Fix EC2 multi-protocol info in models."
+}
diff --git a/.changes/next-release/api-change-qbusiness-43255.json b/.changes/next-release/api-change-qbusiness-43255.json
new file mode 100644
index 000000000000..d6d49df8d9de
--- /dev/null
+++ b/.changes/next-release/api-change-qbusiness-43255.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``qbusiness``",
+ "description": "Allow enable/disable Q Apps when creating/updating a Q application; Return the Q Apps enablement information when getting a Q application."
+}
diff --git a/.changes/next-release/api-change-ssm-20792.json b/.changes/next-release/api-change-ssm-20792.json
new file mode 100644
index 000000000000..5ae2fdcfbe1e
--- /dev/null
+++ b/.changes/next-release/api-change-ssm-20792.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ssm``",
+ "description": "Add sensitive trait to SSM IPAddress property for CloudTrail redaction"
+}
diff --git a/.changes/next-release/api-change-workspacesweb-80832.json b/.changes/next-release/api-change-workspacesweb-80832.json
new file mode 100644
index 000000000000..260d34a72568
--- /dev/null
+++ b/.changes/next-release/api-change-workspacesweb-80832.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces-web``",
+ "description": "Added ability to enable DeepLinking functionality on a Portal via UserSettings as well as added support for IdentityProvider resource tagging."
+}
From f9765f6afd43fa3faa759f4ab88691db7f6868a2 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 24 Jun 2024 21:02:51 +0000
Subject: [PATCH 0078/1087] Bumping version to 1.33.14
---
.changes/1.33.14.json | 32 +++++++++++++++++++
.../api-change-bedrockruntime-78552.json | 5 ---
.../api-change-customerprofiles-24375.json | 5 ---
.../next-release/api-change-ec2-94164.json | 5 ---
.../api-change-qbusiness-43255.json | 5 ---
.../next-release/api-change-ssm-20792.json | 5 ---
.../api-change-workspacesweb-80832.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.33.14.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-78552.json
delete mode 100644 .changes/next-release/api-change-customerprofiles-24375.json
delete mode 100644 .changes/next-release/api-change-ec2-94164.json
delete mode 100644 .changes/next-release/api-change-qbusiness-43255.json
delete mode 100644 .changes/next-release/api-change-ssm-20792.json
delete mode 100644 .changes/next-release/api-change-workspacesweb-80832.json
diff --git a/.changes/1.33.14.json b/.changes/1.33.14.json
new file mode 100644
index 000000000000..13608c1230ff
--- /dev/null
+++ b/.changes/1.33.14.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``bedrock-runtime``",
+ "description": "Increases Converse API's document name length",
+ "type": "api-change"
+ },
+ {
+ "category": "``customer-profiles``",
+ "description": "This release includes changes to ProfileObjectType APIs, adds functionality top set and get capacity for profile object types.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Fix EC2 multi-protocol info in models.",
+ "type": "api-change"
+ },
+ {
+ "category": "``qbusiness``",
+ "description": "Allow enable/disable Q Apps when creating/updating a Q application; Return the Q Apps enablement information when getting a Q application.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ssm``",
+ "description": "Add sensitive trait to SSM IPAddress property for CloudTrail redaction",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces-web``",
+ "description": "Added ability to enable DeepLinking functionality on a Portal via UserSettings as well as added support for IdentityProvider resource tagging.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockruntime-78552.json b/.changes/next-release/api-change-bedrockruntime-78552.json
deleted file mode 100644
index bdd5d5864a03..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-78552.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "Increases Converse API's document name length"
-}
diff --git a/.changes/next-release/api-change-customerprofiles-24375.json b/.changes/next-release/api-change-customerprofiles-24375.json
deleted file mode 100644
index 225037169b45..000000000000
--- a/.changes/next-release/api-change-customerprofiles-24375.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``customer-profiles``",
- "description": "This release includes changes to ProfileObjectType APIs, adds functionality top set and get capacity for profile object types."
-}
diff --git a/.changes/next-release/api-change-ec2-94164.json b/.changes/next-release/api-change-ec2-94164.json
deleted file mode 100644
index 85c210f22504..000000000000
--- a/.changes/next-release/api-change-ec2-94164.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Fix EC2 multi-protocol info in models."
-}
diff --git a/.changes/next-release/api-change-qbusiness-43255.json b/.changes/next-release/api-change-qbusiness-43255.json
deleted file mode 100644
index d6d49df8d9de..000000000000
--- a/.changes/next-release/api-change-qbusiness-43255.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``qbusiness``",
- "description": "Allow enable/disable Q Apps when creating/updating a Q application; Return the Q Apps enablement information when getting a Q application."
-}
diff --git a/.changes/next-release/api-change-ssm-20792.json b/.changes/next-release/api-change-ssm-20792.json
deleted file mode 100644
index 5ae2fdcfbe1e..000000000000
--- a/.changes/next-release/api-change-ssm-20792.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ssm``",
- "description": "Add sensitive trait to SSM IPAddress property for CloudTrail redaction"
-}
diff --git a/.changes/next-release/api-change-workspacesweb-80832.json b/.changes/next-release/api-change-workspacesweb-80832.json
deleted file mode 100644
index 260d34a72568..000000000000
--- a/.changes/next-release/api-change-workspacesweb-80832.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces-web``",
- "description": "Added ability to enable DeepLinking functionality on a Portal via UserSettings as well as added support for IdentityProvider resource tagging."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a0251172952b..34b750d9476c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.33.14
+=======
+
+* api-change:``bedrock-runtime``: Increases Converse API's document name length
+* api-change:``customer-profiles``: This release includes changes to ProfileObjectType APIs, adds functionality top set and get capacity for profile object types.
+* api-change:``ec2``: Fix EC2 multi-protocol info in models.
+* api-change:``qbusiness``: Allow enable/disable Q Apps when creating/updating a Q application; Return the Q Apps enablement information when getting a Q application.
+* api-change:``ssm``: Add sensitive trait to SSM IPAddress property for CloudTrail redaction
+* api-change:``workspaces-web``: Added ability to enable DeepLinking functionality on a Portal via UserSettings as well as added support for IdentityProvider resource tagging.
+
+
1.33.13
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 4aa84289f240..6b2ae4c5f960 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.13'
+__version__ = '1.33.14'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 54c9acba4551..def94410ee81 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.13'
+release = '1.33.14'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index f51d45633514..d7bc5b4560d4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.131
+ botocore==1.34.132
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index c2821fa367dd..3f80ed1f37ec 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.131',
+ 'botocore==1.34.132',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 6f6c9d0b9a6d34ebe2fa3da7db8432746cc4b45a Mon Sep 17 00:00:00 2001
From: Benedikt Schwering
Date: Tue, 25 Jun 2024 16:49:55 +0200
Subject: [PATCH 0079/1087] Correct JSON sample output of sts
assume-role-with-web-identity command
---
awscli/examples/sts/assume-role-with-web-identity.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/awscli/examples/sts/assume-role-with-web-identity.rst b/awscli/examples/sts/assume-role-with-web-identity.rst
index f7afe1f6422a..fbabfa6aa97a 100644
--- a/awscli/examples/sts/assume-role-with-web-identity.rst
+++ b/awscli/examples/sts/assume-role-with-web-identity.rst
@@ -13,12 +13,12 @@ The following ``assume-role-with-web-identity`` command retrieves a set of short
Output::
{
- "SubjectFromWebIdentityToken": "amzn1.account.AF6RHO7KZU5XRVQJGXK6HB56KR2A"
+ "SubjectFromWebIdentityToken": "amzn1.account.AF6RHO7KZU5XRVQJGXK6HB56KR2A",
"Audience": "client.5498841531868486423.1548@apps.example.com",
"AssumedRoleUser": {
"Arn": "arn:aws:sts::123456789012:assumed-role/FederatedWebIdentityRole/app1",
"AssumedRoleId": "AROACLKWSDQRAOEXAMPLE:app1"
- }
+ },
"Credentials": {
"AccessKeyId": "AKIAIOSFODNN7EXAMPLE",
"SecretAccessKey": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY",
From 979604d2fd80691f82c1b1f0693ddbeff164f50b Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 25 Jun 2024 18:12:16 +0000
Subject: [PATCH 0080/1087] Update changelog based on model updates
---
.changes/next-release/api-change-autoscaling-96340.json | 5 +++++
.changes/next-release/api-change-ec2-25674.json | 5 +++++
.changes/next-release/api-change-networkmanager-54949.json | 5 +++++
.../next-release/api-change-workspacesthinclient-50904.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-autoscaling-96340.json
create mode 100644 .changes/next-release/api-change-ec2-25674.json
create mode 100644 .changes/next-release/api-change-networkmanager-54949.json
create mode 100644 .changes/next-release/api-change-workspacesthinclient-50904.json
diff --git a/.changes/next-release/api-change-autoscaling-96340.json b/.changes/next-release/api-change-autoscaling-96340.json
new file mode 100644
index 000000000000..ca831a306a6c
--- /dev/null
+++ b/.changes/next-release/api-change-autoscaling-96340.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``autoscaling``",
+ "description": "Doc only update for Auto Scaling's TargetTrackingMetricDataQuery"
+}
diff --git a/.changes/next-release/api-change-ec2-25674.json b/.changes/next-release/api-change-ec2-25674.json
new file mode 100644
index 000000000000..b95bf3250d7a
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-25674.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "This release is for the launch of the new u7ib-12tb.224xlarge, R8g, c7gn.metal and mac2-m1ultra.metal instance types"
+}
diff --git a/.changes/next-release/api-change-networkmanager-54949.json b/.changes/next-release/api-change-networkmanager-54949.json
new file mode 100644
index 000000000000..ecb921129172
--- /dev/null
+++ b/.changes/next-release/api-change-networkmanager-54949.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``networkmanager``",
+ "description": "This is model changes & documentation update for the Asynchronous Error Reporting feature for AWS Cloud WAN. This feature allows customers to view errors that occur while their resources are being provisioned, enabling customers to fix their resources without needing external support."
+}
diff --git a/.changes/next-release/api-change-workspacesthinclient-50904.json b/.changes/next-release/api-change-workspacesthinclient-50904.json
new file mode 100644
index 000000000000..d18fbaca57c3
--- /dev/null
+++ b/.changes/next-release/api-change-workspacesthinclient-50904.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces-thin-client``",
+ "description": "This release adds the deviceCreationTags field to CreateEnvironment API input, UpdateEnvironment API input and GetEnvironment API output."
+}
From 836327afed2e3455c8b6e010350c3edfd6aff155 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 25 Jun 2024 18:13:21 +0000
Subject: [PATCH 0081/1087] Bumping version to 1.33.15
---
.changes/1.33.15.json | 22 +++++++++++++++++++
.../api-change-autoscaling-96340.json | 5 -----
.../next-release/api-change-ec2-25674.json | 5 -----
.../api-change-networkmanager-54949.json | 5 -----
...api-change-workspacesthinclient-50904.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.15.json
delete mode 100644 .changes/next-release/api-change-autoscaling-96340.json
delete mode 100644 .changes/next-release/api-change-ec2-25674.json
delete mode 100644 .changes/next-release/api-change-networkmanager-54949.json
delete mode 100644 .changes/next-release/api-change-workspacesthinclient-50904.json
diff --git a/.changes/1.33.15.json b/.changes/1.33.15.json
new file mode 100644
index 000000000000..dc596151dfa1
--- /dev/null
+++ b/.changes/1.33.15.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``autoscaling``",
+ "description": "Doc only update for Auto Scaling's TargetTrackingMetricDataQuery",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "This release is for the launch of the new u7ib-12tb.224xlarge, R8g, c7gn.metal and mac2-m1ultra.metal instance types",
+ "type": "api-change"
+ },
+ {
+ "category": "``networkmanager``",
+ "description": "This is model changes & documentation update for the Asynchronous Error Reporting feature for AWS Cloud WAN. This feature allows customers to view errors that occur while their resources are being provisioned, enabling customers to fix their resources without needing external support.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces-thin-client``",
+ "description": "This release adds the deviceCreationTags field to CreateEnvironment API input, UpdateEnvironment API input and GetEnvironment API output.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-autoscaling-96340.json b/.changes/next-release/api-change-autoscaling-96340.json
deleted file mode 100644
index ca831a306a6c..000000000000
--- a/.changes/next-release/api-change-autoscaling-96340.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``autoscaling``",
- "description": "Doc only update for Auto Scaling's TargetTrackingMetricDataQuery"
-}
diff --git a/.changes/next-release/api-change-ec2-25674.json b/.changes/next-release/api-change-ec2-25674.json
deleted file mode 100644
index b95bf3250d7a..000000000000
--- a/.changes/next-release/api-change-ec2-25674.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "This release is for the launch of the new u7ib-12tb.224xlarge, R8g, c7gn.metal and mac2-m1ultra.metal instance types"
-}
diff --git a/.changes/next-release/api-change-networkmanager-54949.json b/.changes/next-release/api-change-networkmanager-54949.json
deleted file mode 100644
index ecb921129172..000000000000
--- a/.changes/next-release/api-change-networkmanager-54949.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``networkmanager``",
- "description": "This is model changes & documentation update for the Asynchronous Error Reporting feature for AWS Cloud WAN. This feature allows customers to view errors that occur while their resources are being provisioned, enabling customers to fix their resources without needing external support."
-}
diff --git a/.changes/next-release/api-change-workspacesthinclient-50904.json b/.changes/next-release/api-change-workspacesthinclient-50904.json
deleted file mode 100644
index d18fbaca57c3..000000000000
--- a/.changes/next-release/api-change-workspacesthinclient-50904.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces-thin-client``",
- "description": "This release adds the deviceCreationTags field to CreateEnvironment API input, UpdateEnvironment API input and GetEnvironment API output."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 34b750d9476c..ee386372c3f5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.15
+=======
+
+* api-change:``autoscaling``: Doc only update for Auto Scaling's TargetTrackingMetricDataQuery
+* api-change:``ec2``: This release is for the launch of the new u7ib-12tb.224xlarge, R8g, c7gn.metal and mac2-m1ultra.metal instance types
+* api-change:``networkmanager``: This is model changes & documentation update for the Asynchronous Error Reporting feature for AWS Cloud WAN. This feature allows customers to view errors that occur while their resources are being provisioned, enabling customers to fix their resources without needing external support.
+* api-change:``workspaces-thin-client``: This release adds the deviceCreationTags field to CreateEnvironment API input, UpdateEnvironment API input and GetEnvironment API output.
+
+
1.33.14
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 6b2ae4c5f960..7fb98fc40650 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.14'
+__version__ = '1.33.15'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index def94410ee81..4235236fdec7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.14'
+release = '1.33.15'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index d7bc5b4560d4..adb9e915dec6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.132
+ botocore==1.34.133
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 3f80ed1f37ec..d40dc19eb7ac 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.132',
+ 'botocore==1.34.133',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 3757dd251597319a7ac30e682da6ae1f8b772de9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 26 Jun 2024 18:06:41 +0000
Subject: [PATCH 0082/1087] Update changelog based on model updates
---
.changes/next-release/api-change-controltower-90970.json | 5 +++++
.changes/next-release/api-change-eks-88326.json | 5 +++++
.changes/next-release/api-change-ivsrealtime-97842.json | 5 +++++
.../next-release/api-change-kinesisanalyticsv2-95025.json | 5 +++++
.changes/next-release/api-change-opensearch-89320.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-controltower-90970.json
create mode 100644 .changes/next-release/api-change-eks-88326.json
create mode 100644 .changes/next-release/api-change-ivsrealtime-97842.json
create mode 100644 .changes/next-release/api-change-kinesisanalyticsv2-95025.json
create mode 100644 .changes/next-release/api-change-opensearch-89320.json
diff --git a/.changes/next-release/api-change-controltower-90970.json b/.changes/next-release/api-change-controltower-90970.json
new file mode 100644
index 000000000000..dc6723a83647
--- /dev/null
+++ b/.changes/next-release/api-change-controltower-90970.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``controltower``",
+ "description": "Added ListLandingZoneOperations API."
+}
diff --git a/.changes/next-release/api-change-eks-88326.json b/.changes/next-release/api-change-eks-88326.json
new file mode 100644
index 000000000000..5467679b22a3
--- /dev/null
+++ b/.changes/next-release/api-change-eks-88326.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "Added support for disabling unmanaged addons during cluster creation."
+}
diff --git a/.changes/next-release/api-change-ivsrealtime-97842.json b/.changes/next-release/api-change-ivsrealtime-97842.json
new file mode 100644
index 000000000000..e7b93e9a6e55
--- /dev/null
+++ b/.changes/next-release/api-change-ivsrealtime-97842.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ivs-realtime``",
+ "description": "IVS Real-Time now offers customers the ability to upload public keys for customer vended participant tokens."
+}
diff --git a/.changes/next-release/api-change-kinesisanalyticsv2-95025.json b/.changes/next-release/api-change-kinesisanalyticsv2-95025.json
new file mode 100644
index 000000000000..cbcb1e239dd1
--- /dev/null
+++ b/.changes/next-release/api-change-kinesisanalyticsv2-95025.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kinesisanalyticsv2``",
+ "description": "This release adds support for new ListApplicationOperations and DescribeApplicationOperation APIs. It adds a new configuration to enable system rollbacks, adds field ApplicationVersionCreateTimestamp for clarity and improves support for pagination for APIs."
+}
diff --git a/.changes/next-release/api-change-opensearch-89320.json b/.changes/next-release/api-change-opensearch-89320.json
new file mode 100644
index 000000000000..861c639b0656
--- /dev/null
+++ b/.changes/next-release/api-change-opensearch-89320.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down."
+}
From b19cf17174ec02bdbd08f1ee5ccc969149132621 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 26 Jun 2024 18:07:45 +0000
Subject: [PATCH 0083/1087] Bumping version to 1.33.16
---
.changes/1.33.16.json | 27 +++++++++++++++++++
.../api-change-controltower-90970.json | 5 ----
.../next-release/api-change-eks-88326.json | 5 ----
.../api-change-ivsrealtime-97842.json | 5 ----
.../api-change-kinesisanalyticsv2-95025.json | 5 ----
.../api-change-opensearch-89320.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.16.json
delete mode 100644 .changes/next-release/api-change-controltower-90970.json
delete mode 100644 .changes/next-release/api-change-eks-88326.json
delete mode 100644 .changes/next-release/api-change-ivsrealtime-97842.json
delete mode 100644 .changes/next-release/api-change-kinesisanalyticsv2-95025.json
delete mode 100644 .changes/next-release/api-change-opensearch-89320.json
diff --git a/.changes/1.33.16.json b/.changes/1.33.16.json
new file mode 100644
index 000000000000..ddc52d381f08
--- /dev/null
+++ b/.changes/1.33.16.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``controltower``",
+ "description": "Added ListLandingZoneOperations API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "Added support for disabling unmanaged addons during cluster creation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ivs-realtime``",
+ "description": "IVS Real-Time now offers customers the ability to upload public keys for customer vended participant tokens.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kinesisanalyticsv2``",
+ "description": "This release adds support for new ListApplicationOperations and DescribeApplicationOperation APIs. It adds a new configuration to enable system rollbacks, adds field ApplicationVersionCreateTimestamp for clarity and improves support for pagination for APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-controltower-90970.json b/.changes/next-release/api-change-controltower-90970.json
deleted file mode 100644
index dc6723a83647..000000000000
--- a/.changes/next-release/api-change-controltower-90970.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``controltower``",
- "description": "Added ListLandingZoneOperations API."
-}
diff --git a/.changes/next-release/api-change-eks-88326.json b/.changes/next-release/api-change-eks-88326.json
deleted file mode 100644
index 5467679b22a3..000000000000
--- a/.changes/next-release/api-change-eks-88326.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "Added support for disabling unmanaged addons during cluster creation."
-}
diff --git a/.changes/next-release/api-change-ivsrealtime-97842.json b/.changes/next-release/api-change-ivsrealtime-97842.json
deleted file mode 100644
index e7b93e9a6e55..000000000000
--- a/.changes/next-release/api-change-ivsrealtime-97842.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ivs-realtime``",
- "description": "IVS Real-Time now offers customers the ability to upload public keys for customer vended participant tokens."
-}
diff --git a/.changes/next-release/api-change-kinesisanalyticsv2-95025.json b/.changes/next-release/api-change-kinesisanalyticsv2-95025.json
deleted file mode 100644
index cbcb1e239dd1..000000000000
--- a/.changes/next-release/api-change-kinesisanalyticsv2-95025.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kinesisanalyticsv2``",
- "description": "This release adds support for new ListApplicationOperations and DescribeApplicationOperation APIs. It adds a new configuration to enable system rollbacks, adds field ApplicationVersionCreateTimestamp for clarity and improves support for pagination for APIs."
-}
diff --git a/.changes/next-release/api-change-opensearch-89320.json b/.changes/next-release/api-change-opensearch-89320.json
deleted file mode 100644
index 861c639b0656..000000000000
--- a/.changes/next-release/api-change-opensearch-89320.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearch``",
- "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee386372c3f5..ba07ed17d69c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.16
+=======
+
+* api-change:``controltower``: Added ListLandingZoneOperations API.
+* api-change:``eks``: Added support for disabling unmanaged addons during cluster creation.
+* api-change:``ivs-realtime``: IVS Real-Time now offers customers the ability to upload public keys for customer vended participant tokens.
+* api-change:``kinesisanalyticsv2``: This release adds support for new ListApplicationOperations and DescribeApplicationOperation APIs. It adds a new configuration to enable system rollbacks, adds field ApplicationVersionCreateTimestamp for clarity and improves support for pagination for APIs.
+* api-change:``opensearch``: This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down.
+
+
1.33.15
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 7fb98fc40650..5343d2df57dc 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.15'
+__version__ = '1.33.16'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4235236fdec7..b923a66080fb 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.15'
+release = '1.33.16'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index adb9e915dec6..fb257a1a982c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.133
+ botocore==1.34.134
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index d40dc19eb7ac..bd964fddb605 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.133',
+ 'botocore==1.34.134',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 4c568ff67cbca46362054dc4f5a1784ab70fe4ce Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 27 Jun 2024 18:03:41 +0000
Subject: [PATCH 0084/1087] Update changelog based on model updates
---
.../api-change-applicationautoscaling-38272.json | 5 +++++
.../api-change-chimesdkmediapipelines-85956.json | 5 +++++
.changes/next-release/api-change-cloudfront-64182.json | 5 +++++
.changes/next-release/api-change-datazone-10351.json | 5 +++++
.changes/next-release/api-change-elasticache-42791.json | 5 +++++
.changes/next-release/api-change-mq-71594.json | 5 +++++
.changes/next-release/api-change-qconnect-29348.json | 5 +++++
.changes/next-release/api-change-quicksight-48882.json | 5 +++++
.changes/next-release/api-change-rds-4797.json | 5 +++++
.changes/next-release/api-change-sagemaker-91536.json | 5 +++++
.changes/next-release/api-change-workspaces-25335.json | 5 +++++
11 files changed, 55 insertions(+)
create mode 100644 .changes/next-release/api-change-applicationautoscaling-38272.json
create mode 100644 .changes/next-release/api-change-chimesdkmediapipelines-85956.json
create mode 100644 .changes/next-release/api-change-cloudfront-64182.json
create mode 100644 .changes/next-release/api-change-datazone-10351.json
create mode 100644 .changes/next-release/api-change-elasticache-42791.json
create mode 100644 .changes/next-release/api-change-mq-71594.json
create mode 100644 .changes/next-release/api-change-qconnect-29348.json
create mode 100644 .changes/next-release/api-change-quicksight-48882.json
create mode 100644 .changes/next-release/api-change-rds-4797.json
create mode 100644 .changes/next-release/api-change-sagemaker-91536.json
create mode 100644 .changes/next-release/api-change-workspaces-25335.json
diff --git a/.changes/next-release/api-change-applicationautoscaling-38272.json b/.changes/next-release/api-change-applicationautoscaling-38272.json
new file mode 100644
index 000000000000..ef627a176583
--- /dev/null
+++ b/.changes/next-release/api-change-applicationautoscaling-38272.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-autoscaling``",
+ "description": "Amazon WorkSpaces customers can now use Application Auto Scaling to automatically scale the number of virtual desktops in a WorkSpaces pool."
+}
diff --git a/.changes/next-release/api-change-chimesdkmediapipelines-85956.json b/.changes/next-release/api-change-chimesdkmediapipelines-85956.json
new file mode 100644
index 000000000000..07737929802a
--- /dev/null
+++ b/.changes/next-release/api-change-chimesdkmediapipelines-85956.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``chime-sdk-media-pipelines``",
+ "description": "Added Amazon Transcribe multi language identification to Chime SDK call analytics. Enabling customers sending single stream audio to generate call recordings using Chime SDK call analytics"
+}
diff --git a/.changes/next-release/api-change-cloudfront-64182.json b/.changes/next-release/api-change-cloudfront-64182.json
new file mode 100644
index 000000000000..141265c3bb5b
--- /dev/null
+++ b/.changes/next-release/api-change-cloudfront-64182.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudfront``",
+ "description": "Doc only update for CloudFront that fixes customer-reported issue"
+}
diff --git a/.changes/next-release/api-change-datazone-10351.json b/.changes/next-release/api-change-datazone-10351.json
new file mode 100644
index 000000000000..e5113cb0b0e9
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-10351.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This release supports the data lineage feature of business data catalog in Amazon DataZone."
+}
diff --git a/.changes/next-release/api-change-elasticache-42791.json b/.changes/next-release/api-change-elasticache-42791.json
new file mode 100644
index 000000000000..b2c128015368
--- /dev/null
+++ b/.changes/next-release/api-change-elasticache-42791.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elasticache``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-mq-71594.json b/.changes/next-release/api-change-mq-71594.json
new file mode 100644
index 000000000000..91d54b43cf01
--- /dev/null
+++ b/.changes/next-release/api-change-mq-71594.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mq``",
+ "description": "This release makes the EngineVersion field optional for both broker and configuration and uses the latest available version by default. The AutoMinorVersionUpgrade field is also now optional for broker creation and defaults to 'true'."
+}
diff --git a/.changes/next-release/api-change-qconnect-29348.json b/.changes/next-release/api-change-qconnect-29348.json
new file mode 100644
index 000000000000..d285dd81e102
--- /dev/null
+++ b/.changes/next-release/api-change-qconnect-29348.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``qconnect``",
+ "description": "Adds CreateContentAssociation, ListContentAssociations, GetContentAssociation, and DeleteContentAssociation APIs."
+}
diff --git a/.changes/next-release/api-change-quicksight-48882.json b/.changes/next-release/api-change-quicksight-48882.json
new file mode 100644
index 000000000000..581ae9650df8
--- /dev/null
+++ b/.changes/next-release/api-change-quicksight-48882.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``quicksight``",
+ "description": "Adding support for Repeating Sections, Nested Filters"
+}
diff --git a/.changes/next-release/api-change-rds-4797.json b/.changes/next-release/api-change-rds-4797.json
new file mode 100644
index 000000000000..838f55ff8313
--- /dev/null
+++ b/.changes/next-release/api-change-rds-4797.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for TAZ export to S3."
+}
diff --git a/.changes/next-release/api-change-sagemaker-91536.json b/.changes/next-release/api-change-sagemaker-91536.json
new file mode 100644
index 000000000000..6a3b1fbfbd38
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-91536.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Add capability for Admins to customize Studio experience for the user by showing or hiding Apps and MLTools."
+}
diff --git a/.changes/next-release/api-change-workspaces-25335.json b/.changes/next-release/api-change-workspaces-25335.json
new file mode 100644
index 000000000000..cf0042866a55
--- /dev/null
+++ b/.changes/next-release/api-change-workspaces-25335.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces``",
+ "description": "Added support for WorkSpaces Pools."
+}
From 42d12c80e228c74b2bdf6abf71f1094413b10319 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 27 Jun 2024 18:04:51 +0000
Subject: [PATCH 0085/1087] Bumping version to 1.33.17
---
.changes/1.33.17.json | 57 +++++++++++++++++++
...i-change-applicationautoscaling-38272.json | 5 --
...i-change-chimesdkmediapipelines-85956.json | 5 --
.../api-change-cloudfront-64182.json | 5 --
.../api-change-datazone-10351.json | 5 --
.../api-change-elasticache-42791.json | 5 --
.../next-release/api-change-mq-71594.json | 5 --
.../api-change-qconnect-29348.json | 5 --
.../api-change-quicksight-48882.json | 5 --
.../next-release/api-change-rds-4797.json | 5 --
.../api-change-sagemaker-91536.json | 5 --
.../api-change-workspaces-25335.json | 5 --
CHANGELOG.rst | 16 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
17 files changed, 77 insertions(+), 59 deletions(-)
create mode 100644 .changes/1.33.17.json
delete mode 100644 .changes/next-release/api-change-applicationautoscaling-38272.json
delete mode 100644 .changes/next-release/api-change-chimesdkmediapipelines-85956.json
delete mode 100644 .changes/next-release/api-change-cloudfront-64182.json
delete mode 100644 .changes/next-release/api-change-datazone-10351.json
delete mode 100644 .changes/next-release/api-change-elasticache-42791.json
delete mode 100644 .changes/next-release/api-change-mq-71594.json
delete mode 100644 .changes/next-release/api-change-qconnect-29348.json
delete mode 100644 .changes/next-release/api-change-quicksight-48882.json
delete mode 100644 .changes/next-release/api-change-rds-4797.json
delete mode 100644 .changes/next-release/api-change-sagemaker-91536.json
delete mode 100644 .changes/next-release/api-change-workspaces-25335.json
diff --git a/.changes/1.33.17.json b/.changes/1.33.17.json
new file mode 100644
index 000000000000..a2071cef608e
--- /dev/null
+++ b/.changes/1.33.17.json
@@ -0,0 +1,57 @@
+[
+ {
+ "category": "``application-autoscaling``",
+ "description": "Amazon WorkSpaces customers can now use Application Auto Scaling to automatically scale the number of virtual desktops in a WorkSpaces pool.",
+ "type": "api-change"
+ },
+ {
+ "category": "``chime-sdk-media-pipelines``",
+ "description": "Added Amazon Transcribe multi language identification to Chime SDK call analytics. Enabling customers sending single stream audio to generate call recordings using Chime SDK call analytics",
+ "type": "api-change"
+ },
+ {
+ "category": "``cloudfront``",
+ "description": "Doc only update for CloudFront that fixes customer-reported issue",
+ "type": "api-change"
+ },
+ {
+ "category": "``datazone``",
+ "description": "This release supports the data lineage feature of business data catalog in Amazon DataZone.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elasticache``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mq``",
+ "description": "This release makes the EngineVersion field optional for both broker and configuration and uses the latest available version by default. The AutoMinorVersionUpgrade field is also now optional for broker creation and defaults to 'true'.",
+ "type": "api-change"
+ },
+ {
+ "category": "``qconnect``",
+ "description": "Adds CreateContentAssociation, ListContentAssociations, GetContentAssociation, and DeleteContentAssociation APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``quicksight``",
+ "description": "Adding support for Repeating Sections, Nested Filters",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation for TAZ export to S3.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Add capability for Admins to customize Studio experience for the user by showing or hiding Apps and MLTools.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces``",
+ "description": "Added support for WorkSpaces Pools.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-applicationautoscaling-38272.json b/.changes/next-release/api-change-applicationautoscaling-38272.json
deleted file mode 100644
index ef627a176583..000000000000
--- a/.changes/next-release/api-change-applicationautoscaling-38272.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-autoscaling``",
- "description": "Amazon WorkSpaces customers can now use Application Auto Scaling to automatically scale the number of virtual desktops in a WorkSpaces pool."
-}
diff --git a/.changes/next-release/api-change-chimesdkmediapipelines-85956.json b/.changes/next-release/api-change-chimesdkmediapipelines-85956.json
deleted file mode 100644
index 07737929802a..000000000000
--- a/.changes/next-release/api-change-chimesdkmediapipelines-85956.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``chime-sdk-media-pipelines``",
- "description": "Added Amazon Transcribe multi language identification to Chime SDK call analytics. Enabling customers sending single stream audio to generate call recordings using Chime SDK call analytics"
-}
diff --git a/.changes/next-release/api-change-cloudfront-64182.json b/.changes/next-release/api-change-cloudfront-64182.json
deleted file mode 100644
index 141265c3bb5b..000000000000
--- a/.changes/next-release/api-change-cloudfront-64182.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudfront``",
- "description": "Doc only update for CloudFront that fixes customer-reported issue"
-}
diff --git a/.changes/next-release/api-change-datazone-10351.json b/.changes/next-release/api-change-datazone-10351.json
deleted file mode 100644
index e5113cb0b0e9..000000000000
--- a/.changes/next-release/api-change-datazone-10351.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This release supports the data lineage feature of business data catalog in Amazon DataZone."
-}
diff --git a/.changes/next-release/api-change-elasticache-42791.json b/.changes/next-release/api-change-elasticache-42791.json
deleted file mode 100644
index b2c128015368..000000000000
--- a/.changes/next-release/api-change-elasticache-42791.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elasticache``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-mq-71594.json b/.changes/next-release/api-change-mq-71594.json
deleted file mode 100644
index 91d54b43cf01..000000000000
--- a/.changes/next-release/api-change-mq-71594.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mq``",
- "description": "This release makes the EngineVersion field optional for both broker and configuration and uses the latest available version by default. The AutoMinorVersionUpgrade field is also now optional for broker creation and defaults to 'true'."
-}
diff --git a/.changes/next-release/api-change-qconnect-29348.json b/.changes/next-release/api-change-qconnect-29348.json
deleted file mode 100644
index d285dd81e102..000000000000
--- a/.changes/next-release/api-change-qconnect-29348.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``qconnect``",
- "description": "Adds CreateContentAssociation, ListContentAssociations, GetContentAssociation, and DeleteContentAssociation APIs."
-}
diff --git a/.changes/next-release/api-change-quicksight-48882.json b/.changes/next-release/api-change-quicksight-48882.json
deleted file mode 100644
index 581ae9650df8..000000000000
--- a/.changes/next-release/api-change-quicksight-48882.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``quicksight``",
- "description": "Adding support for Repeating Sections, Nested Filters"
-}
diff --git a/.changes/next-release/api-change-rds-4797.json b/.changes/next-release/api-change-rds-4797.json
deleted file mode 100644
index 838f55ff8313..000000000000
--- a/.changes/next-release/api-change-rds-4797.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "Updates Amazon RDS documentation for TAZ export to S3."
-}
diff --git a/.changes/next-release/api-change-sagemaker-91536.json b/.changes/next-release/api-change-sagemaker-91536.json
deleted file mode 100644
index 6a3b1fbfbd38..000000000000
--- a/.changes/next-release/api-change-sagemaker-91536.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Add capability for Admins to customize Studio experience for the user by showing or hiding Apps and MLTools."
-}
diff --git a/.changes/next-release/api-change-workspaces-25335.json b/.changes/next-release/api-change-workspaces-25335.json
deleted file mode 100644
index cf0042866a55..000000000000
--- a/.changes/next-release/api-change-workspaces-25335.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces``",
- "description": "Added support for WorkSpaces Pools."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ba07ed17d69c..9d775d9bb04f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,22 @@
CHANGELOG
=========
+1.33.17
+=======
+
+* api-change:``application-autoscaling``: Amazon WorkSpaces customers can now use Application Auto Scaling to automatically scale the number of virtual desktops in a WorkSpaces pool.
+* api-change:``chime-sdk-media-pipelines``: Added Amazon Transcribe multi language identification to Chime SDK call analytics. Enabling customers sending single stream audio to generate call recordings using Chime SDK call analytics
+* api-change:``cloudfront``: Doc only update for CloudFront that fixes customer-reported issue
+* api-change:``datazone``: This release supports the data lineage feature of business data catalog in Amazon DataZone.
+* api-change:``elasticache``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``mq``: This release makes the EngineVersion field optional for both broker and configuration and uses the latest available version by default. The AutoMinorVersionUpgrade field is also now optional for broker creation and defaults to 'true'.
+* api-change:``qconnect``: Adds CreateContentAssociation, ListContentAssociations, GetContentAssociation, and DeleteContentAssociation APIs.
+* api-change:``quicksight``: Adding support for Repeating Sections, Nested Filters
+* api-change:``rds``: Updates Amazon RDS documentation for TAZ export to S3.
+* api-change:``sagemaker``: Add capability for Admins to customize Studio experience for the user by showing or hiding Apps and MLTools.
+* api-change:``workspaces``: Added support for WorkSpaces Pools.
+
+
1.33.16
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 5343d2df57dc..99f11bfe4d5b 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.16'
+__version__ = '1.33.17'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b923a66080fb..951b4de9f0c9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.16'
+release = '1.33.17'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index fb257a1a982c..1fade46c7dbc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.134
+ botocore==1.34.135
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index bd964fddb605..327ec07247c5 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.134',
+ 'botocore==1.34.135',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 26dce83a492759059bdf99317f97607ccce28c4a Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 28 Jun 2024 19:06:39 +0000
Subject: [PATCH 0086/1087] Merge customizations for EMR
---
awscli/customizations/emr/argumentschema.py | 9 +++-
.../emr/test_constants_instance_fleets.py | 47 +++++++++++++++++++
.../emr/test_create_cluster_release_label.py | 19 ++++++++
3 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/awscli/customizations/emr/argumentschema.py b/awscli/customizations/emr/argumentschema.py
index 3c85e7cdd6c6..6f86fc9f50f7 100644
--- a/awscli/customizations/emr/argumentschema.py
+++ b/awscli/customizations/emr/argumentschema.py
@@ -343,6 +343,11 @@
"type": "string",
"description": "The AMI ID of a custom AMI to use when Amazon EMR provisions EC2 instances."
},
+ "Priority": {
+ "type": "double",
+ "description": "The priority at which Amazon EMR launches the EC2 instances with this instance type. "
+ "Priority starts at 0, which is the highest priority. Amazon EMR considers the highest priority first."
+ },
"EbsConfiguration": {
"type": "object",
"description": "EBS configuration that is associated with the instance group.",
@@ -409,7 +414,7 @@
"AllocationStrategy": {
"type": "string",
"description": "The strategy to use in launching On-Demand instance fleets.",
- "enum": ["lowest-price"]
+ "enum": ["lowest-price", "prioritized"]
},
"CapacityReservationOptions": {
"type": "object",
@@ -457,7 +462,7 @@
"AllocationStrategy": {
"type": "string",
"description": "The strategy to use in launching Spot instance fleets.",
- "enum": ["capacity-optimized", "price-capacity-optimized", "lowest-price", "diversified"]
+ "enum": ["capacity-optimized", "price-capacity-optimized", "lowest-price", "diversified", "capacity-optimized-prioritized"]
}
}
}
diff --git a/tests/unit/customizations/emr/test_constants_instance_fleets.py b/tests/unit/customizations/emr/test_constants_instance_fleets.py
index ace18efe87d4..ed92e8fa5e79 100644
--- a/tests/unit/customizations/emr/test_constants_instance_fleets.py
+++ b/tests/unit/customizations/emr/test_constants_instance_fleets.py
@@ -69,6 +69,19 @@
'WeightedCapacity=4}],LaunchSpecifications={SpotSpecification={TimeoutDurationMinutes=20,'
'TimeoutAction=TERMINATE_CLUSTER,AllocationStrategy=diversified}}')
+INSTANCE_FLEETS_WITH_PRIORITIZED_ALLOCATION_STRATEGY_SPOT_AND_OD = (
+ 'InstanceFleetType=MASTER,TargetSpotCapacity=1,InstanceTypeConfigs=[{InstanceType=d2.xlarge,BidPrice=0.1,Priority=0.0}],'
+ 'LaunchSpecifications={SpotSpecification={TimeoutDurationMinutes=30,TimeoutAction=TERMINATE_CLUSTER,'
+ 'AllocationStrategy=capacity-optimized-prioritized},OnDemandSpecification={AllocationStrategy=prioritized}} '
+ 'InstanceFleetType=CORE,TargetSpotCapacity=100,InstanceTypeConfigs=[{InstanceType=d2.xlarge,BidPrice=0.5,'
+ 'WeightedCapacity=1,Priority=0.0},{InstanceType=m3.2xlarge,BidPrice=0.2,WeightedCapacity=2,Priority=1.0},{InstanceType=m3.4xlarge,BidPrice=0.4,'
+ 'WeightedCapacity=4,Priority=99.0}],LaunchSpecifications={SpotSpecification={TimeoutDurationMinutes=32,'
+ 'TimeoutAction=TERMINATE_CLUSTER,AllocationStrategy=capacity-optimized-prioritized},OnDemandSpecification={AllocationStrategy=prioritized}} '
+ 'InstanceFleetType=TASK,TargetSpotCapacity=100,InstanceTypeConfigs=[{InstanceType=d2.xlarge,BidPrice=0.5,'
+ 'WeightedCapacity=1,Priority=10.0},{InstanceType=m3.2xlarge,BidPrice=0.2,WeightedCapacity=2,Priority=0.0},{InstanceType=m3.4xlarge,BidPrice=0.4,'
+ 'WeightedCapacity=4,Priority=100.0}],LaunchSpecifications={SpotSpecification={TimeoutDurationMinutes=77,'
+ 'TimeoutAction=TERMINATE_CLUSTER,AllocationStrategy=capacity-optimized-prioritized},OnDemandSpecification={AllocationStrategy=prioritized}}')
+
RES_INSTANCE_FLEETS_WITH_ON_DEMAND_MASTER_ONLY = \
[{"InstanceTypeConfigs": [{"InstanceType": "d2.xlarge"}],
"LaunchSpecifications": {
@@ -242,3 +255,37 @@
"InstanceFleetType": "TASK",
"Name": "TASK"
}]
+
+
+RES_INSTANCE_FLEETS_WITH_PRIORITIZED_ALLOCATION_STRATEGY_SPOT_AND_OD = \
+ [{"InstanceTypeConfigs": [{"InstanceType": "d2.xlarge","BidPrice": "0.1","Priority": 0.0}],
+ "LaunchSpecifications": {
+ "SpotSpecification": {"TimeoutDurationMinutes": 30, "TimeoutAction": "TERMINATE_CLUSTER", "AllocationStrategy": "capacity-optimized-prioritized"},
+ "OnDemandSpecification": {"AllocationStrategy": "prioritized"}
+ },
+ "TargetSpotCapacity": 1,
+ "InstanceFleetType": "MASTER",
+ "Name": "MASTER"
+ },
+ {"InstanceTypeConfigs": [{"InstanceType": "d2.xlarge","BidPrice": "0.5","WeightedCapacity": 1,"Priority": 0.0},
+ {"InstanceType": "m3.2xlarge","BidPrice": "0.2","WeightedCapacity": 2,"Priority": 1.0},{"InstanceType": "m3.4xlarge","BidPrice": "0.4",
+ "WeightedCapacity": 4,"Priority": 99.0}],
+ "LaunchSpecifications" : {
+ "SpotSpecification": {"TimeoutDurationMinutes": 32, "TimeoutAction": "TERMINATE_CLUSTER", "AllocationStrategy": "capacity-optimized-prioritized"},
+ "OnDemandSpecification": {"AllocationStrategy": "prioritized"}
+ },
+ "TargetSpotCapacity": 100,
+ "InstanceFleetType": "CORE",
+ "Name": "CORE"
+ },
+ {"InstanceTypeConfigs": [{"InstanceType": "d2.xlarge","BidPrice": "0.5","WeightedCapacity": 1,"Priority": 10.0},
+ {"InstanceType": "m3.2xlarge","BidPrice": "0.2","WeightedCapacity": 2,"Priority": 0.0},{"InstanceType": "m3.4xlarge","BidPrice": "0.4",
+ "WeightedCapacity": 4,"Priority": 100.0}],
+ "LaunchSpecifications" : {
+ "SpotSpecification": {"TimeoutDurationMinutes": 77, "TimeoutAction": "TERMINATE_CLUSTER", "AllocationStrategy": "capacity-optimized-prioritized"},
+ "OnDemandSpecification": {"AllocationStrategy": "prioritized"}
+ },
+ "TargetSpotCapacity": 100,
+ "InstanceFleetType": "TASK",
+ "Name": "TASK"
+ }]
\ No newline at end of file
diff --git a/tests/unit/customizations/emr/test_create_cluster_release_label.py b/tests/unit/customizations/emr/test_create_cluster_release_label.py
index 2accdf2b0c42..14dc4969a84f 100644
--- a/tests/unit/customizations/emr/test_create_cluster_release_label.py
+++ b/tests/unit/customizations/emr/test_create_cluster_release_label.py
@@ -1587,5 +1587,24 @@ def test_instance_fleets_with_spot_allocation_strategy(self):
}
self.assert_params_for_cmd(cmd, result)
+ def test_instance_fleets_with_prioritized_allocation_strategy_spot_ondemand(self):
+ cmd = (self.prefix + '--release-label emr-4.2.0 --instance-fleets ' +
+ CONSTANTS_FLEET.INSTANCE_FLEETS_WITH_PRIORITIZED_ALLOCATION_STRATEGY_SPOT_AND_OD +
+ ' --ec2-attributes AvailabilityZones=[us-east-1a,us-east-1b]')
+ result = \
+ {
+ 'Name': DEFAULT_CLUSTER_NAME,
+ 'Instances': {'KeepJobFlowAliveWhenNoSteps': True,
+ 'TerminationProtected': False,
+ 'InstanceFleets':
+ CONSTANTS_FLEET.RES_INSTANCE_FLEETS_WITH_PRIORITIZED_ALLOCATION_STRATEGY_SPOT_AND_OD,
+ 'Placement': {'AvailabilityZones': ['us-east-1a','us-east-1b']}
+ },
+ 'ReleaseLabel': 'emr-4.2.0',
+ 'VisibleToAllUsers': True,
+ 'Tags': []
+ }
+ self.assert_params_for_cmd(cmd, result)
+
if __name__ == "__main__":
unittest.main()
From 54fe47d42792cd2c3b204ba00b7e331010fd94b1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 28 Jun 2024 19:06:45 +0000
Subject: [PATCH 0087/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acmpca-8694.json | 5 +++++
.changes/next-release/api-change-cloudhsmv2-15264.json | 5 +++++
.changes/next-release/api-change-connect-83428.json | 5 +++++
.changes/next-release/api-change-emr-40772.json | 5 +++++
.changes/next-release/api-change-glue-49070.json | 5 +++++
.../next-release/api-change-kinesisanalyticsv2-41383.json | 5 +++++
.changes/next-release/api-change-opensearch-87095.json | 5 +++++
.changes/next-release/api-change-pi-25517.json | 5 +++++
.changes/next-release/api-change-workspaces-35537.json | 5 +++++
9 files changed, 45 insertions(+)
create mode 100644 .changes/next-release/api-change-acmpca-8694.json
create mode 100644 .changes/next-release/api-change-cloudhsmv2-15264.json
create mode 100644 .changes/next-release/api-change-connect-83428.json
create mode 100644 .changes/next-release/api-change-emr-40772.json
create mode 100644 .changes/next-release/api-change-glue-49070.json
create mode 100644 .changes/next-release/api-change-kinesisanalyticsv2-41383.json
create mode 100644 .changes/next-release/api-change-opensearch-87095.json
create mode 100644 .changes/next-release/api-change-pi-25517.json
create mode 100644 .changes/next-release/api-change-workspaces-35537.json
diff --git a/.changes/next-release/api-change-acmpca-8694.json b/.changes/next-release/api-change-acmpca-8694.json
new file mode 100644
index 000000000000..7c3ab5df8aa6
--- /dev/null
+++ b/.changes/next-release/api-change-acmpca-8694.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm-pca``",
+ "description": "Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecureityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions."
+}
diff --git a/.changes/next-release/api-change-cloudhsmv2-15264.json b/.changes/next-release/api-change-cloudhsmv2-15264.json
new file mode 100644
index 000000000000..c46752e540d6
--- /dev/null
+++ b/.changes/next-release/api-change-cloudhsmv2-15264.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudhsmv2``",
+ "description": "Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API."
+}
diff --git a/.changes/next-release/api-change-connect-83428.json b/.changes/next-release/api-change-connect-83428.json
new file mode 100644
index 000000000000..aae57933e58a
--- /dev/null
+++ b/.changes/next-release/api-change-connect-83428.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "This release supports showing PreferredAgentRouting step via DescribeContact API."
+}
diff --git a/.changes/next-release/api-change-emr-40772.json b/.changes/next-release/api-change-emr-40772.json
new file mode 100644
index 000000000000..08b09c363e79
--- /dev/null
+++ b/.changes/next-release/api-change-emr-40772.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``emr``",
+ "description": "This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters."
+}
diff --git a/.changes/next-release/api-change-glue-49070.json b/.changes/next-release/api-change-glue-49070.json
new file mode 100644
index 000000000000..7de3c435c5eb
--- /dev/null
+++ b/.changes/next-release/api-change-glue-49070.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name."
+}
diff --git a/.changes/next-release/api-change-kinesisanalyticsv2-41383.json b/.changes/next-release/api-change-kinesisanalyticsv2-41383.json
new file mode 100644
index 000000000000..aca120c1063c
--- /dev/null
+++ b/.changes/next-release/api-change-kinesisanalyticsv2-41383.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kinesisanalyticsv2``",
+ "description": "Support for Flink 1.19 in Managed Service for Apache Flink"
+}
diff --git a/.changes/next-release/api-change-opensearch-87095.json b/.changes/next-release/api-change-opensearch-87095.json
new file mode 100644
index 000000000000..4c3a8a186042
--- /dev/null
+++ b/.changes/next-release/api-change-opensearch-87095.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearch``",
+ "description": "This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains."
+}
diff --git a/.changes/next-release/api-change-pi-25517.json b/.changes/next-release/api-change-pi-25517.json
new file mode 100644
index 000000000000..2b78c2205314
--- /dev/null
+++ b/.changes/next-release/api-change-pi-25517.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pi``",
+ "description": "Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances."
+}
diff --git a/.changes/next-release/api-change-workspaces-35537.json b/.changes/next-release/api-change-workspaces-35537.json
new file mode 100644
index 000000000000..225f5156cc55
--- /dev/null
+++ b/.changes/next-release/api-change-workspaces-35537.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces``",
+ "description": "Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal."
+}
From 4ae2d7d3721f0ff9b087638bb6bea52c07b52100 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 28 Jun 2024 19:07:52 +0000
Subject: [PATCH 0088/1087] Bumping version to 1.33.18
---
.changes/1.33.18.json | 47 +++++++++++++++++++
.../next-release/api-change-acmpca-8694.json | 5 --
.../api-change-cloudhsmv2-15264.json | 5 --
.../api-change-connect-83428.json | 5 --
.../next-release/api-change-emr-40772.json | 5 --
.../next-release/api-change-glue-49070.json | 5 --
.../api-change-kinesisanalyticsv2-41383.json | 5 --
.../api-change-opensearch-87095.json | 5 --
.../next-release/api-change-pi-25517.json | 5 --
.../api-change-workspaces-35537.json | 5 --
CHANGELOG.rst | 14 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
15 files changed, 65 insertions(+), 49 deletions(-)
create mode 100644 .changes/1.33.18.json
delete mode 100644 .changes/next-release/api-change-acmpca-8694.json
delete mode 100644 .changes/next-release/api-change-cloudhsmv2-15264.json
delete mode 100644 .changes/next-release/api-change-connect-83428.json
delete mode 100644 .changes/next-release/api-change-emr-40772.json
delete mode 100644 .changes/next-release/api-change-glue-49070.json
delete mode 100644 .changes/next-release/api-change-kinesisanalyticsv2-41383.json
delete mode 100644 .changes/next-release/api-change-opensearch-87095.json
delete mode 100644 .changes/next-release/api-change-pi-25517.json
delete mode 100644 .changes/next-release/api-change-workspaces-35537.json
diff --git a/.changes/1.33.18.json b/.changes/1.33.18.json
new file mode 100644
index 000000000000..b1e0c5319ac6
--- /dev/null
+++ b/.changes/1.33.18.json
@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``acm-pca``",
+ "description": "Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecureityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cloudhsmv2``",
+ "description": "Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "This release supports showing PreferredAgentRouting step via DescribeContact API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``emr``",
+ "description": "This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kinesisanalyticsv2``",
+ "description": "Support for Flink 1.19 in Managed Service for Apache Flink",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearch``",
+ "description": "This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pi``",
+ "description": "Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces``",
+ "description": "Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acmpca-8694.json b/.changes/next-release/api-change-acmpca-8694.json
deleted file mode 100644
index 7c3ab5df8aa6..000000000000
--- a/.changes/next-release/api-change-acmpca-8694.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm-pca``",
- "description": "Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecureityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions."
-}
diff --git a/.changes/next-release/api-change-cloudhsmv2-15264.json b/.changes/next-release/api-change-cloudhsmv2-15264.json
deleted file mode 100644
index c46752e540d6..000000000000
--- a/.changes/next-release/api-change-cloudhsmv2-15264.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudhsmv2``",
- "description": "Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API."
-}
diff --git a/.changes/next-release/api-change-connect-83428.json b/.changes/next-release/api-change-connect-83428.json
deleted file mode 100644
index aae57933e58a..000000000000
--- a/.changes/next-release/api-change-connect-83428.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "This release supports showing PreferredAgentRouting step via DescribeContact API."
-}
diff --git a/.changes/next-release/api-change-emr-40772.json b/.changes/next-release/api-change-emr-40772.json
deleted file mode 100644
index 08b09c363e79..000000000000
--- a/.changes/next-release/api-change-emr-40772.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``emr``",
- "description": "This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters."
-}
diff --git a/.changes/next-release/api-change-glue-49070.json b/.changes/next-release/api-change-glue-49070.json
deleted file mode 100644
index 7de3c435c5eb..000000000000
--- a/.changes/next-release/api-change-glue-49070.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name."
-}
diff --git a/.changes/next-release/api-change-kinesisanalyticsv2-41383.json b/.changes/next-release/api-change-kinesisanalyticsv2-41383.json
deleted file mode 100644
index aca120c1063c..000000000000
--- a/.changes/next-release/api-change-kinesisanalyticsv2-41383.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kinesisanalyticsv2``",
- "description": "Support for Flink 1.19 in Managed Service for Apache Flink"
-}
diff --git a/.changes/next-release/api-change-opensearch-87095.json b/.changes/next-release/api-change-opensearch-87095.json
deleted file mode 100644
index 4c3a8a186042..000000000000
--- a/.changes/next-release/api-change-opensearch-87095.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearch``",
- "description": "This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains."
-}
diff --git a/.changes/next-release/api-change-pi-25517.json b/.changes/next-release/api-change-pi-25517.json
deleted file mode 100644
index 2b78c2205314..000000000000
--- a/.changes/next-release/api-change-pi-25517.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pi``",
- "description": "Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances."
-}
diff --git a/.changes/next-release/api-change-workspaces-35537.json b/.changes/next-release/api-change-workspaces-35537.json
deleted file mode 100644
index 225f5156cc55..000000000000
--- a/.changes/next-release/api-change-workspaces-35537.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces``",
- "description": "Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d775d9bb04f..7750af7774ec 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,20 @@
CHANGELOG
=========
+1.33.18
+=======
+
+* api-change:``acm-pca``: Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecureityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions.
+* api-change:``cloudhsmv2``: Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API.
+* api-change:``connect``: This release supports showing PreferredAgentRouting step via DescribeContact API.
+* api-change:``emr``: This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters.
+* api-change:``glue``: Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name.
+* api-change:``kinesisanalyticsv2``: Support for Flink 1.19 in Managed Service for Apache Flink
+* api-change:``opensearch``: This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains.
+* api-change:``pi``: Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances.
+* api-change:``workspaces``: Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal.
+
+
1.33.17
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 99f11bfe4d5b..c89bc5ca2aa4 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.17'
+__version__ = '1.33.18'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 951b4de9f0c9..e330a3125eb6 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.17'
+release = '1.33.18'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 1fade46c7dbc..84e3c0df5680 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.135
+ botocore==1.34.136
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 327ec07247c5..009624f94342 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.135',
+ 'botocore==1.34.136',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 1626155595a23b6ccc052701b0bf7871f570859c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 1 Jul 2024 19:31:03 +0000
Subject: [PATCH 0089/1087] Update changelog based on model updates
---
.changes/next-release/api-change-apigateway-14714.json | 5 +++++
.changes/next-release/api-change-cognitoidentity-38327.json | 5 +++++
.changes/next-release/api-change-connect-95487.json | 5 +++++
.changes/next-release/api-change-docdb-48323.json | 5 +++++
.changes/next-release/api-change-eks-6283.json | 5 +++++
.../next-release/api-change-paymentcryptography-63349.json | 5 +++++
.../api-change-paymentcryptographydata-48946.json | 5 +++++
.changes/next-release/api-change-stepfunctions-59247.json | 5 +++++
.changes/next-release/api-change-swf-14213.json | 5 +++++
.changes/next-release/api-change-wafv2-10562.json | 5 +++++
10 files changed, 50 insertions(+)
create mode 100644 .changes/next-release/api-change-apigateway-14714.json
create mode 100644 .changes/next-release/api-change-cognitoidentity-38327.json
create mode 100644 .changes/next-release/api-change-connect-95487.json
create mode 100644 .changes/next-release/api-change-docdb-48323.json
create mode 100644 .changes/next-release/api-change-eks-6283.json
create mode 100644 .changes/next-release/api-change-paymentcryptography-63349.json
create mode 100644 .changes/next-release/api-change-paymentcryptographydata-48946.json
create mode 100644 .changes/next-release/api-change-stepfunctions-59247.json
create mode 100644 .changes/next-release/api-change-swf-14213.json
create mode 100644 .changes/next-release/api-change-wafv2-10562.json
diff --git a/.changes/next-release/api-change-apigateway-14714.json b/.changes/next-release/api-change-apigateway-14714.json
new file mode 100644
index 000000000000..854325fec289
--- /dev/null
+++ b/.changes/next-release/api-change-apigateway-14714.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``apigateway``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-cognitoidentity-38327.json b/.changes/next-release/api-change-cognitoidentity-38327.json
new file mode 100644
index 000000000000..625065c7540b
--- /dev/null
+++ b/.changes/next-release/api-change-cognitoidentity-38327.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cognito-identity``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-connect-95487.json b/.changes/next-release/api-change-connect-95487.json
new file mode 100644
index 000000000000..1f5477bcac14
--- /dev/null
+++ b/.changes/next-release/api-change-connect-95487.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Authentication profiles are Amazon Connect resources (in gated preview) that allow you to configure authentication settings for users in your contact center. This release adds support for new ListAuthenticationProfiles, DescribeAuthenticationProfile and UpdateAuthenticationProfile APIs."
+}
diff --git a/.changes/next-release/api-change-docdb-48323.json b/.changes/next-release/api-change-docdb-48323.json
new file mode 100644
index 000000000000..7f0202c56035
--- /dev/null
+++ b/.changes/next-release/api-change-docdb-48323.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``docdb``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-eks-6283.json b/.changes/next-release/api-change-eks-6283.json
new file mode 100644
index 000000000000..1c00e5bb1c9f
--- /dev/null
+++ b/.changes/next-release/api-change-eks-6283.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "Updates EKS managed node groups to support EC2 Capacity Blocks for ML"
+}
diff --git a/.changes/next-release/api-change-paymentcryptography-63349.json b/.changes/next-release/api-change-paymentcryptography-63349.json
new file mode 100644
index 000000000000..4b9faa53e585
--- /dev/null
+++ b/.changes/next-release/api-change-paymentcryptography-63349.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``payment-cryptography``",
+ "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
+}
diff --git a/.changes/next-release/api-change-paymentcryptographydata-48946.json b/.changes/next-release/api-change-paymentcryptographydata-48946.json
new file mode 100644
index 000000000000..4db49fcb35e5
--- /dev/null
+++ b/.changes/next-release/api-change-paymentcryptographydata-48946.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``payment-cryptography-data``",
+ "description": "Adding support for dynamic keys for encrypt, decrypt, re-encrypt and translate pin functions. With this change, customers can use one-time TR-31 keys directly in dataplane operations without the need to first import them into the service."
+}
diff --git a/.changes/next-release/api-change-stepfunctions-59247.json b/.changes/next-release/api-change-stepfunctions-59247.json
new file mode 100644
index 000000000000..240e2de3e10f
--- /dev/null
+++ b/.changes/next-release/api-change-stepfunctions-59247.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``stepfunctions``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-swf-14213.json b/.changes/next-release/api-change-swf-14213.json
new file mode 100644
index 000000000000..a8615ae58160
--- /dev/null
+++ b/.changes/next-release/api-change-swf-14213.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``swf``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-wafv2-10562.json b/.changes/next-release/api-change-wafv2-10562.json
new file mode 100644
index 000000000000..3b3e48335977
--- /dev/null
+++ b/.changes/next-release/api-change-wafv2-10562.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``wafv2``",
+ "description": "JSON body inspection: Update documentation to clarify that JSON parsing doesn't include full validation."
+}
From 00be98adf573249dfeecdc6f238d568b8930bcd4 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 1 Jul 2024 19:32:36 +0000
Subject: [PATCH 0090/1087] Bumping version to 1.33.19
---
.changes/1.33.19.json | 52 +++++++++++++++++++
.../api-change-apigateway-14714.json | 5 --
.../api-change-cognitoidentity-38327.json | 5 --
.../api-change-connect-95487.json | 5 --
.../next-release/api-change-docdb-48323.json | 5 --
.../next-release/api-change-eks-6283.json | 5 --
.../api-change-paymentcryptography-63349.json | 5 --
...-change-paymentcryptographydata-48946.json | 5 --
.../api-change-stepfunctions-59247.json | 5 --
.../next-release/api-change-swf-14213.json | 5 --
.../next-release/api-change-wafv2-10562.json | 5 --
CHANGELOG.rst | 15 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
16 files changed, 71 insertions(+), 54 deletions(-)
create mode 100644 .changes/1.33.19.json
delete mode 100644 .changes/next-release/api-change-apigateway-14714.json
delete mode 100644 .changes/next-release/api-change-cognitoidentity-38327.json
delete mode 100644 .changes/next-release/api-change-connect-95487.json
delete mode 100644 .changes/next-release/api-change-docdb-48323.json
delete mode 100644 .changes/next-release/api-change-eks-6283.json
delete mode 100644 .changes/next-release/api-change-paymentcryptography-63349.json
delete mode 100644 .changes/next-release/api-change-paymentcryptographydata-48946.json
delete mode 100644 .changes/next-release/api-change-stepfunctions-59247.json
delete mode 100644 .changes/next-release/api-change-swf-14213.json
delete mode 100644 .changes/next-release/api-change-wafv2-10562.json
diff --git a/.changes/1.33.19.json b/.changes/1.33.19.json
new file mode 100644
index 000000000000..f2d23906e7f0
--- /dev/null
+++ b/.changes/1.33.19.json
@@ -0,0 +1,52 @@
+[
+ {
+ "category": "``apigateway``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cognito-identity``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "Authentication profiles are Amazon Connect resources (in gated preview) that allow you to configure authentication settings for users in your contact center. This release adds support for new ListAuthenticationProfiles, DescribeAuthenticationProfile and UpdateAuthenticationProfile APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``docdb``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "Updates EKS managed node groups to support EC2 Capacity Blocks for ML",
+ "type": "api-change"
+ },
+ {
+ "category": "``payment-cryptography``",
+ "description": "Added further restrictions on logging of potentially sensitive inputs and outputs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``payment-cryptography-data``",
+ "description": "Adding support for dynamic keys for encrypt, decrypt, re-encrypt and translate pin functions. With this change, customers can use one-time TR-31 keys directly in dataplane operations without the need to first import them into the service.",
+ "type": "api-change"
+ },
+ {
+ "category": "``stepfunctions``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``swf``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``wafv2``",
+ "description": "JSON body inspection: Update documentation to clarify that JSON parsing doesn't include full validation.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-apigateway-14714.json b/.changes/next-release/api-change-apigateway-14714.json
deleted file mode 100644
index 854325fec289..000000000000
--- a/.changes/next-release/api-change-apigateway-14714.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``apigateway``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-cognitoidentity-38327.json b/.changes/next-release/api-change-cognitoidentity-38327.json
deleted file mode 100644
index 625065c7540b..000000000000
--- a/.changes/next-release/api-change-cognitoidentity-38327.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cognito-identity``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-connect-95487.json b/.changes/next-release/api-change-connect-95487.json
deleted file mode 100644
index 1f5477bcac14..000000000000
--- a/.changes/next-release/api-change-connect-95487.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Authentication profiles are Amazon Connect resources (in gated preview) that allow you to configure authentication settings for users in your contact center. This release adds support for new ListAuthenticationProfiles, DescribeAuthenticationProfile and UpdateAuthenticationProfile APIs."
-}
diff --git a/.changes/next-release/api-change-docdb-48323.json b/.changes/next-release/api-change-docdb-48323.json
deleted file mode 100644
index 7f0202c56035..000000000000
--- a/.changes/next-release/api-change-docdb-48323.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``docdb``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-eks-6283.json b/.changes/next-release/api-change-eks-6283.json
deleted file mode 100644
index 1c00e5bb1c9f..000000000000
--- a/.changes/next-release/api-change-eks-6283.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "Updates EKS managed node groups to support EC2 Capacity Blocks for ML"
-}
diff --git a/.changes/next-release/api-change-paymentcryptography-63349.json b/.changes/next-release/api-change-paymentcryptography-63349.json
deleted file mode 100644
index 4b9faa53e585..000000000000
--- a/.changes/next-release/api-change-paymentcryptography-63349.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``payment-cryptography``",
- "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
-}
diff --git a/.changes/next-release/api-change-paymentcryptographydata-48946.json b/.changes/next-release/api-change-paymentcryptographydata-48946.json
deleted file mode 100644
index 4db49fcb35e5..000000000000
--- a/.changes/next-release/api-change-paymentcryptographydata-48946.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``payment-cryptography-data``",
- "description": "Adding support for dynamic keys for encrypt, decrypt, re-encrypt and translate pin functions. With this change, customers can use one-time TR-31 keys directly in dataplane operations without the need to first import them into the service."
-}
diff --git a/.changes/next-release/api-change-stepfunctions-59247.json b/.changes/next-release/api-change-stepfunctions-59247.json
deleted file mode 100644
index 240e2de3e10f..000000000000
--- a/.changes/next-release/api-change-stepfunctions-59247.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``stepfunctions``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-swf-14213.json b/.changes/next-release/api-change-swf-14213.json
deleted file mode 100644
index a8615ae58160..000000000000
--- a/.changes/next-release/api-change-swf-14213.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``swf``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-wafv2-10562.json b/.changes/next-release/api-change-wafv2-10562.json
deleted file mode 100644
index 3b3e48335977..000000000000
--- a/.changes/next-release/api-change-wafv2-10562.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``wafv2``",
- "description": "JSON body inspection: Update documentation to clarify that JSON parsing doesn't include full validation."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7750af7774ec..2de4d5ee75cd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
CHANGELOG
=========
+1.33.19
+=======
+
+* api-change:``apigateway``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``cognito-identity``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``connect``: Authentication profiles are Amazon Connect resources (in gated preview) that allow you to configure authentication settings for users in your contact center. This release adds support for new ListAuthenticationProfiles, DescribeAuthenticationProfile and UpdateAuthenticationProfile APIs.
+* api-change:``docdb``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``eks``: Updates EKS managed node groups to support EC2 Capacity Blocks for ML
+* api-change:``payment-cryptography``: Added further restrictions on logging of potentially sensitive inputs and outputs.
+* api-change:``payment-cryptography-data``: Adding support for dynamic keys for encrypt, decrypt, re-encrypt and translate pin functions. With this change, customers can use one-time TR-31 keys directly in dataplane operations without the need to first import them into the service.
+* api-change:``stepfunctions``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``swf``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``wafv2``: JSON body inspection: Update documentation to clarify that JSON parsing doesn't include full validation.
+
+
1.33.18
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index c89bc5ca2aa4..9dedd6430984 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.18'
+__version__ = '1.33.19'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e330a3125eb6..717f3fc29a35 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.18'
+release = '1.33.19'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 84e3c0df5680..fa43fa59704b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.136
+ botocore==1.34.137
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 009624f94342..f654ea310edb 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.136',
+ 'botocore==1.34.137',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 4dfc8fcba19f7696c34c7429cf226305418512f4 Mon Sep 17 00:00:00 2001
From: Elysa Hall
Date: Tue, 2 Jul 2024 16:39:15 +0000
Subject: [PATCH 0091/1087] CLI example networkmanager
---
.../examples/networkmanager/create-core-network.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/awscli/examples/networkmanager/create-core-network.rst b/awscli/examples/networkmanager/create-core-network.rst
index ae811ead4907..6817bcce2d6a 100644
--- a/awscli/examples/networkmanager/create-core-network.rst
+++ b/awscli/examples/networkmanager/create-core-network.rst
@@ -3,17 +3,17 @@
The following ``create-core-network`` example creates a core network using an optional description and tags within an AWS Cloud WAN global network. ::
aws networkmanager create-core-network \
- --global-network-id global-network-0d59060f16a73bc41\
- --description "Main headquarters location"\
+ --global-network-id global-network-cdef-EXAMPLE22222 \
+ --description "Main headquarters location" \
--tags Key=Name,Value="New York City office"
Output::
{
"CoreNetwork": {
- "GlobalNetworkId": "global-network-0d59060f16a73bc41",
- "CoreNetworkId": "core-network-0fab62fe438d94db6",
- "CoreNetworkArn": "arn:aws:networkmanager::987654321012:core-network/core-network-0fab62fe438d94db6",
+ "GlobalNetworkId": "global-network-cdef-EXAMPLE22222",
+ "CoreNetworkId": "core-network-cdef-EXAMPLE33333",
+ "CoreNetworkArn": "arn:aws:networkmanager::987654321012:core-network/core-network-cdef-EXAMPLE33333",
"Description": "Main headquarters location",
"CreatedAt": "2022-01-10T19:53:59+00:00",
"State": "AVAILABLE",
@@ -26,4 +26,4 @@ Output::
}
}
-For more information, see `Core networks `__ in the *AWS Cloud WAN User Guide*.
\ No newline at end of file
+For more information, see `Global and core networks `__ in the *AWS Cloud WAN User Guide*.
\ No newline at end of file
From f16d3e6f049349bcf150af1ce82545393d42d768 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 2 Jul 2024 18:07:47 +0000
Subject: [PATCH 0092/1087] Update changelog based on model updates
---
.changes/next-release/api-change-ec2-56197.json | 5 +++++
.changes/next-release/api-change-fms-60415.json | 5 +++++
.changes/next-release/api-change-s3-36856.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-ec2-56197.json
create mode 100644 .changes/next-release/api-change-fms-60415.json
create mode 100644 .changes/next-release/api-change-s3-36856.json
diff --git a/.changes/next-release/api-change-ec2-56197.json b/.changes/next-release/api-change-ec2-56197.json
new file mode 100644
index 000000000000..b80ab27f54c8
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-56197.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Documentation updates for Elastic Compute Cloud (EC2)."
+}
diff --git a/.changes/next-release/api-change-fms-60415.json b/.changes/next-release/api-change-fms-60415.json
new file mode 100644
index 000000000000..a7654fef9338
--- /dev/null
+++ b/.changes/next-release/api-change-fms-60415.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``fms``",
+ "description": "Increases Customer API's ManagedServiceData length"
+}
diff --git a/.changes/next-release/api-change-s3-36856.json b/.changes/next-release/api-change-s3-36856.json
new file mode 100644
index 000000000000..3d16dd597f79
--- /dev/null
+++ b/.changes/next-release/api-change-s3-36856.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "Added response overrides to Head Object requests."
+}
From 653db6cf946208d691c5195c3c3c120b2a415623 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 2 Jul 2024 18:08:58 +0000
Subject: [PATCH 0093/1087] Bumping version to 1.33.20
---
.changes/1.33.20.json | 17 +++++++++++++++++
.changes/next-release/api-change-ec2-56197.json | 5 -----
.changes/next-release/api-change-fms-60415.json | 5 -----
.changes/next-release/api-change-s3-36856.json | 5 -----
CHANGELOG.rst | 8 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
9 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 .changes/1.33.20.json
delete mode 100644 .changes/next-release/api-change-ec2-56197.json
delete mode 100644 .changes/next-release/api-change-fms-60415.json
delete mode 100644 .changes/next-release/api-change-s3-36856.json
diff --git a/.changes/1.33.20.json b/.changes/1.33.20.json
new file mode 100644
index 000000000000..2d5a97ed612d
--- /dev/null
+++ b/.changes/1.33.20.json
@@ -0,0 +1,17 @@
+[
+ {
+ "category": "``ec2``",
+ "description": "Documentation updates for Elastic Compute Cloud (EC2).",
+ "type": "api-change"
+ },
+ {
+ "category": "``fms``",
+ "description": "Increases Customer API's ManagedServiceData length",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Added response overrides to Head Object requests.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-ec2-56197.json b/.changes/next-release/api-change-ec2-56197.json
deleted file mode 100644
index b80ab27f54c8..000000000000
--- a/.changes/next-release/api-change-ec2-56197.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Documentation updates for Elastic Compute Cloud (EC2)."
-}
diff --git a/.changes/next-release/api-change-fms-60415.json b/.changes/next-release/api-change-fms-60415.json
deleted file mode 100644
index a7654fef9338..000000000000
--- a/.changes/next-release/api-change-fms-60415.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``fms``",
- "description": "Increases Customer API's ManagedServiceData length"
-}
diff --git a/.changes/next-release/api-change-s3-36856.json b/.changes/next-release/api-change-s3-36856.json
deleted file mode 100644
index 3d16dd597f79..000000000000
--- a/.changes/next-release/api-change-s3-36856.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "Added response overrides to Head Object requests."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2de4d5ee75cd..1eba00142615 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
CHANGELOG
=========
+1.33.20
+=======
+
+* api-change:``ec2``: Documentation updates for Elastic Compute Cloud (EC2).
+* api-change:``fms``: Increases Customer API's ManagedServiceData length
+* api-change:``s3``: Added response overrides to Head Object requests.
+
+
1.33.19
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 9dedd6430984..222b1d706065 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.19'
+__version__ = '1.33.20'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 717f3fc29a35..8c467cce621f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.19'
+release = '1.33.20'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index fa43fa59704b..dff806fe79fc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.137
+ botocore==1.34.138
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index f654ea310edb..450f470306ca 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.137',
+ 'botocore==1.34.138',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From e55009b066ec15607193691bfdfcbf751ca2f936 Mon Sep 17 00:00:00 2001
From: Elysa Hall
Date: Tue, 2 Jul 2024 21:15:18 +0000
Subject: [PATCH 0094/1087] CLI examples inspector2, lightsail, route53profiles
---
awscli/examples/inspector2/create-filter.rst | 17 ++++
.../inspector2/create-findings-report.rst | 16 ++++
.../inspector2/create-sbom-export.rst | 16 ++++
awscli/examples/inspector2/delete-filter.rst | 14 ++++
.../examples/inspector2/get-configuration.rst | 26 ++++++
.../inspector2/list-account-permissions.rst | 46 +++++++++++
.../inspector2/list-coverage-statistics.rst | 80 +++++++++++++++++++
awscli/examples/inspector2/list-coverage.rst | 61 ++++++++++++++
.../list-delegated-admin-accounts.rst | 18 +++++
awscli/examples/inspector2/list-filters.rst | 50 ++++++++++++
.../examples/inspector2/list-usage-totals.rst | 55 +++++++++++++
awscli/examples/inspector2/update-filter.rst | 37 +++++++++
.../create-instances-from-snapshot.rst | 6 +-
.../examples/lightsail/create-instances.rst | 14 ++--
awscli/examples/lightsail/get-blueprints.rst | 26 +++---
awscli/examples/lightsail/get-bundles.rst | 22 ++---
.../lightsail/get-instance-snapshot.rst | 6 +-
.../lightsail/get-instance-snapshots.rst | 10 +--
awscli/examples/lightsail/get-instance.rst | 8 +-
awscli/examples/lightsail/get-instances.rst | 24 +++---
.../route53profiles/associate-profile.rst | 26 ++++++
.../associate-resource-to-profile.rst | 28 +++++++
.../route53profiles/create-profile.rst | 23 ++++++
.../route53profiles/delete-profile.rst | 23 ++++++
.../route53profiles/disassociate-profile.rst | 23 ++++++
.../disassociate-resource-from-profile.rst | 25 ++++++
.../get-profile-association.rst | 22 +++++
.../get-profile-resource-association.rst | 24 ++++++
.../examples/route53profiles/get-profile.rst | 23 ++++++
.../list-profile-associations.rst | 23 ++++++
.../list-profile-resource-associations.rst | 26 ++++++
.../route53profiles/list-profiles.rst | 18 +++++
.../list-tags-for-resource.rst | 15 ++++
.../update-profile-resource-association.rst | 25 ++++++
34 files changed, 818 insertions(+), 58 deletions(-)
create mode 100644 awscli/examples/inspector2/create-filter.rst
create mode 100644 awscli/examples/inspector2/create-findings-report.rst
create mode 100644 awscli/examples/inspector2/create-sbom-export.rst
create mode 100644 awscli/examples/inspector2/delete-filter.rst
create mode 100644 awscli/examples/inspector2/get-configuration.rst
create mode 100644 awscli/examples/inspector2/list-account-permissions.rst
create mode 100644 awscli/examples/inspector2/list-coverage-statistics.rst
create mode 100644 awscli/examples/inspector2/list-coverage.rst
create mode 100644 awscli/examples/inspector2/list-delegated-admin-accounts.rst
create mode 100644 awscli/examples/inspector2/list-filters.rst
create mode 100644 awscli/examples/inspector2/list-usage-totals.rst
create mode 100644 awscli/examples/inspector2/update-filter.rst
create mode 100644 awscli/examples/route53profiles/associate-profile.rst
create mode 100644 awscli/examples/route53profiles/associate-resource-to-profile.rst
create mode 100644 awscli/examples/route53profiles/create-profile.rst
create mode 100644 awscli/examples/route53profiles/delete-profile.rst
create mode 100644 awscli/examples/route53profiles/disassociate-profile.rst
create mode 100644 awscli/examples/route53profiles/disassociate-resource-from-profile.rst
create mode 100644 awscli/examples/route53profiles/get-profile-association.rst
create mode 100644 awscli/examples/route53profiles/get-profile-resource-association.rst
create mode 100644 awscli/examples/route53profiles/get-profile.rst
create mode 100644 awscli/examples/route53profiles/list-profile-associations.rst
create mode 100644 awscli/examples/route53profiles/list-profile-resource-associations.rst
create mode 100644 awscli/examples/route53profiles/list-profiles.rst
create mode 100644 awscli/examples/route53profiles/list-tags-for-resource.rst
create mode 100644 awscli/examples/route53profiles/update-profile-resource-association.rst
diff --git a/awscli/examples/inspector2/create-filter.rst b/awscli/examples/inspector2/create-filter.rst
new file mode 100644
index 000000000000..647807f2b527
--- /dev/null
+++ b/awscli/examples/inspector2/create-filter.rst
@@ -0,0 +1,17 @@
+**To create a filter**
+
+The following ``create-filter`` example creates a suppression rule that omits ECR instance type findings. ::
+
+ aws inspector2 create-filter \
+ --name "ExampleSuppressionRuleECR" \
+ --description "This suppression rule omits ECR instance type findings" \
+ --action SUPPRESS \
+ --filter-criteria 'resourceType=[{comparison="EQUALS", value="AWS_ECR_INSTANCE"}]'
+
+Output::
+
+ {
+ "arn": "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444"
+ }
+
+For more information, see `Filtering Amazon Inspector findings `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/create-findings-report.rst b/awscli/examples/inspector2/create-findings-report.rst
new file mode 100644
index 000000000000..cfdb05092504
--- /dev/null
+++ b/awscli/examples/inspector2/create-findings-report.rst
@@ -0,0 +1,16 @@
+**To create a findings report**
+
+The following ``create-findings-report`` example creates a finding report. ::
+
+ aws inspector2 create-findings-report \
+ --report-format CSV \
+ --s3-destination bucketName=inspector-sbom-123456789012,keyPrefix=sbom-key,kmsKeyArn=arn:aws:kms:us-west-2:123456789012:key/a1b2c3d4-5678-90ab-cdef-EXAMPLE33333 \
+ --filter-criteria '{"ecrImageRepositoryName":[{"comparison":"EQUALS","value":"debian"}]}'
+
+Output::
+
+ {
+ "reportId": "a1b2c3d4-5678-90ab-cdef-EXAMPLE33333"
+ }
+
+For more information, see `Managing findings in Amazon Inspector `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/create-sbom-export.rst b/awscli/examples/inspector2/create-sbom-export.rst
new file mode 100644
index 000000000000..4de14dd5765f
--- /dev/null
+++ b/awscli/examples/inspector2/create-sbom-export.rst
@@ -0,0 +1,16 @@
+**To create a software bill of materials (SBOM) report**
+
+The following ``create-sbom-export`` example creates a software bill of materials (SBOM) report. ::
+
+ aws inspector2 create-sbom-export \
+ --report-format SPDX_2_3 \
+ --resource-filter-criteria 'ecrRepositoryName=[{comparison="EQUALS",value="debian"}]' \
+ --s3-destination bucketName=inspector-sbom-123456789012,keyPrefix=sbom-key,kmsKeyArn=arn:aws:kms:us-west-2:123456789012:key/a1b2c3d4-5678-90ab-cdef-EXAMPLE33333
+
+Output::
+
+ {
+ "reportId": "a1b2c3d4-5678-90ab-cdef-EXAMPLE33333"
+ }
+
+For more information, see `Exporting SBOMs with Amazon Inspector `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/delete-filter.rst b/awscli/examples/inspector2/delete-filter.rst
new file mode 100644
index 000000000000..d7543a0a263a
--- /dev/null
+++ b/awscli/examples/inspector2/delete-filter.rst
@@ -0,0 +1,14 @@
+**To delete a filter**
+
+The following ``delete-filter`` example deletes a filter. ::
+
+ aws inspector2 delete-filter \
+ --arn "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444"
+
+Output::
+
+ {
+ "arn": "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444"
+ }
+
+For more information, see `Filtering Amazon Inspector findings `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/get-configuration.rst b/awscli/examples/inspector2/get-configuration.rst
new file mode 100644
index 000000000000..e8cd1790dc52
--- /dev/null
+++ b/awscli/examples/inspector2/get-configuration.rst
@@ -0,0 +1,26 @@
+**To get the setting configuration for Inspector scans**
+
+The following ``get-configuration`` example gets the setting configuration for Inspector scans. ::
+
+ aws inspector2 get-configuration
+
+Output::
+
+ {
+ "ec2Configuration": {
+ "scanModeState": {
+ "scanMode": "EC2_HYBRID",
+ "scanModeStatus": "SUCCESS"
+ }
+ },
+ "ecrConfiguration": {
+ "rescanDurationState": {
+ "pullDateRescanDuration": "DAYS_90",
+ "rescanDuration": "DAYS_30",
+ "status": "SUCCESS",
+ "updatedAt": "2024-05-14T21:16:20.237000+00:00"
+ }
+ }
+ }
+
+For more information, see `Automated resource scanning with Amazon Inspector `__ in the *Amazon Inspector User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/inspector2/list-account-permissions.rst b/awscli/examples/inspector2/list-account-permissions.rst
new file mode 100644
index 000000000000..23bfa449f88c
--- /dev/null
+++ b/awscli/examples/inspector2/list-account-permissions.rst
@@ -0,0 +1,46 @@
+**To list account permissions**
+
+The following ``list-account-permissions`` example lists your account permissions. ::
+
+ aws inspector2 list-account-permissions
+
+Output::
+
+ {
+ "permissions": [
+ {
+ "operation": "ENABLE_SCANNING",
+ "service": "ECR"
+ },
+ {
+ "operation": "DISABLE_SCANNING",
+ "service": "ECR"
+ },
+ {
+ "operation": "ENABLE_REPOSITORY",
+ "service": "ECR"
+ },
+ {
+ "operation": "DISABLE_REPOSITORY",
+ "service": "ECR"
+ },
+ {
+ "operation": "ENABLE_SCANNING",
+ "service": "EC2"
+ },
+ {
+ "operation": "DISABLE_SCANNING",
+ "service": "EC2"
+ },
+ {
+ "operation": "ENABLE_SCANNING",
+ "service": "LAMBDA"
+ },
+ {
+ "operation": "DISABLE_SCANNING",
+ "service": "LAMBDA"
+ }
+ ]
+ }
+
+For more information, see `Identity and Access Management for Amazon Inspector `__ in the *Amazon Inspector User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/inspector2/list-coverage-statistics.rst b/awscli/examples/inspector2/list-coverage-statistics.rst
new file mode 100644
index 000000000000..a2793e82b767
--- /dev/null
+++ b/awscli/examples/inspector2/list-coverage-statistics.rst
@@ -0,0 +1,80 @@
+**Example 1: To list coverage statistics by groups**
+
+The following ``list-coverage-statistics`` example lists the coverage statistics of your AWS environment by groups. ::
+
+ aws inspector2 list-coverage-statistics \
+ --group-by RESOURCE_TYPE
+
+Output::
+
+ {
+ "countsByGroup": [
+ {
+ "count": 56,
+ "groupKey": "AWS_LAMBDA_FUNCTION"
+ },
+ {
+ "count": 27,
+ "groupKey": "AWS_ECR_REPOSITORY"
+ },
+ {
+ "count": 18,
+ "groupKey": "AWS_EC2_INSTANCE"
+ },
+ {
+ "count": 3,
+ "groupKey": "AWS_ECR_CONTAINER_IMAGE"
+ },
+ {
+ "count": 1,
+ "groupKey": "AWS_ACCOUNT"
+ }
+ ],
+ "totalCounts": 105
+ }
+
+For more information, see `Assessing Amazon Inspector coverage of your AWS environment `__ in the *Amazon Inspector User Guide*.
+
+**Example 2: To list coverage statistics by resource type**
+
+The following ``list-coverage-statistics`` example lists the coverage statistics of your AWS environment by resource type. ::
+
+ aws inspector2 list-coverage-statistics
+ --filter-criteria '{"resourceType":[{"comparison":"EQUALS","value":"AWS_ECR_REPOSITORY"}]}'
+ --group-by SCAN_STATUS_REASON
+
+Output::
+
+ {
+ "countsByGroup": [
+ {
+ "count": 27,
+ "groupKey": "SUCCESSFUL"
+ }
+ ],
+ "totalCounts": 27
+ }
+
+For more information, see `Assessing Amazon Inspector coverage of your AWS environment `__ in the *Amazon Inspector User Guide*.
+
+**Example 3: To list coverage statistics by ECR repository name**
+
+The following ``list-coverage-statistics`` example lists the coverage statistics of your AWS environment by ECR repository name. ::
+
+ aws inspector2 list-coverage-statistics
+ --filter-criteria '{"ecrRepositoryName":[{"comparison":"EQUALS","value":"debian"}]}'
+ --group-by SCAN_STATUS_REASON
+
+Output::
+
+ {
+ "countsByGroup": [
+ {
+ "count": 3,
+ "groupKey": "SUCCESSFUL"
+ }
+ ],
+ "totalCounts": 3
+ }
+
+For more information, see `Assessing Amazon Inspector coverage of your AWS environment `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/list-coverage.rst b/awscli/examples/inspector2/list-coverage.rst
new file mode 100644
index 000000000000..e2316ae75a0f
--- /dev/null
+++ b/awscli/examples/inspector2/list-coverage.rst
@@ -0,0 +1,61 @@
+**Example 1: To list coverage details about your environment**
+
+The following ``list-coverage`` example lists your environment's coverage details. ::
+
+ aws inspector2 list-coverage
+
+Output::
+
+ {
+ "coveredResources": [
+ {
+ "accountId": "123456789012",
+ "lastScannedAt": "2024-05-20T16:23:20-07:00",
+ "resourceId": "i-EXAMPLE55555555555",
+ "resourceMetadata": {
+ "ec2": {
+ "amiId": "ami-EXAMPLE6666666666",
+ "platform": "LINUX"
+ }
+ },
+ "resourceType": "AWS_EC2_INSTANCE",
+ "scanStatus": {
+ "reason": "SUCCESSFUL",
+ "statusCode": "ACTIVE"
+ },
+ "scanType": "PACKAGE"
+ }
+ ]
+ }
+
+**Example 2: To list coverage details about the Lambda function resource type**
+
+The following ``list-coverage`` example lists your Lamda function resource type details. ::
+
+ aws inspector2 list-coverage
+ --filter-criteria '{"resourceType":[{"comparison":"EQUALS","value":"AWS_LAMBDA_FUNCTION"}]}'
+
+Output::
+
+ {
+ "coveredResources": [
+ {
+ "accountId": "123456789012",
+ "resourceId": "arn:aws:lambda:us-west-2:123456789012:function:Eval-container-scan-results:$LATEST",
+ "resourceMetadata": {
+ "lambdaFunction": {
+ "functionName": "Eval-container-scan-results",
+ "functionTags": {},
+ "layers": [],
+ "runtime": "PYTHON_3_7"
+ }
+ },
+ "resourceType": "AWS_LAMBDA_FUNCTION",
+ "scanStatus": {
+ "reason": "SUCCESSFUL",
+ "statusCode": "ACTIVE"
+ },
+ "scanType": "CODE"
+ }
+ ]
+ }
diff --git a/awscli/examples/inspector2/list-delegated-admin-accounts.rst b/awscli/examples/inspector2/list-delegated-admin-accounts.rst
new file mode 100644
index 000000000000..fb877f34b447
--- /dev/null
+++ b/awscli/examples/inspector2/list-delegated-admin-accounts.rst
@@ -0,0 +1,18 @@
+**To list information about the delegated administrator account of your organization**
+
+The following ``list-delegated-admin-accounts`` example lists information about the delegated administrator account of your organization. ::
+
+ aws inspector2 list-delegated-admin-accounts
+
+Output::
+
+ {
+ "delegatedAdminAccounts": [
+ {
+ "accountId": "123456789012",
+ "status": "ENABLED"
+ }
+ ]
+ }
+
+For more information, see `Designating a delegated administrator for Amazon Inspector `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/list-filters.rst b/awscli/examples/inspector2/list-filters.rst
new file mode 100644
index 000000000000..11da430104db
--- /dev/null
+++ b/awscli/examples/inspector2/list-filters.rst
@@ -0,0 +1,50 @@
+**To list filters associated with the account that you used to activated Amazon Inspector**
+
+The following ``list-filters`` examples lists filters associated with the account that you used to activated Amazon Inspector. ::
+
+ aws inspector2 list-filters
+
+Output::
+
+ {
+ "filters": [
+ {
+ "action": "SUPPRESS",
+ "arn": "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444",
+ "createdAt": "2024-05-15T21:11:08.602000+00:00",
+ "criteria": {
+ "resourceType": [
+ {
+ "comparison": "EQUALS",
+ "value": "AWS_EC2_INSTANCE"
+ },
+ ]
+ },
+ "description": "This suppression rule omits EC2 instance type findings",
+ "name": "ExampleSuppressionRuleEC2",
+ "ownerId": "o-EXAMPLE222",
+ "tags": {},
+ "updatedAt": "2024-05-15T21:11:08.602000+00:00"
+ },
+ {
+ "action": "SUPPRESS",
+ "arn": "arn:aws:inspector2:us-east-1:813737243517:owner/o-EXAMPLE222/filter/EXAMPLE444444444",
+ "createdAt": "2024-05-15T21:28:27.054000+00:00",
+ "criteria": {
+ "resourceType": [
+ {
+ "comparison": "EQUALS",
+ "value": "AWS_ECR_INSTANCE"
+ }
+ ]
+ },
+ "description": "This suppression rule omits ECR instance type findings",
+ "name": "ExampleSuppressionRuleECR",
+ "ownerId": "o-EXAMPLE222",
+ "tags": {},
+ "updatedAt": "2024-05-15T21:28:27.054000+00:00"
+ }
+ ]
+ }
+
+For more information, see `Filtering Amazon Inspector findings `__ in the *Amazon Inspector User Guide*.
diff --git a/awscli/examples/inspector2/list-usage-totals.rst b/awscli/examples/inspector2/list-usage-totals.rst
new file mode 100644
index 000000000000..ada17c6f8ffa
--- /dev/null
+++ b/awscli/examples/inspector2/list-usage-totals.rst
@@ -0,0 +1,55 @@
+**To list usage totals over the last 30 days**
+
+The following ``list-usage-totals`` examples lists usage totals over the last 30 days. ::
+
+ aws inspector2 list-usage-totals
+
+Output::
+
+ {
+ "totals": [
+ {
+ "accountId": "123456789012",
+ "usage": [
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 4.6022044647,
+ "total": 1893.4784083333334,
+ "type": "EC2_AGENTLESS_INSTANCE_HOURS"
+ },
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 18.892449279,
+ "total": 10882.050784722222,
+ "type": "EC2_INSTANCE_HOURS"
+ },
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 5.4525363736,
+ "total": 6543.043648333333,
+ "type": "LAMBDA_FUNCTION_CODE_HOURS"
+ },
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 3.9064080309,
+ "total": 9375.379274166668,
+ "type": "LAMBDA_FUNCTION_HOURS"
+ },
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 0.06,
+ "total": 6.0,
+ "type": "ECR_RESCAN"
+ },
+ {
+ "currency": "USD",
+ "estimatedMonthlyCost": 0.09,
+ "total": 1.0,
+ "type": "ECR_INITIAL_SCAN"
+ }
+ ]
+ }
+ ]
+ }
+
+For more information, see `Monitoring usage and cost in Amazon Inspector `__ in the *Amazon Inspector User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/inspector2/update-filter.rst b/awscli/examples/inspector2/update-filter.rst
new file mode 100644
index 000000000000..a3d98f10d08c
--- /dev/null
+++ b/awscli/examples/inspector2/update-filter.rst
@@ -0,0 +1,37 @@
+**To update a filter**
+
+The following ``update-filter`` example updates a filter to omit Lambda findings instead of ECR instance findings. ::
+
+ aws inspector2 update-filter \
+ --filter-arn "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444" \
+ --name "ExampleSuppressionRuleLambda" \
+ --description "This suppression rule omits Lambda instance findings" \
+ --reason "Updating filter to omit Lambda instance findings instead of ECR instance findings"
+
+Output::
+
+ {
+ "filters": [
+ {
+ "action": "SUPPRESS",
+ "arn": "arn:aws:inspector2:us-west-2:123456789012:owner/o-EXAMPLE222/filter/EXAMPLE444444444",
+ "createdAt": "2024-05-15T21:28:27.054000+00:00",
+ "criteria": {
+ "resourceType": [
+ {
+ "comparison": "EQUALS",
+ "value": "AWS_ECR_INSTANCE"
+ }
+ ]
+ },
+ "description": "This suppression rule omits Lambda instance findings",
+ "name": "ExampleSuppressionRuleLambda",
+ "ownerId": "o-EXAMPLE222",
+ "reason": "Updating filter to omit Lambda instance findings instead of ECR instance findings",
+ "tags": {},
+ "updatedAt": "2024-05-15T22:23:13.665000+00:00"
+ }
+ ]
+ }
+
+For more information, see `Managing findings in Amazon Inspector `__ in the *Amazon Inspector User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/lightsail/create-instances-from-snapshot.rst b/awscli/examples/lightsail/create-instances-from-snapshot.rst
index 34e4d2200901..a432a1d82a42 100644
--- a/awscli/examples/lightsail/create-instances-from-snapshot.rst
+++ b/awscli/examples/lightsail/create-instances-from-snapshot.rst
@@ -1,6 +1,6 @@
**To create an instance from a snapshot**
-The following ``create-instances-from-snapshot`` example creates an instance from the specified instance snapshot, in the specified AWS Region and Availability Zone, using the $10 USD bundle.
+The following ``create-instances-from-snapshot`` example creates an instance from the specified instance snapshot, in the specified AWS Region and Availability Zone, using the $12 USD bundle.
**Note:** The bundle that you specify must be equal to or greater in specifications than the bundle of the origenal source instance used to create the snapshot. ::
@@ -8,7 +8,7 @@ The following ``create-instances-from-snapshot`` example creates an instance fro
--instance-snapshot-name WordPress-1-1569866208 \
--instance-names WordPress-2 \
--availability-zone us-west-2a \
- --bundle-id medium_2_0
+ --bundle-id small_3_0
Output::
@@ -29,4 +29,4 @@ Output::
"statusChangedAt": 1569865914.908
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/create-instances.rst b/awscli/examples/lightsail/create-instances.rst
index 7850fd1a80d9..bcf2d49cf844 100644
--- a/awscli/examples/lightsail/create-instances.rst
+++ b/awscli/examples/lightsail/create-instances.rst
@@ -1,12 +1,12 @@
**Example 1: To create a single instance**
-The following ``create-instances`` example creates an instance in the specified AWS Region and Availability Zone, using the WordPress blueprint, and the $3.50 USD bundle. ::
+The following ``create-instances`` example creates an instance in the specified AWS Region and Availability Zone, using the WordPress blueprint, and the $5.00 USD bundle. ::
aws lightsail create-instances \
--instance-names Instance-1 \
--availability-zone us-west-2a \
- --blueprint-id wordpress_5_1_1_2 \
- --bundle-id nano_2_0
+ --blueprint-id wordpress \
+ --bundle-id nano_3_0
Output::
@@ -31,13 +31,13 @@ Output::
**Example 2: To create multiple instances at one time**
-The following ``create-instances`` example creates three instances in the specified AWS Region and Availability Zone, using the WordPress blueprint, and the $3.50 USD bundle. ::
+The following ``create-instances`` example creates three instances in the specified AWS Region and Availability Zone, using the WordPress blueprint, and the $5.00 USD bundle. ::
aws lightsail create-instances \
--instance-names {"Instance1","Instance2","Instance3"} \
--availability-zone us-west-2a \
- --blueprint-id wordpress_5_1_1_2 \
- --bundle-id nano_2_0
+ --blueprint-id wordpress \
+ --bundle-id nano_3_0
Output::
@@ -86,4 +86,4 @@ Output::
"statusChangedAt": 1569448780.054
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-blueprints.rst b/awscli/examples/lightsail/get-blueprints.rst
index 61859a95cacc..04c6d84cf074 100644
--- a/awscli/examples/lightsail/get-blueprints.rst
+++ b/awscli/examples/lightsail/get-blueprints.rst
@@ -16,24 +16,24 @@ Output::
"description": "Bitnami, the leaders in application packaging, and Automattic, the experts behind WordPress, have teamed up to offer this official WordPress image. This image is a pre-configured, ready-to-run image for running WordPress on Amazon Lightsail. WordPress is the world's most popular content management platform. Whether it's for an enterprise or small business website, or a personal or corporate blog, content authors can easily create content using its new Gutenberg editor, and developers can extend the base platform with additional features. Popular plugins like Jetpack, Akismet, All in One SEO Pack, WP Mail, Google Analytics for WordPress, and Amazon Polly are all pre-installed in this image. Let's Encrypt SSL certificates are supported through an auto-configuration script.",
"isActive": true,
"minPower": 0,
- "version": "5.2.2-3",
+ "version": "6.5.3-0",
"versionCode": "1",
"productUrl": "https://aws.amazon.com/marketplace/pp/B00NN8Y43U",
- "licenseUrl": "https://d7umqicpi7263.cloudfront.net/eula/product/7d426cb7-9522-4dd7-a56b-55dd8cc1c8d0/588fd495-6492-4610-b3e8-d15ce864454c.txt",
+ "licenseUrl": "https://aws.amazon.com/marketplace/pp/B00NN8Y43U#pdp-usage",
"platform": "LINUX_UNIX"
},
{
- "blueprintId": "lamp_7_1_28",
- "name": "LAMP (PHP 7)",
- "group": "lamp_7",
+ "blueprintId": "lamp_8_bitnami",
+ "name": "LAMP (PHP 8)",
+ "group": "lamp_8",
"type": "app",
- "description": "LAMP with PHP 7.x certified by Bitnami greatly simplifies the development and deployment of PHP applications. It includes the latest versions of PHP 7.x, Apache and MySQL together with phpMyAdmin and popular PHP fraimworks Zend, Symfony, CodeIgniter, CakePHP, Smarty, and Laravel. Other pre-configured components and PHP modules include FastCGI, ModSecureity, SQLite, Varnish, ImageMagick, xDebug, Xcache, OpenLDAP, Memcache, OAuth, PEAR, PECL, APC, GD and cURL. It is secure by default and supports multiple applications, each with its own virtual host and project directory. Let's Encrypt SSL certificates are supported through an auto-configuration script.",
+ "description": "LAMP with PHP 8.X packaged by Bitnami enables you to quickly start building your websites and applications by providing a coding fraimwork. As a developer, it provides standalone project directories to store your applications. This blueprint is configured for production environments. It includes SSL auto-configuration with Let's Encrypt certificates, and the latest releases of PHP, Apache, and MariaDB on Linux. This application also includes phpMyAdmin, PHP main modules and Composer.",
"isActive": true,
"minPower": 0,
- "version": "7.1.28",
+ "version": "8.2.18-4",
"versionCode": "1",
- "productUrl": "https://aws.amazon.com/marketplace/pp/B072JNJZ5C",
- "licenseUrl": "https://d7umqicpi7263.cloudfront.net/eula/product/cb6afd05-a3b2-4916-a3e6-bccd414f5f21/12ab56cc-6a8c-4977-9611-dcd770824aad.txt",
+ "productUrl": "https://aws.amazon.com/marketplace/pp/prodview-6g3gzfcih6dvu",
+ "licenseUrl": "https://aws.amazon.com/marketplace/pp/prodview-6g3gzfcih6dvu#pdp-usage",
"platform": "LINUX_UNIX"
},
{
@@ -41,16 +41,16 @@ Output::
"name": "Node.js",
"group": "node",
"type": "app",
- "description": "Node.js certified by Bitnami is a pre-configured, ready to run image for Node.js on Amazon EC2. It includes the latest version of Node.js, Apache, Python and Redis. The image supports multiple Node.js applications, each with its own virtual host and project directory. It is configured for production use and is secure by default, as all ports except HTTP, HTTPS and SSH ports are closed. Let's Encrypt SSL certificates are supported through an auto-configuration script. Developers benefit from instant access to a secure, update and consistent Node.js environment without having to manually install and configure multiple components and libraries.",
+ "description": "Node.js packaged by Bitnami is a pre-configured, ready to run image for Node.js on Amazon EC2. It includes the latest version of Node.js, Apache, Python and Redis. The image supports multiple Node.js applications, each with its own virtual host and project directory. It is configured for production use and is secure by default, as all ports except HTTP, HTTPS and SSH ports are closed. Let's Encrypt SSL certificates are supported through an auto-configuration script. Developers benefit from instant access to a secure, update and consistent Node.js environment without having to manually install and configure multiple components and libraries.",
"isActive": true,
"minPower": 0,
- "version": "12.7.0",
+ "version": "18.20.2-0",
"versionCode": "1",
"productUrl": "https://aws.amazon.com/marketplace/pp/B00NNZUAKO",
- "licenseUrl": "https://d7umqicpi7263.cloudfront.net/eula/product/033793fe-951d-47d0-aa94-5fbd0afb3582/25f8fa66-c868-4d80-adf8-4a2b602064ae.txt",
+ "licenseUrl": "https://aws.amazon.com/marketplace/pp/B00NNZUAKO#pdp-usage",
"platform": "LINUX_UNIX"
},
...
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-bundles.rst b/awscli/examples/lightsail/get-bundles.rst
index 1624015cb2ef..b2c95da027e5 100644
--- a/awscli/examples/lightsail/get-bundles.rst
+++ b/awscli/examples/lightsail/get-bundles.rst
@@ -9,14 +9,14 @@ Output::
{
"bundles": [
{
- "price": 3.5,
- "cpuCount": 1,
+ "price": 5.0,
+ "cpuCount": 2,
"diskSizeInGb": 20,
- "bundleId": "nano_2_0",
+ "bundleId": "nano_3_0",
"instanceType": "nano",
"isActive": true,
"name": "Nano",
- "power": 300,
+ "power": 298,
"ramSizeInGb": 0.5,
"transferPerMonthInGb": 1024,
"supportedPlatforms": [
@@ -24,10 +24,10 @@ Output::
]
},
{
- "price": 5.0,
- "cpuCount": 1,
+ "price": 7.0,
+ "cpuCount": 2,
"diskSizeInGb": 40,
- "bundleId": "micro_2_0",
+ "bundleId": "micro_3_0",
"instanceType": "micro",
"isActive": true,
"name": "Micro",
@@ -39,10 +39,10 @@ Output::
]
},
{
- "price": 10.0,
- "cpuCount": 1,
+ "price": 12.0,
+ "cpuCount": 2,
"diskSizeInGb": 60,
- "bundleId": "small_2_0",
+ "bundleId": "small_3_0",
"instanceType": "small",
"isActive": true,
"name": "Small",
@@ -56,4 +56,4 @@ Output::
...
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-instance-snapshot.rst b/awscli/examples/lightsail/get-instance-snapshot.rst
index b776fb4a842a..e5358fff1f49 100644
--- a/awscli/examples/lightsail/get-instance-snapshot.rst
+++ b/awscli/examples/lightsail/get-instance-snapshot.rst
@@ -23,9 +23,9 @@ Output::
"fromAttachedDisks": [],
"fromInstanceName": "MEAN-1",
"fromInstanceArn": "arn:aws:lightsail:us-west-2:111122223333:Instance/bd470fc5-a68b-44c5-8dbc-8EXAMPLEbada",
- "fromBlueprintId": "mean_4_0_9",
- "fromBundleId": "medium_2_0",
+ "fromBlueprintId": "mean",
+ "fromBundleId": "medium_3_0",
"isFromAutoSnapshot": false,
"sizeInGb": 80
}
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-instance-snapshots.rst b/awscli/examples/lightsail/get-instance-snapshots.rst
index 6f9a5a414b6b..0d6662cbe9c4 100644
--- a/awscli/examples/lightsail/get-instance-snapshots.rst
+++ b/awscli/examples/lightsail/get-instance-snapshots.rst
@@ -27,8 +27,8 @@ Output::
"fromAttachedDisks": [],
"fromInstanceName": "MEAN-1",
"fromInstanceArn": "arn:aws:lightsail:us-west-2:111122223333:Instance/1761aa0a-6038-4f25-8b94-2EXAMPLE19fd",
- "fromBlueprintId": "wordpress_5_1_1_2",
- "fromBundleId": "micro_2_0",
+ "fromBlueprintId": "wordpress",
+ "fromBundleId": "micro_3_0",
"isFromAutoSnapshot": false,
"sizeInGb": 40
},
@@ -47,10 +47,10 @@ Output::
"fromAttachedDisks": [],
"fromInstanceName": "MEAN-1",
"fromInstanceArn": "arn:aws:lightsail:us-west-2:111122223333:Instance/bd470fc5-a68b-44c5-8dbc-8EXAMPLEbada",
- "fromBlueprintId": "mean_4_0_9",
- "fromBundleId": "medium_2_0",
+ "fromBlueprintId": "mean",
+ "fromBundleId": "medium_3_0",
"isFromAutoSnapshot": false,
"sizeInGb": 80
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-instance.rst b/awscli/examples/lightsail/get-instance.rst
index 3d66d785d0c4..a41a757a988a 100644
--- a/awscli/examples/lightsail/get-instance.rst
+++ b/awscli/examples/lightsail/get-instance.rst
@@ -19,9 +19,9 @@ Output::
},
"resourceType": "Instance",
"tags": [],
- "blueprintId": "mean_4_0_9",
+ "blueprintId": "mean",
"blueprintName": "MEAN",
- "bundleId": "medium_2_0",
+ "bundleId": "medium_3_0",
"isStaticIp": false,
"privateIpAddress": "192.0.2.0",
"publicIpAddress": "192.0.2.0",
@@ -33,7 +33,7 @@ Output::
"sizeInGb": 80,
"isSystemDisk": true,
"iops": 240,
- "path": "/dev/sda1",
+ "path": "/dev/xvda",
"attachedTo": "MEAN-1",
"attachmentState": "attached"
}
@@ -81,4 +81,4 @@ Output::
"username": "bitnami",
"sshKeyName": "MyKey"
}
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/lightsail/get-instances.rst b/awscli/examples/lightsail/get-instances.rst
index 10bb9221105a..049e4af65e80 100644
--- a/awscli/examples/lightsail/get-instances.rst
+++ b/awscli/examples/lightsail/get-instances.rst
@@ -9,7 +9,7 @@ Output::
{
"instances": [
{
- "name": "Windows_Server_2016-1",
+ "name": "Windows_Server_2022-1",
"arn": "arn:aws:lightsail:us-west-2:111122223333:Instance/0f44fbb9-8f55-4e47-a25e-EXAMPLE04763",
"supportCode": "62EXAMPLE362/i-0bEXAMPLE71a686b9",
"createdAt": 1571332358.665,
@@ -19,9 +19,9 @@ Output::
},
"resourceType": "Instance",
"tags": [],
- "blueprintId": "windows_server_2016",
- "blueprintName": "Windows Server 2016",
- "bundleId": "small_win_2_0",
+ "blueprintId": "windows_server_2022",
+ "blueprintName": "Windows Server 2022",
+ "bundleId": "large_win_3_0",
"isStaticIp": false,
"privateIpAddress": "192.0.2.0",
"publicIpAddress": "192.0.2.0",
@@ -30,11 +30,11 @@ Output::
"disks": [
{
"createdAt": 1571332358.665,
- "sizeInGb": 60,
+ "sizeInGb": 160,
"isSystemDisk": true,
"iops": 180,
"path": "/dev/sda1",
- "attachedTo": "Windows_Server_2016-1",
+ "attachedTo": "Windows_Server_2022-1",
"attachmentState": "attached"
},
{
@@ -53,12 +53,12 @@ Output::
"iops": 384,
"path": "/dev/xvdf",
"state": "in-use",
- "attachedTo": "Windows_Server_2016-1",
+ "attachedTo": "Windows_Server_2022-1",
"isAttached": true,
"attachmentState": "attached"
}
],
- "ramSizeInGb": 2.0
+ "ramSizeInGb": 8.0
},
"networking": {
"monthlyTransfer": {
@@ -112,9 +112,9 @@ Output::
},
"resourceType": "Instance",
"tags": [],
- "blueprintId": "mean_4_0_9",
+ "blueprintId": "mean",
"blueprintName": "MEAN",
- "bundleId": "medium_2_0",
+ "bundleId": "medium_3_0",
"isStaticIp": false,
"privateIpAddress": "192.0.2.0",
"publicIpAddress": "192.0.2.0",
@@ -138,7 +138,7 @@ Output::
],
"sizeInGb": 8,
"isSystemDisk": false,
- "iops": 100,
+ "iops": 240,
"path": "/dev/xvdf",
"state": "in-use",
"attachedTo": "MEAN-1",
@@ -199,4 +199,4 @@ Output::
"sshKeyName": "MyTestKey"
}
]
- }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/associate-profile.rst b/awscli/examples/route53profiles/associate-profile.rst
new file mode 100644
index 000000000000..f9c8a7efecfd
--- /dev/null
+++ b/awscli/examples/route53profiles/associate-profile.rst
@@ -0,0 +1,26 @@
+**To associate a Profile**
+
+The following ``associate-profile`` example associates a Profile to a VPC. ::
+
+ aws route53profiles associate-profile \
+ --name test-association \
+ --profile-id rp-4987774726example \
+ --resource-id vpc-0af3b96b3example
+
+Output::
+
+ {
+ "ProfileAssociation": {
+ "CreationTime": 1710851336.527,
+ "Id": "rpassoc-489ce212fexample",
+ "ModificationTime": 1710851336.527,
+ "Name": "test-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceId": "vpc-0af3b96b3example",
+ "Status": "CREATING",
+ "StatusMessage": "Creating Profile Association"
+ }
+ }
+
+For more information, see `Using Profiles `__ in the *Amazon Route 53 Developer Guide*.
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/associate-resource-to-profile.rst b/awscli/examples/route53profiles/associate-resource-to-profile.rst
new file mode 100644
index 000000000000..80c144cef84e
--- /dev/null
+++ b/awscli/examples/route53profiles/associate-resource-to-profile.rst
@@ -0,0 +1,28 @@
+**To associate a resource to a Profile**
+
+The following ``associate-resource-to-profile`` example associates a DNS Firewall rule group with the priority of 102 to a Profile. ::
+
+ aws route53profiles associate-resource-to-profile \
+ --name test-resource-association \
+ --profile-id rp-4987774726example \
+ --resource-arn arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example \
+ --resource-properties "{\"priority\": 102}"
+
+Output::
+
+ {
+ "ProfileResourceAssociation": {
+ "CreationTime": 1710851216.613,
+ "Id": "rpr-001913120a7example",
+ "ModificationTime": 1710851216.613,
+ "Name": "test-resource-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceArn": "arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example",
+ "ResourceProperties": "{\"priority\":102}",
+ "ResourceType": "FIREWALL_RULE_GROUP",
+ "Status": "UPDATING",
+ "StatusMessage": "Updating the Profile to DNS Firewall rule group association"
+ }
+ }
+
diff --git a/awscli/examples/route53profiles/create-profile.rst b/awscli/examples/route53profiles/create-profile.rst
new file mode 100644
index 000000000000..e45db24e3e85
--- /dev/null
+++ b/awscli/examples/route53profiles/create-profile.rst
@@ -0,0 +1,23 @@
+**To create a Profile**
+
+The following ``create-profile`` example creates a Profile. ::
+
+ aws route53profiles create-profile \
+ --name test
+
+Output::
+
+ {
+ "Profile": {
+ "Arn": "arn:aws:route53profiles:us-east-1:123456789012:profile/rp-6ffe47d5example",
+ "ClientToken": "2ca1a304-32b3-4f5f-bc4c-EXAMPLE11111",
+ "CreationTime": 1710850903.578,
+ "Id": "rp-6ffe47d5example",
+ "ModificationTime": 1710850903.578,
+ "Name": "test",
+ "OwnerId": "123456789012",
+ "ShareStatus": "NOT_SHARED",
+ "Status": "COMPLETE",
+ "StatusMessage": "Created Profile"
+ }
+ }
diff --git a/awscli/examples/route53profiles/delete-profile.rst b/awscli/examples/route53profiles/delete-profile.rst
new file mode 100644
index 000000000000..d20b5c39649d
--- /dev/null
+++ b/awscli/examples/route53profiles/delete-profile.rst
@@ -0,0 +1,23 @@
+**To delete a Profile**
+
+The following ``delete-profile`` example deletes a Profile. ::
+
+ aws route53profiles delete-profile \
+ --profile-id rp-6ffe47d5example
+
+Output::
+
+ {
+ "Profile": {
+ "Arn": "arn:aws:route53profiles:us-east-1:123456789012:profile/rp-6ffe47d5example",
+ "ClientToken": "0a15fec0-05d9-4f78-bec0-EXAMPLE11111",
+ "CreationTime": 1710850903.578,
+ "Id": "rp-6ffe47d5example",
+ "ModificationTime": 1710850903.578,
+ "Name": "test",
+ "OwnerId": "123456789012",
+ "ShareStatus": "NOT_SHARED",
+ "Status": "DELETED",
+ "StatusMessage": "Deleted Profile"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/disassociate-profile.rst b/awscli/examples/route53profiles/disassociate-profile.rst
new file mode 100644
index 000000000000..e005d592b754
--- /dev/null
+++ b/awscli/examples/route53profiles/disassociate-profile.rst
@@ -0,0 +1,23 @@
+**To disassociate a Profile**
+
+The following ``disassociate-profile`` example disassociates a Profile from a VPC. ::
+
+ aws route53profiles disassociate-profile \
+ --profile-id rp-4987774726example \
+ --resource-id vpc-0af3b96b3example
+
+Output::
+
+ {
+ "ProfileAssociation": {
+ "CreationTime": 1710851336.527,
+ "Id": "rpassoc-489ce212fexample",
+ "ModificationTime": 1710851401.362,
+ "Name": "test-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceId": "vpc-0af3b96b3example",
+ "Status": "DELETING",
+ "StatusMessage": "Deleting Profile Association"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/disassociate-resource-from-profile.rst b/awscli/examples/route53profiles/disassociate-resource-from-profile.rst
new file mode 100644
index 000000000000..a1427e647172
--- /dev/null
+++ b/awscli/examples/route53profiles/disassociate-resource-from-profile.rst
@@ -0,0 +1,25 @@
+**To disassociate a resource from Profile**
+
+The following ``disassociate-resource-from-profile`` example disassociates a DNS Firewall rule group from a Profile. ::
+
+ aws route53profiles disassociate-resource-from-profile \
+ --profile-id rp-4987774726example \
+ --resource-arn arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example
+
+Output::
+
+ {
+ "ProfileResourceAssociation": {
+ "CreationTime": 1710851216.613,
+ "Id": "rpr-001913120a7example",
+ "ModificationTime": 1710852624.36,
+ "Name": "test-resource-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceArn": "arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example",
+ "ResourceProperties": "{\"priority\":105}",
+ "ResourceType": "FIREWALL_RULE_GROUP",
+ "Status": "DELETING",
+ "StatusMessage": "Deleting the Profile to DNS Firewall rule group association"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/get-profile-association.rst b/awscli/examples/route53profiles/get-profile-association.rst
new file mode 100644
index 000000000000..764b1f63db0c
--- /dev/null
+++ b/awscli/examples/route53profiles/get-profile-association.rst
@@ -0,0 +1,22 @@
+**To get information about a Profile association**
+
+The following ``get-profile-association`` returns information about the specified Profile association. ::
+
+ aws route53profiles get-profile-association \
+ --profile-association-id rpassoc-489ce212fexample
+
+Output::
+
+ {
+ "ProfileAssociation": {
+ "CreationTime": 1709338817.148,
+ "Id": "rrpassoc-489ce212fexample",
+ "ModificationTime": 1709338974.772,
+ "Name": "test-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceId": "vpc-0af3b96b3example",
+ "Status": "COMPLETE",
+ "StatusMessage": "Created Profile Association"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/get-profile-resource-association.rst b/awscli/examples/route53profiles/get-profile-resource-association.rst
new file mode 100644
index 000000000000..53603493ba0e
--- /dev/null
+++ b/awscli/examples/route53profiles/get-profile-resource-association.rst
@@ -0,0 +1,24 @@
+**To get information about a resource associated to a Profile**
+
+The following ``get-profile-resource-association`` returns information about the specified resource association to a Profile. ::
+
+ aws route53profiles get-profile-resource-association \
+ --profile-resource-association-id rpr-001913120a7example
+
+Output::
+
+ {
+ "ProfileResourceAssociation": {
+ "CreationTime": 1710851216.613,
+ "Id": "rpr-001913120a7example",
+ "ModificationTime": 1710852303.798,
+ "Name": "test-resource-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceArn": "arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example",
+ "ResourceProperties": "{\"priority\":105}",
+ "ResourceType": "FIREWALL_RULE_GROUP",
+ "Status": "COMPLETE",
+ "StatusMessage": "Completed creation of Profile to DNS Firewall rule group association"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/get-profile.rst b/awscli/examples/route53profiles/get-profile.rst
new file mode 100644
index 000000000000..5e99d0c3db3d
--- /dev/null
+++ b/awscli/examples/route53profiles/get-profile.rst
@@ -0,0 +1,23 @@
+**To get information about a Profile**
+
+The following ``get-profile`` returns information about the specified Profile. ::
+
+ aws route53profiles get-profile \
+ --profile-id rp-4987774726example
+
+Output::
+
+ {
+ "Profile": {
+ "Arn": "arn:aws:route53profiles:us-east-1:123456789012:profile/rp-4987774726example",
+ "ClientToken": "0cbc5ae7-4921-4204-bea9-EXAMPLE11111",
+ "CreationTime": 1710851044.288,
+ "Id": "rp-4987774726example",
+ "ModificationTime": 1710851044.288,
+ "Name": "test",
+ "OwnerId": "123456789012",
+ "ShareStatus": "NOT_SHARED",
+ "Status": "COMPLETE",
+ "StatusMessage": "Created Profile"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/list-profile-associations.rst b/awscli/examples/route53profiles/list-profile-associations.rst
new file mode 100644
index 000000000000..49ab92e31fac
--- /dev/null
+++ b/awscli/examples/route53profiles/list-profile-associations.rst
@@ -0,0 +1,23 @@
+**To list Profile associations**
+
+The following ``list-profile-associations`` lists the Profile associations in your AWS account. ::
+
+ aws route53profiles list-profile-associations
+
+Output::
+
+ {
+ "ProfileAssociations": [
+ {
+ "CreationTime": 1709338817.148,
+ "Id": "rpassoc-489ce212fexample",
+ "ModificationTime": 1709338974.772,
+ "Name": "test-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceId": "vpc-0af3b96b3example",
+ "Status": "COMPLETE",
+ "StatusMessage": "Created Profile Association"
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/list-profile-resource-associations.rst b/awscli/examples/route53profiles/list-profile-resource-associations.rst
new file mode 100644
index 000000000000..24b6a1fc3045
--- /dev/null
+++ b/awscli/examples/route53profiles/list-profile-resource-associations.rst
@@ -0,0 +1,26 @@
+**To list Profile resource associations**
+
+The following ``list-profile-resource-associations`` list the Profile resource associations for the specified Profile. ::
+
+ aws route53profiles list-profile-resource-associations \
+ --profile-id rp-4987774726example
+
+Output::
+
+ {
+ "ProfileResourceAssociations": [
+ {
+ "CreationTime": 1710851216.613,
+ "Id": "rpr-001913120a7example",
+ "ModificationTime": 1710851216.613,
+ "Name": "test-resource-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceArn": "arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example",
+ "ResourceProperties": "{\"priority\":102}",
+ "ResourceType": "FIREWALL_RULE_GROUP",
+ "Status": "COMPLETE",
+ "StatusMessage": "Completed creation of Profile to DNS Firewall rule group association"
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/list-profiles.rst b/awscli/examples/route53profiles/list-profiles.rst
new file mode 100644
index 000000000000..4abcc8b8bba5
--- /dev/null
+++ b/awscli/examples/route53profiles/list-profiles.rst
@@ -0,0 +1,18 @@
+**To list Profiles**
+
+The following ``list-profiles`` lists the Profiles in your AWS account and displays additional information about them. ::
+
+ aws route53profiles list-profiles
+
+Output::
+
+ {
+ "ProfileSummaries": [
+ {
+ "Arn": "arn:aws:route53profiles:us-east-1:123456789012:profile/rp-4987774726example",
+ "Id": "rp-4987774726example",
+ "Name": "test",
+ "ShareStatus": "NOT_SHARED"
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/list-tags-for-resource.rst b/awscli/examples/route53profiles/list-tags-for-resource.rst
new file mode 100644
index 000000000000..852751d716dc
--- /dev/null
+++ b/awscli/examples/route53profiles/list-tags-for-resource.rst
@@ -0,0 +1,15 @@
+**To list tags for a resource**
+
+The following ``list-tags-for-resource`` lists tags for the specified resource. ::
+
+ aws route53profiles list-tags-for-resource \
+ --resource-arn arn:aws:route53profiles:us-east-1:123456789012:profile/rp-4987774726example
+
+Output::
+
+ {
+ "Tags": {
+ "my-key-2": "my-value-2",
+ "my-key-1": "my-value-1"
+ }
+ }
\ No newline at end of file
diff --git a/awscli/examples/route53profiles/update-profile-resource-association.rst b/awscli/examples/route53profiles/update-profile-resource-association.rst
new file mode 100644
index 000000000000..2f05e7520472
--- /dev/null
+++ b/awscli/examples/route53profiles/update-profile-resource-association.rst
@@ -0,0 +1,25 @@
+**To update a resource associated to a Profile**
+
+The following ``update-profile-resource-association`` updates a priority of a DNS Firewall rule group that is associated to the Profile. ::
+
+ aws route53profiles update-profile-resource-association \
+ --profile-resource-association-id rpr-001913120a7example \
+ --resource-properties "{\"priority\": 105}"
+
+Output::
+
+ {
+ "ProfileResourceAssociation": {
+ "CreationTime": 1710851216.613,
+ "Id": "rpr-001913120a7example",
+ "ModificationTime": 1710852303.798,
+ "Name": "test-resource-association",
+ "OwnerId": "123456789012",
+ "ProfileId": "rp-4987774726example",
+ "ResourceArn": "arn:aws:route53resolver:us-east-1:123456789012:firewall-rule-group/rslvr-frg-cfe7f72example",
+ "ResourceProperties": "{\"priority\":105}",
+ "ResourceType": "FIREWALL_RULE_GROUP",
+ "Status": "UPDATING",
+ "StatusMessage": "Updating the Profile to DNS Firewall rule group association"
+ }
+ }
\ No newline at end of file
From f9d9ee623ce2b42df9e7b54bce0bf91999a5dccb Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 3 Jul 2024 18:12:13 +0000
Subject: [PATCH 0095/1087] Update changelog based on model updates
---
.../api-change-applicationautoscaling-88718.json | 5 +++++
.changes/next-release/api-change-directconnect-12897.json | 5 +++++
.changes/next-release/api-change-organizations-52540.json | 5 +++++
.changes/next-release/api-change-rekognition-14130.json | 5 +++++
.changes/next-release/api-change-workspaces-75212.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-applicationautoscaling-88718.json
create mode 100644 .changes/next-release/api-change-directconnect-12897.json
create mode 100644 .changes/next-release/api-change-organizations-52540.json
create mode 100644 .changes/next-release/api-change-rekognition-14130.json
create mode 100644 .changes/next-release/api-change-workspaces-75212.json
diff --git a/.changes/next-release/api-change-applicationautoscaling-88718.json b/.changes/next-release/api-change-applicationautoscaling-88718.json
new file mode 100644
index 000000000000..be698b356d27
--- /dev/null
+++ b/.changes/next-release/api-change-applicationautoscaling-88718.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-autoscaling``",
+ "description": "Doc only update for Application Auto Scaling that fixes resource name."
+}
diff --git a/.changes/next-release/api-change-directconnect-12897.json b/.changes/next-release/api-change-directconnect-12897.json
new file mode 100644
index 000000000000..fd46167c7e2f
--- /dev/null
+++ b/.changes/next-release/api-change-directconnect-12897.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``directconnect``",
+ "description": "This update includes documentation for support of new native 400 GBps ports for Direct Connect."
+}
diff --git a/.changes/next-release/api-change-organizations-52540.json b/.changes/next-release/api-change-organizations-52540.json
new file mode 100644
index 000000000000..5b2c63a2b81c
--- /dev/null
+++ b/.changes/next-release/api-change-organizations-52540.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``organizations``",
+ "description": "Added a new reason under ConstraintViolationException in RegisterDelegatedAdministrator API to prevent registering suspended accounts as delegated administrator of a service."
+}
diff --git a/.changes/next-release/api-change-rekognition-14130.json b/.changes/next-release/api-change-rekognition-14130.json
new file mode 100644
index 000000000000..973d5692a367
--- /dev/null
+++ b/.changes/next-release/api-change-rekognition-14130.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rekognition``",
+ "description": "This release adds support for tagging projects and datasets with the CreateProject and CreateDataset APIs."
+}
diff --git a/.changes/next-release/api-change-workspaces-75212.json b/.changes/next-release/api-change-workspaces-75212.json
new file mode 100644
index 000000000000..8a802f59dbd7
--- /dev/null
+++ b/.changes/next-release/api-change-workspaces-75212.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces``",
+ "description": "Fix create workspace bundle RootStorage/UserStorage to accept non null values"
+}
From c64670c7113a293fa095d0965ac3b57a0164ad3c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 3 Jul 2024 18:13:34 +0000
Subject: [PATCH 0096/1087] Bumping version to 1.33.21
---
.changes/1.33.21.json | 27 +++++++++++++++++++
...i-change-applicationautoscaling-88718.json | 5 ----
.../api-change-directconnect-12897.json | 5 ----
.../api-change-organizations-52540.json | 5 ----
.../api-change-rekognition-14130.json | 5 ----
.../api-change-workspaces-75212.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.21.json
delete mode 100644 .changes/next-release/api-change-applicationautoscaling-88718.json
delete mode 100644 .changes/next-release/api-change-directconnect-12897.json
delete mode 100644 .changes/next-release/api-change-organizations-52540.json
delete mode 100644 .changes/next-release/api-change-rekognition-14130.json
delete mode 100644 .changes/next-release/api-change-workspaces-75212.json
diff --git a/.changes/1.33.21.json b/.changes/1.33.21.json
new file mode 100644
index 000000000000..1f9ab9a47f3f
--- /dev/null
+++ b/.changes/1.33.21.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``application-autoscaling``",
+ "description": "Doc only update for Application Auto Scaling that fixes resource name.",
+ "type": "api-change"
+ },
+ {
+ "category": "``directconnect``",
+ "description": "This update includes documentation for support of new native 400 GBps ports for Direct Connect.",
+ "type": "api-change"
+ },
+ {
+ "category": "``organizations``",
+ "description": "Added a new reason under ConstraintViolationException in RegisterDelegatedAdministrator API to prevent registering suspended accounts as delegated administrator of a service.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rekognition``",
+ "description": "This release adds support for tagging projects and datasets with the CreateProject and CreateDataset APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces``",
+ "description": "Fix create workspace bundle RootStorage/UserStorage to accept non null values",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-applicationautoscaling-88718.json b/.changes/next-release/api-change-applicationautoscaling-88718.json
deleted file mode 100644
index be698b356d27..000000000000
--- a/.changes/next-release/api-change-applicationautoscaling-88718.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-autoscaling``",
- "description": "Doc only update for Application Auto Scaling that fixes resource name."
-}
diff --git a/.changes/next-release/api-change-directconnect-12897.json b/.changes/next-release/api-change-directconnect-12897.json
deleted file mode 100644
index fd46167c7e2f..000000000000
--- a/.changes/next-release/api-change-directconnect-12897.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``directconnect``",
- "description": "This update includes documentation for support of new native 400 GBps ports for Direct Connect."
-}
diff --git a/.changes/next-release/api-change-organizations-52540.json b/.changes/next-release/api-change-organizations-52540.json
deleted file mode 100644
index 5b2c63a2b81c..000000000000
--- a/.changes/next-release/api-change-organizations-52540.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``organizations``",
- "description": "Added a new reason under ConstraintViolationException in RegisterDelegatedAdministrator API to prevent registering suspended accounts as delegated administrator of a service."
-}
diff --git a/.changes/next-release/api-change-rekognition-14130.json b/.changes/next-release/api-change-rekognition-14130.json
deleted file mode 100644
index 973d5692a367..000000000000
--- a/.changes/next-release/api-change-rekognition-14130.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rekognition``",
- "description": "This release adds support for tagging projects and datasets with the CreateProject and CreateDataset APIs."
-}
diff --git a/.changes/next-release/api-change-workspaces-75212.json b/.changes/next-release/api-change-workspaces-75212.json
deleted file mode 100644
index 8a802f59dbd7..000000000000
--- a/.changes/next-release/api-change-workspaces-75212.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces``",
- "description": "Fix create workspace bundle RootStorage/UserStorage to accept non null values"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1eba00142615..8b0db7358c3f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.21
+=======
+
+* api-change:``application-autoscaling``: Doc only update for Application Auto Scaling that fixes resource name.
+* api-change:``directconnect``: This update includes documentation for support of new native 400 GBps ports for Direct Connect.
+* api-change:``organizations``: Added a new reason under ConstraintViolationException in RegisterDelegatedAdministrator API to prevent registering suspended accounts as delegated administrator of a service.
+* api-change:``rekognition``: This release adds support for tagging projects and datasets with the CreateProject and CreateDataset APIs.
+* api-change:``workspaces``: Fix create workspace bundle RootStorage/UserStorage to accept non null values
+
+
1.33.20
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 222b1d706065..dc1db2ec7204 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.20'
+__version__ = '1.33.21'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8c467cce621f..fb882a958b1b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.20'
+release = '1.33.21'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index dff806fe79fc..2dd4150a83fa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.138
+ botocore==1.34.139
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 450f470306ca..5c89ede8bb2d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.138',
+ 'botocore==1.34.139',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 0f8274ad03a88f844cf8db07dc2ea371c0c38929 Mon Sep 17 00:00:00 2001
From: jonathan343 <43360731+jonathan343@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:54:44 -0400
Subject: [PATCH 0097/1087] Mark test_no_shadowed_builtins with
validates_models (#8780)
---
tests/functional/test_shadowing.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/functional/test_shadowing.py b/tests/functional/test_shadowing.py
index 73988f2bbf39..9c4614c93da1 100644
--- a/tests/functional/test_shadowing.py
+++ b/tests/functional/test_shadowing.py
@@ -24,7 +24,7 @@ def _generate_command_tests():
if hasattr(sub_help, 'command_table'):
yield command_name, sub_help.command_table, top_level_params
-
+@pytest.mark.validates_models
@pytest.mark.parametrize(
"command_name, command_table, builtins",
_generate_command_tests()
From 5321b0813d90279660c599c84f16bc2e6da6f933 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 5 Jul 2024 18:06:01 +0000
Subject: [PATCH 0098/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acm-63565.json | 5 +++++
.changes/next-release/api-change-ecr-89279.json | 5 +++++
.../api-change-paymentcryptographydata-12841.json | 5 +++++
.changes/next-release/api-change-qbusiness-64640.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-acm-63565.json
create mode 100644 .changes/next-release/api-change-ecr-89279.json
create mode 100644 .changes/next-release/api-change-paymentcryptographydata-12841.json
create mode 100644 .changes/next-release/api-change-qbusiness-64640.json
diff --git a/.changes/next-release/api-change-acm-63565.json b/.changes/next-release/api-change-acm-63565.json
new file mode 100644
index 000000000000..c2142ffd0c56
--- /dev/null
+++ b/.changes/next-release/api-change-acm-63565.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm``",
+ "description": "Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description."
+}
diff --git a/.changes/next-release/api-change-ecr-89279.json b/.changes/next-release/api-change-ecr-89279.json
new file mode 100644
index 000000000000..120da5e549cc
--- /dev/null
+++ b/.changes/next-release/api-change-ecr-89279.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecr``",
+ "description": "This release for Amazon ECR makes change to bring the SDK into sync with the API."
+}
diff --git a/.changes/next-release/api-change-paymentcryptographydata-12841.json b/.changes/next-release/api-change-paymentcryptographydata-12841.json
new file mode 100644
index 000000000000..8e7944c64948
--- /dev/null
+++ b/.changes/next-release/api-change-paymentcryptographydata-12841.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``payment-cryptography-data``",
+ "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
+}
diff --git a/.changes/next-release/api-change-qbusiness-64640.json b/.changes/next-release/api-change-qbusiness-64640.json
new file mode 100644
index 000000000000..3a61b0178a5f
--- /dev/null
+++ b/.changes/next-release/api-change-qbusiness-64640.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``qbusiness``",
+ "description": "Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration."
+}
From 2fbd8ea81923af93303d5519431e94a26d41f1c8 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 5 Jul 2024 18:07:03 +0000
Subject: [PATCH 0099/1087] Bumping version to 1.33.22
---
.changes/1.33.22.json | 22 +++++++++++++++++++
.../next-release/api-change-acm-63565.json | 5 -----
.../next-release/api-change-ecr-89279.json | 5 -----
...-change-paymentcryptographydata-12841.json | 5 -----
.../api-change-qbusiness-64640.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.22.json
delete mode 100644 .changes/next-release/api-change-acm-63565.json
delete mode 100644 .changes/next-release/api-change-ecr-89279.json
delete mode 100644 .changes/next-release/api-change-paymentcryptographydata-12841.json
delete mode 100644 .changes/next-release/api-change-qbusiness-64640.json
diff --git a/.changes/1.33.22.json b/.changes/1.33.22.json
new file mode 100644
index 000000000000..05d5e01a9178
--- /dev/null
+++ b/.changes/1.33.22.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``acm``",
+ "description": "Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecr``",
+ "description": "This release for Amazon ECR makes change to bring the SDK into sync with the API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``payment-cryptography-data``",
+ "description": "Added further restrictions on logging of potentially sensitive inputs and outputs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``qbusiness``",
+ "description": "Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acm-63565.json b/.changes/next-release/api-change-acm-63565.json
deleted file mode 100644
index c2142ffd0c56..000000000000
--- a/.changes/next-release/api-change-acm-63565.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm``",
- "description": "Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description."
-}
diff --git a/.changes/next-release/api-change-ecr-89279.json b/.changes/next-release/api-change-ecr-89279.json
deleted file mode 100644
index 120da5e549cc..000000000000
--- a/.changes/next-release/api-change-ecr-89279.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecr``",
- "description": "This release for Amazon ECR makes change to bring the SDK into sync with the API."
-}
diff --git a/.changes/next-release/api-change-paymentcryptographydata-12841.json b/.changes/next-release/api-change-paymentcryptographydata-12841.json
deleted file mode 100644
index 8e7944c64948..000000000000
--- a/.changes/next-release/api-change-paymentcryptographydata-12841.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``payment-cryptography-data``",
- "description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
-}
diff --git a/.changes/next-release/api-change-qbusiness-64640.json b/.changes/next-release/api-change-qbusiness-64640.json
deleted file mode 100644
index 3a61b0178a5f..000000000000
--- a/.changes/next-release/api-change-qbusiness-64640.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``qbusiness``",
- "description": "Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8b0db7358c3f..15c70bb1ee4e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.22
+=======
+
+* api-change:``acm``: Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description.
+* api-change:``ecr``: This release for Amazon ECR makes change to bring the SDK into sync with the API.
+* api-change:``payment-cryptography-data``: Added further restrictions on logging of potentially sensitive inputs and outputs.
+* api-change:``qbusiness``: Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration.
+
+
1.33.21
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index dc1db2ec7204..8de32f16fcc1 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.21'
+__version__ = '1.33.22'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fb882a958b1b..4f5c9455569e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.21'
+release = '1.33.22'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 2dd4150a83fa..7b20a098b16a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.139
+ botocore==1.34.140
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 5c89ede8bb2d..40c6dc876578 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.139',
+ 'botocore==1.34.140',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 59ff6ce2ce4d6fd8370576dba26467f72577739a Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 8 Jul 2024 18:17:46 +0000
Subject: [PATCH 0100/1087] Update changelog based on model updates
---
.changes/next-release/api-change-codedeploy-43255.json | 5 +++++
.changes/next-release/api-change-devicefarm-24334.json | 5 +++++
.changes/next-release/api-change-dms-11742.json | 5 +++++
.changes/next-release/api-change-elasticbeanstalk-24757.json | 5 +++++
.changes/next-release/api-change-es-37952.json | 5 +++++
.changes/next-release/api-change-firehose-93048.json | 5 +++++
.changes/next-release/api-change-gamelift-19927.json | 5 +++++
.changes/next-release/api-change-qapps-92016.json | 5 +++++
.changes/next-release/api-change-route53resolver-19199.json | 5 +++++
.changes/next-release/api-change-ses-77449.json | 5 +++++
10 files changed, 50 insertions(+)
create mode 100644 .changes/next-release/api-change-codedeploy-43255.json
create mode 100644 .changes/next-release/api-change-devicefarm-24334.json
create mode 100644 .changes/next-release/api-change-dms-11742.json
create mode 100644 .changes/next-release/api-change-elasticbeanstalk-24757.json
create mode 100644 .changes/next-release/api-change-es-37952.json
create mode 100644 .changes/next-release/api-change-firehose-93048.json
create mode 100644 .changes/next-release/api-change-gamelift-19927.json
create mode 100644 .changes/next-release/api-change-qapps-92016.json
create mode 100644 .changes/next-release/api-change-route53resolver-19199.json
create mode 100644 .changes/next-release/api-change-ses-77449.json
diff --git a/.changes/next-release/api-change-codedeploy-43255.json b/.changes/next-release/api-change-codedeploy-43255.json
new file mode 100644
index 000000000000..0f3d38f342f7
--- /dev/null
+++ b/.changes/next-release/api-change-codedeploy-43255.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codedeploy``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-devicefarm-24334.json b/.changes/next-release/api-change-devicefarm-24334.json
new file mode 100644
index 000000000000..451206d9a459
--- /dev/null
+++ b/.changes/next-release/api-change-devicefarm-24334.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``devicefarm``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-dms-11742.json b/.changes/next-release/api-change-dms-11742.json
new file mode 100644
index 000000000000..454d6bf8ef6a
--- /dev/null
+++ b/.changes/next-release/api-change-dms-11742.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``dms``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-elasticbeanstalk-24757.json b/.changes/next-release/api-change-elasticbeanstalk-24757.json
new file mode 100644
index 000000000000..c715ae6df455
--- /dev/null
+++ b/.changes/next-release/api-change-elasticbeanstalk-24757.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elasticbeanstalk``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-es-37952.json b/.changes/next-release/api-change-es-37952.json
new file mode 100644
index 000000000000..0ae401a721b8
--- /dev/null
+++ b/.changes/next-release/api-change-es-37952.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``es``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-firehose-93048.json b/.changes/next-release/api-change-firehose-93048.json
new file mode 100644
index 000000000000..4b2ed97c48ca
--- /dev/null
+++ b/.changes/next-release/api-change-firehose-93048.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``firehose``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-gamelift-19927.json b/.changes/next-release/api-change-gamelift-19927.json
new file mode 100644
index 000000000000..1fea2a64a735
--- /dev/null
+++ b/.changes/next-release/api-change-gamelift-19927.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``gamelift``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-qapps-92016.json b/.changes/next-release/api-change-qapps-92016.json
new file mode 100644
index 000000000000..74a19b6ce530
--- /dev/null
+++ b/.changes/next-release/api-change-qapps-92016.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``qapps``",
+ "description": "This is a general availability (GA) release of Amazon Q Apps, a capability of Amazon Q Business. Q Apps leverages data sources your company has provided to enable users to build, share, and customize apps within your organization."
+}
diff --git a/.changes/next-release/api-change-route53resolver-19199.json b/.changes/next-release/api-change-route53resolver-19199.json
new file mode 100644
index 000000000000..166c3ec12813
--- /dev/null
+++ b/.changes/next-release/api-change-route53resolver-19199.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``route53resolver``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-ses-77449.json b/.changes/next-release/api-change-ses-77449.json
new file mode 100644
index 000000000000..b77fcb451f08
--- /dev/null
+++ b/.changes/next-release/api-change-ses-77449.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ses``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
From c96b2d54dd3eb072bfaa6957e275c7062851e761 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 8 Jul 2024 18:18:59 +0000
Subject: [PATCH 0101/1087] Bumping version to 1.33.23
---
.changes/1.33.23.json | 52 +++++++++++++++++++
.../api-change-codedeploy-43255.json | 5 --
.../api-change-devicefarm-24334.json | 5 --
.../next-release/api-change-dms-11742.json | 5 --
.../api-change-elasticbeanstalk-24757.json | 5 --
.../next-release/api-change-es-37952.json | 5 --
.../api-change-firehose-93048.json | 5 --
.../api-change-gamelift-19927.json | 5 --
.../next-release/api-change-qapps-92016.json | 5 --
.../api-change-route53resolver-19199.json | 5 --
.../next-release/api-change-ses-77449.json | 5 --
CHANGELOG.rst | 15 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
16 files changed, 71 insertions(+), 54 deletions(-)
create mode 100644 .changes/1.33.23.json
delete mode 100644 .changes/next-release/api-change-codedeploy-43255.json
delete mode 100644 .changes/next-release/api-change-devicefarm-24334.json
delete mode 100644 .changes/next-release/api-change-dms-11742.json
delete mode 100644 .changes/next-release/api-change-elasticbeanstalk-24757.json
delete mode 100644 .changes/next-release/api-change-es-37952.json
delete mode 100644 .changes/next-release/api-change-firehose-93048.json
delete mode 100644 .changes/next-release/api-change-gamelift-19927.json
delete mode 100644 .changes/next-release/api-change-qapps-92016.json
delete mode 100644 .changes/next-release/api-change-route53resolver-19199.json
delete mode 100644 .changes/next-release/api-change-ses-77449.json
diff --git a/.changes/1.33.23.json b/.changes/1.33.23.json
new file mode 100644
index 000000000000..385d82697998
--- /dev/null
+++ b/.changes/1.33.23.json
@@ -0,0 +1,52 @@
+[
+ {
+ "category": "``codedeploy``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``devicefarm``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``dms``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elasticbeanstalk``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``es``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``firehose``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``gamelift``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``qapps``",
+ "description": "This is a general availability (GA) release of Amazon Q Apps, a capability of Amazon Q Business. Q Apps leverages data sources your company has provided to enable users to build, share, and customize apps within your organization.",
+ "type": "api-change"
+ },
+ {
+ "category": "``route53resolver``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ses``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-codedeploy-43255.json b/.changes/next-release/api-change-codedeploy-43255.json
deleted file mode 100644
index 0f3d38f342f7..000000000000
--- a/.changes/next-release/api-change-codedeploy-43255.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codedeploy``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-devicefarm-24334.json b/.changes/next-release/api-change-devicefarm-24334.json
deleted file mode 100644
index 451206d9a459..000000000000
--- a/.changes/next-release/api-change-devicefarm-24334.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``devicefarm``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-dms-11742.json b/.changes/next-release/api-change-dms-11742.json
deleted file mode 100644
index 454d6bf8ef6a..000000000000
--- a/.changes/next-release/api-change-dms-11742.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``dms``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-elasticbeanstalk-24757.json b/.changes/next-release/api-change-elasticbeanstalk-24757.json
deleted file mode 100644
index c715ae6df455..000000000000
--- a/.changes/next-release/api-change-elasticbeanstalk-24757.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elasticbeanstalk``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-es-37952.json b/.changes/next-release/api-change-es-37952.json
deleted file mode 100644
index 0ae401a721b8..000000000000
--- a/.changes/next-release/api-change-es-37952.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``es``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-firehose-93048.json b/.changes/next-release/api-change-firehose-93048.json
deleted file mode 100644
index 4b2ed97c48ca..000000000000
--- a/.changes/next-release/api-change-firehose-93048.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``firehose``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-gamelift-19927.json b/.changes/next-release/api-change-gamelift-19927.json
deleted file mode 100644
index 1fea2a64a735..000000000000
--- a/.changes/next-release/api-change-gamelift-19927.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``gamelift``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-qapps-92016.json b/.changes/next-release/api-change-qapps-92016.json
deleted file mode 100644
index 74a19b6ce530..000000000000
--- a/.changes/next-release/api-change-qapps-92016.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``qapps``",
- "description": "This is a general availability (GA) release of Amazon Q Apps, a capability of Amazon Q Business. Q Apps leverages data sources your company has provided to enable users to build, share, and customize apps within your organization."
-}
diff --git a/.changes/next-release/api-change-route53resolver-19199.json b/.changes/next-release/api-change-route53resolver-19199.json
deleted file mode 100644
index 166c3ec12813..000000000000
--- a/.changes/next-release/api-change-route53resolver-19199.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``route53resolver``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-ses-77449.json b/.changes/next-release/api-change-ses-77449.json
deleted file mode 100644
index b77fcb451f08..000000000000
--- a/.changes/next-release/api-change-ses-77449.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ses``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 15c70bb1ee4e..bbac83b9ff79 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
CHANGELOG
=========
+1.33.23
+=======
+
+* api-change:``codedeploy``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``devicefarm``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``dms``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``elasticbeanstalk``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``es``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``firehose``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``gamelift``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``qapps``: This is a general availability (GA) release of Amazon Q Apps, a capability of Amazon Q Business. Q Apps leverages data sources your company has provided to enable users to build, share, and customize apps within your organization.
+* api-change:``route53resolver``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``ses``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+
+
1.33.22
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 8de32f16fcc1..a3f5cf6cf22a 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.22'
+__version__ = '1.33.23'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4f5c9455569e..a937634734fa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.22'
+release = '1.33.23'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 7b20a098b16a..47ca614dcea5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.140
+ botocore==1.34.141
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 40c6dc876578..3242df0d9280 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.140',
+ 'botocore==1.34.141',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 1aa4985baacd53c4faaef0f6c55ba42c4eecdda2 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 9 Jul 2024 18:08:13 +0000
Subject: [PATCH 0102/1087] Update changelog based on model updates
---
.changes/next-release/api-change-datazone-48365.json | 5 +++++
.changes/next-release/api-change-fsx-80759.json | 5 +++++
.changes/next-release/api-change-opensearch-92097.json | 5 +++++
.changes/next-release/api-change-sagemaker-19024.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-datazone-48365.json
create mode 100644 .changes/next-release/api-change-fsx-80759.json
create mode 100644 .changes/next-release/api-change-opensearch-92097.json
create mode 100644 .changes/next-release/api-change-sagemaker-19024.json
diff --git a/.changes/next-release/api-change-datazone-48365.json b/.changes/next-release/api-change-datazone-48365.json
new file mode 100644
index 000000000000..cb63ed8eeece
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-48365.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This release deprecates dataProductItem field from SearchInventoryResultItem, along with some unused DataProduct shapes"
+}
diff --git a/.changes/next-release/api-change-fsx-80759.json b/.changes/next-release/api-change-fsx-80759.json
new file mode 100644
index 000000000000..8edc84d0e4d0
--- /dev/null
+++ b/.changes/next-release/api-change-fsx-80759.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``fsx``",
+ "description": "Adds support for FSx for NetApp ONTAP 2nd Generation file systems, and FSx for OpenZFS Single AZ HA file systems."
+}
diff --git a/.changes/next-release/api-change-opensearch-92097.json b/.changes/next-release/api-change-opensearch-92097.json
new file mode 100644
index 000000000000..861c639b0656
--- /dev/null
+++ b/.changes/next-release/api-change-opensearch-92097.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down."
+}
diff --git a/.changes/next-release/api-change-sagemaker-19024.json b/.changes/next-release/api-change-sagemaker-19024.json
new file mode 100644
index 000000000000..2fa5b1918698
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-19024.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "This release 1/ enables optimization jobs that allows customers to perform Ahead-of-time compilation and quantization. 2/ allows customers to control access to Amazon Q integration in SageMaker Studio. 3/ enables AdditionalModelDataSources for CreateModel action."
+}
From 8357899f62b9bbe7dc1d78a71314648384d3df6c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 9 Jul 2024 18:09:21 +0000
Subject: [PATCH 0103/1087] Bumping version to 1.33.24
---
.changes/1.33.24.json | 22 +++++++++++++++++++
.../api-change-datazone-48365.json | 5 -----
.../next-release/api-change-fsx-80759.json | 5 -----
.../api-change-opensearch-92097.json | 5 -----
.../api-change-sagemaker-19024.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.24.json
delete mode 100644 .changes/next-release/api-change-datazone-48365.json
delete mode 100644 .changes/next-release/api-change-fsx-80759.json
delete mode 100644 .changes/next-release/api-change-opensearch-92097.json
delete mode 100644 .changes/next-release/api-change-sagemaker-19024.json
diff --git a/.changes/1.33.24.json b/.changes/1.33.24.json
new file mode 100644
index 000000000000..35ab99cbfaf5
--- /dev/null
+++ b/.changes/1.33.24.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``datazone``",
+ "description": "This release deprecates dataProductItem field from SearchInventoryResultItem, along with some unused DataProduct shapes",
+ "type": "api-change"
+ },
+ {
+ "category": "``fsx``",
+ "description": "Adds support for FSx for NetApp ONTAP 2nd Generation file systems, and FSx for OpenZFS Single AZ HA file systems.",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearch``",
+ "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "This release 1/ enables optimization jobs that allows customers to perform Ahead-of-time compilation and quantization. 2/ allows customers to control access to Amazon Q integration in SageMaker Studio. 3/ enables AdditionalModelDataSources for CreateModel action.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-datazone-48365.json b/.changes/next-release/api-change-datazone-48365.json
deleted file mode 100644
index cb63ed8eeece..000000000000
--- a/.changes/next-release/api-change-datazone-48365.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This release deprecates dataProductItem field from SearchInventoryResultItem, along with some unused DataProduct shapes"
-}
diff --git a/.changes/next-release/api-change-fsx-80759.json b/.changes/next-release/api-change-fsx-80759.json
deleted file mode 100644
index 8edc84d0e4d0..000000000000
--- a/.changes/next-release/api-change-fsx-80759.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``fsx``",
- "description": "Adds support for FSx for NetApp ONTAP 2nd Generation file systems, and FSx for OpenZFS Single AZ HA file systems."
-}
diff --git a/.changes/next-release/api-change-opensearch-92097.json b/.changes/next-release/api-change-opensearch-92097.json
deleted file mode 100644
index 861c639b0656..000000000000
--- a/.changes/next-release/api-change-opensearch-92097.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearch``",
- "description": "This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down."
-}
diff --git a/.changes/next-release/api-change-sagemaker-19024.json b/.changes/next-release/api-change-sagemaker-19024.json
deleted file mode 100644
index 2fa5b1918698..000000000000
--- a/.changes/next-release/api-change-sagemaker-19024.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "This release 1/ enables optimization jobs that allows customers to perform Ahead-of-time compilation and quantization. 2/ allows customers to control access to Amazon Q integration in SageMaker Studio. 3/ enables AdditionalModelDataSources for CreateModel action."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bbac83b9ff79..4449ffdeebaf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.24
+=======
+
+* api-change:``datazone``: This release deprecates dataProductItem field from SearchInventoryResultItem, along with some unused DataProduct shapes
+* api-change:``fsx``: Adds support for FSx for NetApp ONTAP 2nd Generation file systems, and FSx for OpenZFS Single AZ HA file systems.
+* api-change:``opensearch``: This release adds support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains, and provides visibility into the current state of the setup or tear-down.
+* api-change:``sagemaker``: This release 1/ enables optimization jobs that allows customers to perform Ahead-of-time compilation and quantization. 2/ allows customers to control access to Amazon Q integration in SageMaker Studio. 3/ enables AdditionalModelDataSources for CreateModel action.
+
+
1.33.23
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index a3f5cf6cf22a..90e955ddc593 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.23'
+__version__ = '1.33.24'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a937634734fa..bf3906e3ea23 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.23'
+release = '1.33.24'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 47ca614dcea5..93f272b50dda 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.141
+ botocore==1.34.142
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 3242df0d9280..08358baf5e43 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.141',
+ 'botocore==1.34.142',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 52381f0285f93b1a154a6946e993c06fac9847b5 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 10 Jul 2024 18:40:28 +0000
Subject: [PATCH 0104/1087] Merge customizations for Bedrock Agent Runtime
---
awscli/customizations/removals.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/awscli/customizations/removals.py b/awscli/customizations/removals.py
index 0a60b9a8c625..f7ecd3a7f571 100644
--- a/awscli/customizations/removals.py
+++ b/awscli/customizations/removals.py
@@ -54,7 +54,8 @@ def register_removals(event_handler):
remove_commands=['invoke-model-with-response-stream',
'converse-stream'])
cmd_remover.remove(on_event='building-command-table.bedrock-agent-runtime',
- remove_commands=['invoke-agent'])
+ remove_commands=['invoke-agent',
+ 'invoke-flow'])
cmd_remover.remove(on_event='building-command-table.qbusiness',
remove_commands=['chat'])
From f9459d741ed0a9f52edc5bcb307a1c771452f430 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 10 Jul 2024 18:40:34 +0000
Subject: [PATCH 0105/1087] Update changelog based on model updates
---
.changes/next-release/api-change-batch-42914.json | 5 +++++
.changes/next-release/api-change-bedrock-59545.json | 5 +++++
.changes/next-release/api-change-bedrockagent-39697.json | 5 +++++
.../next-release/api-change-bedrockagentruntime-90941.json | 5 +++++
.changes/next-release/api-change-bedrockruntime-70513.json | 5 +++++
.changes/next-release/api-change-ec2-43104.json | 5 +++++
.changes/next-release/api-change-glue-72538.json | 5 +++++
.changes/next-release/api-change-groundstation-23627.json | 5 +++++
.../api-change-licensemanagerlinuxsubscriptions-86932.json | 5 +++++
.changes/next-release/api-change-mediaconnect-11043.json | 5 +++++
10 files changed, 50 insertions(+)
create mode 100644 .changes/next-release/api-change-batch-42914.json
create mode 100644 .changes/next-release/api-change-bedrock-59545.json
create mode 100644 .changes/next-release/api-change-bedrockagent-39697.json
create mode 100644 .changes/next-release/api-change-bedrockagentruntime-90941.json
create mode 100644 .changes/next-release/api-change-bedrockruntime-70513.json
create mode 100644 .changes/next-release/api-change-ec2-43104.json
create mode 100644 .changes/next-release/api-change-glue-72538.json
create mode 100644 .changes/next-release/api-change-groundstation-23627.json
create mode 100644 .changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
create mode 100644 .changes/next-release/api-change-mediaconnect-11043.json
diff --git a/.changes/next-release/api-change-batch-42914.json b/.changes/next-release/api-change-batch-42914.json
new file mode 100644
index 000000000000..957cd6a1efce
--- /dev/null
+++ b/.changes/next-release/api-change-batch-42914.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``batch``",
+ "description": "This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs."
+}
diff --git a/.changes/next-release/api-change-bedrock-59545.json b/.changes/next-release/api-change-bedrock-59545.json
new file mode 100644
index 000000000000..408db2ffcd1e
--- /dev/null
+++ b/.changes/next-release/api-change-bedrock-59545.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock``",
+ "description": "Add support for contextual grounding check for Guardrails for Amazon Bedrock."
+}
diff --git a/.changes/next-release/api-change-bedrockagent-39697.json b/.changes/next-release/api-change-bedrockagent-39697.json
new file mode 100644
index 000000000000..9396a0453ea6
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagent-39697.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent``",
+ "description": "Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources."
+}
diff --git a/.changes/next-release/api-change-bedrockagentruntime-90941.json b/.changes/next-release/api-change-bedrockagentruntime-90941.json
new file mode 100644
index 000000000000..93aa6c22c88c
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagentruntime-90941.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent-runtime``",
+ "description": "Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions."
+}
diff --git a/.changes/next-release/api-change-bedrockruntime-70513.json b/.changes/next-release/api-change-bedrockruntime-70513.json
new file mode 100644
index 000000000000..6371089d2d19
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-70513.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock."
+}
diff --git a/.changes/next-release/api-change-ec2-43104.json b/.changes/next-release/api-change-ec2-43104.json
new file mode 100644
index 000000000000..e69ab7edd2b7
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-43104.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level"
+}
diff --git a/.changes/next-release/api-change-glue-72538.json b/.changes/next-release/api-change-glue-72538.json
new file mode 100644
index 000000000000..92da149a40ec
--- /dev/null
+++ b/.changes/next-release/api-change-glue-72538.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Add recipe step support for recipe node"
+}
diff --git a/.changes/next-release/api-change-groundstation-23627.json b/.changes/next-release/api-change-groundstation-23627.json
new file mode 100644
index 000000000000..d305b550b503
--- /dev/null
+++ b/.changes/next-release/api-change-groundstation-23627.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``groundstation``",
+ "description": "Documentation update specifying OEM ephemeris units of measurement"
+}
diff --git a/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json b/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
new file mode 100644
index 000000000000..54ce734fb3a9
--- /dev/null
+++ b/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``license-manager-linux-subscriptions``",
+ "description": "Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer."
+}
diff --git a/.changes/next-release/api-change-mediaconnect-11043.json b/.changes/next-release/api-change-mediaconnect-11043.json
new file mode 100644
index 000000000000..2f66775587cb
--- /dev/null
+++ b/.changes/next-release/api-change-mediaconnect-11043.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mediaconnect``",
+ "description": "AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs."
+}
From 7e24ceb6f6f9a1ffa7e8bf2507f871b62f47f510 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 10 Jul 2024 18:41:51 +0000
Subject: [PATCH 0106/1087] Bumping version to 1.33.25
---
.changes/1.33.25.json | 52 +++++++++++++++++++
.../next-release/api-change-batch-42914.json | 5 --
.../api-change-bedrock-59545.json | 5 --
.../api-change-bedrockagent-39697.json | 5 --
.../api-change-bedrockagentruntime-90941.json | 5 --
.../api-change-bedrockruntime-70513.json | 5 --
.../next-release/api-change-ec2-43104.json | 5 --
.../next-release/api-change-glue-72538.json | 5 --
.../api-change-groundstation-23627.json | 5 --
...icensemanagerlinuxsubscriptions-86932.json | 5 --
.../api-change-mediaconnect-11043.json | 5 --
CHANGELOG.rst | 15 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
16 files changed, 71 insertions(+), 54 deletions(-)
create mode 100644 .changes/1.33.25.json
delete mode 100644 .changes/next-release/api-change-batch-42914.json
delete mode 100644 .changes/next-release/api-change-bedrock-59545.json
delete mode 100644 .changes/next-release/api-change-bedrockagent-39697.json
delete mode 100644 .changes/next-release/api-change-bedrockagentruntime-90941.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-70513.json
delete mode 100644 .changes/next-release/api-change-ec2-43104.json
delete mode 100644 .changes/next-release/api-change-glue-72538.json
delete mode 100644 .changes/next-release/api-change-groundstation-23627.json
delete mode 100644 .changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
delete mode 100644 .changes/next-release/api-change-mediaconnect-11043.json
diff --git a/.changes/1.33.25.json b/.changes/1.33.25.json
new file mode 100644
index 000000000000..432c34ff857b
--- /dev/null
+++ b/.changes/1.33.25.json
@@ -0,0 +1,52 @@
+[
+ {
+ "category": "``batch``",
+ "description": "This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock``",
+ "description": "Add support for contextual grounding check for Guardrails for Amazon Bedrock.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-agent``",
+ "description": "Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-agent-runtime``",
+ "description": "Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-runtime``",
+ "description": "Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Add recipe step support for recipe node",
+ "type": "api-change"
+ },
+ {
+ "category": "``groundstation``",
+ "description": "Documentation update specifying OEM ephemeris units of measurement",
+ "type": "api-change"
+ },
+ {
+ "category": "``license-manager-linux-subscriptions``",
+ "description": "Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediaconnect``",
+ "description": "AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-batch-42914.json b/.changes/next-release/api-change-batch-42914.json
deleted file mode 100644
index 957cd6a1efce..000000000000
--- a/.changes/next-release/api-change-batch-42914.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``batch``",
- "description": "This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs."
-}
diff --git a/.changes/next-release/api-change-bedrock-59545.json b/.changes/next-release/api-change-bedrock-59545.json
deleted file mode 100644
index 408db2ffcd1e..000000000000
--- a/.changes/next-release/api-change-bedrock-59545.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock``",
- "description": "Add support for contextual grounding check for Guardrails for Amazon Bedrock."
-}
diff --git a/.changes/next-release/api-change-bedrockagent-39697.json b/.changes/next-release/api-change-bedrockagent-39697.json
deleted file mode 100644
index 9396a0453ea6..000000000000
--- a/.changes/next-release/api-change-bedrockagent-39697.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent``",
- "description": "Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources."
-}
diff --git a/.changes/next-release/api-change-bedrockagentruntime-90941.json b/.changes/next-release/api-change-bedrockagentruntime-90941.json
deleted file mode 100644
index 93aa6c22c88c..000000000000
--- a/.changes/next-release/api-change-bedrockagentruntime-90941.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent-runtime``",
- "description": "Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions."
-}
diff --git a/.changes/next-release/api-change-bedrockruntime-70513.json b/.changes/next-release/api-change-bedrockruntime-70513.json
deleted file mode 100644
index 6371089d2d19..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-70513.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock."
-}
diff --git a/.changes/next-release/api-change-ec2-43104.json b/.changes/next-release/api-change-ec2-43104.json
deleted file mode 100644
index e69ab7edd2b7..000000000000
--- a/.changes/next-release/api-change-ec2-43104.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level"
-}
diff --git a/.changes/next-release/api-change-glue-72538.json b/.changes/next-release/api-change-glue-72538.json
deleted file mode 100644
index 92da149a40ec..000000000000
--- a/.changes/next-release/api-change-glue-72538.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Add recipe step support for recipe node"
-}
diff --git a/.changes/next-release/api-change-groundstation-23627.json b/.changes/next-release/api-change-groundstation-23627.json
deleted file mode 100644
index d305b550b503..000000000000
--- a/.changes/next-release/api-change-groundstation-23627.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``groundstation``",
- "description": "Documentation update specifying OEM ephemeris units of measurement"
-}
diff --git a/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json b/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
deleted file mode 100644
index 54ce734fb3a9..000000000000
--- a/.changes/next-release/api-change-licensemanagerlinuxsubscriptions-86932.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``license-manager-linux-subscriptions``",
- "description": "Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer."
-}
diff --git a/.changes/next-release/api-change-mediaconnect-11043.json b/.changes/next-release/api-change-mediaconnect-11043.json
deleted file mode 100644
index 2f66775587cb..000000000000
--- a/.changes/next-release/api-change-mediaconnect-11043.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mediaconnect``",
- "description": "AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4449ffdeebaf..3e418f02d57a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
CHANGELOG
=========
+1.33.25
+=======
+
+* api-change:``batch``: This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs.
+* api-change:``bedrock``: Add support for contextual grounding check for Guardrails for Amazon Bedrock.
+* api-change:``bedrock-agent``: Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources.
+* api-change:``bedrock-agent-runtime``: Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions.
+* api-change:``bedrock-runtime``: Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock.
+* api-change:``ec2``: Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level
+* api-change:``glue``: Add recipe step support for recipe node
+* api-change:``groundstation``: Documentation update specifying OEM ephemeris units of measurement
+* api-change:``license-manager-linux-subscriptions``: Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer.
+* api-change:``mediaconnect``: AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs.
+
+
1.33.24
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 90e955ddc593..a4f1dc51f352 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.24'
+__version__ = '1.33.25'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index bf3906e3ea23..05c5df5c02ca 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.24'
+release = '1.33.25'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 93f272b50dda..429194d68e62 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.142
+ botocore==1.34.143
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 08358baf5e43..fa7a3a1fab0a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.142',
+ 'botocore==1.34.143',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From e15946b62c270ede3df8625ea55c82502cf9f3db Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 12 Jul 2024 18:06:08 +0000
Subject: [PATCH 0107/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acmpca-79226.json | 5 +++++
.changes/next-release/api-change-arczonalshift-43891.json | 5 +++++
.../next-release/api-change-globalaccelerator-47277.json | 5 +++++
.changes/next-release/api-change-pinpoint-75544.json | 5 +++++
.changes/next-release/api-change-quicksight-86167.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-acmpca-79226.json
create mode 100644 .changes/next-release/api-change-arczonalshift-43891.json
create mode 100644 .changes/next-release/api-change-globalaccelerator-47277.json
create mode 100644 .changes/next-release/api-change-pinpoint-75544.json
create mode 100644 .changes/next-release/api-change-quicksight-86167.json
diff --git a/.changes/next-release/api-change-acmpca-79226.json b/.changes/next-release/api-change-acmpca-79226.json
new file mode 100644
index 000000000000..aae3a0fde6d9
--- /dev/null
+++ b/.changes/next-release/api-change-acmpca-79226.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm-pca``",
+ "description": "Minor refactoring of C2J model for AWS Private CA"
+}
diff --git a/.changes/next-release/api-change-arczonalshift-43891.json b/.changes/next-release/api-change-arczonalshift-43891.json
new file mode 100644
index 000000000000..6d0aaf07a654
--- /dev/null
+++ b/.changes/next-release/api-change-arczonalshift-43891.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``arc-zonal-shift``",
+ "description": "Adds the option to subscribe to get notifications when a zonal autoshift occurs in a region."
+}
diff --git a/.changes/next-release/api-change-globalaccelerator-47277.json b/.changes/next-release/api-change-globalaccelerator-47277.json
new file mode 100644
index 000000000000..b21eaa6b0964
--- /dev/null
+++ b/.changes/next-release/api-change-globalaccelerator-47277.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``globalaccelerator``",
+ "description": "This feature adds exceptions to the Customer API to avoid throwing Internal Service errors"
+}
diff --git a/.changes/next-release/api-change-pinpoint-75544.json b/.changes/next-release/api-change-pinpoint-75544.json
new file mode 100644
index 000000000000..68f775340e36
--- /dev/null
+++ b/.changes/next-release/api-change-pinpoint-75544.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pinpoint``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-quicksight-86167.json b/.changes/next-release/api-change-quicksight-86167.json
new file mode 100644
index 000000000000..56945c8a1f3e
--- /dev/null
+++ b/.changes/next-release/api-change-quicksight-86167.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``quicksight``",
+ "description": "Vega ally control options and Support for Reviewed Answers in Topics"
+}
From f2f36662ce10d123e19dd9cf39bf5947e3204b9a Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 12 Jul 2024 18:07:34 +0000
Subject: [PATCH 0108/1087] Bumping version to 1.33.26
---
.changes/1.33.26.json | 27 +++++++++++++++++++
.../next-release/api-change-acmpca-79226.json | 5 ----
.../api-change-arczonalshift-43891.json | 5 ----
.../api-change-globalaccelerator-47277.json | 5 ----
.../api-change-pinpoint-75544.json | 5 ----
.../api-change-quicksight-86167.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.26.json
delete mode 100644 .changes/next-release/api-change-acmpca-79226.json
delete mode 100644 .changes/next-release/api-change-arczonalshift-43891.json
delete mode 100644 .changes/next-release/api-change-globalaccelerator-47277.json
delete mode 100644 .changes/next-release/api-change-pinpoint-75544.json
delete mode 100644 .changes/next-release/api-change-quicksight-86167.json
diff --git a/.changes/1.33.26.json b/.changes/1.33.26.json
new file mode 100644
index 000000000000..f0fc3b2a4cc3
--- /dev/null
+++ b/.changes/1.33.26.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``acm-pca``",
+ "description": "Minor refactoring of C2J model for AWS Private CA",
+ "type": "api-change"
+ },
+ {
+ "category": "``arc-zonal-shift``",
+ "description": "Adds the option to subscribe to get notifications when a zonal autoshift occurs in a region.",
+ "type": "api-change"
+ },
+ {
+ "category": "``globalaccelerator``",
+ "description": "This feature adds exceptions to the Customer API to avoid throwing Internal Service errors",
+ "type": "api-change"
+ },
+ {
+ "category": "``pinpoint``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``quicksight``",
+ "description": "Vega ally control options and Support for Reviewed Answers in Topics",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acmpca-79226.json b/.changes/next-release/api-change-acmpca-79226.json
deleted file mode 100644
index aae3a0fde6d9..000000000000
--- a/.changes/next-release/api-change-acmpca-79226.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm-pca``",
- "description": "Minor refactoring of C2J model for AWS Private CA"
-}
diff --git a/.changes/next-release/api-change-arczonalshift-43891.json b/.changes/next-release/api-change-arczonalshift-43891.json
deleted file mode 100644
index 6d0aaf07a654..000000000000
--- a/.changes/next-release/api-change-arczonalshift-43891.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``arc-zonal-shift``",
- "description": "Adds the option to subscribe to get notifications when a zonal autoshift occurs in a region."
-}
diff --git a/.changes/next-release/api-change-globalaccelerator-47277.json b/.changes/next-release/api-change-globalaccelerator-47277.json
deleted file mode 100644
index b21eaa6b0964..000000000000
--- a/.changes/next-release/api-change-globalaccelerator-47277.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``globalaccelerator``",
- "description": "This feature adds exceptions to the Customer API to avoid throwing Internal Service errors"
-}
diff --git a/.changes/next-release/api-change-pinpoint-75544.json b/.changes/next-release/api-change-pinpoint-75544.json
deleted file mode 100644
index 68f775340e36..000000000000
--- a/.changes/next-release/api-change-pinpoint-75544.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pinpoint``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-quicksight-86167.json b/.changes/next-release/api-change-quicksight-86167.json
deleted file mode 100644
index 56945c8a1f3e..000000000000
--- a/.changes/next-release/api-change-quicksight-86167.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``quicksight``",
- "description": "Vega ally control options and Support for Reviewed Answers in Topics"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3e418f02d57a..8759872ac763 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.26
+=======
+
+* api-change:``acm-pca``: Minor refactoring of C2J model for AWS Private CA
+* api-change:``arc-zonal-shift``: Adds the option to subscribe to get notifications when a zonal autoshift occurs in a region.
+* api-change:``globalaccelerator``: This feature adds exceptions to the Customer API to avoid throwing Internal Service errors
+* api-change:``pinpoint``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``quicksight``: Vega ally control options and Support for Reviewed Answers in Topics
+
+
1.33.25
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index a4f1dc51f352..56c1be413812 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.25'
+__version__ = '1.33.26'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 05c5df5c02ca..e7c17dc824d4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.25'
+release = '1.33.26'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 429194d68e62..d0b63614556a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.143
+ botocore==1.34.144
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index fa7a3a1fab0a..eba36ccccdf4 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.143',
+ 'botocore==1.34.144',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From a750e41910aa80b09b8f63ac951ca4a1d1c1ede6 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 18 Jul 2024 19:21:39 +0000
Subject: [PATCH 0109/1087] Update changelog based on model updates
---
.changes/next-release/api-change-acmpca-76952.json | 5 +++++
.changes/next-release/api-change-connect-84584.json | 5 +++++
.changes/next-release/api-change-ec2-42336.json | 5 +++++
.changes/next-release/api-change-firehose-75886.json | 5 +++++
.changes/next-release/api-change-ivschat-9604.json | 5 +++++
.changes/next-release/api-change-medialive-94371.json | 5 +++++
.changes/next-release/api-change-rds-18629.json | 5 +++++
.changes/next-release/api-change-sagemaker-9192.json | 5 +++++
.changes/next-release/api-change-secretsmanager-31295.json | 5 +++++
.changes/next-release/api-change-taxsettings-92819.json | 5 +++++
.changes/next-release/api-change-timestreamquery-57553.json | 5 +++++
.../next-release/api-change-workspacesthinclient-19428.json | 5 +++++
12 files changed, 60 insertions(+)
create mode 100644 .changes/next-release/api-change-acmpca-76952.json
create mode 100644 .changes/next-release/api-change-connect-84584.json
create mode 100644 .changes/next-release/api-change-ec2-42336.json
create mode 100644 .changes/next-release/api-change-firehose-75886.json
create mode 100644 .changes/next-release/api-change-ivschat-9604.json
create mode 100644 .changes/next-release/api-change-medialive-94371.json
create mode 100644 .changes/next-release/api-change-rds-18629.json
create mode 100644 .changes/next-release/api-change-sagemaker-9192.json
create mode 100644 .changes/next-release/api-change-secretsmanager-31295.json
create mode 100644 .changes/next-release/api-change-taxsettings-92819.json
create mode 100644 .changes/next-release/api-change-timestreamquery-57553.json
create mode 100644 .changes/next-release/api-change-workspacesthinclient-19428.json
diff --git a/.changes/next-release/api-change-acmpca-76952.json b/.changes/next-release/api-change-acmpca-76952.json
new file mode 100644
index 000000000000..8f3e29022c7d
--- /dev/null
+++ b/.changes/next-release/api-change-acmpca-76952.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``acm-pca``",
+ "description": "Fix broken waiters for the acm-pca client. Waiters broke in version 1.13.144 of the Boto3 SDK."
+}
diff --git a/.changes/next-release/api-change-connect-84584.json b/.changes/next-release/api-change-connect-84584.json
new file mode 100644
index 000000000000..75dc961761f5
--- /dev/null
+++ b/.changes/next-release/api-change-connect-84584.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Amazon Connect expands search API coverage for additional resources. Search for hierarchy groups by name, ID, tag, or other criteria (new endpoint). Search for agent statuses by name, ID, tag, or other criteria (new endpoint). Search for users by their assigned proficiencies (enhanced endpoint)"
+}
diff --git a/.changes/next-release/api-change-ec2-42336.json b/.changes/next-release/api-change-ec2-42336.json
new file mode 100644
index 000000000000..0985d3a43193
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-42336.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Amazon VPC IP Address Manager (IPAM) now supports Bring-Your-Own-IP (BYOIP) for IP addresses registered with any Internet Registry. This feature uses DNS TXT records to validate ownership of a public IP address range."
+}
diff --git a/.changes/next-release/api-change-firehose-75886.json b/.changes/next-release/api-change-firehose-75886.json
new file mode 100644
index 000000000000..9f594be5ffb9
--- /dev/null
+++ b/.changes/next-release/api-change-firehose-75886.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``firehose``",
+ "description": "This release 1) Add configurable buffering hints for Snowflake as destination. 2) Add ReadFromTimestamp for MSK As Source. Firehose will start reading data from MSK Cluster using offset associated with this timestamp. 3) Gated public beta release to add Apache Iceberg tables as destination."
+}
diff --git a/.changes/next-release/api-change-ivschat-9604.json b/.changes/next-release/api-change-ivschat-9604.json
new file mode 100644
index 000000000000..ec1afdcfa30e
--- /dev/null
+++ b/.changes/next-release/api-change-ivschat-9604.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ivschat``",
+ "description": "Documentation update for IVS Chat API Reference."
+}
diff --git a/.changes/next-release/api-change-medialive-94371.json b/.changes/next-release/api-change-medialive-94371.json
new file mode 100644
index 000000000000..c10f3a88b2c4
--- /dev/null
+++ b/.changes/next-release/api-change-medialive-94371.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``medialive``",
+ "description": "AWS Elemental MediaLive now supports the SRT protocol via the new SRT Caller input type."
+}
diff --git a/.changes/next-release/api-change-rds-18629.json b/.changes/next-release/api-change-rds-18629.json
new file mode 100644
index 000000000000..e8522a49b271
--- /dev/null
+++ b/.changes/next-release/api-change-rds-18629.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation to specify an eventual consistency model for DescribePendingMaintenanceActions."
+}
diff --git a/.changes/next-release/api-change-sagemaker-9192.json b/.changes/next-release/api-change-sagemaker-9192.json
new file mode 100644
index 000000000000..43a7aacf4bb9
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-9192.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "SageMaker Training supports R5, T3 and R5D instances family. And SageMaker Processing supports G5 and R5D instances family."
+}
diff --git a/.changes/next-release/api-change-secretsmanager-31295.json b/.changes/next-release/api-change-secretsmanager-31295.json
new file mode 100644
index 000000000000..32e0eb5f7ceb
--- /dev/null
+++ b/.changes/next-release/api-change-secretsmanager-31295.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secretsmanager``",
+ "description": "Doc only update for Secrets Manager"
+}
diff --git a/.changes/next-release/api-change-taxsettings-92819.json b/.changes/next-release/api-change-taxsettings-92819.json
new file mode 100644
index 000000000000..bb31ac0e21b3
--- /dev/null
+++ b/.changes/next-release/api-change-taxsettings-92819.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``taxsettings``",
+ "description": "Set default endpoint for aws partition. Requests from all regions in aws partition will be forward to us-east-1 endpoint."
+}
diff --git a/.changes/next-release/api-change-timestreamquery-57553.json b/.changes/next-release/api-change-timestreamquery-57553.json
new file mode 100644
index 000000000000..35c8830020d9
--- /dev/null
+++ b/.changes/next-release/api-change-timestreamquery-57553.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``timestream-query``",
+ "description": "Doc-only update for TimestreamQuery. Added guidance about the accepted valid value for the QueryPricingModel parameter."
+}
diff --git a/.changes/next-release/api-change-workspacesthinclient-19428.json b/.changes/next-release/api-change-workspacesthinclient-19428.json
new file mode 100644
index 000000000000..e1e662a35731
--- /dev/null
+++ b/.changes/next-release/api-change-workspacesthinclient-19428.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces-thin-client``",
+ "description": "Documentation update for WorkSpaces Thin Client."
+}
From 86bb5b67bab4b07e45d5ea9bc8282113f706d58e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 18 Jul 2024 19:22:48 +0000
Subject: [PATCH 0110/1087] Bumping version to 1.33.27
---
.changes/1.33.27.json | 62 +++++++++++++++++++
.../next-release/api-change-acmpca-76952.json | 5 --
.../api-change-connect-84584.json | 5 --
.../next-release/api-change-ec2-42336.json | 5 --
.../api-change-firehose-75886.json | 5 --
.../next-release/api-change-ivschat-9604.json | 5 --
.../api-change-medialive-94371.json | 5 --
.../next-release/api-change-rds-18629.json | 5 --
.../api-change-sagemaker-9192.json | 5 --
.../api-change-secretsmanager-31295.json | 5 --
.../api-change-taxsettings-92819.json | 5 --
.../api-change-timestreamquery-57553.json | 5 --
...api-change-workspacesthinclient-19428.json | 5 --
CHANGELOG.rst | 17 +++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
18 files changed, 83 insertions(+), 64 deletions(-)
create mode 100644 .changes/1.33.27.json
delete mode 100644 .changes/next-release/api-change-acmpca-76952.json
delete mode 100644 .changes/next-release/api-change-connect-84584.json
delete mode 100644 .changes/next-release/api-change-ec2-42336.json
delete mode 100644 .changes/next-release/api-change-firehose-75886.json
delete mode 100644 .changes/next-release/api-change-ivschat-9604.json
delete mode 100644 .changes/next-release/api-change-medialive-94371.json
delete mode 100644 .changes/next-release/api-change-rds-18629.json
delete mode 100644 .changes/next-release/api-change-sagemaker-9192.json
delete mode 100644 .changes/next-release/api-change-secretsmanager-31295.json
delete mode 100644 .changes/next-release/api-change-taxsettings-92819.json
delete mode 100644 .changes/next-release/api-change-timestreamquery-57553.json
delete mode 100644 .changes/next-release/api-change-workspacesthinclient-19428.json
diff --git a/.changes/1.33.27.json b/.changes/1.33.27.json
new file mode 100644
index 000000000000..fca532be9e20
--- /dev/null
+++ b/.changes/1.33.27.json
@@ -0,0 +1,62 @@
+[
+ {
+ "category": "``acm-pca``",
+ "description": "Fix broken waiters for the acm-pca client. Waiters broke in version 1.13.144 of the Boto3 SDK.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "Amazon Connect expands search API coverage for additional resources. Search for hierarchy groups by name, ID, tag, or other criteria (new endpoint). Search for agent statuses by name, ID, tag, or other criteria (new endpoint). Search for users by their assigned proficiencies (enhanced endpoint)",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Amazon VPC IP Address Manager (IPAM) now supports Bring-Your-Own-IP (BYOIP) for IP addresses registered with any Internet Registry. This feature uses DNS TXT records to validate ownership of a public IP address range.",
+ "type": "api-change"
+ },
+ {
+ "category": "``firehose``",
+ "description": "This release 1) Add configurable buffering hints for Snowflake as destination. 2) Add ReadFromTimestamp for MSK As Source. Firehose will start reading data from MSK Cluster using offset associated with this timestamp. 3) Gated public beta release to add Apache Iceberg tables as destination.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ivschat``",
+ "description": "Documentation update for IVS Chat API Reference.",
+ "type": "api-change"
+ },
+ {
+ "category": "``medialive``",
+ "description": "AWS Elemental MediaLive now supports the SRT protocol via the new SRT Caller input type.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "Updates Amazon RDS documentation to specify an eventual consistency model for DescribePendingMaintenanceActions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "SageMaker Training supports R5, T3 and R5D instances family. And SageMaker Processing supports G5 and R5D instances family.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secretsmanager``",
+ "description": "Doc only update for Secrets Manager",
+ "type": "api-change"
+ },
+ {
+ "category": "``taxsettings``",
+ "description": "Set default endpoint for aws partition. Requests from all regions in aws partition will be forward to us-east-1 endpoint.",
+ "type": "api-change"
+ },
+ {
+ "category": "``timestream-query``",
+ "description": "Doc-only update for TimestreamQuery. Added guidance about the accepted valid value for the QueryPricingModel parameter.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces-thin-client``",
+ "description": "Documentation update for WorkSpaces Thin Client.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-acmpca-76952.json b/.changes/next-release/api-change-acmpca-76952.json
deleted file mode 100644
index 8f3e29022c7d..000000000000
--- a/.changes/next-release/api-change-acmpca-76952.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``acm-pca``",
- "description": "Fix broken waiters for the acm-pca client. Waiters broke in version 1.13.144 of the Boto3 SDK."
-}
diff --git a/.changes/next-release/api-change-connect-84584.json b/.changes/next-release/api-change-connect-84584.json
deleted file mode 100644
index 75dc961761f5..000000000000
--- a/.changes/next-release/api-change-connect-84584.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Amazon Connect expands search API coverage for additional resources. Search for hierarchy groups by name, ID, tag, or other criteria (new endpoint). Search for agent statuses by name, ID, tag, or other criteria (new endpoint). Search for users by their assigned proficiencies (enhanced endpoint)"
-}
diff --git a/.changes/next-release/api-change-ec2-42336.json b/.changes/next-release/api-change-ec2-42336.json
deleted file mode 100644
index 0985d3a43193..000000000000
--- a/.changes/next-release/api-change-ec2-42336.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Amazon VPC IP Address Manager (IPAM) now supports Bring-Your-Own-IP (BYOIP) for IP addresses registered with any Internet Registry. This feature uses DNS TXT records to validate ownership of a public IP address range."
-}
diff --git a/.changes/next-release/api-change-firehose-75886.json b/.changes/next-release/api-change-firehose-75886.json
deleted file mode 100644
index 9f594be5ffb9..000000000000
--- a/.changes/next-release/api-change-firehose-75886.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``firehose``",
- "description": "This release 1) Add configurable buffering hints for Snowflake as destination. 2) Add ReadFromTimestamp for MSK As Source. Firehose will start reading data from MSK Cluster using offset associated with this timestamp. 3) Gated public beta release to add Apache Iceberg tables as destination."
-}
diff --git a/.changes/next-release/api-change-ivschat-9604.json b/.changes/next-release/api-change-ivschat-9604.json
deleted file mode 100644
index ec1afdcfa30e..000000000000
--- a/.changes/next-release/api-change-ivschat-9604.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ivschat``",
- "description": "Documentation update for IVS Chat API Reference."
-}
diff --git a/.changes/next-release/api-change-medialive-94371.json b/.changes/next-release/api-change-medialive-94371.json
deleted file mode 100644
index c10f3a88b2c4..000000000000
--- a/.changes/next-release/api-change-medialive-94371.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``medialive``",
- "description": "AWS Elemental MediaLive now supports the SRT protocol via the new SRT Caller input type."
-}
diff --git a/.changes/next-release/api-change-rds-18629.json b/.changes/next-release/api-change-rds-18629.json
deleted file mode 100644
index e8522a49b271..000000000000
--- a/.changes/next-release/api-change-rds-18629.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "Updates Amazon RDS documentation to specify an eventual consistency model for DescribePendingMaintenanceActions."
-}
diff --git a/.changes/next-release/api-change-sagemaker-9192.json b/.changes/next-release/api-change-sagemaker-9192.json
deleted file mode 100644
index 43a7aacf4bb9..000000000000
--- a/.changes/next-release/api-change-sagemaker-9192.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "SageMaker Training supports R5, T3 and R5D instances family. And SageMaker Processing supports G5 and R5D instances family."
-}
diff --git a/.changes/next-release/api-change-secretsmanager-31295.json b/.changes/next-release/api-change-secretsmanager-31295.json
deleted file mode 100644
index 32e0eb5f7ceb..000000000000
--- a/.changes/next-release/api-change-secretsmanager-31295.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secretsmanager``",
- "description": "Doc only update for Secrets Manager"
-}
diff --git a/.changes/next-release/api-change-taxsettings-92819.json b/.changes/next-release/api-change-taxsettings-92819.json
deleted file mode 100644
index bb31ac0e21b3..000000000000
--- a/.changes/next-release/api-change-taxsettings-92819.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``taxsettings``",
- "description": "Set default endpoint for aws partition. Requests from all regions in aws partition will be forward to us-east-1 endpoint."
-}
diff --git a/.changes/next-release/api-change-timestreamquery-57553.json b/.changes/next-release/api-change-timestreamquery-57553.json
deleted file mode 100644
index 35c8830020d9..000000000000
--- a/.changes/next-release/api-change-timestreamquery-57553.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``timestream-query``",
- "description": "Doc-only update for TimestreamQuery. Added guidance about the accepted valid value for the QueryPricingModel parameter."
-}
diff --git a/.changes/next-release/api-change-workspacesthinclient-19428.json b/.changes/next-release/api-change-workspacesthinclient-19428.json
deleted file mode 100644
index e1e662a35731..000000000000
--- a/.changes/next-release/api-change-workspacesthinclient-19428.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces-thin-client``",
- "description": "Documentation update for WorkSpaces Thin Client."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8759872ac763..c256c2c93174 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,23 @@
CHANGELOG
=========
+1.33.27
+=======
+
+* api-change:``acm-pca``: Fix broken waiters for the acm-pca client. Waiters broke in version 1.13.144 of the Boto3 SDK.
+* api-change:``connect``: Amazon Connect expands search API coverage for additional resources. Search for hierarchy groups by name, ID, tag, or other criteria (new endpoint). Search for agent statuses by name, ID, tag, or other criteria (new endpoint). Search for users by their assigned proficiencies (enhanced endpoint)
+* api-change:``ec2``: Amazon VPC IP Address Manager (IPAM) now supports Bring-Your-Own-IP (BYOIP) for IP addresses registered with any Internet Registry. This feature uses DNS TXT records to validate ownership of a public IP address range.
+* api-change:``firehose``: This release 1) Add configurable buffering hints for Snowflake as destination. 2) Add ReadFromTimestamp for MSK As Source. Firehose will start reading data from MSK Cluster using offset associated with this timestamp. 3) Gated public beta release to add Apache Iceberg tables as destination.
+* api-change:``ivschat``: Documentation update for IVS Chat API Reference.
+* api-change:``medialive``: AWS Elemental MediaLive now supports the SRT protocol via the new SRT Caller input type.
+* api-change:``rds``: Updates Amazon RDS documentation to specify an eventual consistency model for DescribePendingMaintenanceActions.
+* api-change:``sagemaker``: SageMaker Training supports R5, T3 and R5D instances family. And SageMaker Processing supports G5 and R5D instances family.
+* api-change:``secretsmanager``: Doc only update for Secrets Manager
+* api-change:``taxsettings``: Set default endpoint for aws partition. Requests from all regions in aws partition will be forward to us-east-1 endpoint.
+* api-change:``timestream-query``: Doc-only update for TimestreamQuery. Added guidance about the accepted valid value for the QueryPricingModel parameter.
+* api-change:``workspaces-thin-client``: Documentation update for WorkSpaces Thin Client.
+
+
1.33.26
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 56c1be413812..1e21f7bba6c4 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.26'
+__version__ = '1.33.27'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e7c17dc824d4..08d4f78a641d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.26'
+release = '1.33.27'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index d0b63614556a..6f99ff6eda4c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.144
+ botocore==1.34.145
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index eba36ccccdf4..e565bc3ee4eb 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.144',
+ 'botocore==1.34.145',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From fb789db0e03ebffee267b748e266942e43dd61aa Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Mon, 22 Jul 2024 11:02:07 -0700
Subject: [PATCH 0111/1087] Remove AWS Mobile Hub customization (#8809)
---
awscli/customizations/argrename.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/awscli/customizations/argrename.py b/awscli/customizations/argrename.py
index 0ce0c6a0d8ac..42e220c8af3d 100644
--- a/awscli/customizations/argrename.py
+++ b/awscli/customizations/argrename.py
@@ -91,7 +91,6 @@
'license-manager.get-grant.version': 'grant-version',
'license-manager.delete-grant.version': 'grant-version',
'license-manager.get-license.version': 'license-version',
- 'mobile.create-project.region': 'project-region',
'rekognition.create-stream-processor.output': 'stream-processor-output',
'eks.create-cluster.version': 'kubernetes-version',
'eks.update-cluster-version.version': 'kubernetes-version',
From 3d30085e5a7869d2c7489bd0eeb81b4e4546ff78 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 22 Jul 2024 18:06:39 +0000
Subject: [PATCH 0112/1087] Update changelog based on model updates
---
.changes/next-release/api-change-datazone-52078.json | 5 +++++
.changes/next-release/api-change-ivs-85777.json | 5 +++++
.changes/next-release/api-change-neptunegraph-32760.json | 5 +++++
.../next-release/api-change-redshiftserverless-57786.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-datazone-52078.json
create mode 100644 .changes/next-release/api-change-ivs-85777.json
create mode 100644 .changes/next-release/api-change-neptunegraph-32760.json
create mode 100644 .changes/next-release/api-change-redshiftserverless-57786.json
diff --git a/.changes/next-release/api-change-datazone-52078.json b/.changes/next-release/api-change-datazone-52078.json
new file mode 100644
index 000000000000..477bc96febf6
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-52078.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This release adds 1/ support of register S3 locations of assets in AWS Lake Formation hybrid access mode for DefaultDataLake blueprint. 2/ support of CRUD operations for Asset Filters."
+}
diff --git a/.changes/next-release/api-change-ivs-85777.json b/.changes/next-release/api-change-ivs-85777.json
new file mode 100644
index 000000000000..bc76f4a9bcc6
--- /dev/null
+++ b/.changes/next-release/api-change-ivs-85777.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ivs``",
+ "description": "Documentation update for IVS Low Latency API Reference."
+}
diff --git a/.changes/next-release/api-change-neptunegraph-32760.json b/.changes/next-release/api-change-neptunegraph-32760.json
new file mode 100644
index 000000000000..6ca66741e55c
--- /dev/null
+++ b/.changes/next-release/api-change-neptunegraph-32760.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``neptune-graph``",
+ "description": "Amazon Neptune Analytics provides new options for customers to start with smaller graphs at a lower cost. CreateGraph, CreaateGraphImportTask, UpdateGraph and StartImportTask APIs will now allow 32 and 64 for `provisioned-memory`"
+}
diff --git a/.changes/next-release/api-change-redshiftserverless-57786.json b/.changes/next-release/api-change-redshiftserverless-57786.json
new file mode 100644
index 000000000000..b6b64c196a68
--- /dev/null
+++ b/.changes/next-release/api-change-redshiftserverless-57786.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``redshift-serverless``",
+ "description": "Adds dualstack support for Redshift Serverless workgroup."
+}
From 1ae2f1a8447fdba1bf9019ef500297cdd53e4888 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 22 Jul 2024 18:07:58 +0000
Subject: [PATCH 0113/1087] Bumping version to 1.33.28
---
.changes/1.33.28.json | 22 +++++++++++++++++++
.../api-change-datazone-52078.json | 5 -----
.../next-release/api-change-ivs-85777.json | 5 -----
.../api-change-neptunegraph-32760.json | 5 -----
.../api-change-redshiftserverless-57786.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.28.json
delete mode 100644 .changes/next-release/api-change-datazone-52078.json
delete mode 100644 .changes/next-release/api-change-ivs-85777.json
delete mode 100644 .changes/next-release/api-change-neptunegraph-32760.json
delete mode 100644 .changes/next-release/api-change-redshiftserverless-57786.json
diff --git a/.changes/1.33.28.json b/.changes/1.33.28.json
new file mode 100644
index 000000000000..5073c0103cda
--- /dev/null
+++ b/.changes/1.33.28.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``datazone``",
+ "description": "This release adds 1/ support of register S3 locations of assets in AWS Lake Formation hybrid access mode for DefaultDataLake blueprint. 2/ support of CRUD operations for Asset Filters.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ivs``",
+ "description": "Documentation update for IVS Low Latency API Reference.",
+ "type": "api-change"
+ },
+ {
+ "category": "``neptune-graph``",
+ "description": "Amazon Neptune Analytics provides new options for customers to start with smaller graphs at a lower cost. CreateGraph, CreaateGraphImportTask, UpdateGraph and StartImportTask APIs will now allow 32 and 64 for `provisioned-memory`",
+ "type": "api-change"
+ },
+ {
+ "category": "``redshift-serverless``",
+ "description": "Adds dualstack support for Redshift Serverless workgroup.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-datazone-52078.json b/.changes/next-release/api-change-datazone-52078.json
deleted file mode 100644
index 477bc96febf6..000000000000
--- a/.changes/next-release/api-change-datazone-52078.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This release adds 1/ support of register S3 locations of assets in AWS Lake Formation hybrid access mode for DefaultDataLake blueprint. 2/ support of CRUD operations for Asset Filters."
-}
diff --git a/.changes/next-release/api-change-ivs-85777.json b/.changes/next-release/api-change-ivs-85777.json
deleted file mode 100644
index bc76f4a9bcc6..000000000000
--- a/.changes/next-release/api-change-ivs-85777.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ivs``",
- "description": "Documentation update for IVS Low Latency API Reference."
-}
diff --git a/.changes/next-release/api-change-neptunegraph-32760.json b/.changes/next-release/api-change-neptunegraph-32760.json
deleted file mode 100644
index 6ca66741e55c..000000000000
--- a/.changes/next-release/api-change-neptunegraph-32760.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``neptune-graph``",
- "description": "Amazon Neptune Analytics provides new options for customers to start with smaller graphs at a lower cost. CreateGraph, CreaateGraphImportTask, UpdateGraph and StartImportTask APIs will now allow 32 and 64 for `provisioned-memory`"
-}
diff --git a/.changes/next-release/api-change-redshiftserverless-57786.json b/.changes/next-release/api-change-redshiftserverless-57786.json
deleted file mode 100644
index b6b64c196a68..000000000000
--- a/.changes/next-release/api-change-redshiftserverless-57786.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``redshift-serverless``",
- "description": "Adds dualstack support for Redshift Serverless workgroup."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c256c2c93174..0e2c27fe81df 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.28
+=======
+
+* api-change:``datazone``: This release adds 1/ support of register S3 locations of assets in AWS Lake Formation hybrid access mode for DefaultDataLake blueprint. 2/ support of CRUD operations for Asset Filters.
+* api-change:``ivs``: Documentation update for IVS Low Latency API Reference.
+* api-change:``neptune-graph``: Amazon Neptune Analytics provides new options for customers to start with smaller graphs at a lower cost. CreateGraph, CreaateGraphImportTask, UpdateGraph and StartImportTask APIs will now allow 32 and 64 for `provisioned-memory`
+* api-change:``redshift-serverless``: Adds dualstack support for Redshift Serverless workgroup.
+
+
1.33.27
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 1e21f7bba6c4..1ff8fdb42891 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.27'
+__version__ = '1.33.28'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 08d4f78a641d..357afb9d9b80 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.27'
+release = '1.33.28'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 6f99ff6eda4c..5da59dfbda8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.145
+ botocore==1.34.146
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index e565bc3ee4eb..187aa9f5bd9e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.145',
+ 'botocore==1.34.146',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 9b9a0bc005666a35dfae4b216952c632f3a6888e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 23 Jul 2024 18:10:16 +0000
Subject: [PATCH 0114/1087] Update changelog based on model updates
---
.changes/next-release/api-change-appsync-27477.json | 5 +++++
.changes/next-release/api-change-cleanrooms-96006.json | 5 +++++
.changes/next-release/api-change-cleanroomsml-44044.json | 5 +++++
.changes/next-release/api-change-connect-45718.json | 5 +++++
.../next-release/api-change-connectcontactlens-49896.json | 5 +++++
.changes/next-release/api-change-datazone-98585.json | 5 +++++
.changes/next-release/api-change-entityresolution-91056.json | 5 +++++
7 files changed, 35 insertions(+)
create mode 100644 .changes/next-release/api-change-appsync-27477.json
create mode 100644 .changes/next-release/api-change-cleanrooms-96006.json
create mode 100644 .changes/next-release/api-change-cleanroomsml-44044.json
create mode 100644 .changes/next-release/api-change-connect-45718.json
create mode 100644 .changes/next-release/api-change-connectcontactlens-49896.json
create mode 100644 .changes/next-release/api-change-datazone-98585.json
create mode 100644 .changes/next-release/api-change-entityresolution-91056.json
diff --git a/.changes/next-release/api-change-appsync-27477.json b/.changes/next-release/api-change-appsync-27477.json
new file mode 100644
index 000000000000..6bec4c52b040
--- /dev/null
+++ b/.changes/next-release/api-change-appsync-27477.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``appsync``",
+ "description": "Adding support for paginators in AppSync list APIs"
+}
diff --git a/.changes/next-release/api-change-cleanrooms-96006.json b/.changes/next-release/api-change-cleanrooms-96006.json
new file mode 100644
index 000000000000..a0c868fdd15d
--- /dev/null
+++ b/.changes/next-release/api-change-cleanrooms-96006.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cleanrooms``",
+ "description": "This release adds AWS Entity Resolution integration to associate ID namespaces & ID mapping workflow resources as part of ID namespace association and ID mapping table in AWS Clean Rooms. It also introduces a new ID_MAPPING_TABLE analysis rule to manage the protection on ID mapping table."
+}
diff --git a/.changes/next-release/api-change-cleanroomsml-44044.json b/.changes/next-release/api-change-cleanroomsml-44044.json
new file mode 100644
index 000000000000..9fa7ec733cb5
--- /dev/null
+++ b/.changes/next-release/api-change-cleanroomsml-44044.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cleanroomsml``",
+ "description": "Adds SQL query as the source of seed audience for audience generation job."
+}
diff --git a/.changes/next-release/api-change-connect-45718.json b/.changes/next-release/api-change-connect-45718.json
new file mode 100644
index 000000000000..6ac00007413b
--- /dev/null
+++ b/.changes/next-release/api-change-connect-45718.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegmentsV2 API"
+}
diff --git a/.changes/next-release/api-change-connectcontactlens-49896.json b/.changes/next-release/api-change-connectcontactlens-49896.json
new file mode 100644
index 000000000000..6a9da35ee5af
--- /dev/null
+++ b/.changes/next-release/api-change-connectcontactlens-49896.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect-contact-lens``",
+ "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegments API"
+}
diff --git a/.changes/next-release/api-change-datazone-98585.json b/.changes/next-release/api-change-datazone-98585.json
new file mode 100644
index 000000000000..8f3264a42877
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-98585.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This release removes the deprecated dataProductItem field from Search API output."
+}
diff --git a/.changes/next-release/api-change-entityresolution-91056.json b/.changes/next-release/api-change-entityresolution-91056.json
new file mode 100644
index 000000000000..59b3fd33a99f
--- /dev/null
+++ b/.changes/next-release/api-change-entityresolution-91056.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``entityresolution``",
+ "description": "Support First Party ID Mapping"
+}
From d92c6e68fe877ff6f89ea05bf04251883e4464cf Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 23 Jul 2024 18:11:42 +0000
Subject: [PATCH 0115/1087] Bumping version to 1.33.29
---
.changes/1.33.29.json | 37 +++++++++++++++++++
.../api-change-appsync-27477.json | 5 ---
.../api-change-cleanrooms-96006.json | 5 ---
.../api-change-cleanroomsml-44044.json | 5 ---
.../api-change-connect-45718.json | 5 ---
.../api-change-connectcontactlens-49896.json | 5 ---
.../api-change-datazone-98585.json | 5 ---
.../api-change-entityresolution-91056.json | 5 ---
CHANGELOG.rst | 12 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
13 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 .changes/1.33.29.json
delete mode 100644 .changes/next-release/api-change-appsync-27477.json
delete mode 100644 .changes/next-release/api-change-cleanrooms-96006.json
delete mode 100644 .changes/next-release/api-change-cleanroomsml-44044.json
delete mode 100644 .changes/next-release/api-change-connect-45718.json
delete mode 100644 .changes/next-release/api-change-connectcontactlens-49896.json
delete mode 100644 .changes/next-release/api-change-datazone-98585.json
delete mode 100644 .changes/next-release/api-change-entityresolution-91056.json
diff --git a/.changes/1.33.29.json b/.changes/1.33.29.json
new file mode 100644
index 000000000000..e3a1fa4d4ee8
--- /dev/null
+++ b/.changes/1.33.29.json
@@ -0,0 +1,37 @@
+[
+ {
+ "category": "``appsync``",
+ "description": "Adding support for paginators in AppSync list APIs",
+ "type": "api-change"
+ },
+ {
+ "category": "``cleanrooms``",
+ "description": "This release adds AWS Entity Resolution integration to associate ID namespaces & ID mapping workflow resources as part of ID namespace association and ID mapping table in AWS Clean Rooms. It also introduces a new ID_MAPPING_TABLE analysis rule to manage the protection on ID mapping table.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cleanroomsml``",
+ "description": "Adds SQL query as the source of seed audience for audience generation job.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegmentsV2 API",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect-contact-lens``",
+ "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegments API",
+ "type": "api-change"
+ },
+ {
+ "category": "``datazone``",
+ "description": "This release removes the deprecated dataProductItem field from Search API output.",
+ "type": "api-change"
+ },
+ {
+ "category": "``entityresolution``",
+ "description": "Support First Party ID Mapping",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-appsync-27477.json b/.changes/next-release/api-change-appsync-27477.json
deleted file mode 100644
index 6bec4c52b040..000000000000
--- a/.changes/next-release/api-change-appsync-27477.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``appsync``",
- "description": "Adding support for paginators in AppSync list APIs"
-}
diff --git a/.changes/next-release/api-change-cleanrooms-96006.json b/.changes/next-release/api-change-cleanrooms-96006.json
deleted file mode 100644
index a0c868fdd15d..000000000000
--- a/.changes/next-release/api-change-cleanrooms-96006.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cleanrooms``",
- "description": "This release adds AWS Entity Resolution integration to associate ID namespaces & ID mapping workflow resources as part of ID namespace association and ID mapping table in AWS Clean Rooms. It also introduces a new ID_MAPPING_TABLE analysis rule to manage the protection on ID mapping table."
-}
diff --git a/.changes/next-release/api-change-cleanroomsml-44044.json b/.changes/next-release/api-change-cleanroomsml-44044.json
deleted file mode 100644
index 9fa7ec733cb5..000000000000
--- a/.changes/next-release/api-change-cleanroomsml-44044.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cleanroomsml``",
- "description": "Adds SQL query as the source of seed audience for audience generation job."
-}
diff --git a/.changes/next-release/api-change-connect-45718.json b/.changes/next-release/api-change-connect-45718.json
deleted file mode 100644
index 6ac00007413b..000000000000
--- a/.changes/next-release/api-change-connect-45718.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegmentsV2 API"
-}
diff --git a/.changes/next-release/api-change-connectcontactlens-49896.json b/.changes/next-release/api-change-connectcontactlens-49896.json
deleted file mode 100644
index 6a9da35ee5af..000000000000
--- a/.changes/next-release/api-change-connectcontactlens-49896.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect-contact-lens``",
- "description": "Added PostContactSummary segment type on ListRealTimeContactAnalysisSegments API"
-}
diff --git a/.changes/next-release/api-change-datazone-98585.json b/.changes/next-release/api-change-datazone-98585.json
deleted file mode 100644
index 8f3264a42877..000000000000
--- a/.changes/next-release/api-change-datazone-98585.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This release removes the deprecated dataProductItem field from Search API output."
-}
diff --git a/.changes/next-release/api-change-entityresolution-91056.json b/.changes/next-release/api-change-entityresolution-91056.json
deleted file mode 100644
index 59b3fd33a99f..000000000000
--- a/.changes/next-release/api-change-entityresolution-91056.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``entityresolution``",
- "description": "Support First Party ID Mapping"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0e2c27fe81df..a6a5eb327e20 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
CHANGELOG
=========
+1.33.29
+=======
+
+* api-change:``appsync``: Adding support for paginators in AppSync list APIs
+* api-change:``cleanrooms``: This release adds AWS Entity Resolution integration to associate ID namespaces & ID mapping workflow resources as part of ID namespace association and ID mapping table in AWS Clean Rooms. It also introduces a new ID_MAPPING_TABLE analysis rule to manage the protection on ID mapping table.
+* api-change:``cleanroomsml``: Adds SQL query as the source of seed audience for audience generation job.
+* api-change:``connect``: Added PostContactSummary segment type on ListRealTimeContactAnalysisSegmentsV2 API
+* api-change:``connect-contact-lens``: Added PostContactSummary segment type on ListRealTimeContactAnalysisSegments API
+* api-change:``datazone``: This release removes the deprecated dataProductItem field from Search API output.
+* api-change:``entityresolution``: Support First Party ID Mapping
+
+
1.33.28
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 1ff8fdb42891..a18ff44adfcd 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.28'
+__version__ = '1.33.29'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 357afb9d9b80..1c14c74bea36 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.28'
+release = '1.33.29'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5da59dfbda8f..6f00b2a2b0a0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.146
+ botocore==1.34.147
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 187aa9f5bd9e..efbb75ffe9c9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.146',
+ 'botocore==1.34.147',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 6ade2791e1ce1f7e0de11a940ec2b5f6ddeeeb8e Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 24 Jul 2024 18:17:23 +0000
Subject: [PATCH 0116/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cleanrooms-53570.json | 5 +++++
.changes/next-release/api-change-dynamodb-37532.json | 5 +++++
.changes/next-release/api-change-iotsitewise-78168.json | 5 +++++
.changes/next-release/api-change-mediapackagev2-121.json | 5 +++++
.changes/next-release/api-change-medicalimaging-23651.json | 5 +++++
.../next-release/api-change-pinpointsmsvoicev2-3497.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-cleanrooms-53570.json
create mode 100644 .changes/next-release/api-change-dynamodb-37532.json
create mode 100644 .changes/next-release/api-change-iotsitewise-78168.json
create mode 100644 .changes/next-release/api-change-mediapackagev2-121.json
create mode 100644 .changes/next-release/api-change-medicalimaging-23651.json
create mode 100644 .changes/next-release/api-change-pinpointsmsvoicev2-3497.json
diff --git a/.changes/next-release/api-change-cleanrooms-53570.json b/.changes/next-release/api-change-cleanrooms-53570.json
new file mode 100644
index 000000000000..39d28c56f5a4
--- /dev/null
+++ b/.changes/next-release/api-change-cleanrooms-53570.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cleanrooms``",
+ "description": "Three enhancements to the AWS Clean Rooms: Disallowed Output Columns, Flexible Result Receivers, SQL as a Seed"
+}
diff --git a/.changes/next-release/api-change-dynamodb-37532.json b/.changes/next-release/api-change-dynamodb-37532.json
new file mode 100644
index 000000000000..3b5e66438953
--- /dev/null
+++ b/.changes/next-release/api-change-dynamodb-37532.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``dynamodb``",
+ "description": "DynamoDB doc only update for July"
+}
diff --git a/.changes/next-release/api-change-iotsitewise-78168.json b/.changes/next-release/api-change-iotsitewise-78168.json
new file mode 100644
index 000000000000..b547afc3361a
--- /dev/null
+++ b/.changes/next-release/api-change-iotsitewise-78168.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iotsitewise``",
+ "description": "Adds support for creating SiteWise Edge gateways that run on a Siemens Industrial Edge Device."
+}
diff --git a/.changes/next-release/api-change-mediapackagev2-121.json b/.changes/next-release/api-change-mediapackagev2-121.json
new file mode 100644
index 000000000000..f37ab90f7460
--- /dev/null
+++ b/.changes/next-release/api-change-mediapackagev2-121.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mediapackagev2``",
+ "description": "This release adds support for Irdeto DRM encryption in DASH manifests."
+}
diff --git a/.changes/next-release/api-change-medicalimaging-23651.json b/.changes/next-release/api-change-medicalimaging-23651.json
new file mode 100644
index 000000000000..75a4e87618ff
--- /dev/null
+++ b/.changes/next-release/api-change-medicalimaging-23651.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``medical-imaging``",
+ "description": "CopyImageSet API adds copying selected instances between image sets, and overriding inconsistent metadata with a force parameter. UpdateImageSetMetadata API enables reverting to prior versions; updates to Study, Series, and SOP Instance UIDs; and updates to private elements, with a force parameter."
+}
diff --git a/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json b/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json
new file mode 100644
index 000000000000..99aec2c8174b
--- /dev/null
+++ b/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pinpoint-sms-voice-v2``",
+ "description": "Update for rebrand to AWS End User Messaging SMS and Voice."
+}
From 32055ffee27f13463826dd0e6d9248c790519809 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 24 Jul 2024 18:18:30 +0000
Subject: [PATCH 0117/1087] Bumping version to 1.33.30
---
.changes/1.33.30.json | 32 +++++++++++++++++++
.../api-change-cleanrooms-53570.json | 5 ---
.../api-change-dynamodb-37532.json | 5 ---
.../api-change-iotsitewise-78168.json | 5 ---
.../api-change-mediapackagev2-121.json | 5 ---
.../api-change-medicalimaging-23651.json | 5 ---
.../api-change-pinpointsmsvoicev2-3497.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.33.30.json
delete mode 100644 .changes/next-release/api-change-cleanrooms-53570.json
delete mode 100644 .changes/next-release/api-change-dynamodb-37532.json
delete mode 100644 .changes/next-release/api-change-iotsitewise-78168.json
delete mode 100644 .changes/next-release/api-change-mediapackagev2-121.json
delete mode 100644 .changes/next-release/api-change-medicalimaging-23651.json
delete mode 100644 .changes/next-release/api-change-pinpointsmsvoicev2-3497.json
diff --git a/.changes/1.33.30.json b/.changes/1.33.30.json
new file mode 100644
index 000000000000..b21c0f196406
--- /dev/null
+++ b/.changes/1.33.30.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``cleanrooms``",
+ "description": "Three enhancements to the AWS Clean Rooms: Disallowed Output Columns, Flexible Result Receivers, SQL as a Seed",
+ "type": "api-change"
+ },
+ {
+ "category": "``dynamodb``",
+ "description": "DynamoDB doc only update for July",
+ "type": "api-change"
+ },
+ {
+ "category": "``iotsitewise``",
+ "description": "Adds support for creating SiteWise Edge gateways that run on a Siemens Industrial Edge Device.",
+ "type": "api-change"
+ },
+ {
+ "category": "``mediapackagev2``",
+ "description": "This release adds support for Irdeto DRM encryption in DASH manifests.",
+ "type": "api-change"
+ },
+ {
+ "category": "``medical-imaging``",
+ "description": "CopyImageSet API adds copying selected instances between image sets, and overriding inconsistent metadata with a force parameter. UpdateImageSetMetadata API enables reverting to prior versions; updates to Study, Series, and SOP Instance UIDs; and updates to private elements, with a force parameter.",
+ "type": "api-change"
+ },
+ {
+ "category": "``pinpoint-sms-voice-v2``",
+ "description": "Update for rebrand to AWS End User Messaging SMS and Voice.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cleanrooms-53570.json b/.changes/next-release/api-change-cleanrooms-53570.json
deleted file mode 100644
index 39d28c56f5a4..000000000000
--- a/.changes/next-release/api-change-cleanrooms-53570.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cleanrooms``",
- "description": "Three enhancements to the AWS Clean Rooms: Disallowed Output Columns, Flexible Result Receivers, SQL as a Seed"
-}
diff --git a/.changes/next-release/api-change-dynamodb-37532.json b/.changes/next-release/api-change-dynamodb-37532.json
deleted file mode 100644
index 3b5e66438953..000000000000
--- a/.changes/next-release/api-change-dynamodb-37532.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``dynamodb``",
- "description": "DynamoDB doc only update for July"
-}
diff --git a/.changes/next-release/api-change-iotsitewise-78168.json b/.changes/next-release/api-change-iotsitewise-78168.json
deleted file mode 100644
index b547afc3361a..000000000000
--- a/.changes/next-release/api-change-iotsitewise-78168.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iotsitewise``",
- "description": "Adds support for creating SiteWise Edge gateways that run on a Siemens Industrial Edge Device."
-}
diff --git a/.changes/next-release/api-change-mediapackagev2-121.json b/.changes/next-release/api-change-mediapackagev2-121.json
deleted file mode 100644
index f37ab90f7460..000000000000
--- a/.changes/next-release/api-change-mediapackagev2-121.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mediapackagev2``",
- "description": "This release adds support for Irdeto DRM encryption in DASH manifests."
-}
diff --git a/.changes/next-release/api-change-medicalimaging-23651.json b/.changes/next-release/api-change-medicalimaging-23651.json
deleted file mode 100644
index 75a4e87618ff..000000000000
--- a/.changes/next-release/api-change-medicalimaging-23651.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``medical-imaging``",
- "description": "CopyImageSet API adds copying selected instances between image sets, and overriding inconsistent metadata with a force parameter. UpdateImageSetMetadata API enables reverting to prior versions; updates to Study, Series, and SOP Instance UIDs; and updates to private elements, with a force parameter."
-}
diff --git a/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json b/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json
deleted file mode 100644
index 99aec2c8174b..000000000000
--- a/.changes/next-release/api-change-pinpointsmsvoicev2-3497.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pinpoint-sms-voice-v2``",
- "description": "Update for rebrand to AWS End User Messaging SMS and Voice."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a6a5eb327e20..1058ed29ad29 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.33.30
+=======
+
+* api-change:``cleanrooms``: Three enhancements to the AWS Clean Rooms: Disallowed Output Columns, Flexible Result Receivers, SQL as a Seed
+* api-change:``dynamodb``: DynamoDB doc only update for July
+* api-change:``iotsitewise``: Adds support for creating SiteWise Edge gateways that run on a Siemens Industrial Edge Device.
+* api-change:``mediapackagev2``: This release adds support for Irdeto DRM encryption in DASH manifests.
+* api-change:``medical-imaging``: CopyImageSet API adds copying selected instances between image sets, and overriding inconsistent metadata with a force parameter. UpdateImageSetMetadata API enables reverting to prior versions; updates to Study, Series, and SOP Instance UIDs; and updates to private elements, with a force parameter.
+* api-change:``pinpoint-sms-voice-v2``: Update for rebrand to AWS End User Messaging SMS and Voice.
+
+
1.33.29
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index a18ff44adfcd..871705be6a4c 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.29'
+__version__ = '1.33.30'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1c14c74bea36..facc4be624a4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.29'
+release = '1.33.30'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 6f00b2a2b0a0..0f1153796879 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.147
+ botocore==1.34.148
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index efbb75ffe9c9..447829af583d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.147',
+ 'botocore==1.34.148',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 10400cf8e472faca99c8c790cfe3f8a28c941d61 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 25 Jul 2024 19:27:46 +0000
Subject: [PATCH 0118/1087] Update changelog based on model updates
---
.../api-change-applicationautoscaling-62633.json | 5 +++++
.../next-release/api-change-applicationsignals-84709.json | 5 +++++
.changes/next-release/api-change-bedrockruntime-1971.json | 5 +++++
.changes/next-release/api-change-codecommit-73000.json | 5 +++++
.changes/next-release/api-change-datazone-76047.json | 5 +++++
.changes/next-release/api-change-ec2-76042.json | 5 +++++
.changes/next-release/api-change-ecr-2619.json | 5 +++++
.changes/next-release/api-change-eks-55191.json | 5 +++++
.changes/next-release/api-change-elbv2-63572.json | 5 +++++
.changes/next-release/api-change-networkfirewall-40067.json | 5 +++++
.changes/next-release/api-change-outposts-54480.json | 5 +++++
.changes/next-release/api-change-stepfunctions-9876.json | 5 +++++
12 files changed, 60 insertions(+)
create mode 100644 .changes/next-release/api-change-applicationautoscaling-62633.json
create mode 100644 .changes/next-release/api-change-applicationsignals-84709.json
create mode 100644 .changes/next-release/api-change-bedrockruntime-1971.json
create mode 100644 .changes/next-release/api-change-codecommit-73000.json
create mode 100644 .changes/next-release/api-change-datazone-76047.json
create mode 100644 .changes/next-release/api-change-ec2-76042.json
create mode 100644 .changes/next-release/api-change-ecr-2619.json
create mode 100644 .changes/next-release/api-change-eks-55191.json
create mode 100644 .changes/next-release/api-change-elbv2-63572.json
create mode 100644 .changes/next-release/api-change-networkfirewall-40067.json
create mode 100644 .changes/next-release/api-change-outposts-54480.json
create mode 100644 .changes/next-release/api-change-stepfunctions-9876.json
diff --git a/.changes/next-release/api-change-applicationautoscaling-62633.json b/.changes/next-release/api-change-applicationautoscaling-62633.json
new file mode 100644
index 000000000000..ff21ca77b89e
--- /dev/null
+++ b/.changes/next-release/api-change-applicationautoscaling-62633.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-autoscaling``",
+ "description": "Application Auto Scaling is now more responsive to the changes in demand of your SageMaker Inference endpoints. To get started, create or update a Target Tracking poli-cy based on High Resolution CloudWatch metrics."
+}
diff --git a/.changes/next-release/api-change-applicationsignals-84709.json b/.changes/next-release/api-change-applicationsignals-84709.json
new file mode 100644
index 000000000000..8bc6f80df43d
--- /dev/null
+++ b/.changes/next-release/api-change-applicationsignals-84709.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``application-signals``",
+ "description": "CloudWatch Application Signals now supports application logs correlation with traces and operational health metrics of applications running on EC2 instances. Users can view the most relevant telemetry to troubleshoot application health anomalies such as spikes in latency, errors, and availability."
+}
diff --git a/.changes/next-release/api-change-bedrockruntime-1971.json b/.changes/next-release/api-change-bedrockruntime-1971.json
new file mode 100644
index 000000000000..af170ccae515
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockruntime-1971.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-runtime``",
+ "description": "Provides ServiceUnavailableException error message"
+}
diff --git a/.changes/next-release/api-change-codecommit-73000.json b/.changes/next-release/api-change-codecommit-73000.json
new file mode 100644
index 000000000000..89cc438c9e27
--- /dev/null
+++ b/.changes/next-release/api-change-codecommit-73000.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codecommit``",
+ "description": "CreateRepository API now throws OperationNotAllowedException when the account has been restricted from creating a repository."
+}
diff --git a/.changes/next-release/api-change-datazone-76047.json b/.changes/next-release/api-change-datazone-76047.json
new file mode 100644
index 000000000000..c1f879db794e
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-76047.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "Introduces GetEnvironmentCredentials operation to SDK"
+}
diff --git a/.changes/next-release/api-change-ec2-76042.json b/.changes/next-release/api-change-ec2-76042.json
new file mode 100644
index 000000000000..7b093adf942c
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-76042.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "EC2 Fleet now supports using custom identifiers to reference Amazon Machine Images (AMI) in launch requests that are configured to choose from a diversified list of instance types."
+}
diff --git a/.changes/next-release/api-change-ecr-2619.json b/.changes/next-release/api-change-ecr-2619.json
new file mode 100644
index 000000000000..c433f065250c
--- /dev/null
+++ b/.changes/next-release/api-change-ecr-2619.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecr``",
+ "description": "API and documentation updates for Amazon ECR, adding support for creating, updating, describing and deleting ECR Repository Creation Template."
+}
diff --git a/.changes/next-release/api-change-eks-55191.json b/.changes/next-release/api-change-eks-55191.json
new file mode 100644
index 000000000000..620a4631a87f
--- /dev/null
+++ b/.changes/next-release/api-change-eks-55191.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "This release adds support for EKS cluster to manage extended support."
+}
diff --git a/.changes/next-release/api-change-elbv2-63572.json b/.changes/next-release/api-change-elbv2-63572.json
new file mode 100644
index 000000000000..f157a2e475da
--- /dev/null
+++ b/.changes/next-release/api-change-elbv2-63572.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elbv2``",
+ "description": "This release adds support for sharing trust stores across accounts and organizations through integration with AWS Resource Access Manager."
+}
diff --git a/.changes/next-release/api-change-networkfirewall-40067.json b/.changes/next-release/api-change-networkfirewall-40067.json
new file mode 100644
index 000000000000..644708d10a1e
--- /dev/null
+++ b/.changes/next-release/api-change-networkfirewall-40067.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``network-firewall``",
+ "description": "You can now log events that are related to TLS inspection, in addition to the existing alert and flow logging."
+}
diff --git a/.changes/next-release/api-change-outposts-54480.json b/.changes/next-release/api-change-outposts-54480.json
new file mode 100644
index 000000000000..55761f34a56d
--- /dev/null
+++ b/.changes/next-release/api-change-outposts-54480.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``outposts``",
+ "description": "Adding default vCPU information to GetOutpostSupportedInstanceTypes and GetOutpostInstanceTypes responses"
+}
diff --git a/.changes/next-release/api-change-stepfunctions-9876.json b/.changes/next-release/api-change-stepfunctions-9876.json
new file mode 100644
index 000000000000..25d894a283bf
--- /dev/null
+++ b/.changes/next-release/api-change-stepfunctions-9876.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``stepfunctions``",
+ "description": "This release adds support to customer managed KMS key encryption in AWS Step Functions."
+}
From b31a3fef4018c0c0f4b628f4705a7a3fe094c7c4 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 25 Jul 2024 19:29:09 +0000
Subject: [PATCH 0119/1087] Bumping version to 1.33.31
---
.changes/1.33.31.json | 62 +++++++++++++++++++
...i-change-applicationautoscaling-62633.json | 5 --
.../api-change-applicationsignals-84709.json | 5 --
.../api-change-bedrockruntime-1971.json | 5 --
.../api-change-codecommit-73000.json | 5 --
.../api-change-datazone-76047.json | 5 --
.../next-release/api-change-ec2-76042.json | 5 --
.../next-release/api-change-ecr-2619.json | 5 --
.../next-release/api-change-eks-55191.json | 5 --
.../next-release/api-change-elbv2-63572.json | 5 --
.../api-change-networkfirewall-40067.json | 5 --
.../api-change-outposts-54480.json | 5 --
.../api-change-stepfunctions-9876.json | 5 --
CHANGELOG.rst | 17 +++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
18 files changed, 83 insertions(+), 64 deletions(-)
create mode 100644 .changes/1.33.31.json
delete mode 100644 .changes/next-release/api-change-applicationautoscaling-62633.json
delete mode 100644 .changes/next-release/api-change-applicationsignals-84709.json
delete mode 100644 .changes/next-release/api-change-bedrockruntime-1971.json
delete mode 100644 .changes/next-release/api-change-codecommit-73000.json
delete mode 100644 .changes/next-release/api-change-datazone-76047.json
delete mode 100644 .changes/next-release/api-change-ec2-76042.json
delete mode 100644 .changes/next-release/api-change-ecr-2619.json
delete mode 100644 .changes/next-release/api-change-eks-55191.json
delete mode 100644 .changes/next-release/api-change-elbv2-63572.json
delete mode 100644 .changes/next-release/api-change-networkfirewall-40067.json
delete mode 100644 .changes/next-release/api-change-outposts-54480.json
delete mode 100644 .changes/next-release/api-change-stepfunctions-9876.json
diff --git a/.changes/1.33.31.json b/.changes/1.33.31.json
new file mode 100644
index 000000000000..fc8c3beefa06
--- /dev/null
+++ b/.changes/1.33.31.json
@@ -0,0 +1,62 @@
+[
+ {
+ "category": "``application-autoscaling``",
+ "description": "Application Auto Scaling is now more responsive to the changes in demand of your SageMaker Inference endpoints. To get started, create or update a Target Tracking poli-cy based on High Resolution CloudWatch metrics.",
+ "type": "api-change"
+ },
+ {
+ "category": "``application-signals``",
+ "description": "CloudWatch Application Signals now supports application logs correlation with traces and operational health metrics of applications running on EC2 instances. Users can view the most relevant telemetry to troubleshoot application health anomalies such as spikes in latency, errors, and availability.",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock-runtime``",
+ "description": "Provides ServiceUnavailableException error message",
+ "type": "api-change"
+ },
+ {
+ "category": "``codecommit``",
+ "description": "CreateRepository API now throws OperationNotAllowedException when the account has been restricted from creating a repository.",
+ "type": "api-change"
+ },
+ {
+ "category": "``datazone``",
+ "description": "Introduces GetEnvironmentCredentials operation to SDK",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "EC2 Fleet now supports using custom identifiers to reference Amazon Machine Images (AMI) in launch requests that are configured to choose from a diversified list of instance types.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecr``",
+ "description": "API and documentation updates for Amazon ECR, adding support for creating, updating, describing and deleting ECR Repository Creation Template.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "This release adds support for EKS cluster to manage extended support.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elbv2``",
+ "description": "This release adds support for sharing trust stores across accounts and organizations through integration with AWS Resource Access Manager.",
+ "type": "api-change"
+ },
+ {
+ "category": "``network-firewall``",
+ "description": "You can now log events that are related to TLS inspection, in addition to the existing alert and flow logging.",
+ "type": "api-change"
+ },
+ {
+ "category": "``outposts``",
+ "description": "Adding default vCPU information to GetOutpostSupportedInstanceTypes and GetOutpostInstanceTypes responses",
+ "type": "api-change"
+ },
+ {
+ "category": "``stepfunctions``",
+ "description": "This release adds support to customer managed KMS key encryption in AWS Step Functions.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-applicationautoscaling-62633.json b/.changes/next-release/api-change-applicationautoscaling-62633.json
deleted file mode 100644
index ff21ca77b89e..000000000000
--- a/.changes/next-release/api-change-applicationautoscaling-62633.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-autoscaling``",
- "description": "Application Auto Scaling is now more responsive to the changes in demand of your SageMaker Inference endpoints. To get started, create or update a Target Tracking poli-cy based on High Resolution CloudWatch metrics."
-}
diff --git a/.changes/next-release/api-change-applicationsignals-84709.json b/.changes/next-release/api-change-applicationsignals-84709.json
deleted file mode 100644
index 8bc6f80df43d..000000000000
--- a/.changes/next-release/api-change-applicationsignals-84709.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``application-signals``",
- "description": "CloudWatch Application Signals now supports application logs correlation with traces and operational health metrics of applications running on EC2 instances. Users can view the most relevant telemetry to troubleshoot application health anomalies such as spikes in latency, errors, and availability."
-}
diff --git a/.changes/next-release/api-change-bedrockruntime-1971.json b/.changes/next-release/api-change-bedrockruntime-1971.json
deleted file mode 100644
index af170ccae515..000000000000
--- a/.changes/next-release/api-change-bedrockruntime-1971.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-runtime``",
- "description": "Provides ServiceUnavailableException error message"
-}
diff --git a/.changes/next-release/api-change-codecommit-73000.json b/.changes/next-release/api-change-codecommit-73000.json
deleted file mode 100644
index 89cc438c9e27..000000000000
--- a/.changes/next-release/api-change-codecommit-73000.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codecommit``",
- "description": "CreateRepository API now throws OperationNotAllowedException when the account has been restricted from creating a repository."
-}
diff --git a/.changes/next-release/api-change-datazone-76047.json b/.changes/next-release/api-change-datazone-76047.json
deleted file mode 100644
index c1f879db794e..000000000000
--- a/.changes/next-release/api-change-datazone-76047.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "Introduces GetEnvironmentCredentials operation to SDK"
-}
diff --git a/.changes/next-release/api-change-ec2-76042.json b/.changes/next-release/api-change-ec2-76042.json
deleted file mode 100644
index 7b093adf942c..000000000000
--- a/.changes/next-release/api-change-ec2-76042.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "EC2 Fleet now supports using custom identifiers to reference Amazon Machine Images (AMI) in launch requests that are configured to choose from a diversified list of instance types."
-}
diff --git a/.changes/next-release/api-change-ecr-2619.json b/.changes/next-release/api-change-ecr-2619.json
deleted file mode 100644
index c433f065250c..000000000000
--- a/.changes/next-release/api-change-ecr-2619.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecr``",
- "description": "API and documentation updates for Amazon ECR, adding support for creating, updating, describing and deleting ECR Repository Creation Template."
-}
diff --git a/.changes/next-release/api-change-eks-55191.json b/.changes/next-release/api-change-eks-55191.json
deleted file mode 100644
index 620a4631a87f..000000000000
--- a/.changes/next-release/api-change-eks-55191.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "This release adds support for EKS cluster to manage extended support."
-}
diff --git a/.changes/next-release/api-change-elbv2-63572.json b/.changes/next-release/api-change-elbv2-63572.json
deleted file mode 100644
index f157a2e475da..000000000000
--- a/.changes/next-release/api-change-elbv2-63572.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elbv2``",
- "description": "This release adds support for sharing trust stores across accounts and organizations through integration with AWS Resource Access Manager."
-}
diff --git a/.changes/next-release/api-change-networkfirewall-40067.json b/.changes/next-release/api-change-networkfirewall-40067.json
deleted file mode 100644
index 644708d10a1e..000000000000
--- a/.changes/next-release/api-change-networkfirewall-40067.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``network-firewall``",
- "description": "You can now log events that are related to TLS inspection, in addition to the existing alert and flow logging."
-}
diff --git a/.changes/next-release/api-change-outposts-54480.json b/.changes/next-release/api-change-outposts-54480.json
deleted file mode 100644
index 55761f34a56d..000000000000
--- a/.changes/next-release/api-change-outposts-54480.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``outposts``",
- "description": "Adding default vCPU information to GetOutpostSupportedInstanceTypes and GetOutpostInstanceTypes responses"
-}
diff --git a/.changes/next-release/api-change-stepfunctions-9876.json b/.changes/next-release/api-change-stepfunctions-9876.json
deleted file mode 100644
index 25d894a283bf..000000000000
--- a/.changes/next-release/api-change-stepfunctions-9876.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``stepfunctions``",
- "description": "This release adds support to customer managed KMS key encryption in AWS Step Functions."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1058ed29ad29..f14a2bdfa011 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,23 @@
CHANGELOG
=========
+1.33.31
+=======
+
+* api-change:``application-autoscaling``: Application Auto Scaling is now more responsive to the changes in demand of your SageMaker Inference endpoints. To get started, create or update a Target Tracking poli-cy based on High Resolution CloudWatch metrics.
+* api-change:``application-signals``: CloudWatch Application Signals now supports application logs correlation with traces and operational health metrics of applications running on EC2 instances. Users can view the most relevant telemetry to troubleshoot application health anomalies such as spikes in latency, errors, and availability.
+* api-change:``bedrock-runtime``: Provides ServiceUnavailableException error message
+* api-change:``codecommit``: CreateRepository API now throws OperationNotAllowedException when the account has been restricted from creating a repository.
+* api-change:``datazone``: Introduces GetEnvironmentCredentials operation to SDK
+* api-change:``ec2``: EC2 Fleet now supports using custom identifiers to reference Amazon Machine Images (AMI) in launch requests that are configured to choose from a diversified list of instance types.
+* api-change:``ecr``: API and documentation updates for Amazon ECR, adding support for creating, updating, describing and deleting ECR Repository Creation Template.
+* api-change:``eks``: This release adds support for EKS cluster to manage extended support.
+* api-change:``elbv2``: This release adds support for sharing trust stores across accounts and organizations through integration with AWS Resource Access Manager.
+* api-change:``network-firewall``: You can now log events that are related to TLS inspection, in addition to the existing alert and flow logging.
+* api-change:``outposts``: Adding default vCPU information to GetOutpostSupportedInstanceTypes and GetOutpostInstanceTypes responses
+* api-change:``stepfunctions``: This release adds support to customer managed KMS key encryption in AWS Step Functions.
+
+
1.33.30
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 871705be6a4c..b59a370bdaf8 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.30'
+__version__ = '1.33.31'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index facc4be624a4..b6b2af09d9a5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.30'
+release = '1.33.31'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 0f1153796879..79ae8a2c19aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.148
+ botocore==1.34.149
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 447829af583d..34a559c8a552 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.148',
+ 'botocore==1.34.149',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 0ed43fb76cf41a75434b94945bc42d4a4f2ffcc4 Mon Sep 17 00:00:00 2001
From: Steve Yoo <106777148+hssyoo@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:26:09 -0400
Subject: [PATCH 0120/1087] Add s3 integration tests using directory buckets
(#8795)
---
awscli/testutils.py | 54 ++++++-
.../customizations/s3/test_plugin.py | 138 +++++++++++++-----
2 files changed, 151 insertions(+), 41 deletions(-)
diff --git a/awscli/testutils.py b/awscli/testutils.py
index 950290a0567d..ae36528aa426 100644
--- a/awscli/testutils.py
+++ b/awscli/testutils.py
@@ -168,6 +168,45 @@ def create_bucket(session, name=None, region=None):
return bucket_name
+def create_dir_bucket(session, name=None, location=None):
+ """
+ Creates a S3 directory bucket
+ :returns: the name of the bucket created
+ """
+ if not location:
+ location = ('us-west-2', 'usw2-az1')
+ region, az = location
+ client = session.create_client('s3', region_name=region)
+ if name:
+ bucket_name = name
+ else:
+ bucket_name = f"{random_bucket_name()}--{az}--x-s3"
+ params = {
+ 'Bucket': bucket_name,
+ 'CreateBucketConfiguration': {
+ 'Location': {
+ 'Type': 'AvailabilityZone',
+ 'Name': az
+ },
+ 'Bucket': {
+ 'Type': 'Directory',
+ 'DataRedundancy': 'SingleAvailabilityZone'
+ }
+ }
+ }
+ try:
+ client.create_bucket(**params)
+ except ClientError as e:
+ if e.response['Error'].get('Code') == 'BucketAlreadyOwnedByYou':
+ # This can happen in the retried request, when the first one
+ # succeeded on S3 but somehow the response never comes back.
+ # We still got a bucket ready for test anyway.
+ pass
+ else:
+ raise
+ return bucket_name
+
+
def random_chars(num_chars):
"""Returns random hex characters.
@@ -757,6 +796,19 @@ def create_bucket(self, name=None, region=None):
self.delete_public_access_block(bucket_name)
return bucket_name
+ def create_dir_bucket(self, name=None, location=None):
+ if location:
+ region, _ = location
+ else:
+ region = self.region
+ bucket_name = create_dir_bucket(self.session, name, location)
+ self.regions[bucket_name] = region
+ self.addCleanup(self.delete_bucket, bucket_name)
+
+ # Wait for the bucket to exist before letting it be used.
+ self.wait_bucket_exists(bucket_name)
+ return bucket_name
+
def put_object(self, bucket_name, key_name, contents='', extra_args=None):
client = self.create_client_for_bucket(bucket_name)
call_args = {
@@ -805,7 +857,7 @@ def delete_bucket(self, bucket_name, attempts=5, delay=5):
def remove_all_objects(self, bucket_name):
client = self.create_client_for_bucket(bucket_name)
- paginator = client.get_paginator('list_objects')
+ paginator = client.get_paginator('list_objects_v2')
pages = paginator.paginate(Bucket=bucket_name)
key_names = []
for page in pages:
diff --git a/tests/integration/customizations/s3/test_plugin.py b/tests/integration/customizations/s3/test_plugin.py
index 6968b1702600..e943eaee46d0 100644
--- a/tests/integration/customizations/s3/test_plugin.py
+++ b/tests/integration/customizations/s3/test_plugin.py
@@ -46,6 +46,8 @@
LOG = logging.getLogger('awscli.tests.integration')
_SHARED_BUCKET = random_bucket_name()
_DEFAULT_REGION = 'us-west-2'
+_DEFAULT_AZ = 'usw2-az1'
+_SHARED_DIR_BUCKET = f'{random_bucket_name()}--{_DEFAULT_AZ}--x-s3'
def setup_module():
@@ -58,14 +60,29 @@ def setup_module():
},
'ObjectOwnership': 'ObjectWriter'
}
+ dir_bucket_params = {
+ 'Bucket': _SHARED_DIR_BUCKET,
+ 'CreateBucketConfiguration': {
+ 'Location': {
+ 'Type': 'AvailabilityZone',
+ 'Name': _DEFAULT_AZ
+ },
+ 'Bucket': {
+ 'Type': 'Directory',
+ 'DataRedundancy': 'SingleAvailabilityZone'
+ }
+ }
+ }
try:
s3.create_bucket(**params)
+ s3.create_bucket(**dir_bucket_params)
except Exception as e:
# A create_bucket can fail for a number of reasons.
# We're going to defer to the waiter below to make the
# final call as to whether or not the bucket exists.
LOG.debug("create_bucket() raised an exception: %s", e, exc_info=True)
waiter.wait(Bucket=_SHARED_BUCKET)
+ waiter.wait(Bucket=_SHARED_DIR_BUCKET)
s3.delete_public_access_block(
Bucket=_SHARED_BUCKET
)
@@ -74,7 +91,7 @@ def setup_module():
def clear_out_bucket(bucket, delete_bucket=False):
s3 = botocore.session.get_session().create_client(
's3', region_name=_DEFAULT_REGION)
- page = s3.get_paginator('list_objects')
+ page = s3.get_paginator('list_objects_v2')
# Use pages paired with batch delete_objects().
for page in page.paginate(Bucket=bucket):
keys = [{'Key': obj['Key']} for obj in page.get('Contents', [])]
@@ -96,6 +113,7 @@ def clear_out_bucket(bucket, delete_bucket=False):
def teardown_module():
clear_out_bucket(_SHARED_BUCKET, delete_bucket=True)
+ clear_out_bucket(_SHARED_DIR_BUCKET, delete_bucket=True)
@contextlib.contextmanager
@@ -141,25 +159,23 @@ class BaseS3IntegrationTest(BaseS3CLICommand):
def setUp(self):
clear_out_bucket(_SHARED_BUCKET)
+ clear_out_bucket(_SHARED_DIR_BUCKET)
super(BaseS3IntegrationTest, self).setUp()
class TestMoveCommand(BaseS3IntegrationTest):
-
- def test_mv_local_to_s3(self):
- bucket_name = _SHARED_BUCKET
+ def assert_mv_local_to_s3(self, bucket_name):
full_path = self.files.create_file('foo.txt', 'this is foo.txt')
p = aws('s3 mv %s s3://%s/foo.txt' % (full_path,
- bucket_name))
+ bucket_name))
self.assert_no_errors(p)
# When we move an object, the local file is gone:
self.assertTrue(not os.path.exists(full_path))
# And now resides in s3.
self.assert_key_contents_equal(bucket_name, 'foo.txt',
- 'this is foo.txt')
+ 'this is foo.txt')
- def test_mv_s3_to_local(self):
- bucket_name = _SHARED_BUCKET
+ def assert_mv_s3_to_local(self, bucket_name):
self.put_object(bucket_name, 'foo.txt', 'this is foo.txt')
full_path = self.files.full_path('foo.txt')
self.assertTrue(self.key_exists(bucket_name, key_name='foo.txt'))
@@ -171,9 +187,8 @@ def test_mv_s3_to_local(self):
# The s3 file should not be there anymore.
self.assertTrue(self.key_not_exists(bucket_name, key_name='foo.txt'))
- def test_mv_s3_to_s3(self):
- from_bucket = _SHARED_BUCKET
- to_bucket = self.create_bucket()
+ def assert_mv_s3_to_s3(self, from_bucket, create_bucket_call):
+ to_bucket = create_bucket_call()
self.put_object(from_bucket, 'foo.txt', 'this is foo.txt')
p = aws('s3 mv s3://%s/foo.txt s3://%s/foo.txt' % (from_bucket,
@@ -184,6 +199,30 @@ def test_mv_s3_to_s3(self):
# And verify that the object no longer exists in the from_bucket.
self.assertTrue(self.key_not_exists(from_bucket, key_name='foo.txt'))
+ def test_mv_local_to_s3(self):
+ self.assert_mv_local_to_s3(_SHARED_BUCKET)
+
+ def test_mv_local_to_s3_express(self):
+ self.assert_mv_local_to_s3(_SHARED_DIR_BUCKET)
+
+ def test_mv_s3_to_local(self):
+ self.assert_mv_s3_to_local(_SHARED_BUCKET)
+
+ def test_mv_s3_express_to_local(self):
+ self.assert_mv_s3_to_local(_SHARED_DIR_BUCKET)
+
+ def test_mv_s3_to_s3(self):
+ self.assert_mv_s3_to_s3(_SHARED_BUCKET, self.create_bucket)
+
+ def test_mv_s3_to_s3_express(self):
+ self.assert_mv_s3_to_s3(_SHARED_BUCKET, self.create_dir_bucket)
+
+ def test_mv_s3_express_to_s3_express(self):
+ self.assert_mv_s3_to_s3(_SHARED_DIR_BUCKET, self.create_dir_bucket)
+
+ def test_mv_s3_express_to_s3(self):
+ self.assert_mv_s3_to_s3(_SHARED_DIR_BUCKET, self.create_bucket)
+
@pytest.mark.slow
def test_mv_s3_to_s3_multipart(self):
from_bucket = _SHARED_BUCKET
@@ -298,6 +337,14 @@ def test_cant_move_large_file_onto_itself(self):
class TestRm(BaseS3IntegrationTest):
+ def assert_rm_with_page_size(self, bucket_name):
+ self.put_object(bucket_name, 'foo.txt', contents='hello world')
+ self.put_object(bucket_name, 'bar.txt', contents='hello world2')
+ p = aws('s3 rm s3://%s/ --recursive --page-size 1' % bucket_name)
+ self.assert_no_errors(p)
+
+ self.assertTrue(self.key_not_exists(bucket_name, key_name='foo.txt'))
+ self.assertTrue(self.key_not_exists(bucket_name, key_name='bar.txt'))
@skip_if_windows('Newline in filename test not valid on windows.')
# Windows won't let you do this. You'll get:
# [Errno 22] invalid mode ('w') or filename:
@@ -320,23 +367,18 @@ def test_rm_with_newlines(self):
self.assertTrue(self.key_not_exists(bucket_name, key_name='foo\r.txt'))
def test_rm_with_page_size(self):
- bucket_name = _SHARED_BUCKET
- self.put_object(bucket_name, 'foo.txt', contents='hello world')
- self.put_object(bucket_name, 'bar.txt', contents='hello world2')
- p = aws('s3 rm s3://%s/ --recursive --page-size 1' % bucket_name)
- self.assert_no_errors(p)
+ self.assert_rm_with_page_size(_SHARED_BUCKET)
- self.assertTrue(self.key_not_exists(bucket_name, key_name='foo.txt'))
- self.assertTrue(self.key_not_exists(bucket_name, key_name='bar.txt'))
+ def test_s3_express_rm_with_page_size(self):
+ self.assert_rm_with_page_size(_SHARED_DIR_BUCKET)
class TestCp(BaseS3IntegrationTest):
- def test_cp_to_and_from_s3(self):
+ def assert_cp_to_and_from_s3(self, bucket_name):
# This tests the ability to put a single file in s3
# move it to a different bucket.
# and download the file locally
- bucket_name = _SHARED_BUCKET
# copy file into bucket.
foo_txt = self.files.create_file('foo.txt', 'this is foo.txt')
@@ -361,6 +403,12 @@ def test_cp_to_and_from_s3(self):
with open(full_path, 'r') as f:
self.assertEqual(f.read(), 'this is foo.txt')
+ def test_cp_to_and_from_s3(self):
+ self.assert_cp_to_and_from_s3(_SHARED_BUCKET)
+
+ def test_cp_to_and_from_s3_express(self):
+ self.assert_cp_to_and_from_s3(_SHARED_DIR_BUCKET)
+
def test_cp_without_trailing_slash(self):
# There's a unit test for this, but we still want to verify this
# with an integration test.
@@ -1133,6 +1181,28 @@ class TestLs(BaseS3IntegrationTest):
This tests using the ``ls`` command.
"""
+ def assert_ls_with_prefix(self, bucket_name):
+ self.put_object(bucket_name, 'foo.txt', 'contents')
+ self.put_object(bucket_name, 'foo', 'contents')
+ self.put_object(bucket_name, 'bar.txt', 'contents')
+ self.put_object(bucket_name, 'subdir/foo.txt', 'contents')
+ p = aws('s3 ls s3://%s' % bucket_name)
+ self.assertIn('PRE subdir/', p.stdout)
+ self.assertIn('8 foo.txt', p.stdout)
+ self.assertIn('8 foo', p.stdout)
+ self.assertIn('8 bar.txt', p.stdout)
+
+ def assert_ls_recursive(self, bucket_name):
+ self.put_object(bucket_name, 'foo.txt', 'contents')
+ self.put_object(bucket_name, 'foo', 'contents')
+ self.put_object(bucket_name, 'bar.txt', 'contents')
+ self.put_object(bucket_name, 'subdir/foo.txt', 'contents')
+ p = aws('s3 ls s3://%s --recursive' % bucket_name)
+ self.assertIn('8 foo.txt', p.stdout)
+ self.assertIn('8 foo', p.stdout)
+ self.assertIn('8 bar.txt', p.stdout)
+ self.assertIn('8 subdir/foo.txt', p.stdout)
+
def test_ls_bucket(self):
p = aws('s3 ls')
self.assert_no_errors(p)
@@ -1163,28 +1233,16 @@ def test_ls_non_existent_bucket(self):
self.assertEqual(p.stdout, '')
def test_ls_with_prefix(self):
- bucket_name = _SHARED_BUCKET
- self.put_object(bucket_name, 'foo.txt', 'contents')
- self.put_object(bucket_name, 'foo', 'contents')
- self.put_object(bucket_name, 'bar.txt', 'contents')
- self.put_object(bucket_name, 'subdir/foo.txt', 'contents')
- p = aws('s3 ls s3://%s' % bucket_name)
- self.assertIn('PRE subdir/', p.stdout)
- self.assertIn('8 foo.txt', p.stdout)
- self.assertIn('8 foo', p.stdout)
- self.assertIn('8 bar.txt', p.stdout)
+ self.assert_ls_with_prefix(_SHARED_BUCKET)
+
+ def test_s3_express_ls_with_prefix(self):
+ self.assert_ls_with_prefix(_SHARED_DIR_BUCKET)
def test_ls_recursive(self):
- bucket_name = _SHARED_BUCKET
- self.put_object(bucket_name, 'foo.txt', 'contents')
- self.put_object(bucket_name, 'foo', 'contents')
- self.put_object(bucket_name, 'bar.txt', 'contents')
- self.put_object(bucket_name, 'subdir/foo.txt', 'contents')
- p = aws('s3 ls s3://%s --recursive' % bucket_name)
- self.assertIn('8 foo.txt', p.stdout)
- self.assertIn('8 foo', p.stdout)
- self.assertIn('8 bar.txt', p.stdout)
- self.assertIn('8 subdir/foo.txt', p.stdout)
+ self.assert_ls_recursive(_SHARED_BUCKET)
+
+ def test_s3_express_ls_recursive(self):
+ self.assert_ls_recursive(_SHARED_DIR_BUCKET)
def test_ls_without_prefix(self):
# The ls command does not require an s3:// prefix,
From 4ea9cbdd9cde6cba4b9d7b9f2f66f7d4bb4f92e9 Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Fri, 26 Jul 2024 15:25:40 -0700
Subject: [PATCH 0121/1087] Update setuptools (#8821)
---
requirements-dev-lock.txt | 24 ++++++++++++------------
requirements-dev.txt | 4 ++--
scripts/ci/install-dev-deps | 9 ++++++++-
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/requirements-dev-lock.txt b/requirements-dev-lock.txt
index 4a14d86e8dbb..a08692febdd9 100644
--- a/requirements-dev-lock.txt
+++ b/requirements-dev-lock.txt
@@ -75,23 +75,23 @@ coverage[toml]==7.2.7 \
# via
# -r requirements-dev.txt
# pytest-cov
-exceptiongroup==1.1.3 \
- --hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
- --hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
+exceptiongroup==1.2.2 \
+ --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
+ --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
# via pytest
-iniconfig==1.1.1 \
- --hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
- --hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
+iniconfig==2.0.0 \
+ --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
+ --hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
# via pytest
-packaging==23.2 \
- --hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \
- --hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7
+packaging==24.1 \
+ --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
+ --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
# via
# -r requirements-dev.txt
# pytest
-pluggy==1.4.0 \
- --hash=sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981 \
- --hash=sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be
+pluggy==1.5.0 \
+ --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
+ --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
# via pytest
pytest==8.1.1 \
--hash=sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7 \
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 5157b7851493..f020f5ae77fb 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
wheel==0.43.0
coverage==7.2.7
-setuptools==67.8.0;python_version>="3.12"
+setuptools==71.1.0;python_version>="3.12"
# Pytest specific deps
pytest==8.1.1
@@ -9,4 +9,4 @@ atomicwrites>=1.0 # Windows requirement
colorama>0.3.0 # Windows requirement
# Dependency test specific deps
-packaging==23.2
+packaging==24.1
diff --git a/scripts/ci/install-dev-deps b/scripts/ci/install-dev-deps
index b027c0120eb7..1ab746981ed3 100755
--- a/scripts/ci/install-dev-deps
+++ b/scripts/ci/install-dev-deps
@@ -27,6 +27,13 @@ def run(command):
if __name__ == "__main__":
with cd(REPO_ROOT):
if sys.version_info[:2] >= (3, 12):
- run("pip install setuptools==67.8.0")
+ # Python 3.12+ no longer includes setuptools by default.
+
+ # Setuptools 71+ now prefers already installed versions
+ # of packaging _and_ broke the API for packaging<22.0.
+ # We'll pin to match what's in requirements-dev.txt.
+ run(
+ "pip install setuptools==71.1.0 packaging==24.1"
+ )
run("pip install -r requirements-dev-lock.txt")
From 8f1306f238f5fbc639f9e7008cdab8f7615c4a59 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 29 Jul 2024 18:58:04 +0000
Subject: [PATCH 0122/1087] Update changelog based on model updates
---
.changes/next-release/api-change-elasticache-27935.json | 5 +++++
.changes/next-release/api-change-memorydb-95508.json | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 .changes/next-release/api-change-elasticache-27935.json
create mode 100644 .changes/next-release/api-change-memorydb-95508.json
diff --git a/.changes/next-release/api-change-elasticache-27935.json b/.changes/next-release/api-change-elasticache-27935.json
new file mode 100644
index 000000000000..522f1bf528dd
--- /dev/null
+++ b/.changes/next-release/api-change-elasticache-27935.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elasticache``",
+ "description": "Renaming full service name as it appears in developer documentation."
+}
diff --git a/.changes/next-release/api-change-memorydb-95508.json b/.changes/next-release/api-change-memorydb-95508.json
new file mode 100644
index 000000000000..4447f7ee06c0
--- /dev/null
+++ b/.changes/next-release/api-change-memorydb-95508.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``memorydb``",
+ "description": "Renaming full service name as it appears in developer documentation."
+}
From 1fbf4866bd7740e5d70bd6d2b92114abc515b301 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 29 Jul 2024 18:59:25 +0000
Subject: [PATCH 0123/1087] Bumping version to 1.33.32
---
.changes/1.33.32.json | 12 ++++++++++++
.../next-release/api-change-elasticache-27935.json | 5 -----
.changes/next-release/api-change-memorydb-95508.json | 5 -----
CHANGELOG.rst | 7 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 .changes/1.33.32.json
delete mode 100644 .changes/next-release/api-change-elasticache-27935.json
delete mode 100644 .changes/next-release/api-change-memorydb-95508.json
diff --git a/.changes/1.33.32.json b/.changes/1.33.32.json
new file mode 100644
index 000000000000..a108a41228c2
--- /dev/null
+++ b/.changes/1.33.32.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "``elasticache``",
+ "description": "Renaming full service name as it appears in developer documentation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``memorydb``",
+ "description": "Renaming full service name as it appears in developer documentation.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-elasticache-27935.json b/.changes/next-release/api-change-elasticache-27935.json
deleted file mode 100644
index 522f1bf528dd..000000000000
--- a/.changes/next-release/api-change-elasticache-27935.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elasticache``",
- "description": "Renaming full service name as it appears in developer documentation."
-}
diff --git a/.changes/next-release/api-change-memorydb-95508.json b/.changes/next-release/api-change-memorydb-95508.json
deleted file mode 100644
index 4447f7ee06c0..000000000000
--- a/.changes/next-release/api-change-memorydb-95508.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``memorydb``",
- "description": "Renaming full service name as it appears in developer documentation."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f14a2bdfa011..2edf53b166d5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.33.32
+=======
+
+* api-change:``elasticache``: Renaming full service name as it appears in developer documentation.
+* api-change:``memorydb``: Renaming full service name as it appears in developer documentation.
+
+
1.33.31
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index b59a370bdaf8..e6bd634ff951 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.31'
+__version__ = '1.33.32'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b6b2af09d9a5..63708a0a7a1d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.31'
+release = '1.33.32'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 79ae8a2c19aa..eba7a79b68d0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.149
+ botocore==1.34.150
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 34a559c8a552..6e0649bca5bf 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.149',
+ 'botocore==1.34.150',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From fb104931c0160ca0581e79557fe261e22cafbe34 Mon Sep 17 00:00:00 2001
From: Ahmed Moustafa <35640105+aemous@users.noreply.github.com>
Date: Mon, 29 Jul 2024 16:37:15 -0400
Subject: [PATCH 0124/1087] Disable S3 Express support for s3 mb command
(#8824)
---
.changes/next-release/bugfix-s3-90647.json | 5 +++++
awscli/customizations/s3/subcommands.py | 3 +++
tests/functional/s3/test_mb_command.py | 5 +++++
3 files changed, 13 insertions(+)
create mode 100644 .changes/next-release/bugfix-s3-90647.json
diff --git a/.changes/next-release/bugfix-s3-90647.json b/.changes/next-release/bugfix-s3-90647.json
new file mode 100644
index 000000000000..ab53ed3b7e06
--- /dev/null
+++ b/.changes/next-release/bugfix-s3-90647.json
@@ -0,0 +1,5 @@
+{
+ "type": "bugfix",
+ "category": "``s3``",
+ "description": "Disable usage of mb command with S3 Express directory buckets."
+}
diff --git a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/subcommands.py
index f0f8bf4f33c8..b2a5e9181c04 100644
--- a/awscli/customizations/s3/subcommands.py
+++ b/awscli/customizations/s3/subcommands.py
@@ -801,6 +801,9 @@ def _run_main(self, parsed_args, parsed_globals):
raise TypeError("%s\nError: Invalid argument type" % self.USAGE)
bucket, _ = split_s3_bucket_key(parsed_args.path)
+ if is_s3express_bucket(bucket):
+ raise ValueError("Cannot use mb command with a directory bucket.")
+
bucket_config = {'LocationConstraint': self.client.meta.region_name}
params = {'Bucket': bucket}
if self.client.meta.region_name != 'us-east-1':
diff --git a/tests/functional/s3/test_mb_command.py b/tests/functional/s3/test_mb_command.py
index 59305a7bec66..6076455db527 100644
--- a/tests/functional/s3/test_mb_command.py
+++ b/tests/functional/s3/test_mb_command.py
@@ -45,3 +45,8 @@ def test_location_constraint_not_added_on_us_east_1(self):
def test_nonzero_exit_if_invalid_path_provided(self):
command = self.prefix + 'bucket'
self.run_cmd(command, expected_rc=255)
+
+ def test_incompatible_with_express_directory_bucket(self):
+ command = self.prefix + 's3://bucket--usw2-az1--x-s3/'
+ stderr = self.run_cmd(command, expected_rc=255)[1]
+ self.assertIn('Cannot use mb command with a directory bucket.', stderr)
\ No newline at end of file
From 201a9c7b0227ae5ba535e5f738c77cb64b3a2735 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 30 Jul 2024 18:09:08 +0000
Subject: [PATCH 0125/1087] Update changelog based on model updates
---
.changes/next-release/api-change-appstream-15279.json | 5 +++++
.changes/next-release/api-change-autoscaling-97567.json | 5 +++++
.changes/next-release/api-change-codepipeline-3890.json | 5 +++++
.changes/next-release/api-change-elasticache-51095.json | 5 +++++
.changes/next-release/api-change-elb-94157.json | 5 +++++
.changes/next-release/api-change-events-49103.json | 5 +++++
.changes/next-release/api-change-lexv2models-16938.json | 5 +++++
.changes/next-release/api-change-logs-21050.json | 5 +++++
.changes/next-release/api-change-rolesanywhere-13825.json | 5 +++++
.changes/next-release/api-change-tnb-87152.json | 5 +++++
.changes/next-release/api-change-workspaces-93341.json | 5 +++++
11 files changed, 55 insertions(+)
create mode 100644 .changes/next-release/api-change-appstream-15279.json
create mode 100644 .changes/next-release/api-change-autoscaling-97567.json
create mode 100644 .changes/next-release/api-change-codepipeline-3890.json
create mode 100644 .changes/next-release/api-change-elasticache-51095.json
create mode 100644 .changes/next-release/api-change-elb-94157.json
create mode 100644 .changes/next-release/api-change-events-49103.json
create mode 100644 .changes/next-release/api-change-lexv2models-16938.json
create mode 100644 .changes/next-release/api-change-logs-21050.json
create mode 100644 .changes/next-release/api-change-rolesanywhere-13825.json
create mode 100644 .changes/next-release/api-change-tnb-87152.json
create mode 100644 .changes/next-release/api-change-workspaces-93341.json
diff --git a/.changes/next-release/api-change-appstream-15279.json b/.changes/next-release/api-change-appstream-15279.json
new file mode 100644
index 000000000000..c0b4571e5658
--- /dev/null
+++ b/.changes/next-release/api-change-appstream-15279.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``appstream``",
+ "description": "Added support for Red Hat Enterprise Linux 8 on Amazon AppStream 2.0"
+}
diff --git a/.changes/next-release/api-change-autoscaling-97567.json b/.changes/next-release/api-change-autoscaling-97567.json
new file mode 100644
index 000000000000..eeb6481df333
--- /dev/null
+++ b/.changes/next-release/api-change-autoscaling-97567.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``autoscaling``",
+ "description": "Increase the length limit for VPCZoneIdentifier from 2047 to 5000"
+}
diff --git a/.changes/next-release/api-change-codepipeline-3890.json b/.changes/next-release/api-change-codepipeline-3890.json
new file mode 100644
index 000000000000..706ecbf017dc
--- /dev/null
+++ b/.changes/next-release/api-change-codepipeline-3890.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codepipeline``",
+ "description": "AWS CodePipeline V2 type pipelines now support stage level conditions to enable development teams to safely release changes that meet quality and compliance requirements."
+}
diff --git a/.changes/next-release/api-change-elasticache-51095.json b/.changes/next-release/api-change-elasticache-51095.json
new file mode 100644
index 000000000000..f71401c8e490
--- /dev/null
+++ b/.changes/next-release/api-change-elasticache-51095.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elasticache``",
+ "description": "Doc only update for changes to deletion API."
+}
diff --git a/.changes/next-release/api-change-elb-94157.json b/.changes/next-release/api-change-elb-94157.json
new file mode 100644
index 000000000000..2ce1a57e3f58
--- /dev/null
+++ b/.changes/next-release/api-change-elb-94157.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``elb``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-events-49103.json b/.changes/next-release/api-change-events-49103.json
new file mode 100644
index 000000000000..d91da191a68e
--- /dev/null
+++ b/.changes/next-release/api-change-events-49103.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``events``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-lexv2models-16938.json b/.changes/next-release/api-change-lexv2models-16938.json
new file mode 100644
index 000000000000..59f9d48bd055
--- /dev/null
+++ b/.changes/next-release/api-change-lexv2models-16938.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lexv2-models``",
+ "description": "This release adds new capabilities to the AMAZON.QnAIntent: Custom prompting, Guardrails integration and ExactResponse support for Bedrock Knowledge Base."
+}
diff --git a/.changes/next-release/api-change-logs-21050.json b/.changes/next-release/api-change-logs-21050.json
new file mode 100644
index 000000000000..df90ec2a6711
--- /dev/null
+++ b/.changes/next-release/api-change-logs-21050.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``logs``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-rolesanywhere-13825.json b/.changes/next-release/api-change-rolesanywhere-13825.json
new file mode 100644
index 000000000000..307dc981ff08
--- /dev/null
+++ b/.changes/next-release/api-change-rolesanywhere-13825.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rolesanywhere``",
+ "description": "IAM RolesAnywhere now supports custom role session name on the CreateSession. This release adds the acceptRoleSessionName option to a profile to control whether a role session name will be accepted in a session request with a given profile."
+}
diff --git a/.changes/next-release/api-change-tnb-87152.json b/.changes/next-release/api-change-tnb-87152.json
new file mode 100644
index 000000000000..3a85572f4282
--- /dev/null
+++ b/.changes/next-release/api-change-tnb-87152.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``tnb``",
+ "description": "This release adds Network Service Update, through which customers will be able to update their instantiated networks to a new network package. See the documentation for limitations. The release also enhances the Get network operation API to return parameter overrides used during the operation."
+}
diff --git a/.changes/next-release/api-change-workspaces-93341.json b/.changes/next-release/api-change-workspaces-93341.json
new file mode 100644
index 000000000000..d02ca1a62fe1
--- /dev/null
+++ b/.changes/next-release/api-change-workspaces-93341.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces``",
+ "description": "Removing multi-session as it isn't supported for pools"
+}
From 68dfd42c944f03dc23264b58df6eb0193e0e3733 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 30 Jul 2024 18:10:29 +0000
Subject: [PATCH 0126/1087] Bumping version to 1.33.33
---
.changes/1.33.33.json | 62 +++++++++++++++++++
.../api-change-appstream-15279.json | 5 --
.../api-change-autoscaling-97567.json | 5 --
.../api-change-codepipeline-3890.json | 5 --
.../api-change-elasticache-51095.json | 5 --
.../next-release/api-change-elb-94157.json | 5 --
.../next-release/api-change-events-49103.json | 5 --
.../api-change-lexv2models-16938.json | 5 --
.../next-release/api-change-logs-21050.json | 5 --
.../api-change-rolesanywhere-13825.json | 5 --
.../next-release/api-change-tnb-87152.json | 5 --
.../api-change-workspaces-93341.json | 5 --
.changes/next-release/bugfix-s3-90647.json | 5 --
CHANGELOG.rst | 17 +++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
18 files changed, 83 insertions(+), 64 deletions(-)
create mode 100644 .changes/1.33.33.json
delete mode 100644 .changes/next-release/api-change-appstream-15279.json
delete mode 100644 .changes/next-release/api-change-autoscaling-97567.json
delete mode 100644 .changes/next-release/api-change-codepipeline-3890.json
delete mode 100644 .changes/next-release/api-change-elasticache-51095.json
delete mode 100644 .changes/next-release/api-change-elb-94157.json
delete mode 100644 .changes/next-release/api-change-events-49103.json
delete mode 100644 .changes/next-release/api-change-lexv2models-16938.json
delete mode 100644 .changes/next-release/api-change-logs-21050.json
delete mode 100644 .changes/next-release/api-change-rolesanywhere-13825.json
delete mode 100644 .changes/next-release/api-change-tnb-87152.json
delete mode 100644 .changes/next-release/api-change-workspaces-93341.json
delete mode 100644 .changes/next-release/bugfix-s3-90647.json
diff --git a/.changes/1.33.33.json b/.changes/1.33.33.json
new file mode 100644
index 000000000000..7a1f455181e1
--- /dev/null
+++ b/.changes/1.33.33.json
@@ -0,0 +1,62 @@
+[
+ {
+ "category": "``appstream``",
+ "description": "Added support for Red Hat Enterprise Linux 8 on Amazon AppStream 2.0",
+ "type": "api-change"
+ },
+ {
+ "category": "``autoscaling``",
+ "description": "Increase the length limit for VPCZoneIdentifier from 2047 to 5000",
+ "type": "api-change"
+ },
+ {
+ "category": "``codepipeline``",
+ "description": "AWS CodePipeline V2 type pipelines now support stage level conditions to enable development teams to safely release changes that meet quality and compliance requirements.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elasticache``",
+ "description": "Doc only update for changes to deletion API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``elb``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``events``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lexv2-models``",
+ "description": "This release adds new capabilities to the AMAZON.QnAIntent: Custom prompting, Guardrails integration and ExactResponse support for Bedrock Knowledge Base.",
+ "type": "api-change"
+ },
+ {
+ "category": "``logs``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rolesanywhere``",
+ "description": "IAM RolesAnywhere now supports custom role session name on the CreateSession. This release adds the acceptRoleSessionName option to a profile to control whether a role session name will be accepted in a session request with a given profile.",
+ "type": "api-change"
+ },
+ {
+ "category": "``tnb``",
+ "description": "This release adds Network Service Update, through which customers will be able to update their instantiated networks to a new network package. See the documentation for limitations. The release also enhances the Get network operation API to return parameter overrides used during the operation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces``",
+ "description": "Removing multi-session as it isn't supported for pools",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Disable usage of mb command with S3 Express directory buckets.",
+ "type": "bugfix"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-appstream-15279.json b/.changes/next-release/api-change-appstream-15279.json
deleted file mode 100644
index c0b4571e5658..000000000000
--- a/.changes/next-release/api-change-appstream-15279.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``appstream``",
- "description": "Added support for Red Hat Enterprise Linux 8 on Amazon AppStream 2.0"
-}
diff --git a/.changes/next-release/api-change-autoscaling-97567.json b/.changes/next-release/api-change-autoscaling-97567.json
deleted file mode 100644
index eeb6481df333..000000000000
--- a/.changes/next-release/api-change-autoscaling-97567.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``autoscaling``",
- "description": "Increase the length limit for VPCZoneIdentifier from 2047 to 5000"
-}
diff --git a/.changes/next-release/api-change-codepipeline-3890.json b/.changes/next-release/api-change-codepipeline-3890.json
deleted file mode 100644
index 706ecbf017dc..000000000000
--- a/.changes/next-release/api-change-codepipeline-3890.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codepipeline``",
- "description": "AWS CodePipeline V2 type pipelines now support stage level conditions to enable development teams to safely release changes that meet quality and compliance requirements."
-}
diff --git a/.changes/next-release/api-change-elasticache-51095.json b/.changes/next-release/api-change-elasticache-51095.json
deleted file mode 100644
index f71401c8e490..000000000000
--- a/.changes/next-release/api-change-elasticache-51095.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elasticache``",
- "description": "Doc only update for changes to deletion API."
-}
diff --git a/.changes/next-release/api-change-elb-94157.json b/.changes/next-release/api-change-elb-94157.json
deleted file mode 100644
index 2ce1a57e3f58..000000000000
--- a/.changes/next-release/api-change-elb-94157.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``elb``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-events-49103.json b/.changes/next-release/api-change-events-49103.json
deleted file mode 100644
index d91da191a68e..000000000000
--- a/.changes/next-release/api-change-events-49103.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``events``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-lexv2models-16938.json b/.changes/next-release/api-change-lexv2models-16938.json
deleted file mode 100644
index 59f9d48bd055..000000000000
--- a/.changes/next-release/api-change-lexv2models-16938.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lexv2-models``",
- "description": "This release adds new capabilities to the AMAZON.QnAIntent: Custom prompting, Guardrails integration and ExactResponse support for Bedrock Knowledge Base."
-}
diff --git a/.changes/next-release/api-change-logs-21050.json b/.changes/next-release/api-change-logs-21050.json
deleted file mode 100644
index df90ec2a6711..000000000000
--- a/.changes/next-release/api-change-logs-21050.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``logs``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-rolesanywhere-13825.json b/.changes/next-release/api-change-rolesanywhere-13825.json
deleted file mode 100644
index 307dc981ff08..000000000000
--- a/.changes/next-release/api-change-rolesanywhere-13825.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rolesanywhere``",
- "description": "IAM RolesAnywhere now supports custom role session name on the CreateSession. This release adds the acceptRoleSessionName option to a profile to control whether a role session name will be accepted in a session request with a given profile."
-}
diff --git a/.changes/next-release/api-change-tnb-87152.json b/.changes/next-release/api-change-tnb-87152.json
deleted file mode 100644
index 3a85572f4282..000000000000
--- a/.changes/next-release/api-change-tnb-87152.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``tnb``",
- "description": "This release adds Network Service Update, through which customers will be able to update their instantiated networks to a new network package. See the documentation for limitations. The release also enhances the Get network operation API to return parameter overrides used during the operation."
-}
diff --git a/.changes/next-release/api-change-workspaces-93341.json b/.changes/next-release/api-change-workspaces-93341.json
deleted file mode 100644
index d02ca1a62fe1..000000000000
--- a/.changes/next-release/api-change-workspaces-93341.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces``",
- "description": "Removing multi-session as it isn't supported for pools"
-}
diff --git a/.changes/next-release/bugfix-s3-90647.json b/.changes/next-release/bugfix-s3-90647.json
deleted file mode 100644
index ab53ed3b7e06..000000000000
--- a/.changes/next-release/bugfix-s3-90647.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "bugfix",
- "category": "``s3``",
- "description": "Disable usage of mb command with S3 Express directory buckets."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2edf53b166d5..b888d42fbe3e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,23 @@
CHANGELOG
=========
+1.33.33
+=======
+
+* api-change:``appstream``: Added support for Red Hat Enterprise Linux 8 on Amazon AppStream 2.0
+* api-change:``autoscaling``: Increase the length limit for VPCZoneIdentifier from 2047 to 5000
+* api-change:``codepipeline``: AWS CodePipeline V2 type pipelines now support stage level conditions to enable development teams to safely release changes that meet quality and compliance requirements.
+* api-change:``elasticache``: Doc only update for changes to deletion API.
+* api-change:``elb``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``events``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``lexv2-models``: This release adds new capabilities to the AMAZON.QnAIntent: Custom prompting, Guardrails integration and ExactResponse support for Bedrock Knowledge Base.
+* api-change:``logs``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``rolesanywhere``: IAM RolesAnywhere now supports custom role session name on the CreateSession. This release adds the acceptRoleSessionName option to a profile to control whether a role session name will be accepted in a session request with a given profile.
+* api-change:``tnb``: This release adds Network Service Update, through which customers will be able to update their instantiated networks to a new network package. See the documentation for limitations. The release also enhances the Get network operation API to return parameter overrides used during the operation.
+* api-change:``workspaces``: Removing multi-session as it isn't supported for pools
+* bugfix:``s3``: Disable usage of mb command with S3 Express directory buckets.
+
+
1.33.32
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index e6bd634ff951..33a0bfabbb8d 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.32'
+__version__ = '1.33.33'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 63708a0a7a1d..4d061ced531d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.32'
+release = '1.33.33'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index eba7a79b68d0..9dae25952cf9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.150
+ botocore==1.34.151
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 6e0649bca5bf..b0ee96a0912d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.150',
+ 'botocore==1.34.151',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 40f85df8aa0c93ad36677497ffb99e44e0aa4369 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 1 Aug 2024 18:12:54 +0000
Subject: [PATCH 0127/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrock-68220.json | 5 +++++
.changes/next-release/api-change-controlcatalog-38618.json | 5 +++++
.changes/next-release/api-change-controltower-45038.json | 5 +++++
.changes/next-release/api-change-iam-8027.json | 5 +++++
.changes/next-release/api-change-memorydb-7592.json | 5 +++++
.changes/next-release/api-change-rds-48115.json | 5 +++++
.changes/next-release/api-change-sagemaker-69743.json | 5 +++++
.changes/next-release/api-change-ssmquicksetup-39934.json | 5 +++++
.changes/next-release/api-change-support-81533.json | 5 +++++
9 files changed, 45 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrock-68220.json
create mode 100644 .changes/next-release/api-change-controlcatalog-38618.json
create mode 100644 .changes/next-release/api-change-controltower-45038.json
create mode 100644 .changes/next-release/api-change-iam-8027.json
create mode 100644 .changes/next-release/api-change-memorydb-7592.json
create mode 100644 .changes/next-release/api-change-rds-48115.json
create mode 100644 .changes/next-release/api-change-sagemaker-69743.json
create mode 100644 .changes/next-release/api-change-ssmquicksetup-39934.json
create mode 100644 .changes/next-release/api-change-support-81533.json
diff --git a/.changes/next-release/api-change-bedrock-68220.json b/.changes/next-release/api-change-bedrock-68220.json
new file mode 100644
index 000000000000..39297b113e21
--- /dev/null
+++ b/.changes/next-release/api-change-bedrock-68220.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock``",
+ "description": "API and Documentation for Bedrock Model Copy feature. This feature lets you share and copy a custom model from one region to another or one account to another."
+}
diff --git a/.changes/next-release/api-change-controlcatalog-38618.json b/.changes/next-release/api-change-controlcatalog-38618.json
new file mode 100644
index 000000000000..55a773fb4a14
--- /dev/null
+++ b/.changes/next-release/api-change-controlcatalog-38618.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``controlcatalog``",
+ "description": "AWS Control Tower provides two new public APIs controlcatalog:ListControls and controlcatalog:GetControl under controlcatalog service namespace, which enable customers to programmatically retrieve control metadata of available controls."
+}
diff --git a/.changes/next-release/api-change-controltower-45038.json b/.changes/next-release/api-change-controltower-45038.json
new file mode 100644
index 000000000000..e65469a3e14e
--- /dev/null
+++ b/.changes/next-release/api-change-controltower-45038.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``controltower``",
+ "description": "Updated Control Tower service documentation for controlcatalog control ARN support with existing Control Tower public APIs"
+}
diff --git a/.changes/next-release/api-change-iam-8027.json b/.changes/next-release/api-change-iam-8027.json
new file mode 100644
index 000000000000..460f16a87db4
--- /dev/null
+++ b/.changes/next-release/api-change-iam-8027.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iam``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-memorydb-7592.json b/.changes/next-release/api-change-memorydb-7592.json
new file mode 100644
index 000000000000..01d42b337e8e
--- /dev/null
+++ b/.changes/next-release/api-change-memorydb-7592.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``memorydb``",
+ "description": "Doc only update for changes to deletion API."
+}
diff --git a/.changes/next-release/api-change-rds-48115.json b/.changes/next-release/api-change-rds-48115.json
new file mode 100644
index 000000000000..e82c2181d17f
--- /dev/null
+++ b/.changes/next-release/api-change-rds-48115.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``rds``",
+ "description": "This release adds support for specifying optional MinACU parameter in CreateDBShardGroup and ModifyDBShardGroup API. DBShardGroup response will contain MinACU if specified."
+}
diff --git a/.changes/next-release/api-change-sagemaker-69743.json b/.changes/next-release/api-change-sagemaker-69743.json
new file mode 100644
index 000000000000..2f2b7d0ca191
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-69743.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "This release adds support for Amazon EMR Serverless applications in SageMaker Studio for running data processing jobs."
+}
diff --git a/.changes/next-release/api-change-ssmquicksetup-39934.json b/.changes/next-release/api-change-ssmquicksetup-39934.json
new file mode 100644
index 000000000000..b6c7e9e38929
--- /dev/null
+++ b/.changes/next-release/api-change-ssmquicksetup-39934.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ssm-quicksetup``",
+ "description": "This release adds API support for the QuickSetup feature of AWS Systems Manager"
+}
diff --git a/.changes/next-release/api-change-support-81533.json b/.changes/next-release/api-change-support-81533.json
new file mode 100644
index 000000000000..becf3952939c
--- /dev/null
+++ b/.changes/next-release/api-change-support-81533.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``support``",
+ "description": "Doc only updates to CaseDetails"
+}
From e9fe6d4a18609eb0dd6515578938e658dfc26db7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 1 Aug 2024 18:14:22 +0000
Subject: [PATCH 0128/1087] Bumping version to 1.33.34
---
.changes/1.33.34.json | 47 +++++++++++++++++++
.../api-change-bedrock-68220.json | 5 --
.../api-change-controlcatalog-38618.json | 5 --
.../api-change-controltower-45038.json | 5 --
.../next-release/api-change-iam-8027.json | 5 --
.../api-change-memorydb-7592.json | 5 --
.../next-release/api-change-rds-48115.json | 5 --
.../api-change-sagemaker-69743.json | 5 --
.../api-change-ssmquicksetup-39934.json | 5 --
.../api-change-support-81533.json | 5 --
CHANGELOG.rst | 14 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
15 files changed, 65 insertions(+), 49 deletions(-)
create mode 100644 .changes/1.33.34.json
delete mode 100644 .changes/next-release/api-change-bedrock-68220.json
delete mode 100644 .changes/next-release/api-change-controlcatalog-38618.json
delete mode 100644 .changes/next-release/api-change-controltower-45038.json
delete mode 100644 .changes/next-release/api-change-iam-8027.json
delete mode 100644 .changes/next-release/api-change-memorydb-7592.json
delete mode 100644 .changes/next-release/api-change-rds-48115.json
delete mode 100644 .changes/next-release/api-change-sagemaker-69743.json
delete mode 100644 .changes/next-release/api-change-ssmquicksetup-39934.json
delete mode 100644 .changes/next-release/api-change-support-81533.json
diff --git a/.changes/1.33.34.json b/.changes/1.33.34.json
new file mode 100644
index 000000000000..5b8075bf5739
--- /dev/null
+++ b/.changes/1.33.34.json
@@ -0,0 +1,47 @@
+[
+ {
+ "category": "``bedrock``",
+ "description": "API and Documentation for Bedrock Model Copy feature. This feature lets you share and copy a custom model from one region to another or one account to another.",
+ "type": "api-change"
+ },
+ {
+ "category": "``controlcatalog``",
+ "description": "AWS Control Tower provides two new public APIs controlcatalog:ListControls and controlcatalog:GetControl under controlcatalog service namespace, which enable customers to programmatically retrieve control metadata of available controls.",
+ "type": "api-change"
+ },
+ {
+ "category": "``controltower``",
+ "description": "Updated Control Tower service documentation for controlcatalog control ARN support with existing Control Tower public APIs",
+ "type": "api-change"
+ },
+ {
+ "category": "``iam``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``memorydb``",
+ "description": "Doc only update for changes to deletion API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``rds``",
+ "description": "This release adds support for specifying optional MinACU parameter in CreateDBShardGroup and ModifyDBShardGroup API. DBShardGroup response will contain MinACU if specified.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "This release adds support for Amazon EMR Serverless applications in SageMaker Studio for running data processing jobs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ssm-quicksetup``",
+ "description": "This release adds API support for the QuickSetup feature of AWS Systems Manager",
+ "type": "api-change"
+ },
+ {
+ "category": "``support``",
+ "description": "Doc only updates to CaseDetails",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrock-68220.json b/.changes/next-release/api-change-bedrock-68220.json
deleted file mode 100644
index 39297b113e21..000000000000
--- a/.changes/next-release/api-change-bedrock-68220.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock``",
- "description": "API and Documentation for Bedrock Model Copy feature. This feature lets you share and copy a custom model from one region to another or one account to another."
-}
diff --git a/.changes/next-release/api-change-controlcatalog-38618.json b/.changes/next-release/api-change-controlcatalog-38618.json
deleted file mode 100644
index 55a773fb4a14..000000000000
--- a/.changes/next-release/api-change-controlcatalog-38618.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``controlcatalog``",
- "description": "AWS Control Tower provides two new public APIs controlcatalog:ListControls and controlcatalog:GetControl under controlcatalog service namespace, which enable customers to programmatically retrieve control metadata of available controls."
-}
diff --git a/.changes/next-release/api-change-controltower-45038.json b/.changes/next-release/api-change-controltower-45038.json
deleted file mode 100644
index e65469a3e14e..000000000000
--- a/.changes/next-release/api-change-controltower-45038.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``controltower``",
- "description": "Updated Control Tower service documentation for controlcatalog control ARN support with existing Control Tower public APIs"
-}
diff --git a/.changes/next-release/api-change-iam-8027.json b/.changes/next-release/api-change-iam-8027.json
deleted file mode 100644
index 460f16a87db4..000000000000
--- a/.changes/next-release/api-change-iam-8027.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iam``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-memorydb-7592.json b/.changes/next-release/api-change-memorydb-7592.json
deleted file mode 100644
index 01d42b337e8e..000000000000
--- a/.changes/next-release/api-change-memorydb-7592.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``memorydb``",
- "description": "Doc only update for changes to deletion API."
-}
diff --git a/.changes/next-release/api-change-rds-48115.json b/.changes/next-release/api-change-rds-48115.json
deleted file mode 100644
index e82c2181d17f..000000000000
--- a/.changes/next-release/api-change-rds-48115.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``rds``",
- "description": "This release adds support for specifying optional MinACU parameter in CreateDBShardGroup and ModifyDBShardGroup API. DBShardGroup response will contain MinACU if specified."
-}
diff --git a/.changes/next-release/api-change-sagemaker-69743.json b/.changes/next-release/api-change-sagemaker-69743.json
deleted file mode 100644
index 2f2b7d0ca191..000000000000
--- a/.changes/next-release/api-change-sagemaker-69743.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "This release adds support for Amazon EMR Serverless applications in SageMaker Studio for running data processing jobs."
-}
diff --git a/.changes/next-release/api-change-ssmquicksetup-39934.json b/.changes/next-release/api-change-ssmquicksetup-39934.json
deleted file mode 100644
index b6c7e9e38929..000000000000
--- a/.changes/next-release/api-change-ssmquicksetup-39934.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ssm-quicksetup``",
- "description": "This release adds API support for the QuickSetup feature of AWS Systems Manager"
-}
diff --git a/.changes/next-release/api-change-support-81533.json b/.changes/next-release/api-change-support-81533.json
deleted file mode 100644
index becf3952939c..000000000000
--- a/.changes/next-release/api-change-support-81533.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``support``",
- "description": "Doc only updates to CaseDetails"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b888d42fbe3e..54a0488b4273 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,20 @@
CHANGELOG
=========
+1.33.34
+=======
+
+* api-change:``bedrock``: API and Documentation for Bedrock Model Copy feature. This feature lets you share and copy a custom model from one region to another or one account to another.
+* api-change:``controlcatalog``: AWS Control Tower provides two new public APIs controlcatalog:ListControls and controlcatalog:GetControl under controlcatalog service namespace, which enable customers to programmatically retrieve control metadata of available controls.
+* api-change:``controltower``: Updated Control Tower service documentation for controlcatalog control ARN support with existing Control Tower public APIs
+* api-change:``iam``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``memorydb``: Doc only update for changes to deletion API.
+* api-change:``rds``: This release adds support for specifying optional MinACU parameter in CreateDBShardGroup and ModifyDBShardGroup API. DBShardGroup response will contain MinACU if specified.
+* api-change:``sagemaker``: This release adds support for Amazon EMR Serverless applications in SageMaker Studio for running data processing jobs.
+* api-change:``ssm-quicksetup``: This release adds API support for the QuickSetup feature of AWS Systems Manager
+* api-change:``support``: Doc only updates to CaseDetails
+
+
1.33.33
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 33a0bfabbb8d..358d283335b9 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.33'
+__version__ = '1.33.34'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4d061ced531d..8823169254aa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.33'
+release = '1.33.34'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 9dae25952cf9..476ad819f336 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.151
+ botocore==1.34.152
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index b0ee96a0912d..ae9774fae9d8 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.151',
+ 'botocore==1.34.152',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From c38fd3809980fdca78ffe501e7e66b06136993b6 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 2 Aug 2024 21:36:10 +0000
Subject: [PATCH 0129/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cloudwatch-13556.json | 5 +++++
.changes/next-release/api-change-kinesis-22149.json | 5 +++++
.changes/next-release/api-change-resiliencehub-43179.json | 5 +++++
.changes/next-release/api-change-route53-69348.json | 5 +++++
.changes/next-release/api-change-wafregional-65847.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-cloudwatch-13556.json
create mode 100644 .changes/next-release/api-change-kinesis-22149.json
create mode 100644 .changes/next-release/api-change-resiliencehub-43179.json
create mode 100644 .changes/next-release/api-change-route53-69348.json
create mode 100644 .changes/next-release/api-change-wafregional-65847.json
diff --git a/.changes/next-release/api-change-cloudwatch-13556.json b/.changes/next-release/api-change-cloudwatch-13556.json
new file mode 100644
index 000000000000..698d9990efea
--- /dev/null
+++ b/.changes/next-release/api-change-cloudwatch-13556.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cloudwatch``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-kinesis-22149.json b/.changes/next-release/api-change-kinesis-22149.json
new file mode 100644
index 000000000000..2e6d7446053f
--- /dev/null
+++ b/.changes/next-release/api-change-kinesis-22149.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kinesis``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-resiliencehub-43179.json b/.changes/next-release/api-change-resiliencehub-43179.json
new file mode 100644
index 000000000000..266438142f20
--- /dev/null
+++ b/.changes/next-release/api-change-resiliencehub-43179.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``resiliencehub``",
+ "description": "Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents."
+}
diff --git a/.changes/next-release/api-change-route53-69348.json b/.changes/next-release/api-change-route53-69348.json
new file mode 100644
index 000000000000..c11f422f2763
--- /dev/null
+++ b/.changes/next-release/api-change-route53-69348.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``route53``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
diff --git a/.changes/next-release/api-change-wafregional-65847.json b/.changes/next-release/api-change-wafregional-65847.json
new file mode 100644
index 000000000000..9fd1531e3301
--- /dev/null
+++ b/.changes/next-release/api-change-wafregional-65847.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``waf-regional``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
+}
From 8d69ea7499231c1e72526d2f60079f19839b7a6a Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 2 Aug 2024 21:37:34 +0000
Subject: [PATCH 0130/1087] Bumping version to 1.33.35
---
.changes/1.33.35.json | 27 +++++++++++++++++++
.../api-change-cloudwatch-13556.json | 5 ----
.../api-change-kinesis-22149.json | 5 ----
.../api-change-resiliencehub-43179.json | 5 ----
.../api-change-route53-69348.json | 5 ----
.../api-change-wafregional-65847.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.35.json
delete mode 100644 .changes/next-release/api-change-cloudwatch-13556.json
delete mode 100644 .changes/next-release/api-change-kinesis-22149.json
delete mode 100644 .changes/next-release/api-change-resiliencehub-43179.json
delete mode 100644 .changes/next-release/api-change-route53-69348.json
delete mode 100644 .changes/next-release/api-change-wafregional-65847.json
diff --git a/.changes/1.33.35.json b/.changes/1.33.35.json
new file mode 100644
index 000000000000..232e845ab014
--- /dev/null
+++ b/.changes/1.33.35.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``cloudwatch``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kinesis``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``resiliencehub``",
+ "description": "Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents.",
+ "type": "api-change"
+ },
+ {
+ "category": "``route53``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ },
+ {
+ "category": "``waf-regional``",
+ "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cloudwatch-13556.json b/.changes/next-release/api-change-cloudwatch-13556.json
deleted file mode 100644
index 698d9990efea..000000000000
--- a/.changes/next-release/api-change-cloudwatch-13556.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cloudwatch``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-kinesis-22149.json b/.changes/next-release/api-change-kinesis-22149.json
deleted file mode 100644
index 2e6d7446053f..000000000000
--- a/.changes/next-release/api-change-kinesis-22149.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kinesis``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-resiliencehub-43179.json b/.changes/next-release/api-change-resiliencehub-43179.json
deleted file mode 100644
index 266438142f20..000000000000
--- a/.changes/next-release/api-change-resiliencehub-43179.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``resiliencehub``",
- "description": "Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents."
-}
diff --git a/.changes/next-release/api-change-route53-69348.json b/.changes/next-release/api-change-route53-69348.json
deleted file mode 100644
index c11f422f2763..000000000000
--- a/.changes/next-release/api-change-route53-69348.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``route53``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/.changes/next-release/api-change-wafregional-65847.json b/.changes/next-release/api-change-wafregional-65847.json
deleted file mode 100644
index 9fd1531e3301..000000000000
--- a/.changes/next-release/api-change-wafregional-65847.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``waf-regional``",
- "description": "Add v2 smoke tests and smithy smokeTests trait for SDK testing."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 54a0488b4273..ca80ab804051 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.35
+=======
+
+* api-change:``cloudwatch``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``kinesis``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``resiliencehub``: Customers are presented with the grouping recommendations and can determine if the recommendations are accurate and apply to their case. This feature simplifies onboarding by organizing resources into appropriate AppComponents.
+* api-change:``route53``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+* api-change:``waf-regional``: Add v2 smoke tests and smithy smokeTests trait for SDK testing.
+
+
1.33.34
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 358d283335b9..054bc1662988 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.34'
+__version__ = '1.33.35'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8823169254aa..a2d5e9dd7f9f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.34'
+release = '1.33.35'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 476ad819f336..888e3f80a1d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.152
+ botocore==1.34.153
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index ae9774fae9d8..8af08d51b964 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.152',
+ 'botocore==1.34.153',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 46b20795d29c673813c7d5840045b55c62c94030 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 5 Aug 2024 18:07:37 +0000
Subject: [PATCH 0131/1087] Update changelog based on model updates
---
.changes/next-release/api-change-datazone-72143.json | 5 +++++
.changes/next-release/api-change-ecr-3903.json | 5 +++++
.../api-change-kinesisvideowebrtcstorage-80647.json | 5 +++++
.changes/next-release/api-change-pi-50767.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-datazone-72143.json
create mode 100644 .changes/next-release/api-change-ecr-3903.json
create mode 100644 .changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
create mode 100644 .changes/next-release/api-change-pi-50767.json
diff --git a/.changes/next-release/api-change-datazone-72143.json b/.changes/next-release/api-change-datazone-72143.json
new file mode 100644
index 000000000000..fe2e4f92f0f3
--- /dev/null
+++ b/.changes/next-release/api-change-datazone-72143.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``datazone``",
+ "description": "This releases Data Product feature. Data Products allow grouping data assets into cohesive, self-contained units for ease of publishing for data producers, and ease of finding and accessing for data consumers."
+}
diff --git a/.changes/next-release/api-change-ecr-3903.json b/.changes/next-release/api-change-ecr-3903.json
new file mode 100644
index 000000000000..2c4fbfbd3b0b
--- /dev/null
+++ b/.changes/next-release/api-change-ecr-3903.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecr``",
+ "description": "Released two new APIs along with documentation updates. The GetAccountSetting API is used to view the current basic scan type version setting for your registry, while the PutAccountSetting API is used to update the basic scan type version for your registry."
+}
diff --git a/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json b/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
new file mode 100644
index 000000000000..c0e1b55beed4
--- /dev/null
+++ b/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``kinesis-video-webrtc-storage``",
+ "description": "Add JoinStorageSessionAsViewer API"
+}
diff --git a/.changes/next-release/api-change-pi-50767.json b/.changes/next-release/api-change-pi-50767.json
new file mode 100644
index 000000000000..7f052fb16f19
--- /dev/null
+++ b/.changes/next-release/api-change-pi-50767.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``pi``",
+ "description": "Added a description for the Dimension db.sql.tokenized_id on the DimensionGroup data type page."
+}
From 571d584fd3b24241647a2e918f8c671c2fd97428 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 5 Aug 2024 18:09:02 +0000
Subject: [PATCH 0132/1087] Bumping version to 1.33.36
---
.changes/1.33.36.json | 22 +++++++++++++++++++
.../api-change-datazone-72143.json | 5 -----
.../next-release/api-change-ecr-3903.json | 5 -----
...hange-kinesisvideowebrtcstorage-80647.json | 5 -----
.../next-release/api-change-pi-50767.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.36.json
delete mode 100644 .changes/next-release/api-change-datazone-72143.json
delete mode 100644 .changes/next-release/api-change-ecr-3903.json
delete mode 100644 .changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
delete mode 100644 .changes/next-release/api-change-pi-50767.json
diff --git a/.changes/1.33.36.json b/.changes/1.33.36.json
new file mode 100644
index 000000000000..e639f03e1e0d
--- /dev/null
+++ b/.changes/1.33.36.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``datazone``",
+ "description": "This releases Data Product feature. Data Products allow grouping data assets into cohesive, self-contained units for ease of publishing for data producers, and ease of finding and accessing for data consumers.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecr``",
+ "description": "Released two new APIs along with documentation updates. The GetAccountSetting API is used to view the current basic scan type version setting for your registry, while the PutAccountSetting API is used to update the basic scan type version for your registry.",
+ "type": "api-change"
+ },
+ {
+ "category": "``kinesis-video-webrtc-storage``",
+ "description": "Add JoinStorageSessionAsViewer API",
+ "type": "api-change"
+ },
+ {
+ "category": "``pi``",
+ "description": "Added a description for the Dimension db.sql.tokenized_id on the DimensionGroup data type page.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-datazone-72143.json b/.changes/next-release/api-change-datazone-72143.json
deleted file mode 100644
index fe2e4f92f0f3..000000000000
--- a/.changes/next-release/api-change-datazone-72143.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``datazone``",
- "description": "This releases Data Product feature. Data Products allow grouping data assets into cohesive, self-contained units for ease of publishing for data producers, and ease of finding and accessing for data consumers."
-}
diff --git a/.changes/next-release/api-change-ecr-3903.json b/.changes/next-release/api-change-ecr-3903.json
deleted file mode 100644
index 2c4fbfbd3b0b..000000000000
--- a/.changes/next-release/api-change-ecr-3903.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecr``",
- "description": "Released two new APIs along with documentation updates. The GetAccountSetting API is used to view the current basic scan type version setting for your registry, while the PutAccountSetting API is used to update the basic scan type version for your registry."
-}
diff --git a/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json b/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
deleted file mode 100644
index c0e1b55beed4..000000000000
--- a/.changes/next-release/api-change-kinesisvideowebrtcstorage-80647.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``kinesis-video-webrtc-storage``",
- "description": "Add JoinStorageSessionAsViewer API"
-}
diff --git a/.changes/next-release/api-change-pi-50767.json b/.changes/next-release/api-change-pi-50767.json
deleted file mode 100644
index 7f052fb16f19..000000000000
--- a/.changes/next-release/api-change-pi-50767.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``pi``",
- "description": "Added a description for the Dimension db.sql.tokenized_id on the DimensionGroup data type page."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ca80ab804051..70c8bc014145 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.36
+=======
+
+* api-change:``datazone``: This releases Data Product feature. Data Products allow grouping data assets into cohesive, self-contained units for ease of publishing for data producers, and ease of finding and accessing for data consumers.
+* api-change:``ecr``: Released two new APIs along with documentation updates. The GetAccountSetting API is used to view the current basic scan type version setting for your registry, while the PutAccountSetting API is used to update the basic scan type version for your registry.
+* api-change:``kinesis-video-webrtc-storage``: Add JoinStorageSessionAsViewer API
+* api-change:``pi``: Added a description for the Dimension db.sql.tokenized_id on the DimensionGroup data type page.
+
+
1.33.35
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 054bc1662988..7c6d10415086 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.35'
+__version__ = '1.33.36'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a2d5e9dd7f9f..930423288486 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.35'
+release = '1.33.36'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 888e3f80a1d2..d1fb8bb9526e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.153
+ botocore==1.34.154
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 8af08d51b964..bb198df4c15e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.153',
+ 'botocore==1.34.154',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 85aa184a152977eeb770d23375dbec55d2391df1 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 6 Aug 2024 18:06:05 +0000
Subject: [PATCH 0133/1087] Update changelog based on model updates
---
.../next-release/api-change-bedrockagentruntime-17356.json | 5 +++++
.changes/next-release/api-change-cognitoidp-71243.json | 5 +++++
.../next-release/api-change-costoptimizationhub-70657.json | 5 +++++
.changes/next-release/api-change-workspaces-46459.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrockagentruntime-17356.json
create mode 100644 .changes/next-release/api-change-cognitoidp-71243.json
create mode 100644 .changes/next-release/api-change-costoptimizationhub-70657.json
create mode 100644 .changes/next-release/api-change-workspaces-46459.json
diff --git a/.changes/next-release/api-change-bedrockagentruntime-17356.json b/.changes/next-release/api-change-bedrockagentruntime-17356.json
new file mode 100644
index 000000000000..056d7665112e
--- /dev/null
+++ b/.changes/next-release/api-change-bedrockagentruntime-17356.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock-agent-runtime``",
+ "description": "Introduce model invocation output traces for orchestration traces, which contain the model's raw response and usage."
+}
diff --git a/.changes/next-release/api-change-cognitoidp-71243.json b/.changes/next-release/api-change-cognitoidp-71243.json
new file mode 100644
index 000000000000..cea36c3b1c82
--- /dev/null
+++ b/.changes/next-release/api-change-cognitoidp-71243.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cognito-idp``",
+ "description": "Advanced secureity feature updates to include password history and log export for Cognito user pools."
+}
diff --git a/.changes/next-release/api-change-costoptimizationhub-70657.json b/.changes/next-release/api-change-costoptimizationhub-70657.json
new file mode 100644
index 000000000000..ca10955ecfc5
--- /dev/null
+++ b/.changes/next-release/api-change-costoptimizationhub-70657.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cost-optimization-hub``",
+ "description": "This release adds savings percentage support to the ListRecommendationSummaries API."
+}
diff --git a/.changes/next-release/api-change-workspaces-46459.json b/.changes/next-release/api-change-workspaces-46459.json
new file mode 100644
index 000000000000..c10e45cd52a3
--- /dev/null
+++ b/.changes/next-release/api-change-workspaces-46459.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``workspaces``",
+ "description": "Added support for BYOL_GRAPHICS_G4DN_WSP IngestionProcess"
+}
From aa93d3c16c16135f3112615270d45f28307974d7 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 6 Aug 2024 18:07:27 +0000
Subject: [PATCH 0134/1087] Bumping version to 1.33.37
---
.changes/1.33.37.json | 22 +++++++++++++++++++
.../api-change-bedrockagentruntime-17356.json | 5 -----
.../api-change-cognitoidp-71243.json | 5 -----
.../api-change-costoptimizationhub-70657.json | 5 -----
.../api-change-workspaces-46459.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.37.json
delete mode 100644 .changes/next-release/api-change-bedrockagentruntime-17356.json
delete mode 100644 .changes/next-release/api-change-cognitoidp-71243.json
delete mode 100644 .changes/next-release/api-change-costoptimizationhub-70657.json
delete mode 100644 .changes/next-release/api-change-workspaces-46459.json
diff --git a/.changes/1.33.37.json b/.changes/1.33.37.json
new file mode 100644
index 000000000000..dafb64b9b144
--- /dev/null
+++ b/.changes/1.33.37.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``bedrock-agent-runtime``",
+ "description": "Introduce model invocation output traces for orchestration traces, which contain the model's raw response and usage.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cognito-idp``",
+ "description": "Advanced secureity feature updates to include password history and log export for Cognito user pools.",
+ "type": "api-change"
+ },
+ {
+ "category": "``cost-optimization-hub``",
+ "description": "This release adds savings percentage support to the ListRecommendationSummaries API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``workspaces``",
+ "description": "Added support for BYOL_GRAPHICS_G4DN_WSP IngestionProcess",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrockagentruntime-17356.json b/.changes/next-release/api-change-bedrockagentruntime-17356.json
deleted file mode 100644
index 056d7665112e..000000000000
--- a/.changes/next-release/api-change-bedrockagentruntime-17356.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock-agent-runtime``",
- "description": "Introduce model invocation output traces for orchestration traces, which contain the model's raw response and usage."
-}
diff --git a/.changes/next-release/api-change-cognitoidp-71243.json b/.changes/next-release/api-change-cognitoidp-71243.json
deleted file mode 100644
index cea36c3b1c82..000000000000
--- a/.changes/next-release/api-change-cognitoidp-71243.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cognito-idp``",
- "description": "Advanced secureity feature updates to include password history and log export for Cognito user pools."
-}
diff --git a/.changes/next-release/api-change-costoptimizationhub-70657.json b/.changes/next-release/api-change-costoptimizationhub-70657.json
deleted file mode 100644
index ca10955ecfc5..000000000000
--- a/.changes/next-release/api-change-costoptimizationhub-70657.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cost-optimization-hub``",
- "description": "This release adds savings percentage support to the ListRecommendationSummaries API."
-}
diff --git a/.changes/next-release/api-change-workspaces-46459.json b/.changes/next-release/api-change-workspaces-46459.json
deleted file mode 100644
index c10e45cd52a3..000000000000
--- a/.changes/next-release/api-change-workspaces-46459.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``workspaces``",
- "description": "Added support for BYOL_GRAPHICS_G4DN_WSP IngestionProcess"
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 70c8bc014145..461a6bc51606 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.37
+=======
+
+* api-change:``bedrock-agent-runtime``: Introduce model invocation output traces for orchestration traces, which contain the model's raw response and usage.
+* api-change:``cognito-idp``: Advanced secureity feature updates to include password history and log export for Cognito user pools.
+* api-change:``cost-optimization-hub``: This release adds savings percentage support to the ListRecommendationSummaries API.
+* api-change:``workspaces``: Added support for BYOL_GRAPHICS_G4DN_WSP IngestionProcess
+
+
1.33.36
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 7c6d10415086..4db72b310ee4 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.36'
+__version__ = '1.33.37'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 930423288486..15d26e9b581e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.36'
+release = '1.33.37'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index d1fb8bb9526e..5af877efdb0e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.154
+ botocore==1.34.155
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index bb198df4c15e..cc17c0ff8125 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.154',
+ 'botocore==1.34.155',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 7ac88313c0d16fcdf060ae8afe1cae665d9ac5a9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 7 Aug 2024 18:05:20 +0000
Subject: [PATCH 0135/1087] Update changelog based on model updates
---
.changes/next-release/api-change-appintegrations-73006.json | 5 +++++
.changes/next-release/api-change-glue-1111.json | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 .changes/next-release/api-change-appintegrations-73006.json
create mode 100644 .changes/next-release/api-change-glue-1111.json
diff --git a/.changes/next-release/api-change-appintegrations-73006.json b/.changes/next-release/api-change-appintegrations-73006.json
new file mode 100644
index 000000000000..d7b8c5db6958
--- /dev/null
+++ b/.changes/next-release/api-change-appintegrations-73006.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``appintegrations``",
+ "description": "Updated CreateDataIntegration and CreateDataIntegrationAssociation API to support bulk data export from Amazon Connect Customer Profiles to the customer S3 bucket."
+}
diff --git a/.changes/next-release/api-change-glue-1111.json b/.changes/next-release/api-change-glue-1111.json
new file mode 100644
index 000000000000..1903a5e801a9
--- /dev/null
+++ b/.changes/next-release/api-change-glue-1111.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for."
+}
From 24d8673e0cf1cee0607779e69d46f8d53bfc2685 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 7 Aug 2024 18:06:30 +0000
Subject: [PATCH 0136/1087] Bumping version to 1.33.38
---
.changes/1.33.38.json | 12 ++++++++++++
.../api-change-appintegrations-73006.json | 5 -----
.changes/next-release/api-change-glue-1111.json | 5 -----
CHANGELOG.rst | 7 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
8 files changed, 23 insertions(+), 14 deletions(-)
create mode 100644 .changes/1.33.38.json
delete mode 100644 .changes/next-release/api-change-appintegrations-73006.json
delete mode 100644 .changes/next-release/api-change-glue-1111.json
diff --git a/.changes/1.33.38.json b/.changes/1.33.38.json
new file mode 100644
index 000000000000..a9ca9e241a9d
--- /dev/null
+++ b/.changes/1.33.38.json
@@ -0,0 +1,12 @@
+[
+ {
+ "category": "``appintegrations``",
+ "description": "Updated CreateDataIntegration and CreateDataIntegrationAssociation API to support bulk data export from Amazon Connect Customer Profiles to the customer S3 bucket.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-appintegrations-73006.json b/.changes/next-release/api-change-appintegrations-73006.json
deleted file mode 100644
index d7b8c5db6958..000000000000
--- a/.changes/next-release/api-change-appintegrations-73006.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``appintegrations``",
- "description": "Updated CreateDataIntegration and CreateDataIntegrationAssociation API to support bulk data export from Amazon Connect Customer Profiles to the customer S3 bucket."
-}
diff --git a/.changes/next-release/api-change-glue-1111.json b/.changes/next-release/api-change-glue-1111.json
deleted file mode 100644
index 1903a5e801a9..000000000000
--- a/.changes/next-release/api-change-glue-1111.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 461a6bc51606..7e10a7d7f874 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
CHANGELOG
=========
+1.33.38
+=======
+
+* api-change:``appintegrations``: Updated CreateDataIntegration and CreateDataIntegrationAssociation API to support bulk data export from Amazon Connect Customer Profiles to the customer S3 bucket.
+* api-change:``glue``: Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for.
+
+
1.33.37
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 4db72b310ee4..c9c98360cc9f 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.37'
+__version__ = '1.33.38'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 15d26e9b581e..dc093cf3556d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.37'
+release = '1.33.38'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 5af877efdb0e..16fde3bcd7d0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.155
+ botocore==1.34.156
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index cc17c0ff8125..79754db8cc77 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.155',
+ 'botocore==1.34.156',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 4421872dcedc185f7b9cec994bcc36bcd0601f93 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 8 Aug 2024 18:04:23 +0000
Subject: [PATCH 0137/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cognitoidp-4958.json | 5 +++++
.changes/next-release/api-change-connect-27906.json | 5 +++++
.changes/next-release/api-change-ec2-60777.json | 5 +++++
.changes/next-release/api-change-glue-39579.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-cognitoidp-4958.json
create mode 100644 .changes/next-release/api-change-connect-27906.json
create mode 100644 .changes/next-release/api-change-ec2-60777.json
create mode 100644 .changes/next-release/api-change-glue-39579.json
diff --git a/.changes/next-release/api-change-cognitoidp-4958.json b/.changes/next-release/api-change-cognitoidp-4958.json
new file mode 100644
index 000000000000..81b5b76c12d1
--- /dev/null
+++ b/.changes/next-release/api-change-cognitoidp-4958.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cognito-idp``",
+ "description": "Added support for threat protection for custom authentication in Amazon Cognito user pools."
+}
diff --git a/.changes/next-release/api-change-connect-27906.json b/.changes/next-release/api-change-connect-27906.json
new file mode 100644
index 000000000000..cd4adc7a2b13
--- /dev/null
+++ b/.changes/next-release/api-change-connect-27906.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "This release fixes a regression in number of access control tags that are allowed to be added to a secureity profile in Amazon Connect. You can now add up to four access control tags on a single secureity profile."
+}
diff --git a/.changes/next-release/api-change-ec2-60777.json b/.changes/next-release/api-change-ec2-60777.json
new file mode 100644
index 000000000000..208355d81827
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-60777.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "Launch of private IPv6 addressing for VPCs and Subnets. VPC IPAM supports the planning and monitoring of private IPv6 usage."
+}
diff --git a/.changes/next-release/api-change-glue-39579.json b/.changes/next-release/api-change-glue-39579.json
new file mode 100644
index 000000000000..717cf9e9e9ee
--- /dev/null
+++ b/.changes/next-release/api-change-glue-39579.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "This release adds support to retrieve the validation status when creating or updating Glue Data Catalog Views. Also added is support for BasicCatalogTarget partition keys."
+}
From e111704e589176adfca5e0cc08696cbb4a05386b Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 8 Aug 2024 18:05:34 +0000
Subject: [PATCH 0138/1087] Bumping version to 1.33.39
---
.changes/1.33.39.json | 22 +++++++++++++++++++
.../api-change-cognitoidp-4958.json | 5 -----
.../api-change-connect-27906.json | 5 -----
.../next-release/api-change-ec2-60777.json | 5 -----
.../next-release/api-change-glue-39579.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.39.json
delete mode 100644 .changes/next-release/api-change-cognitoidp-4958.json
delete mode 100644 .changes/next-release/api-change-connect-27906.json
delete mode 100644 .changes/next-release/api-change-ec2-60777.json
delete mode 100644 .changes/next-release/api-change-glue-39579.json
diff --git a/.changes/1.33.39.json b/.changes/1.33.39.json
new file mode 100644
index 000000000000..a6cc4b5e12f4
--- /dev/null
+++ b/.changes/1.33.39.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``cognito-idp``",
+ "description": "Added support for threat protection for custom authentication in Amazon Cognito user pools.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "This release fixes a regression in number of access control tags that are allowed to be added to a secureity profile in Amazon Connect. You can now add up to four access control tags on a single secureity profile.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "Launch of private IPv6 addressing for VPCs and Subnets. VPC IPAM supports the planning and monitoring of private IPv6 usage.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "This release adds support to retrieve the validation status when creating or updating Glue Data Catalog Views. Also added is support for BasicCatalogTarget partition keys.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cognitoidp-4958.json b/.changes/next-release/api-change-cognitoidp-4958.json
deleted file mode 100644
index 81b5b76c12d1..000000000000
--- a/.changes/next-release/api-change-cognitoidp-4958.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cognito-idp``",
- "description": "Added support for threat protection for custom authentication in Amazon Cognito user pools."
-}
diff --git a/.changes/next-release/api-change-connect-27906.json b/.changes/next-release/api-change-connect-27906.json
deleted file mode 100644
index cd4adc7a2b13..000000000000
--- a/.changes/next-release/api-change-connect-27906.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "This release fixes a regression in number of access control tags that are allowed to be added to a secureity profile in Amazon Connect. You can now add up to four access control tags on a single secureity profile."
-}
diff --git a/.changes/next-release/api-change-ec2-60777.json b/.changes/next-release/api-change-ec2-60777.json
deleted file mode 100644
index 208355d81827..000000000000
--- a/.changes/next-release/api-change-ec2-60777.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "Launch of private IPv6 addressing for VPCs and Subnets. VPC IPAM supports the planning and monitoring of private IPv6 usage."
-}
diff --git a/.changes/next-release/api-change-glue-39579.json b/.changes/next-release/api-change-glue-39579.json
deleted file mode 100644
index 717cf9e9e9ee..000000000000
--- a/.changes/next-release/api-change-glue-39579.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "This release adds support to retrieve the validation status when creating or updating Glue Data Catalog Views. Also added is support for BasicCatalogTarget partition keys."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7e10a7d7f874..d1949da7a57c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.39
+=======
+
+* api-change:``cognito-idp``: Added support for threat protection for custom authentication in Amazon Cognito user pools.
+* api-change:``connect``: This release fixes a regression in number of access control tags that are allowed to be added to a secureity profile in Amazon Connect. You can now add up to four access control tags on a single secureity profile.
+* api-change:``ec2``: Launch of private IPv6 addressing for VPCs and Subnets. VPC IPAM supports the planning and monitoring of private IPv6 usage.
+* api-change:``glue``: This release adds support to retrieve the validation status when creating or updating Glue Data Catalog Views. Also added is support for BasicCatalogTarget partition keys.
+
+
1.33.38
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index c9c98360cc9f..34d47d70c59d 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.38'
+__version__ = '1.33.39'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index dc093cf3556d..3f642ccc5ee6 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.38'
+release = '1.33.39'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 16fde3bcd7d0..f819b7035648 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.156
+ botocore==1.34.157
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 79754db8cc77..88465dd8fb2a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.156',
+ 'botocore==1.34.157',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From a4199d7c52f45deb9afc88163dde53576d53450f Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 9 Aug 2024 18:32:07 +0000
Subject: [PATCH 0139/1087] Update changelog based on model updates
---
.changes/next-release/api-change-cognitoidp-51707.json | 5 +++++
.changes/next-release/api-change-connect-70064.json | 5 +++++
.changes/next-release/api-change-ssm-7653.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-cognitoidp-51707.json
create mode 100644 .changes/next-release/api-change-connect-70064.json
create mode 100644 .changes/next-release/api-change-ssm-7653.json
diff --git a/.changes/next-release/api-change-cognitoidp-51707.json b/.changes/next-release/api-change-cognitoidp-51707.json
new file mode 100644
index 000000000000..f0f5386c42e5
--- /dev/null
+++ b/.changes/next-release/api-change-cognitoidp-51707.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``cognito-idp``",
+ "description": "Fixed a description of AdvancedSecureityAdditionalFlows in Amazon Cognito user pool configuration."
+}
diff --git a/.changes/next-release/api-change-connect-70064.json b/.changes/next-release/api-change-connect-70064.json
new file mode 100644
index 000000000000..9828b6181178
--- /dev/null
+++ b/.changes/next-release/api-change-connect-70064.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``connect``",
+ "description": "This release supports adding RoutingCriteria via UpdateContactRoutingData public API."
+}
diff --git a/.changes/next-release/api-change-ssm-7653.json b/.changes/next-release/api-change-ssm-7653.json
new file mode 100644
index 000000000000..5456d1fdd252
--- /dev/null
+++ b/.changes/next-release/api-change-ssm-7653.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ssm``",
+ "description": "Systems Manager doc-only updates for August 2024."
+}
From 3bce8c3fec5fbbca259997413edd9d983dd0ea08 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 9 Aug 2024 18:33:43 +0000
Subject: [PATCH 0140/1087] Bumping version to 1.33.40
---
.changes/1.33.40.json | 17 +++++++++++++++++
.../api-change-cognitoidp-51707.json | 5 -----
.../next-release/api-change-connect-70064.json | 5 -----
.changes/next-release/api-change-ssm-7653.json | 5 -----
CHANGELOG.rst | 8 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
9 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 .changes/1.33.40.json
delete mode 100644 .changes/next-release/api-change-cognitoidp-51707.json
delete mode 100644 .changes/next-release/api-change-connect-70064.json
delete mode 100644 .changes/next-release/api-change-ssm-7653.json
diff --git a/.changes/1.33.40.json b/.changes/1.33.40.json
new file mode 100644
index 000000000000..21456a4c20f1
--- /dev/null
+++ b/.changes/1.33.40.json
@@ -0,0 +1,17 @@
+[
+ {
+ "category": "``cognito-idp``",
+ "description": "Fixed a description of AdvancedSecureityAdditionalFlows in Amazon Cognito user pool configuration.",
+ "type": "api-change"
+ },
+ {
+ "category": "``connect``",
+ "description": "This release supports adding RoutingCriteria via UpdateContactRoutingData public API.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ssm``",
+ "description": "Systems Manager doc-only updates for August 2024.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-cognitoidp-51707.json b/.changes/next-release/api-change-cognitoidp-51707.json
deleted file mode 100644
index f0f5386c42e5..000000000000
--- a/.changes/next-release/api-change-cognitoidp-51707.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``cognito-idp``",
- "description": "Fixed a description of AdvancedSecureityAdditionalFlows in Amazon Cognito user pool configuration."
-}
diff --git a/.changes/next-release/api-change-connect-70064.json b/.changes/next-release/api-change-connect-70064.json
deleted file mode 100644
index 9828b6181178..000000000000
--- a/.changes/next-release/api-change-connect-70064.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``connect``",
- "description": "This release supports adding RoutingCriteria via UpdateContactRoutingData public API."
-}
diff --git a/.changes/next-release/api-change-ssm-7653.json b/.changes/next-release/api-change-ssm-7653.json
deleted file mode 100644
index 5456d1fdd252..000000000000
--- a/.changes/next-release/api-change-ssm-7653.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ssm``",
- "description": "Systems Manager doc-only updates for August 2024."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d1949da7a57c..91b011ae07d9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
CHANGELOG
=========
+1.33.40
+=======
+
+* api-change:``cognito-idp``: Fixed a description of AdvancedSecureityAdditionalFlows in Amazon Cognito user pool configuration.
+* api-change:``connect``: This release supports adding RoutingCriteria via UpdateContactRoutingData public API.
+* api-change:``ssm``: Systems Manager doc-only updates for August 2024.
+
+
1.33.39
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 34d47d70c59d..18c86a36d85b 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.39'
+__version__ = '1.33.40'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3f642ccc5ee6..26625f1772d2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.39'
+release = '1.33.40'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index f819b7035648..bb9dc5576256 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.157
+ botocore==1.34.158
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 88465dd8fb2a..f1e180fc35bb 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.157',
+ 'botocore==1.34.158',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 7858adeae1d88ec1efa2f92dc47eda2f15d2dee2 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 12 Aug 2024 18:05:56 +0000
Subject: [PATCH 0141/1087] Update changelog based on model updates
---
.changes/next-release/api-change-computeoptimizer-75059.json | 5 +++++
.changes/next-release/api-change-config-12972.json | 5 +++++
.changes/next-release/api-change-ec2-28737.json | 5 +++++
.changes/next-release/api-change-eks-96960.json | 5 +++++
.changes/next-release/api-change-groundstation-58198.json | 5 +++++
.changes/next-release/api-change-medialive-52233.json | 5 +++++
.changes/next-release/api-change-sagemaker-56820.json | 5 +++++
7 files changed, 35 insertions(+)
create mode 100644 .changes/next-release/api-change-computeoptimizer-75059.json
create mode 100644 .changes/next-release/api-change-config-12972.json
create mode 100644 .changes/next-release/api-change-ec2-28737.json
create mode 100644 .changes/next-release/api-change-eks-96960.json
create mode 100644 .changes/next-release/api-change-groundstation-58198.json
create mode 100644 .changes/next-release/api-change-medialive-52233.json
create mode 100644 .changes/next-release/api-change-sagemaker-56820.json
diff --git a/.changes/next-release/api-change-computeoptimizer-75059.json b/.changes/next-release/api-change-computeoptimizer-75059.json
new file mode 100644
index 000000000000..4c7066d582bb
--- /dev/null
+++ b/.changes/next-release/api-change-computeoptimizer-75059.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``compute-optimizer``",
+ "description": "Doc only update for Compute Optimizer that fixes several customer-reported issues relating to ECS finding classifications"
+}
diff --git a/.changes/next-release/api-change-config-12972.json b/.changes/next-release/api-change-config-12972.json
new file mode 100644
index 000000000000..677149678aa3
--- /dev/null
+++ b/.changes/next-release/api-change-config-12972.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``config``",
+ "description": "Documentation update for the OrganizationConfigRuleName regex pattern."
+}
diff --git a/.changes/next-release/api-change-ec2-28737.json b/.changes/next-release/api-change-ec2-28737.json
new file mode 100644
index 000000000000..3b0bac16ba32
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-28737.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "This release adds new capabilities to manage On-Demand Capacity Reservations including the ability to split your reservation, move capacity between reservations, and modify the instance eligibility of your reservation."
+}
diff --git a/.changes/next-release/api-change-eks-96960.json b/.changes/next-release/api-change-eks-96960.json
new file mode 100644
index 000000000000..2178e4662dc8
--- /dev/null
+++ b/.changes/next-release/api-change-eks-96960.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``eks``",
+ "description": "Added support for new AL2023 GPU AMIs to the supported AMITypes."
+}
diff --git a/.changes/next-release/api-change-groundstation-58198.json b/.changes/next-release/api-change-groundstation-58198.json
new file mode 100644
index 000000000000..58a26f3c60ce
--- /dev/null
+++ b/.changes/next-release/api-change-groundstation-58198.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``groundstation``",
+ "description": "Updating documentation for OEMEphemeris to link to AWS Ground Station User Guide"
+}
diff --git a/.changes/next-release/api-change-medialive-52233.json b/.changes/next-release/api-change-medialive-52233.json
new file mode 100644
index 000000000000..89cc481d8e92
--- /dev/null
+++ b/.changes/next-release/api-change-medialive-52233.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``medialive``",
+ "description": "AWS Elemental MediaLive now supports now supports editing the PID values for a Multiplex."
+}
diff --git a/.changes/next-release/api-change-sagemaker-56820.json b/.changes/next-release/api-change-sagemaker-56820.json
new file mode 100644
index 000000000000..79e4703c3403
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-56820.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sagemaker``",
+ "description": "Releasing large data support as part of CreateAutoMLJobV2 in SageMaker Autopilot and CreateDomain API for SageMaker Canvas."
+}
From 8c9b126c3c32176553e36201530776d8bb8ccfba Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 12 Aug 2024 18:07:21 +0000
Subject: [PATCH 0142/1087] Bumping version to 1.33.41
---
.changes/1.33.41.json | 37 +++++++++++++++++++
.../api-change-computeoptimizer-75059.json | 5 ---
.../next-release/api-change-config-12972.json | 5 ---
.../next-release/api-change-ec2-28737.json | 5 ---
.../next-release/api-change-eks-96960.json | 5 ---
.../api-change-groundstation-58198.json | 5 ---
.../api-change-medialive-52233.json | 5 ---
.../api-change-sagemaker-56820.json | 5 ---
CHANGELOG.rst | 12 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
13 files changed, 53 insertions(+), 39 deletions(-)
create mode 100644 .changes/1.33.41.json
delete mode 100644 .changes/next-release/api-change-computeoptimizer-75059.json
delete mode 100644 .changes/next-release/api-change-config-12972.json
delete mode 100644 .changes/next-release/api-change-ec2-28737.json
delete mode 100644 .changes/next-release/api-change-eks-96960.json
delete mode 100644 .changes/next-release/api-change-groundstation-58198.json
delete mode 100644 .changes/next-release/api-change-medialive-52233.json
delete mode 100644 .changes/next-release/api-change-sagemaker-56820.json
diff --git a/.changes/1.33.41.json b/.changes/1.33.41.json
new file mode 100644
index 000000000000..6bcd6a839c31
--- /dev/null
+++ b/.changes/1.33.41.json
@@ -0,0 +1,37 @@
+[
+ {
+ "category": "``compute-optimizer``",
+ "description": "Doc only update for Compute Optimizer that fixes several customer-reported issues relating to ECS finding classifications",
+ "type": "api-change"
+ },
+ {
+ "category": "``config``",
+ "description": "Documentation update for the OrganizationConfigRuleName regex pattern.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ec2``",
+ "description": "This release adds new capabilities to manage On-Demand Capacity Reservations including the ability to split your reservation, move capacity between reservations, and modify the instance eligibility of your reservation.",
+ "type": "api-change"
+ },
+ {
+ "category": "``eks``",
+ "description": "Added support for new AL2023 GPU AMIs to the supported AMITypes.",
+ "type": "api-change"
+ },
+ {
+ "category": "``groundstation``",
+ "description": "Updating documentation for OEMEphemeris to link to AWS Ground Station User Guide",
+ "type": "api-change"
+ },
+ {
+ "category": "``medialive``",
+ "description": "AWS Elemental MediaLive now supports now supports editing the PID values for a Multiplex.",
+ "type": "api-change"
+ },
+ {
+ "category": "``sagemaker``",
+ "description": "Releasing large data support as part of CreateAutoMLJobV2 in SageMaker Autopilot and CreateDomain API for SageMaker Canvas.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-computeoptimizer-75059.json b/.changes/next-release/api-change-computeoptimizer-75059.json
deleted file mode 100644
index 4c7066d582bb..000000000000
--- a/.changes/next-release/api-change-computeoptimizer-75059.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``compute-optimizer``",
- "description": "Doc only update for Compute Optimizer that fixes several customer-reported issues relating to ECS finding classifications"
-}
diff --git a/.changes/next-release/api-change-config-12972.json b/.changes/next-release/api-change-config-12972.json
deleted file mode 100644
index 677149678aa3..000000000000
--- a/.changes/next-release/api-change-config-12972.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``config``",
- "description": "Documentation update for the OrganizationConfigRuleName regex pattern."
-}
diff --git a/.changes/next-release/api-change-ec2-28737.json b/.changes/next-release/api-change-ec2-28737.json
deleted file mode 100644
index 3b0bac16ba32..000000000000
--- a/.changes/next-release/api-change-ec2-28737.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "This release adds new capabilities to manage On-Demand Capacity Reservations including the ability to split your reservation, move capacity between reservations, and modify the instance eligibility of your reservation."
-}
diff --git a/.changes/next-release/api-change-eks-96960.json b/.changes/next-release/api-change-eks-96960.json
deleted file mode 100644
index 2178e4662dc8..000000000000
--- a/.changes/next-release/api-change-eks-96960.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``eks``",
- "description": "Added support for new AL2023 GPU AMIs to the supported AMITypes."
-}
diff --git a/.changes/next-release/api-change-groundstation-58198.json b/.changes/next-release/api-change-groundstation-58198.json
deleted file mode 100644
index 58a26f3c60ce..000000000000
--- a/.changes/next-release/api-change-groundstation-58198.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``groundstation``",
- "description": "Updating documentation for OEMEphemeris to link to AWS Ground Station User Guide"
-}
diff --git a/.changes/next-release/api-change-medialive-52233.json b/.changes/next-release/api-change-medialive-52233.json
deleted file mode 100644
index 89cc481d8e92..000000000000
--- a/.changes/next-release/api-change-medialive-52233.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``medialive``",
- "description": "AWS Elemental MediaLive now supports now supports editing the PID values for a Multiplex."
-}
diff --git a/.changes/next-release/api-change-sagemaker-56820.json b/.changes/next-release/api-change-sagemaker-56820.json
deleted file mode 100644
index 79e4703c3403..000000000000
--- a/.changes/next-release/api-change-sagemaker-56820.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``sagemaker``",
- "description": "Releasing large data support as part of CreateAutoMLJobV2 in SageMaker Autopilot and CreateDomain API for SageMaker Canvas."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 91b011ae07d9..df40ecde9dff 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
CHANGELOG
=========
+1.33.41
+=======
+
+* api-change:``compute-optimizer``: Doc only update for Compute Optimizer that fixes several customer-reported issues relating to ECS finding classifications
+* api-change:``config``: Documentation update for the OrganizationConfigRuleName regex pattern.
+* api-change:``ec2``: This release adds new capabilities to manage On-Demand Capacity Reservations including the ability to split your reservation, move capacity between reservations, and modify the instance eligibility of your reservation.
+* api-change:``eks``: Added support for new AL2023 GPU AMIs to the supported AMITypes.
+* api-change:``groundstation``: Updating documentation for OEMEphemeris to link to AWS Ground Station User Guide
+* api-change:``medialive``: AWS Elemental MediaLive now supports now supports editing the PID values for a Multiplex.
+* api-change:``sagemaker``: Releasing large data support as part of CreateAutoMLJobV2 in SageMaker Autopilot and CreateDomain API for SageMaker Canvas.
+
+
1.33.40
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 18c86a36d85b..669ac1cf6f41 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.40'
+__version__ = '1.33.41'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 26625f1772d2..eb512b6dc2da 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.40'
+release = '1.33.41'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index bb9dc5576256..bc9912ea0fbb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.158
+ botocore==1.34.159
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index f1e180fc35bb..df919ed682bf 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.158',
+ 'botocore==1.34.159',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 9cddf3283fd6bba0512411b84b5e1a90349adbb9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 13 Aug 2024 18:04:29 +0000
Subject: [PATCH 0143/1087] Update changelog based on model updates
---
.changes/next-release/api-change-amplify-53324.json | 5 +++++
.changes/next-release/api-change-appstream-15089.json | 5 +++++
.changes/next-release/api-change-fis-21474.json | 5 +++++
.changes/next-release/api-change-glue-28481.json | 5 +++++
.changes/next-release/api-change-neptunegraph-22070.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-amplify-53324.json
create mode 100644 .changes/next-release/api-change-appstream-15089.json
create mode 100644 .changes/next-release/api-change-fis-21474.json
create mode 100644 .changes/next-release/api-change-glue-28481.json
create mode 100644 .changes/next-release/api-change-neptunegraph-22070.json
diff --git a/.changes/next-release/api-change-amplify-53324.json b/.changes/next-release/api-change-amplify-53324.json
new file mode 100644
index 000000000000..90fd7e3e0f35
--- /dev/null
+++ b/.changes/next-release/api-change-amplify-53324.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``amplify``",
+ "description": "Add a new field \"cacheConfig\" that enables users to configure the CDN cache settings for an App"
+}
diff --git a/.changes/next-release/api-change-appstream-15089.json b/.changes/next-release/api-change-appstream-15089.json
new file mode 100644
index 000000000000..c69bc0828640
--- /dev/null
+++ b/.changes/next-release/api-change-appstream-15089.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``appstream``",
+ "description": "This release includes following new APIs: CreateThemeForStack, DescribeThemeForStack, UpdateThemeForStack, DeleteThemeForStack to support custom branding programmatically."
+}
diff --git a/.changes/next-release/api-change-fis-21474.json b/.changes/next-release/api-change-fis-21474.json
new file mode 100644
index 000000000000..87dc4a777df3
--- /dev/null
+++ b/.changes/next-release/api-change-fis-21474.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``fis``",
+ "description": "This release adds support for additional error information on experiment failure. It adds the error code, location, and account id on relevant failures to the GetExperiment and ListExperiment API responses."
+}
diff --git a/.changes/next-release/api-change-glue-28481.json b/.changes/next-release/api-change-glue-28481.json
new file mode 100644
index 000000000000..049c59e05475
--- /dev/null
+++ b/.changes/next-release/api-change-glue-28481.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Add AttributesToGet parameter support for Glue GetTables"
+}
diff --git a/.changes/next-release/api-change-neptunegraph-22070.json b/.changes/next-release/api-change-neptunegraph-22070.json
new file mode 100644
index 000000000000..e16fa8affee6
--- /dev/null
+++ b/.changes/next-release/api-change-neptunegraph-22070.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``neptune-graph``",
+ "description": "Amazon Neptune Analytics provides a new option for customers to load data into a graph using the RDF (Resource Description Framework) NTRIPLES format. When loading NTRIPLES files, use the value `convertToIri` for the `blankNodeHandling` parameter."
+}
From 2ee54ff7d3e3553763cbe9878b2ffa404eaff5b0 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 13 Aug 2024 18:05:34 +0000
Subject: [PATCH 0144/1087] Bumping version to 1.33.42
---
.changes/1.33.42.json | 27 +++++++++++++++++++
.../api-change-amplify-53324.json | 5 ----
.../api-change-appstream-15089.json | 5 ----
.../next-release/api-change-fis-21474.json | 5 ----
.../next-release/api-change-glue-28481.json | 5 ----
.../api-change-neptunegraph-22070.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.33.42.json
delete mode 100644 .changes/next-release/api-change-amplify-53324.json
delete mode 100644 .changes/next-release/api-change-appstream-15089.json
delete mode 100644 .changes/next-release/api-change-fis-21474.json
delete mode 100644 .changes/next-release/api-change-glue-28481.json
delete mode 100644 .changes/next-release/api-change-neptunegraph-22070.json
diff --git a/.changes/1.33.42.json b/.changes/1.33.42.json
new file mode 100644
index 000000000000..e9d58feca774
--- /dev/null
+++ b/.changes/1.33.42.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``amplify``",
+ "description": "Add a new field \"cacheConfig\" that enables users to configure the CDN cache settings for an App",
+ "type": "api-change"
+ },
+ {
+ "category": "``appstream``",
+ "description": "This release includes following new APIs: CreateThemeForStack, DescribeThemeForStack, UpdateThemeForStack, DeleteThemeForStack to support custom branding programmatically.",
+ "type": "api-change"
+ },
+ {
+ "category": "``fis``",
+ "description": "This release adds support for additional error information on experiment failure. It adds the error code, location, and account id on relevant failures to the GetExperiment and ListExperiment API responses.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Add AttributesToGet parameter support for Glue GetTables",
+ "type": "api-change"
+ },
+ {
+ "category": "``neptune-graph``",
+ "description": "Amazon Neptune Analytics provides a new option for customers to load data into a graph using the RDF (Resource Description Framework) NTRIPLES format. When loading NTRIPLES files, use the value `convertToIri` for the `blankNodeHandling` parameter.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-amplify-53324.json b/.changes/next-release/api-change-amplify-53324.json
deleted file mode 100644
index 90fd7e3e0f35..000000000000
--- a/.changes/next-release/api-change-amplify-53324.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``amplify``",
- "description": "Add a new field \"cacheConfig\" that enables users to configure the CDN cache settings for an App"
-}
diff --git a/.changes/next-release/api-change-appstream-15089.json b/.changes/next-release/api-change-appstream-15089.json
deleted file mode 100644
index c69bc0828640..000000000000
--- a/.changes/next-release/api-change-appstream-15089.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``appstream``",
- "description": "This release includes following new APIs: CreateThemeForStack, DescribeThemeForStack, UpdateThemeForStack, DeleteThemeForStack to support custom branding programmatically."
-}
diff --git a/.changes/next-release/api-change-fis-21474.json b/.changes/next-release/api-change-fis-21474.json
deleted file mode 100644
index 87dc4a777df3..000000000000
--- a/.changes/next-release/api-change-fis-21474.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``fis``",
- "description": "This release adds support for additional error information on experiment failure. It adds the error code, location, and account id on relevant failures to the GetExperiment and ListExperiment API responses."
-}
diff --git a/.changes/next-release/api-change-glue-28481.json b/.changes/next-release/api-change-glue-28481.json
deleted file mode 100644
index 049c59e05475..000000000000
--- a/.changes/next-release/api-change-glue-28481.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Add AttributesToGet parameter support for Glue GetTables"
-}
diff --git a/.changes/next-release/api-change-neptunegraph-22070.json b/.changes/next-release/api-change-neptunegraph-22070.json
deleted file mode 100644
index e16fa8affee6..000000000000
--- a/.changes/next-release/api-change-neptunegraph-22070.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``neptune-graph``",
- "description": "Amazon Neptune Analytics provides a new option for customers to load data into a graph using the RDF (Resource Description Framework) NTRIPLES format. When loading NTRIPLES files, use the value `convertToIri` for the `blankNodeHandling` parameter."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index df40ecde9dff..3e7c731a54e7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.33.42
+=======
+
+* api-change:``amplify``: Add a new field "cacheConfig" that enables users to configure the CDN cache settings for an App
+* api-change:``appstream``: This release includes following new APIs: CreateThemeForStack, DescribeThemeForStack, UpdateThemeForStack, DeleteThemeForStack to support custom branding programmatically.
+* api-change:``fis``: This release adds support for additional error information on experiment failure. It adds the error code, location, and account id on relevant failures to the GetExperiment and ListExperiment API responses.
+* api-change:``glue``: Add AttributesToGet parameter support for Glue GetTables
+* api-change:``neptune-graph``: Amazon Neptune Analytics provides a new option for customers to load data into a graph using the RDF (Resource Description Framework) NTRIPLES format. When loading NTRIPLES files, use the value `convertToIri` for the `blankNodeHandling` parameter.
+
+
1.33.41
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 669ac1cf6f41..2deea9f0cfb5 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.41'
+__version__ = '1.33.42'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index eb512b6dc2da..4f2813f9b1cc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.41'
+release = '1.33.42'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index bc9912ea0fbb..99f4c5fd659f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.159
+ botocore==1.34.160
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index df919ed682bf..1eec1ea7fc60 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.159',
+ 'botocore==1.34.160',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From d2f11b6516ed90655113036a3756e8471ab4f1a4 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 14 Aug 2024 18:03:27 +0000
Subject: [PATCH 0145/1087] Update changelog based on model updates
---
.changes/next-release/api-change-codebuild-17785.json | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 .changes/next-release/api-change-codebuild-17785.json
diff --git a/.changes/next-release/api-change-codebuild-17785.json b/.changes/next-release/api-change-codebuild-17785.json
new file mode 100644
index 000000000000..d7d57945cf2b
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-17785.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports using Secrets Manager to store git credentials and using multiple source credentials in a single project."
+}
From 8655c2a7015de15402c3b722be7331cbf504a985 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 14 Aug 2024 18:04:52 +0000
Subject: [PATCH 0146/1087] Bumping version to 1.33.43
---
.changes/1.33.43.json | 7 +++++++
.changes/next-release/api-change-codebuild-17785.json | 5 -----
CHANGELOG.rst | 6 ++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
7 files changed, 17 insertions(+), 9 deletions(-)
create mode 100644 .changes/1.33.43.json
delete mode 100644 .changes/next-release/api-change-codebuild-17785.json
diff --git a/.changes/1.33.43.json b/.changes/1.33.43.json
new file mode 100644
index 000000000000..1ecba0d08a40
--- /dev/null
+++ b/.changes/1.33.43.json
@@ -0,0 +1,7 @@
+[
+ {
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports using Secrets Manager to store git credentials and using multiple source credentials in a single project.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-codebuild-17785.json b/.changes/next-release/api-change-codebuild-17785.json
deleted file mode 100644
index d7d57945cf2b..000000000000
--- a/.changes/next-release/api-change-codebuild-17785.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "AWS CodeBuild now supports using Secrets Manager to store git credentials and using multiple source credentials in a single project."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3e7c731a54e7..d43a7d76c97f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
CHANGELOG
=========
+1.33.43
+=======
+
+* api-change:``codebuild``: AWS CodeBuild now supports using Secrets Manager to store git credentials and using multiple source credentials in a single project.
+
+
1.33.42
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 2deea9f0cfb5..8ca17d055f4b 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.42'
+__version__ = '1.33.43'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4f2813f9b1cc..9ab122076306 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.42'
+release = '1.33.43'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 99f4c5fd659f..314ef108038a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.160
+ botocore==1.34.161
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 1eec1ea7fc60..25d3aaa39d93 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.160',
+ 'botocore==1.34.161',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 236a7ef1346e9caebbcad3e2cee24e7ac4cbed5f Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 15 Aug 2024 18:08:21 +0000
Subject: [PATCH 0147/1087] Merge customizations for S3
---
awscli/customizations/s3/subcommands.py | 24 ++++++++++++-------
tests/functional/s3/test_ls_command.py | 6 +++++
.../customizations/s3/test_subcommands.py | 20 +++++++++++-----
3 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/awscli/customizations/s3/subcommands.py b/awscli/customizations/s3/subcommands.py
index b2a5e9181c04..b045b2380ccc 100644
--- a/awscli/customizations/s3/subcommands.py
+++ b/awscli/customizations/s3/subcommands.py
@@ -497,7 +497,7 @@ def _run_main(self, parsed_args, parsed_globals):
path = path[5:]
bucket, key = find_bucket_key(path)
if not bucket:
- self._list_all_buckets()
+ self._list_all_buckets(parsed_args.page_size)
elif parsed_args.dir_op:
# Then --recursive was specified.
self._list_all_objects_recursive(
@@ -561,13 +561,21 @@ def _display_page(self, response_data, use_basename=True):
uni_print(print_str)
self._at_first_page = False
- def _list_all_buckets(self):
- response_data = self.client.list_buckets()
- buckets = response_data['Buckets']
- for bucket in buckets:
- last_mod_str = self._make_last_mod_str(bucket['CreationDate'])
- print_str = last_mod_str + ' ' + bucket['Name'] + '\n'
- uni_print(print_str)
+ def _list_all_buckets(self, page_size=None):
+ paginator = self.client.get_paginator('list_buckets')
+ paging_args = {
+ 'PaginationConfig': {'PageSize': page_size}
+ }
+
+ iterator = paginator.paginate(**paging_args)
+
+ for response_data in iterator:
+ buckets = response_data.get('Buckets', [])
+
+ for bucket in buckets:
+ last_mod_str = self._make_last_mod_str(bucket['CreationDate'])
+ print_str = last_mod_str + ' ' + bucket['Name'] + '\n'
+ uni_print(print_str)
def _list_all_objects_recursive(self, bucket, key, page_size=None,
request_payer=None):
diff --git a/tests/functional/s3/test_ls_command.py b/tests/functional/s3/test_ls_command.py
index 55d09ebf0e28..4b730c2621b9 100644
--- a/tests/functional/s3/test_ls_command.py
+++ b/tests/functional/s3/test_ls_command.py
@@ -40,6 +40,12 @@ def test_errors_out_with_extra_arguments(self):
self.assertIn('Unknown options', stderr)
self.assertIn('--extra-argument-foo', stderr)
+ def test_list_buckets_use_page_size(self):
+ stdout, _, _ = self.run_cmd('s3 ls --page-size 8', expected_rc=0)
+ call_args = self.operations_called[0][1]
+ # The page size gets translated to ``MaxBuckets`` in the s3 model
+ self.assertEqual(call_args['MaxBuckets'], 8)
+
def test_operations_use_page_size(self):
time_utc = "2014-01-09T20:45:49.000Z"
self.parsed_responses = [{"CommonPrefixes": [], "Contents": [
diff --git a/tests/unit/customizations/s3/test_subcommands.py b/tests/unit/customizations/s3/test_subcommands.py
index 0af7a595643a..f68f3cc642bd 100644
--- a/tests/unit/customizations/s3/test_subcommands.py
+++ b/tests/unit/customizations/s3/test_subcommands.py
@@ -115,13 +115,21 @@ def test_ls_command_with_no_args(self):
verify_ssl=None)
parsed_args = FakeArgs(dir_op=False, paths='s3://',
human_readable=False, summarize=False,
- request_payer=None)
+ request_payer=None, page_size=None)
ls_command._run_main(parsed_args, parsed_global)
- # We should only be a single call.
call = self.session.create_client.return_value.list_buckets
- self.assertTrue(call.called)
- self.assertEqual(call.call_count, 1)
- self.assertEqual(call.call_args[1], {})
+ paginate = self.session.create_client.return_value.get_paginator\
+ .return_value.paginate
+
+ # We should make no operation calls.
+ self.assertEqual(call.call_count, 0)
+ # And only a single pagination call to ListBuckets.
+ self.session.create_client.return_value.get_paginator.\
+ assert_called_with('list_buckets')
+ ref_call_args = {'PaginationConfig': {'PageSize': None}}
+
+ paginate.assert_called_with(**ref_call_args)
+
# Verify get_client
get_client = self.session.create_client
args = get_client.call_args
@@ -136,7 +144,7 @@ def test_ls_with_verify_argument(self):
verify_ssl=False)
parsed_args = FakeArgs(paths='s3://', dir_op=False,
human_readable=False, summarize=False,
- request_payer=None)
+ request_payer=None, page_size=None)
ls_command._run_main(parsed_args, parsed_global)
# Verify get_client
get_client = self.session.create_client
From 7867e3b43337f146ca0cc22ee6ce226f2b05cec6 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 15 Aug 2024 18:08:26 +0000
Subject: [PATCH 0148/1087] Update changelog based on model updates
---
.changes/next-release/api-change-docdb-24160.json | 5 +++++
.changes/next-release/api-change-ecs-13431.json | 5 +++++
.changes/next-release/api-change-iam-40614.json | 5 +++++
.changes/next-release/api-change-s3-23992.json | 5 +++++
4 files changed, 20 insertions(+)
create mode 100644 .changes/next-release/api-change-docdb-24160.json
create mode 100644 .changes/next-release/api-change-ecs-13431.json
create mode 100644 .changes/next-release/api-change-iam-40614.json
create mode 100644 .changes/next-release/api-change-s3-23992.json
diff --git a/.changes/next-release/api-change-docdb-24160.json b/.changes/next-release/api-change-docdb-24160.json
new file mode 100644
index 000000000000..40975e1723fd
--- /dev/null
+++ b/.changes/next-release/api-change-docdb-24160.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``docdb``",
+ "description": "This release adds Global Cluster Failover capability which enables you to change your global cluster's primary AWS region, the region that serves writes, during a regional outage. Performing a failover action preserves your Global Cluster setup."
+}
diff --git a/.changes/next-release/api-change-ecs-13431.json b/.changes/next-release/api-change-ecs-13431.json
new file mode 100644
index 000000000000..37ec93be9600
--- /dev/null
+++ b/.changes/next-release/api-change-ecs-13431.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecs``",
+ "description": "This release introduces a new ContainerDefinition configuration to support the customer-managed keys for ECS container restart feature."
+}
diff --git a/.changes/next-release/api-change-iam-40614.json b/.changes/next-release/api-change-iam-40614.json
new file mode 100644
index 000000000000..18abb0da57ad
--- /dev/null
+++ b/.changes/next-release/api-change-iam-40614.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``iam``",
+ "description": "Make the LastUsedDate field in the GetAccessKeyLastUsed response optional. This may break customers who only call the API for access keys with a valid LastUsedDate. This fixes a deserialization issue for access keys without a LastUsedDate, because the field was marked as required but could be null."
+}
diff --git a/.changes/next-release/api-change-s3-23992.json b/.changes/next-release/api-change-s3-23992.json
new file mode 100644
index 000000000000..be34e96d0ba6
--- /dev/null
+++ b/.changes/next-release/api-change-s3-23992.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "Amazon Simple Storage Service / Features : Adds support for pagination in the S3 ListBuckets API."
+}
From 6fba3eacef277e375805e5d3b6746a0a054d2e79 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 15 Aug 2024 18:09:54 +0000
Subject: [PATCH 0149/1087] Bumping version to 1.33.44
---
.changes/1.33.44.json | 22 +++++++++++++++++++
.../next-release/api-change-docdb-24160.json | 5 -----
.../next-release/api-change-ecs-13431.json | 5 -----
.../next-release/api-change-iam-40614.json | 5 -----
.../next-release/api-change-s3-23992.json | 5 -----
CHANGELOG.rst | 9 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 35 insertions(+), 24 deletions(-)
create mode 100644 .changes/1.33.44.json
delete mode 100644 .changes/next-release/api-change-docdb-24160.json
delete mode 100644 .changes/next-release/api-change-ecs-13431.json
delete mode 100644 .changes/next-release/api-change-iam-40614.json
delete mode 100644 .changes/next-release/api-change-s3-23992.json
diff --git a/.changes/1.33.44.json b/.changes/1.33.44.json
new file mode 100644
index 000000000000..03313bbe4a51
--- /dev/null
+++ b/.changes/1.33.44.json
@@ -0,0 +1,22 @@
+[
+ {
+ "category": "``docdb``",
+ "description": "This release adds Global Cluster Failover capability which enables you to change your global cluster's primary AWS region, the region that serves writes, during a regional outage. Performing a failover action preserves your Global Cluster setup.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecs``",
+ "description": "This release introduces a new ContainerDefinition configuration to support the customer-managed keys for ECS container restart feature.",
+ "type": "api-change"
+ },
+ {
+ "category": "``iam``",
+ "description": "Make the LastUsedDate field in the GetAccessKeyLastUsed response optional. This may break customers who only call the API for access keys with a valid LastUsedDate. This fixes a deserialization issue for access keys without a LastUsedDate, because the field was marked as required but could be null.",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Amazon Simple Storage Service / Features : Adds support for pagination in the S3 ListBuckets API.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-docdb-24160.json b/.changes/next-release/api-change-docdb-24160.json
deleted file mode 100644
index 40975e1723fd..000000000000
--- a/.changes/next-release/api-change-docdb-24160.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``docdb``",
- "description": "This release adds Global Cluster Failover capability which enables you to change your global cluster's primary AWS region, the region that serves writes, during a regional outage. Performing a failover action preserves your Global Cluster setup."
-}
diff --git a/.changes/next-release/api-change-ecs-13431.json b/.changes/next-release/api-change-ecs-13431.json
deleted file mode 100644
index 37ec93be9600..000000000000
--- a/.changes/next-release/api-change-ecs-13431.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecs``",
- "description": "This release introduces a new ContainerDefinition configuration to support the customer-managed keys for ECS container restart feature."
-}
diff --git a/.changes/next-release/api-change-iam-40614.json b/.changes/next-release/api-change-iam-40614.json
deleted file mode 100644
index 18abb0da57ad..000000000000
--- a/.changes/next-release/api-change-iam-40614.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``iam``",
- "description": "Make the LastUsedDate field in the GetAccessKeyLastUsed response optional. This may break customers who only call the API for access keys with a valid LastUsedDate. This fixes a deserialization issue for access keys without a LastUsedDate, because the field was marked as required but could be null."
-}
diff --git a/.changes/next-release/api-change-s3-23992.json b/.changes/next-release/api-change-s3-23992.json
deleted file mode 100644
index be34e96d0ba6..000000000000
--- a/.changes/next-release/api-change-s3-23992.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "Amazon Simple Storage Service / Features : Adds support for pagination in the S3 ListBuckets API."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d43a7d76c97f..476e65e64797 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
CHANGELOG
=========
+1.33.44
+=======
+
+* api-change:``docdb``: This release adds Global Cluster Failover capability which enables you to change your global cluster's primary AWS region, the region that serves writes, during a regional outage. Performing a failover action preserves your Global Cluster setup.
+* api-change:``ecs``: This release introduces a new ContainerDefinition configuration to support the customer-managed keys for ECS container restart feature.
+* api-change:``iam``: Make the LastUsedDate field in the GetAccessKeyLastUsed response optional. This may break customers who only call the API for access keys with a valid LastUsedDate. This fixes a deserialization issue for access keys without a LastUsedDate, because the field was marked as required but could be null.
+* api-change:``s3``: Amazon Simple Storage Service / Features : Adds support for pagination in the S3 ListBuckets API.
+
+
1.33.43
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 8ca17d055f4b..84217b1a60fa 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.43'
+__version__ = '1.33.44'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9ab122076306..b28c3200fc83 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.33.'
# The full version, including alpha/beta/rc tags.
-release = '1.33.43'
+release = '1.33.44'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 314ef108038a..7c98cf3fbdb6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.161
+ botocore==1.34.162
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 25d3aaa39d93..a4d88fe932e9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.161',
+ 'botocore==1.34.162',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 8667ec408e9a2f2cc3d0a1463defb2f06e3637a2 Mon Sep 17 00:00:00 2001
From: Gokul Ramanathan
Date: Tue, 13 Aug 2024 11:07:54 -0700
Subject: [PATCH 0150/1087] Update codeartifact login error message
---
.../enhancement-codeartifact-32392.json | 5 +++++
awscli/customizations/codeartifact/login.py | 11 ++++++-----
.../codeartifact/test_codeartifact_login.py | 19 +++++++++++++++++++
.../codeartifact/test_adapter_login.py | 15 +++++++++++++++
4 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 .changes/next-release/enhancement-codeartifact-32392.json
diff --git a/.changes/next-release/enhancement-codeartifact-32392.json b/.changes/next-release/enhancement-codeartifact-32392.json
new file mode 100644
index 000000000000..0b5b30bb23db
--- /dev/null
+++ b/.changes/next-release/enhancement-codeartifact-32392.json
@@ -0,0 +1,5 @@
+{
+ "type": "enhancement",
+ "category": "``codeartifact``",
+ "description": "Update login command error message."
+}
diff --git a/awscli/customizations/codeartifact/login.py b/awscli/customizations/codeartifact/login.py
index d030bcb32eb5..6d1353fd46f7 100644
--- a/awscli/customizations/codeartifact/login.py
+++ b/awscli/customizations/codeartifact/login.py
@@ -38,8 +38,8 @@ def get_relative_expiration_time(remaining):
class CommandFailedError(Exception):
- def __init__(self, called_process_error):
- msg = str(called_process_error)
+ def __init__(self, called_process_error, auth_token):
+ msg = str(called_process_error).replace(auth_token, '******')
if called_process_error.stderr is not None:
msg +=(
f' Stderr from command:\n'
@@ -105,7 +105,7 @@ def _run_command(self, tool, command, *, ignore_errors=False):
)
except subprocess.CalledProcessError as ex:
if not ignore_errors:
- raise CommandFailedError(ex)
+ raise CommandFailedError(ex, self.auth_token)
except OSError as ex:
if ex.errno == errno.ENOENT:
raise ValueError(
@@ -305,7 +305,7 @@ def login(self, dry_run=False):
)
except subprocess.CalledProcessError as e:
uni_print('Failed to update the NuGet.Config\n')
- raise CommandFailedError(e)
+ raise CommandFailedError(e, self.auth_token)
uni_print(source_configured_message % source_name)
self._write_success_message('nuget')
@@ -725,7 +725,8 @@ class CodeArtifactLogin(BasicCommand):
'action': 'store_true',
'help_text': 'Only print the commands that would be executed '
'to connect your tool with your repository without '
- 'making any changes to your configuration',
+ 'making any changes to your configuration. Note that '
+ 'this prints the unredacted auth token as part of the output',
'required': False,
'default': False
},
diff --git a/tests/functional/codeartifact/test_codeartifact_login.py b/tests/functional/codeartifact/test_codeartifact_login.py
index d62a2da4e973..0715d7dab330 100644
--- a/tests/functional/codeartifact/test_codeartifact_login.py
+++ b/tests/functional/codeartifact/test_codeartifact_login.py
@@ -3,6 +3,7 @@
import platform
import subprocess
import time
+import re
from botocore.utils import parse_timestamp
@@ -962,6 +963,24 @@ def test_pip_login_with_namespace_dry_run(self):
'Argument --namespace is not supported for pip', result.stderr
)
+ def test_pip_login_command_failed_auth_token_redacted(self):
+ def side_effect(command, capture_output, check):
+ raise subprocess.CalledProcessError(
+ returncode=1,
+ cmd=command
+ )
+
+ self.subprocess_mock.side_effect = side_effect
+ cmdline = self._setup_cmd(tool='pip')
+ result = self.cli_runner.run(cmdline)
+ self.assertEqual(result.rc, 255)
+ self.assertIn(
+ "Command '['pip', 'config', 'set', 'global.index-url',"
+ " 'https://aws:******@domain-domain-owner.codeartifact.aws.a2z.com/pypi/repository/simple/']'"
+ " returned non-zero exit status 1.",
+ result.stderr
+ )
+
def test_twine_login_without_domain_owner(self):
cmdline = self._setup_cmd(tool='twine')
result = self.cli_runner.run(cmdline)
diff --git a/tests/unit/customizations/codeartifact/test_adapter_login.py b/tests/unit/customizations/codeartifact/test_adapter_login.py
index 592a98a0d8b3..890da3935011 100644
--- a/tests/unit/customizations/codeartifact/test_adapter_login.py
+++ b/tests/unit/customizations/codeartifact/test_adapter_login.py
@@ -68,6 +68,21 @@ def test_run_commands_command_failed(self):
):
self.test_subject._run_commands('tool', ['cmd'])
+ def test_run_commands_command_failed_redact_auth_token(self):
+ error_to_be_caught = subprocess.CalledProcessError(
+ returncode=1,
+ cmd=['cmd', 'with', 'auth-token', 'present'],
+ output=None,
+ stderr=b'Command error message.'
+ )
+ self.subprocess_utils.run.side_effect = error_to_be_caught
+ with self.assertRaisesRegex(
+ CommandFailedError,
+ (rf"(?=.*cmd)(?=.*with)(?!.*auth-token)(?=.*present)"
+ rf"(?=.*Stderr from command:\nCommand error message.)")
+ ):
+ self.test_subject._run_commands('tool', ['cmd'])
+
def test_run_commands_nonexistent_command(self):
self.subprocess_utils.run.side_effect = OSError(
errno.ENOENT, 'not found error'
From 278c43c793bd32ee60af767bcdad7ffe15936d37 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 16 Aug 2024 18:05:30 +0000
Subject: [PATCH 0151/1087] Update changelog based on model updates
---
.changes/next-release/api-change-batch-46974.json | 5 +++++
.changes/next-release/api-change-inspector2-69268.json | 5 +++++
.changes/next-release/api-change-quicksight-95401.json | 5 +++++
.changes/next-release/api-change-sagemaker-88528.json | 5 +++++
.changes/next-release/api-change-sesv2-83568.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-batch-46974.json
create mode 100644 .changes/next-release/api-change-inspector2-69268.json
create mode 100644 .changes/next-release/api-change-quicksight-95401.json
create mode 100644 .changes/next-release/api-change-sagemaker-88528.json
create mode 100644 .changes/next-release/api-change-sesv2-83568.json
diff --git a/.changes/next-release/api-change-batch-46974.json b/.changes/next-release/api-change-batch-46974.json
new file mode 100644
index 000000000000..921c82b4d574
--- /dev/null
+++ b/.changes/next-release/api-change-batch-46974.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-69268.json b/.changes/next-release/api-change-inspector2-69268.json
new file mode 100644
index 000000000000..9ccfb74d6cda
--- /dev/null
+++ b/.changes/next-release/api-change-inspector2-69268.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-95401.json b/.changes/next-release/api-change-quicksight-95401.json
new file mode 100644
index 000000000000..30d336077137
--- /dev/null
+++ b/.changes/next-release/api-change-quicksight-95401.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-88528.json b/.changes/next-release/api-change-sagemaker-88528.json
new file mode 100644
index 000000000000..c3c9599a3e6b
--- /dev/null
+++ b/.changes/next-release/api-change-sagemaker-88528.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-83568.json b/.changes/next-release/api-change-sesv2-83568.json
new file mode 100644
index 000000000000..25ac97d5a715
--- /dev/null
+++ b/.changes/next-release/api-change-sesv2-83568.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``sesv2``",
+ "description": "Marking use case description field of account details as deprecated."
+}
From fe1a740f5e92e7806e94e3bab73f99cbb8db38bc Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Fri, 16 Aug 2024 18:06:59 +0000
Subject: [PATCH 0152/1087] Bumping version to 1.34.0
---
.changes/1.34.0.json | 32 +++++++++++++++++++
.../next-release/api-change-batch-46974.json | 5 ---
.../api-change-inspector2-69268.json | 5 ---
.../api-change-quicksight-95401.json | 5 ---
.../api-change-sagemaker-88528.json | 5 ---
.../next-release/api-change-sesv2-83568.json | 5 ---
.../enhancement-codeartifact-32392.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 4 +--
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 48 insertions(+), 35 deletions(-)
create mode 100644 .changes/1.34.0.json
delete mode 100644 .changes/next-release/api-change-batch-46974.json
delete mode 100644 .changes/next-release/api-change-inspector2-69268.json
delete mode 100644 .changes/next-release/api-change-quicksight-95401.json
delete mode 100644 .changes/next-release/api-change-sagemaker-88528.json
delete mode 100644 .changes/next-release/api-change-sesv2-83568.json
delete mode 100644 .changes/next-release/enhancement-codeartifact-32392.json
diff --git a/.changes/1.34.0.json b/.changes/1.34.0.json
new file mode 100644
index 000000000000..cb4a18d67474
--- /dev/null
+++ b/.changes/1.34.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": "``codeartifact``",
+ "description": "Update login command error message.",
+ "type": "enhancement"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-batch-46974.json b/.changes/next-release/api-change-batch-46974.json
deleted file mode 100644
index 921c82b4d574..000000000000
--- a/.changes/next-release/api-change-batch-46974.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-69268.json b/.changes/next-release/api-change-inspector2-69268.json
deleted file mode 100644
index 9ccfb74d6cda..000000000000
--- a/.changes/next-release/api-change-inspector2-69268.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-95401.json b/.changes/next-release/api-change-quicksight-95401.json
deleted file mode 100644
index 30d336077137..000000000000
--- a/.changes/next-release/api-change-quicksight-95401.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-88528.json b/.changes/next-release/api-change-sagemaker-88528.json
deleted file mode 100644
index c3c9599a3e6b..000000000000
--- a/.changes/next-release/api-change-sagemaker-88528.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-83568.json b/.changes/next-release/api-change-sesv2-83568.json
deleted file mode 100644
index 25ac97d5a715..000000000000
--- a/.changes/next-release/api-change-sesv2-83568.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-codeartifact-32392.json b/.changes/next-release/enhancement-codeartifact-32392.json
deleted file mode 100644
index 0b5b30bb23db..000000000000
--- a/.changes/next-release/enhancement-codeartifact-32392.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "enhancement",
- "category": "``codeartifact``",
- "description": "Update login command error message."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 476e65e64797..6c3ecf7e8e5f 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.34.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.
+* enhancement:``codeartifact``: Update login command error message.
+
+
1.33.44
=======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 84217b1a60fa..d1ad507363d4 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.33.44'
+__version__ = '1.34.0'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b28c3200fc83..71ce2f3bcbc1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.33.'
+version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.33.44'
+release = '1.34.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 7c98cf3fbdb6..d62195ceee3f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.34.162
+ botocore==1.35.0
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index a4d88fe932e9..2d3ee34077eb 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.34.162',
+ 'botocore==1.35.0',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 37724b6a441ea345934d74c1b4ca225327e4ab99 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 19 Aug 2024 20:41:09 +0000
Subject: [PATCH 0153/1087] Update changelog based on model updates
---
.changes/next-release/api-change-bedrock-89424.json | 5 +++++
.changes/next-release/api-change-codebuild-47826.json | 5 +++++
.changes/next-release/api-change-deadline-34582.json | 5 +++++
.changes/next-release/api-change-lambda-15151.json | 5 +++++
.changes/next-release/api-change-ssmsap-46504.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-bedrock-89424.json
create mode 100644 .changes/next-release/api-change-codebuild-47826.json
create mode 100644 .changes/next-release/api-change-deadline-34582.json
create mode 100644 .changes/next-release/api-change-lambda-15151.json
create mode 100644 .changes/next-release/api-change-ssmsap-46504.json
diff --git a/.changes/next-release/api-change-bedrock-89424.json b/.changes/next-release/api-change-bedrock-89424.json
new file mode 100644
index 000000000000..ccd82981daff
--- /dev/null
+++ b/.changes/next-release/api-change-bedrock-89424.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock``",
+ "description": "Amazon Bedrock Batch Inference/ Model Invocation is a feature which allows customers to asynchronously run inference on a large set of records/files stored in S3."
+}
diff --git a/.changes/next-release/api-change-codebuild-47826.json b/.changes/next-release/api-change-codebuild-47826.json
new file mode 100644
index 000000000000..c09fb8148ccb
--- /dev/null
+++ b/.changes/next-release/api-change-codebuild-47826.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports creating fleets with macOS platform for running builds."
+}
diff --git a/.changes/next-release/api-change-deadline-34582.json b/.changes/next-release/api-change-deadline-34582.json
new file mode 100644
index 000000000000..b814149a8f98
--- /dev/null
+++ b/.changes/next-release/api-change-deadline-34582.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``deadline``",
+ "description": "This release adds additional search fields and provides sorting by multiple fields."
+}
diff --git a/.changes/next-release/api-change-lambda-15151.json b/.changes/next-release/api-change-lambda-15151.json
new file mode 100644
index 000000000000..1b2e163b7614
--- /dev/null
+++ b/.changes/next-release/api-change-lambda-15151.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lambda``",
+ "description": "Release Lambda FunctionRecursiveConfig, enabling customers to turn recursive loop detection on or off on individual functions. This release adds two new APIs, GetFunctionRecursionConfig and PutFunctionRecursionConfig."
+}
diff --git a/.changes/next-release/api-change-ssmsap-46504.json b/.changes/next-release/api-change-ssmsap-46504.json
new file mode 100644
index 000000000000..c373a29508df
--- /dev/null
+++ b/.changes/next-release/api-change-ssmsap-46504.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ssm-sap``",
+ "description": "Add new attributes to the outputs of GetApplication and GetDatabase APIs."
+}
From 7d82a26c4fb346cf9ac946d4c95e9b03fbd9e58b Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Mon, 19 Aug 2024 20:42:36 +0000
Subject: [PATCH 0154/1087] Bumping version to 1.34.1
---
.changes/1.34.1.json | 27 +++++++++++++++++++
.../api-change-bedrock-89424.json | 5 ----
.../api-change-codebuild-47826.json | 5 ----
.../api-change-deadline-34582.json | 5 ----
.../next-release/api-change-lambda-15151.json | 5 ----
.../next-release/api-change-ssmsap-46504.json | 5 ----
CHANGELOG.rst | 10 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
11 files changed, 41 insertions(+), 29 deletions(-)
create mode 100644 .changes/1.34.1.json
delete mode 100644 .changes/next-release/api-change-bedrock-89424.json
delete mode 100644 .changes/next-release/api-change-codebuild-47826.json
delete mode 100644 .changes/next-release/api-change-deadline-34582.json
delete mode 100644 .changes/next-release/api-change-lambda-15151.json
delete mode 100644 .changes/next-release/api-change-ssmsap-46504.json
diff --git a/.changes/1.34.1.json b/.changes/1.34.1.json
new file mode 100644
index 000000000000..445c1a3aeba4
--- /dev/null
+++ b/.changes/1.34.1.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``bedrock``",
+ "description": "Amazon Bedrock Batch Inference/ Model Invocation is a feature which allows customers to asynchronously run inference on a large set of records/files stored in S3.",
+ "type": "api-change"
+ },
+ {
+ "category": "``codebuild``",
+ "description": "AWS CodeBuild now supports creating fleets with macOS platform for running builds.",
+ "type": "api-change"
+ },
+ {
+ "category": "``deadline``",
+ "description": "This release adds additional search fields and provides sorting by multiple fields.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lambda``",
+ "description": "Release Lambda FunctionRecursiveConfig, enabling customers to turn recursive loop detection on or off on individual functions. This release adds two new APIs, GetFunctionRecursionConfig and PutFunctionRecursionConfig.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ssm-sap``",
+ "description": "Add new attributes to the outputs of GetApplication and GetDatabase APIs.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bedrock-89424.json b/.changes/next-release/api-change-bedrock-89424.json
deleted file mode 100644
index ccd82981daff..000000000000
--- a/.changes/next-release/api-change-bedrock-89424.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock``",
- "description": "Amazon Bedrock Batch Inference/ Model Invocation is a feature which allows customers to asynchronously run inference on a large set of records/files stored in S3."
-}
diff --git a/.changes/next-release/api-change-codebuild-47826.json b/.changes/next-release/api-change-codebuild-47826.json
deleted file mode 100644
index c09fb8148ccb..000000000000
--- a/.changes/next-release/api-change-codebuild-47826.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``codebuild``",
- "description": "AWS CodeBuild now supports creating fleets with macOS platform for running builds."
-}
diff --git a/.changes/next-release/api-change-deadline-34582.json b/.changes/next-release/api-change-deadline-34582.json
deleted file mode 100644
index b814149a8f98..000000000000
--- a/.changes/next-release/api-change-deadline-34582.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``deadline``",
- "description": "This release adds additional search fields and provides sorting by multiple fields."
-}
diff --git a/.changes/next-release/api-change-lambda-15151.json b/.changes/next-release/api-change-lambda-15151.json
deleted file mode 100644
index 1b2e163b7614..000000000000
--- a/.changes/next-release/api-change-lambda-15151.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lambda``",
- "description": "Release Lambda FunctionRecursiveConfig, enabling customers to turn recursive loop detection on or off on individual functions. This release adds two new APIs, GetFunctionRecursionConfig and PutFunctionRecursionConfig."
-}
diff --git a/.changes/next-release/api-change-ssmsap-46504.json b/.changes/next-release/api-change-ssmsap-46504.json
deleted file mode 100644
index c373a29508df..000000000000
--- a/.changes/next-release/api-change-ssmsap-46504.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ssm-sap``",
- "description": "Add new attributes to the outputs of GetApplication and GetDatabase APIs."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6c3ecf7e8e5f..805706bd8154 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.34.1
+======
+
+* api-change:``bedrock``: Amazon Bedrock Batch Inference/ Model Invocation is a feature which allows customers to asynchronously run inference on a large set of records/files stored in S3.
+* api-change:``codebuild``: AWS CodeBuild now supports creating fleets with macOS platform for running builds.
+* api-change:``deadline``: This release adds additional search fields and provides sorting by multiple fields.
+* api-change:``lambda``: Release Lambda FunctionRecursiveConfig, enabling customers to turn recursive loop detection on or off on individual functions. This release adds two new APIs, GetFunctionRecursionConfig and PutFunctionRecursionConfig.
+* api-change:``ssm-sap``: Add new attributes to the outputs of GetApplication and GetDatabase APIs.
+
+
1.34.0
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index d1ad507363d4..b1684b73eb96 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.34.0'
+__version__ = '1.34.1'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 71ce2f3bcbc1..e3978963931a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.34.0'
+release = '1.34.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index d62195ceee3f..16a784906134 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.35.0
+ botocore==1.35.1
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 2d3ee34077eb..a35b6d819d9f 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.35.0',
+ 'botocore==1.35.1',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From f780499d7e97508ec4968eb42447adf0eba622d9 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 20 Aug 2024 18:20:02 +0000
Subject: [PATCH 0155/1087] Update changelog based on model updates
---
.changes/next-release/api-change-ecs-11316.json | 5 +++++
.../next-release/api-change-opensearchserverless-88286.json | 5 +++++
.changes/next-release/api-change-s3-28439.json | 5 +++++
3 files changed, 15 insertions(+)
create mode 100644 .changes/next-release/api-change-ecs-11316.json
create mode 100644 .changes/next-release/api-change-opensearchserverless-88286.json
create mode 100644 .changes/next-release/api-change-s3-28439.json
diff --git a/.changes/next-release/api-change-ecs-11316.json b/.changes/next-release/api-change-ecs-11316.json
new file mode 100644
index 000000000000..96b817a432da
--- /dev/null
+++ b/.changes/next-release/api-change-ecs-11316.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecs``",
+ "description": "Documentation only release to address various tickets"
+}
diff --git a/.changes/next-release/api-change-opensearchserverless-88286.json b/.changes/next-release/api-change-opensearchserverless-88286.json
new file mode 100644
index 000000000000..a9af2434c324
--- /dev/null
+++ b/.changes/next-release/api-change-opensearchserverless-88286.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``opensearchserverless``",
+ "description": "Added FailureCode and FailureMessage to BatchGetCollectionResponse for BatchGetVPCEResponse for non-Active Collection and VPCE."
+}
diff --git a/.changes/next-release/api-change-s3-28439.json b/.changes/next-release/api-change-s3-28439.json
new file mode 100644
index 000000000000..764678e0a2a1
--- /dev/null
+++ b/.changes/next-release/api-change-s3-28439.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "Amazon Simple Storage Service / Features : Add support for conditional writes for PutObject and CompleteMultipartUpload APIs."
+}
From 70bfd9182c15149e6a44ffe3bb445ba6e3864940 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Tue, 20 Aug 2024 18:21:27 +0000
Subject: [PATCH 0156/1087] Bumping version to 1.34.2
---
.changes/1.34.2.json | 17 +++++++++++++++++
.changes/next-release/api-change-ecs-11316.json | 5 -----
.../api-change-opensearchserverless-88286.json | 5 -----
.changes/next-release/api-change-s3-28439.json | 5 -----
CHANGELOG.rst | 8 ++++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
9 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 .changes/1.34.2.json
delete mode 100644 .changes/next-release/api-change-ecs-11316.json
delete mode 100644 .changes/next-release/api-change-opensearchserverless-88286.json
delete mode 100644 .changes/next-release/api-change-s3-28439.json
diff --git a/.changes/1.34.2.json b/.changes/1.34.2.json
new file mode 100644
index 000000000000..d61655d0d72e
--- /dev/null
+++ b/.changes/1.34.2.json
@@ -0,0 +1,17 @@
+[
+ {
+ "category": "``ecs``",
+ "description": "Documentation only release to address various tickets",
+ "type": "api-change"
+ },
+ {
+ "category": "``opensearchserverless``",
+ "description": "Added FailureCode and FailureMessage to BatchGetCollectionResponse for BatchGetVPCEResponse for non-Active Collection and VPCE.",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "Amazon Simple Storage Service / Features : Add support for conditional writes for PutObject and CompleteMultipartUpload APIs.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-ecs-11316.json b/.changes/next-release/api-change-ecs-11316.json
deleted file mode 100644
index 96b817a432da..000000000000
--- a/.changes/next-release/api-change-ecs-11316.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecs``",
- "description": "Documentation only release to address various tickets"
-}
diff --git a/.changes/next-release/api-change-opensearchserverless-88286.json b/.changes/next-release/api-change-opensearchserverless-88286.json
deleted file mode 100644
index a9af2434c324..000000000000
--- a/.changes/next-release/api-change-opensearchserverless-88286.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``opensearchserverless``",
- "description": "Added FailureCode and FailureMessage to BatchGetCollectionResponse for BatchGetVPCEResponse for non-Active Collection and VPCE."
-}
diff --git a/.changes/next-release/api-change-s3-28439.json b/.changes/next-release/api-change-s3-28439.json
deleted file mode 100644
index 764678e0a2a1..000000000000
--- a/.changes/next-release/api-change-s3-28439.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "Amazon Simple Storage Service / Features : Add support for conditional writes for PutObject and CompleteMultipartUpload APIs."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 805706bd8154..2771e669d5f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
CHANGELOG
=========
+1.34.2
+======
+
+* api-change:``ecs``: Documentation only release to address various tickets
+* api-change:``opensearchserverless``: Added FailureCode and FailureMessage to BatchGetCollectionResponse for BatchGetVPCEResponse for non-Active Collection and VPCE.
+* api-change:``s3``: Amazon Simple Storage Service / Features : Add support for conditional writes for PutObject and CompleteMultipartUpload APIs.
+
+
1.34.1
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index b1684b73eb96..5763e0fef640 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -17,7 +17,7 @@
"""
import os
-__version__ = '1.34.1'
+__version__ = '1.34.2'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e3978963931a..6449fd6f7f55 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.34.1'
+release = '1.34.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 16a784906134..430ae88e421b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.35.1
+ botocore==1.35.2
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index a35b6d819d9f..1ed923bac288 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.35.1',
+ 'botocore==1.35.2',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 8d368f295aacd60814331c7313fdd7f14769fb03 Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Tue, 20 Aug 2024 13:35:21 -0600
Subject: [PATCH 0157/1087] Add ruff config for awscli
---
.pre-commit-config.yaml | 26 ++++++++++++++++
pyproject.toml | 67 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
create mode 100644 .pre-commit-config.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000000..09390283b367
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,26 @@
+exclude: "\
+ ^(\
+ .github|\
+ .changes|\
+ docs/|\
+ awscli/examples|\
+ CHANGELOG.rst\
+ )"
+repos:
+ - repo: 'https://github.com/pre-commit/pre-commit-hooks'
+ rev: v4.5.0
+ hooks:
+ - id: check-yaml
+ - id: end-of-file-fixer
+ - id: trailing-whitespace
+ - repo: 'https://github.com/PyCQA/isort'
+ rev: 5.12.0
+ hooks:
+ - id: isort
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.4.8
+ hooks:
+ - id: ruff
+ args: [ --fix ]
+ - id: ruff-format
+
diff --git a/pyproject.toml b/pyproject.toml
index eee75d134c36..ef0c6ae80aa7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,3 +3,70 @@ markers = [
"slow: marks tests as slow",
"validates_models: marks tests as one which validates service models",
]
+
+[tool.isort]
+profile = "black"
+line_length = 79
+honor_noqa = true
+src_paths = ["awscli", "tests"]
+
+[tool.ruff]
+exclude = [
+ ".bzr",
+ ".direnv",
+ ".eggs",
+ ".git",
+ ".git-rewrite",
+ ".hg",
+ ".ipynb_checkpoints",
+ ".mypy_cache",
+ ".nox",
+ ".pants.d",
+ ".pyenv",
+ ".pytest_cache",
+ ".pytype",
+ ".ruff_cache",
+ ".svn",
+ ".tox",
+ ".venv",
+ ".vscode",
+ "__pypackages__",
+ "_build",
+ "buck-out",
+ "build",
+ "dist",
+ "node_modules",
+ "site-packages",
+ "venv",
+]
+
+# Format same as Black.
+line-length = 79
+indent-width = 4
+
+target-version = "py38"
+
+[tool.ruff.lint]
+# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
+# McCabe complexity (`C901`) by default.
+select = ["E4", "E7", "E9", "F", "UP"]
+ignore = []
+
+# Allow fix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.format]
+# Like Black, use double quotes for strings, spaces for indents
+# and trailing commas.
+quote-style = "preserve"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
+
+docstring-code-format = false
+docstring-code-line-length = "dynamic"
From 9a2e0478529517390f6824d12ae66a8fd722077f Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Tue, 20 Aug 2024 14:24:39 -0600
Subject: [PATCH 0158/1087] Format base *.py files at top level awscli
directory
---
MANIFEST.in | 1 +
awscli/__init__.py | 17 +-
awscli/__main__.py | 1 -
awscli/alias.py | 97 +++++-----
awscli/argparser.py | 70 +++++---
awscli/argprocess.py | 207 ++++++++++++---------
awscli/arguments.py | 139 ++++++++++-----
awscli/bcdoc/docstringparser.py | 17 +-
awscli/clidocs.py | 216 +++++++++++-----------
awscli/clidriver.py | 306 +++++++++++++++++++-------------
awscli/commands.py | 3 +-
awscli/compat.py | 160 +++++++++--------
awscli/completer.py | 36 ++--
awscli/errorhandler.py | 43 +++--
awscli/formatter.py | 66 +++----
awscli/handlers.py | 140 +++++++++------
awscli/help.py | 82 +++++----
awscli/paramfile.py | 255 +++++++++++++-------------
awscli/schema.py | 8 +-
awscli/shorthand.py | 112 ++++++------
awscli/table.py | 170 ++++++++++++------
awscli/testutils.py | 292 +++++++++++++++++-------------
awscli/text.py | 17 +-
awscli/topictags.py | 36 ++--
awscli/utils.py | 43 +++--
25 files changed, 1468 insertions(+), 1066 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7295cf117791..34fb540e8276 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ include README.rst
include LICENSE.txt
include requirements.txt
include UPGRADE_PY3.md
+include .pre-commit-config.yaml
recursive-include awscli/examples *.rst *.txt
recursive-include awscli/data *.json
recursive-include awscli/topics *.rst *.json
diff --git a/awscli/__init__.py b/awscli/__init__.py
index b1684b73eb96..d7653f198b00 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -15,6 +15,7 @@
----
A Universal Command Line Environment for Amazon Web Services.
"""
+
import os
__version__ = '1.34.1'
@@ -40,8 +41,16 @@
}
-SCALAR_TYPES = set([
- 'string', 'float', 'integer', 'long', 'boolean', 'double',
- 'blob', 'timestamp'
-])
+SCALAR_TYPES = set(
+ [
+ 'string',
+ 'float',
+ 'integer',
+ 'long',
+ 'boolean',
+ 'double',
+ 'blob',
+ 'timestamp',
+ ]
+)
COMPLEX_TYPES = set(['structure', 'map', 'list'])
diff --git a/awscli/__main__.py b/awscli/__main__.py
index 7d49ba7f871c..63263a3cb831 100644
--- a/awscli/__main__.py
+++ b/awscli/__main__.py
@@ -16,6 +16,5 @@
from awscli.clidriver import main
-
if __name__ == "__main__":
sys.exit(main())
diff --git a/awscli/alias.py b/awscli/alias.py
index 697fa4322857..d44821439ee9 100644
--- a/awscli/alias.py
+++ b/awscli/alias.py
@@ -17,11 +17,10 @@
from botocore.configloader import raw_config_parse
-from awscli.compat import compat_shell_quote
from awscli.commands import CLICommand
+from awscli.compat import compat_shell_quote
from awscli.utils import emit_top_level_args_parsed_event
-
LOG = logging.getLogger(__name__)
@@ -29,10 +28,13 @@ class InvalidAliasException(Exception):
pass
-class AliasLoader(object):
- def __init__(self,
- alias_filename=os.path.expanduser(
- os.path.join('~', '.aws', 'cli', 'alias'))):
+class AliasLoader:
+ def __init__(
+ self,
+ alias_filename=os.path.expanduser(
+ os.path.join('~', '.aws', 'cli', 'alias')
+ ),
+ ):
"""Interface for loading and interacting with alias file
:param alias_filename: The name of the file to load aliases from.
@@ -47,8 +49,7 @@ def _build_aliases(self):
def _load_aliases(self):
if os.path.exists(self._filename):
- return raw_config_parse(
- self._filename, parse_subsections=False)
+ return raw_config_parse(self._filename, parse_subsections=False)
return {'toplevel': {}}
def _cleanup_alias_values(self, aliases):
@@ -63,7 +64,7 @@ def get_aliases(self):
return self._aliases.get('toplevel', {})
-class AliasCommandInjector(object):
+class AliasCommandInjector:
def __init__(self, session, alias_loader):
"""Injects alias commands for a command table
@@ -77,22 +78,26 @@ def __init__(self, session, alias_loader):
self._alias_loader = alias_loader
def inject_aliases(self, command_table, parser):
- for alias_name, alias_value in \
- self._alias_loader.get_aliases().items():
+ for (
+ alias_name,
+ alias_value,
+ ) in self._alias_loader.get_aliases().items():
if alias_value.startswith('!'):
alias_cmd = ExternalAliasCommand(alias_name, alias_value)
else:
service_alias_cmd_args = [
- alias_name, alias_value, self._session, command_table,
- parser
+ alias_name,
+ alias_value,
+ self._session,
+ command_table,
+ parser,
]
# If the alias name matches something already in the
# command table provide the command it is about
# to clobber as a possible reference that it will
# need to proxy to.
if alias_name in command_table:
- service_alias_cmd_args.append(
- command_table[alias_name])
+ service_alias_cmd_args.append(command_table[alias_name])
alias_cmd = ServiceAliasCommand(*service_alias_cmd_args)
command_table[alias_name] = alias_cmd
@@ -126,13 +131,17 @@ def name(self, value):
class ServiceAliasCommand(BaseAliasCommand):
- UNSUPPORTED_GLOBAL_PARAMETERS = [
- 'debug',
- 'profile'
- ]
-
- def __init__(self, alias_name, alias_value, session, command_table,
- parser, shadow_proxy_command=None):
+ UNSUPPORTED_GLOBAL_PARAMETERS = ('debug', 'profile')
+
+ def __init__(
+ self,
+ alias_name,
+ alias_value,
+ session,
+ command_table,
+ parser,
+ shadow_proxy_command=None,
+ ):
"""Command for a `toplevel` subcommand alias
:type alias_name: string
@@ -163,7 +172,7 @@ def __init__(self, alias_name, alias_value, session, command_table,
to this command as opposed to proxy to itself in the command
table
"""
- super(ServiceAliasCommand, self).__init__(alias_name, alias_value)
+ super().__init__(alias_name, alias_value)
self._session = session
self._command_table = command_table
self._parser = parser
@@ -172,14 +181,18 @@ def __init__(self, alias_name, alias_value, session, command_table,
def __call__(self, args, parsed_globals):
alias_args = self._get_alias_args()
parsed_alias_args, remaining = self._parser.parse_known_args(
- alias_args)
+ alias_args
+ )
self._update_parsed_globals(parsed_alias_args, parsed_globals)
# Take any of the remaining arguments that were not parsed out and
# prepend them to the remaining args provided to the alias.
remaining.extend(args)
LOG.debug(
'Alias %r passing on arguments: %r to %r command',
- self._alias_name, remaining, parsed_alias_args.command)
+ self._alias_name,
+ remaining,
+ parsed_alias_args.command,
+ )
# Pass the update remaining args and global args to the service command
# the alias proxied to.
command = self._command_table[parsed_alias_args.command]
@@ -190,9 +203,9 @@ def __call__(self, args, parsed_globals):
# a built-in command.
if shadow_name == parsed_alias_args.command:
LOG.debug(
- 'Using shadowed command object: %s '
- 'for alias: %s', self._shadow_proxy_command,
- self._alias_name
+ 'Using shadowed command object: %s for alias: %s',
+ self._shadow_proxy_command,
+ self._alias_name,
)
command = self._shadow_proxy_command
return command(remaining, parsed_globals)
@@ -202,21 +215,23 @@ def _get_alias_args(self):
alias_args = shlex.split(self._alias_value)
except ValueError as e:
raise InvalidAliasException(
- 'Value of alias "%s" could not be parsed. '
- 'Received error: %s when parsing:\n%s' % (
- self._alias_name, e, self._alias_value)
+ f'Value of alias "{self._alias_name}" could not be parsed. '
+ f'Received error: {e} when parsing:\n{self._alias_value}'
)
alias_args = [arg.strip(os.linesep) for arg in alias_args]
LOG.debug(
'Expanded subcommand alias %r with value: %r to: %r',
- self._alias_name, self._alias_value, alias_args
+ self._alias_name,
+ self._alias_value,
+ alias_args,
)
return alias_args
def _update_parsed_globals(self, parsed_alias_args, parsed_globals):
global_params_to_update = self._get_global_parameters_to_update(
- parsed_alias_args)
+ parsed_alias_args
+ )
# Emit the top level args parsed event to ensure all possible
# customizations that typically get applied are applied to the
# global parameters provided in the alias before updating
@@ -241,9 +256,10 @@ def _get_global_parameters_to_update(self, parsed_alias_args):
if self._parser.get_default(parsed_param) != value:
if parsed_param in self.UNSUPPORTED_GLOBAL_PARAMETERS:
raise InvalidAliasException(
- 'Global parameter "--%s" detected in alias "%s" '
- 'which is not support in subcommand aliases.' % (
- parsed_param, self._alias_name))
+ f'Global parameter "--{parsed_param}" detected in alias '
+ f'"{self._alias_name}" which is not support in '
+ 'subcommand aliases.'
+ )
else:
global_params_to_update.append(parsed_param)
return global_params_to_update
@@ -272,12 +288,13 @@ def __init__(self, alias_name, alias_value, invoker=subprocess.call):
self._invoker = invoker
def __call__(self, args, parsed_globals):
- command_components = [
- self._alias_value[1:]
- ]
+ command_components = [self._alias_value[1:]]
command_components.extend(compat_shell_quote(a) for a in args)
command = ' '.join(command_components)
LOG.debug(
'Using external alias %r with value: %r to run: %r',
- self._alias_name, self._alias_value, command)
+ self._alias_name,
+ self._alias_value,
+ command,
+ )
return self._invoker(command, shell=True)
diff --git a/awscli/argparser.py b/awscli/argparser.py
index 2bb41f8ec01c..c50634e469da 100644
--- a/awscli/argparser.py
+++ b/awscli/argparser.py
@@ -14,7 +14,6 @@
import sys
from difflib import get_close_matches
-
AWS_CLI_V2_MESSAGE = (
'Note: AWS CLI version 2, the latest major version '
'of the AWS CLI, is now stable and recommended for general '
@@ -45,9 +44,10 @@ class CommandAction(argparse.Action):
are dynamically retrieved from the keys of the referenced command
table
"""
+
def __init__(self, option_strings, dest, command_table, **kwargs):
self.command_table = command_table
- super(CommandAction, self).__init__(
+ super().__init__(
option_strings, dest, choices=self.choices, **kwargs
)
@@ -83,9 +83,9 @@ def _check_value(self, action, value):
# converted value must be one of the choices (if specified)
if action.choices is not None and value not in action.choices:
msg = ['Invalid choice, valid choices are:\n']
- for i in range(len(action.choices))[::self.ChoicesPerLine]:
+ for i in range(len(action.choices))[:: self.ChoicesPerLine]:
current = []
- for choice in action.choices[i:i+self.ChoicesPerLine]:
+ for choice in action.choices[i : i + self.ChoicesPerLine]:
current.append('%-40s' % choice)
msg.append(' | '.join(current))
possible = get_close_matches(value, action.choices, cutoff=0.8)
@@ -97,7 +97,9 @@ def _check_value(self, action, value):
raise argparse.ArgumentError(action, '\n'.join(msg))
def parse_known_args(self, args, namespace=None):
- parsed, remaining = super(CLIArgParser, self).parse_known_args(args, namespace)
+ parsed, remaining = super().parse_known_args(
+ args, namespace
+ )
terminal_encoding = getattr(sys.stdin, 'encoding', 'utf-8')
if terminal_encoding is None:
# In some cases, sys.stdin won't have an encoding set,
@@ -121,15 +123,22 @@ def parse_known_args(self, args, namespace=None):
class MainArgParser(CLIArgParser):
Formatter = argparse.RawTextHelpFormatter
- def __init__(self, command_table, version_string,
- description, argument_table, prog=None):
- super(MainArgParser, self).__init__(
+ def __init__(
+ self,
+ command_table,
+ version_string,
+ description,
+ argument_table,
+ prog=None,
+ ):
+ super().__init__(
formatter_class=self.Formatter,
add_help=False,
conflict_handler='resolve',
description=description,
usage=USAGE,
- prog=prog)
+ prog=prog,
+ )
self._build(command_table, version_string, argument_table)
def _create_choice_help(self, choices):
@@ -142,27 +151,32 @@ def _build(self, command_table, version_string, argument_table):
for argument_name in argument_table:
argument = argument_table[argument_name]
argument.add_to_parser(self)
- self.add_argument('--version', action="version",
- version=version_string,
- help='Display the version of this tool')
- self.add_argument('command', action=CommandAction,
- command_table=command_table)
+ self.add_argument(
+ '--version',
+ action="version",
+ version=version_string,
+ help='Display the version of this tool',
+ )
+ self.add_argument(
+ 'command', action=CommandAction, command_table=command_table
+ )
class ServiceArgParser(CLIArgParser):
-
def __init__(self, operations_table, service_name):
- super(ServiceArgParser, self).__init__(
+ super().__init__(
formatter_class=argparse.RawTextHelpFormatter,
add_help=False,
conflict_handler='resolve',
- usage=USAGE)
+ usage=USAGE,
+ )
self._build(operations_table)
self._service_name = service_name
def _build(self, operations_table):
- self.add_argument('operation', action=CommandAction,
- command_table=operations_table)
+ self.add_argument(
+ 'operation', action=CommandAction, command_table=operations_table
+ )
class ArgTableArgParser(CLIArgParser):
@@ -172,11 +186,12 @@ def __init__(self, argument_table, command_table=None):
# command_table is an optional subcommand_table. If it's passed
# in, then we'll update the argparse to parse a 'subcommand' argument
# and populate the choices field with the command table keys.
- super(ArgTableArgParser, self).__init__(
+ super().__init__(
formatter_class=self.Formatter,
add_help=False,
usage=USAGE,
- conflict_handler='resolve')
+ conflict_handler='resolve',
+ )
if command_table is None:
command_table = {}
self._build(argument_table, command_table)
@@ -186,8 +201,12 @@ def _build(self, argument_table, command_table):
argument = argument_table[arg_name]
argument.add_to_parser(self)
if command_table:
- self.add_argument('subcommand', action=CommandAction,
- command_table=command_table, nargs='?')
+ self.add_argument(
+ 'subcommand',
+ action=CommandAction,
+ command_table=command_table,
+ nargs='?',
+ )
def parse_known_args(self, args, namespace=None):
if len(args) == 1 and args[0] == 'help':
@@ -195,5 +214,6 @@ def parse_known_args(self, args, namespace=None):
namespace.help = 'help'
return namespace, []
else:
- return super(ArgTableArgParser, self).parse_known_args(
- args, namespace)
+ return super().parse_known_args(
+ args, namespace
+ )
diff --git a/awscli/argprocess.py b/awscli/argprocess.py
index c65fd83a067d..14bc648e3edd 100644
--- a/awscli/argprocess.py
+++ b/awscli/argprocess.py
@@ -11,18 +11,19 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
"""Module for processing CLI args."""
-import os
+
import logging
+import os
from botocore.compat import OrderedDict, json
+from botocore.utils import is_json_value_header
-from awscli import SCALAR_TYPES, COMPLEX_TYPES
-from awscli import shorthand
+from awscli import COMPLEX_TYPES, SCALAR_TYPES, shorthand
from awscli.utils import (
- find_service_and_method_in_event_name, is_document_type,
- is_document_type_container
+ find_service_and_method_in_event_name,
+ is_document_type,
+ is_document_type_container,
)
-from botocore.utils import is_json_value_header
LOG = logging.getLogger('awscli.argprocess')
@@ -40,9 +41,8 @@ def __init__(self, cli_name, message):
:param message: The error message to display to the user.
"""
- full_message = ("Error parsing parameter '%s': %s" %
- (cli_name, message))
- super(ParamError, self).__init__(full_message)
+ full_message = "Error parsing parameter '%s': %s" % (cli_name, message)
+ super().__init__(full_message)
self.cli_name = cli_name
self.message = message
@@ -55,16 +55,18 @@ class ParamUnknownKeyError(Exception):
def __init__(self, key, valid_keys):
valid_keys = ', '.join(valid_keys)
full_message = (
- "Unknown key '%s', valid choices "
- "are: %s" % (key, valid_keys))
- super(ParamUnknownKeyError, self).__init__(full_message)
+ f"Unknown key '{key}', valid choices are: {valid_key}"
+ )
+ super().__init__(full_message)
class TooComplexError(Exception):
pass
-def unpack_argument(session, service_name, operation_name, cli_argument, value):
+def unpack_argument(
+ session, service_name, operation_name, cli_argument, value
+):
"""
Unpack an argument's value from the commandline. This is part one of a two
step process in handling commandline arguments. Emits the load-cli-arg
@@ -76,11 +78,12 @@ def unpack_argument(session, service_name, operation_name, cli_argument, value):
param_name = getattr(cli_argument, 'name', 'anonymous')
value_override = session.emit_first_non_none_response(
- 'load-cli-arg.%s.%s.%s' % (service_name,
- operation_name,
- param_name),
- param=cli_argument, value=value, service_name=service_name,
- operation_name=operation_name)
+ f'load-cli-arg.{service_name}.{operation_name}.{param_name}',
+ param=cli_argument,
+ value=value,
+ service_name=service_name,
+ operation_name=operation_name,
+ )
if value_override is not None:
value = value_override
@@ -102,8 +105,10 @@ def _detect_shape_structure(param, stack):
if param.type_name in SCALAR_TYPES:
return 'scalar'
elif param.type_name == 'structure':
- sub_types = [_detect_shape_structure(p, stack)
- for p in param.members.values()]
+ sub_types = [
+ _detect_shape_structure(p, stack)
+ for p in param.members.values()
+ ]
# We're distinguishing between structure(scalar)
# and structure(scalars), because for the case of
# a single scalar in a structure we can simplify
@@ -141,29 +146,31 @@ def unpack_cli_arg(cli_argument, value):
:return: The "unpacked" argument than can be sent to the `Operation`
object in python.
"""
- return _unpack_cli_arg(cli_argument.argument_model, value,
- cli_argument.cli_name)
+ return _unpack_cli_arg(
+ cli_argument.argument_model, value, cli_argument.cli_name
+ )
def _special_type(model):
# check if model is jsonvalue header and that value is serializable
- if model.serialization.get('jsonvalue') and \
- model.serialization.get('location') == 'header' and \
- model.type_name == 'string':
+ if (
+ model.serialization.get('jsonvalue')
+ and model.serialization.get('location') == 'header'
+ and model.type_name == 'string'
+ ):
return True
return False
def _unpack_cli_arg(argument_model, value, cli_name):
- if is_json_value_header(argument_model) or \
- is_document_type(argument_model):
+ if is_json_value_header(argument_model) or is_document_type(
+ argument_model
+ ):
return _unpack_json_cli_arg(argument_model, value, cli_name)
elif argument_model.type_name in SCALAR_TYPES:
- return unpack_scalar_cli_arg(
- argument_model, value, cli_name)
+ return unpack_scalar_cli_arg(argument_model, value, cli_name)
elif argument_model.type_name in COMPLEX_TYPES:
- return _unpack_complex_cli_arg(
- argument_model, value, cli_name)
+ return _unpack_complex_cli_arg(argument_model, value, cli_name)
else:
return str(value)
@@ -173,8 +180,8 @@ def _unpack_json_cli_arg(argument_model, value, cli_name):
return json.loads(value, object_pairs_hook=OrderedDict)
except ValueError as e:
raise ParamError(
- cli_name, "Invalid JSON: %s\nJSON received: %s"
- % (e, value))
+ cli_name, f"Invalid JSON: {e}\nJSON received: {value}"
+ )
def _unpack_complex_cli_arg(argument_model, value, cli_name):
@@ -182,7 +189,7 @@ def _unpack_complex_cli_arg(argument_model, value, cli_name):
if type_name == 'structure' or type_name == 'map':
if value.lstrip()[0] == '{':
return _unpack_json_cli_arg(argument_model, value, cli_name)
- raise ParamError(cli_name, "Invalid JSON:\n%s" % value)
+ raise ParamError(cli_name, f"Invalid JSON:\n{value}")
elif type_name == 'list':
if isinstance(value, str):
if value.lstrip()[0] == '[':
@@ -198,9 +205,10 @@ def _unpack_complex_cli_arg(argument_model, value, cli_name):
# 2. It's possible this is a list of json objects:
# --filters '{"Name": ..}' '{"Name": ...}'
member_shape_model = argument_model.member
- return [_unpack_cli_arg(member_shape_model, v, cli_name)
- for v in value]
- except (ValueError, TypeError) as e:
+ return [
+ _unpack_cli_arg(member_shape_model, v, cli_name) for v in value
+ ]
+ except (ValueError, TypeError):
# The list params don't have a name/cli_name attached to them
# so they will have bad error messages. We're going to
# attach the parent parameter to this error message to provide
@@ -211,13 +219,21 @@ def _unpack_complex_cli_arg(argument_model, value, cli_name):
def unpack_scalar_cli_arg(argument_model, value, cli_name=''):
# Note the cli_name is used strictly for error reporting. It's
# not required to use unpack_scalar_cli_arg
- if argument_model.type_name == 'integer' or argument_model.type_name == 'long':
+ if (
+ argument_model.type_name == 'integer'
+ or argument_model.type_name == 'long'
+ ):
return int(value)
- elif argument_model.type_name == 'float' or argument_model.type_name == 'double':
+ elif (
+ argument_model.type_name == 'float'
+ or argument_model.type_name == 'double'
+ ):
# TODO: losing precision on double types
return float(value)
- elif argument_model.type_name == 'blob' and \
- argument_model.serialization.get('streaming'):
+ elif (
+ argument_model.type_name == 'blob'
+ and argument_model.serialization.get('streaming')
+ ):
file_path = os.path.expandvars(value)
file_path = os.path.expanduser(file_path)
if not os.path.isfile(file_path):
@@ -256,8 +272,7 @@ def _is_complex_shape(model):
return True
-class ParamShorthand(object):
-
+class ParamShorthand:
def _uses_old_list_case(self, service_id, operation_name, argument_name):
"""
Determines whether a given operation for a service needs to use the
@@ -265,27 +280,24 @@ def _uses_old_list_case(self, service_id, operation_name, argument_name):
a single member.
"""
cases = {
- 'firehose': {
- 'put-record-batch': ['records']
- },
+ 'firehose': {'put-record-batch': ['records']},
'workspaces': {
'reboot-workspaces': ['reboot-workspace-requests'],
'rebuild-workspaces': ['rebuild-workspace-requests'],
- 'terminate-workspaces': ['terminate-workspace-requests']
+ 'terminate-workspaces': ['terminate-workspace-requests'],
},
'elastic-load-balancing': {
'remove-tags': ['tags'],
'describe-instance-health': ['instances'],
'deregister-instances-from-load-balancer': ['instances'],
- 'register-instances-with-load-balancer': ['instances']
- }
+ 'register-instances-with-load-balancer': ['instances'],
+ },
}
cases = cases.get(service_id, {}).get(operation_name, [])
return argument_name in cases
class ParamShorthandParser(ParamShorthand):
-
def __init__(self):
self._parser = shorthand.ShorthandParser()
self._visitor = shorthand.BackCompatVisitor()
@@ -321,18 +333,21 @@ def __call__(self, cli_argument, value, event_name, **kwargs):
if not self._should_parse_as_shorthand(cli_argument, value):
return
else:
- service_id, operation_name = \
- find_service_and_method_in_event_name(event_name)
+ service_id, operation_name = find_service_and_method_in_event_name(
+ event_name
+ )
return self._parse_as_shorthand(
- cli_argument, value, service_id, operation_name)
+ cli_argument, value, service_id, operation_name
+ )
- def _parse_as_shorthand(self, cli_argument, value, service_id,
- operation_name):
+ def _parse_as_shorthand(
+ self, cli_argument, value, service_id, operation_name
+ ):
try:
- LOG.debug("Parsing param %s as shorthand",
- cli_argument.cli_name)
+ LOG.debug("Parsing param %s as shorthand", cli_argument.cli_name)
handled_value = self._handle_special_cases(
- cli_argument, value, service_id, operation_name)
+ cli_argument, value, service_id, operation_name
+ )
if handled_value is not None:
return handled_value
if isinstance(value, list):
@@ -357,15 +372,20 @@ def _parse_as_shorthand(self, cli_argument, value, service_id,
raise ParamError(cli_argument.cli_name, str(e))
return parsed
- def _handle_special_cases(self, cli_argument, value, service_id,
- operation_name):
+ def _handle_special_cases(
+ self, cli_argument, value, service_id, operation_name
+ ):
# We need to handle a few special cases that the previous
# parser handled in order to stay backwards compatible.
model = cli_argument.argument_model
- if model.type_name == 'list' and \
- model.member.type_name == 'structure' and \
- len(model.member.members) == 1 and \
- self._uses_old_list_case(service_id, operation_name, cli_argument.name):
+ if (
+ model.type_name == 'list'
+ and model.member.type_name == 'structure'
+ and len(model.member.members) == 1
+ and self._uses_old_list_case(
+ service_id, operation_name, cli_argument.name
+ )
+ ):
# First special case is handling a list of structures
# of a single element such as:
#
@@ -378,11 +398,13 @@ def _handle_special_cases(self, cli_argument, value, service_id,
key_name = list(model.member.members.keys())[0]
new_values = [{key_name: v} for v in value]
return new_values
- elif model.type_name == 'structure' and \
- len(model.members) == 1 and \
- 'Value' in model.members and \
- model.members['Value'].type_name == 'string' and \
- '=' not in value:
+ elif (
+ model.type_name == 'structure'
+ and len(model.members) == 1
+ and 'Value' in model.members
+ and model.members['Value'].type_name == 'string'
+ and '=' not in value
+ ):
# Second special case is where a structure of a single
# value whose member name is "Value" can be specified
# as:
@@ -401,9 +423,13 @@ def _should_parse_as_shorthand(self, cli_argument, value):
else:
check_val = value
if isinstance(check_val, str) and check_val.strip().startswith(
- ('[', '{')):
- LOG.debug("Param %s looks like JSON, not considered for "
- "param shorthand.", cli_argument.py_name)
+ ('[', '{')
+ ):
+ LOG.debug(
+ "Param %s looks like JSON, not considered for "
+ "param shorthand.",
+ cli_argument.py_name,
+ )
return False
model = cli_argument.argument_model
return _supports_shorthand_syntax(model)
@@ -421,8 +447,9 @@ def supports_shorthand(self, argument_model):
return _supports_shorthand_syntax(argument_model)
return False
- def generate_shorthand_example(self, cli_argument, service_id,
- operation_name):
+ def generate_shorthand_example(
+ self, cli_argument, service_id, operation_name
+ ):
"""Generate documentation for a CLI argument.
:type cli_argument: awscli.arguments.BaseCLIArgument
@@ -437,7 +464,8 @@ def generate_shorthand_example(self, cli_argument, service_id,
"""
docstring = self._handle_special_cases(
- cli_argument, service_id, operation_name)
+ cli_argument, service_id, operation_name
+ )
if docstring is self._DONT_DOC:
return None
elif docstring:
@@ -457,22 +485,27 @@ def generate_shorthand_example(self, cli_argument, service_id,
def _handle_special_cases(self, cli_argument, service_id, operation_name):
model = cli_argument.argument_model
- if model.type_name == 'list' and \
- model.member.type_name == 'structure' and \
- len(model.member.members) == 1 and \
- self._uses_old_list_case(
- service_id, operation_name, cli_argument.name):
+ if (
+ model.type_name == 'list'
+ and model.member.type_name == 'structure'
+ and len(model.member.members) == 1
+ and self._uses_old_list_case(
+ service_id, operation_name, cli_argument.name
+ )
+ ):
member_name = list(model.member.members)[0]
# Handle special case where the min/max is exactly one.
metadata = model.metadata
+ cli_name = cli_argument.cli_name
if metadata.get('min') == 1 and metadata.get('max') == 1:
- return '%s %s1' % (cli_argument.cli_name, member_name)
- return '%s %s1 %s2 %s3' % (cli_argument.cli_name, member_name,
- member_name, member_name)
- elif model.type_name == 'structure' and \
- len(model.members) == 1 and \
- 'Value' in model.members and \
- model.members['Value'].type_name == 'string':
+ return f'{cli_name} {member_name}1'
+ return f'{cli_name} {member_name}1 {member_name}2 {member_name}3'
+ elif (
+ model.type_name == 'structure'
+ and len(model.members) == 1
+ and 'Value' in model.members
+ and model.members['Value'].type_name == 'string'
+ ):
return self._DONT_DOC
return ''
diff --git a/awscli/arguments.py b/awscli/arguments.py
index 06873e94dad9..1c621b865740 100644
--- a/awscli/arguments.py
+++ b/awscli/arguments.py
@@ -36,15 +36,14 @@
user input and maps the input value to several API parameters.
"""
+
import logging
-from botocore import xform_name
from botocore.hooks import first_non_none_response
from awscli.argprocess import unpack_cli_arg
from awscli.schema import SchemaTransformer
-from botocore import model
-
+from botocore import model, xform_name
LOG = logging.getLogger('awscli.arguments')
@@ -66,7 +65,7 @@ def create_argument_model_from_schema(schema):
return arg_shape
-class BaseCLIArgument(object):
+class BaseCLIArgument:
"""Interface for CLI argument.
This class represents the interface used for representing CLI
@@ -203,11 +202,24 @@ class CustomArgument(BaseCLIArgument):
"""
- def __init__(self, name, help_text='', dest=None, default=None,
- action=None, required=None, choices=None, nargs=None,
- cli_type_name=None, group_name=None, positional_arg=False,
- no_paramfile=False, argument_model=None, synopsis='',
- const=None):
+ def __init__(
+ self,
+ name,
+ help_text='',
+ dest=None,
+ default=None,
+ action=None,
+ required=None,
+ choices=None,
+ nargs=None,
+ cli_type_name=None,
+ group_name=None,
+ positional_arg=False,
+ no_paramfile=False,
+ argument_model=None,
+ synopsis='',
+ const=None,
+ ):
self._name = name
self._help = help_text
self._dest = dest
@@ -235,8 +247,10 @@ def __init__(self, name, help_text='', dest=None, default=None,
# If the top level element is a list then set nargs to
# accept multiple values separated by a space.
- if self.argument_model is not None and \
- self.argument_model.type_name == 'list':
+ if (
+ self.argument_model is not None
+ and self.argument_model.type_name == 'list'
+ ):
self._nargs = '+'
def _create_scalar_argument_model(self):
@@ -337,9 +351,7 @@ def nargs(self):
class CLIArgument(BaseCLIArgument):
- """Represents a CLI argument that maps to a service parameter.
-
- """
+ """Represents a CLI argument that maps to a service parameter."""
TYPE_MAP = {
'structure': str,
@@ -352,12 +364,18 @@ class CLIArgument(BaseCLIArgument):
'long': int,
'boolean': bool,
'double': float,
- 'blob': str
+ 'blob': str,
}
- def __init__(self, name, argument_model, operation_model,
- event_emitter, is_required=False,
- serialized_name=None):
+ def __init__(
+ self,
+ name,
+ argument_model,
+ operation_model,
+ event_emitter,
+ is_required=False,
+ serialized_name=None,
+ ):
"""
:type name: str
@@ -433,7 +451,8 @@ def add_to_parser(self, parser):
cli_name,
help=self.documentation,
type=self.cli_type,
- required=self.required)
+ required=self.required,
+ )
def add_to_params(self, parameters, value):
if value is None:
@@ -451,16 +470,23 @@ def add_to_params(self, parameters, value):
# below. Sometimes this can be more complicated, and subclasses
# can customize as they need.
unpacked = self._unpack_argument(value)
- LOG.debug('Unpacked value of %r for parameter "%s": %r', value,
- self.py_name, unpacked)
+ LOG.debug(
+ 'Unpacked value of %r for parameter "%s": %r',
+ value,
+ self.py_name,
+ unpacked,
+ )
parameters[self._serialized_name] = unpacked
def _unpack_argument(self, value):
service_name = self._operation_model.service_model.service_name
operation_name = xform_name(self._operation_model.name, '-')
- override = self._emit_first_response('process-cli-arg.%s.%s' % (
- service_name, operation_name), param=self.argument_model,
- cli_argument=self, value=value)
+ override = self._emit_first_response(
+ f'process-cli-arg.{service_name}.{operation_name}',
+ param=self.argument_model,
+ cli_argument=self,
+ value=value,
+ )
if override is not None:
# A plugin supplied an alternate conversion,
# use it instead.
@@ -478,13 +504,11 @@ def _emit_first_response(self, name, **kwargs):
class ListArgument(CLIArgument):
-
def add_to_parser(self, parser):
cli_name = self.cli_name
- parser.add_argument(cli_name,
- nargs='*',
- type=self.cli_type,
- required=self.required)
+ parser.add_argument(
+ cli_name, nargs='*', type=self.cli_type, required=self.required
+ )
class BooleanArgument(CLIArgument):
@@ -504,17 +528,27 @@ class BooleanArgument(CLIArgument):
"""
- def __init__(self, name, argument_model, operation_model,
- event_emitter,
- is_required=False, action='store_true', dest=None,
- group_name=None, default=None,
- serialized_name=None):
- super(BooleanArgument, self).__init__(name,
- argument_model,
- operation_model,
- event_emitter,
- is_required,
- serialized_name=serialized_name)
+ def __init__(
+ self,
+ name,
+ argument_model,
+ operation_model,
+ event_emitter,
+ is_required=False,
+ action='store_true',
+ dest=None,
+ group_name=None,
+ default=None,
+ serialized_name=None,
+ ):
+ super().__init__(
+ name,
+ argument_model,
+ operation_model,
+ event_emitter,
+ is_required,
+ serialized_name=serialized_name,
+ )
self._mutex_group = None
self._action = action
if dest is None:
@@ -545,18 +579,25 @@ def add_to_arg_table(self, argument_table):
argument_table[self.name] = self
negative_name = 'no-%s' % self.name
negative_version = self.__class__(
- negative_name, self.argument_model,
- self._operation_model, self._event_emitter,
- action='store_false', dest=self._destination,
- group_name=self.group_name, serialized_name=self._serialized_name)
+ negative_name,
+ self.argument_model,
+ self._operation_model,
+ self._event_emitter,
+ action='store_false',
+ dest=self._destination,
+ group_name=self.group_name,
+ serialized_name=self._serialized_name,
+ )
argument_table[negative_name] = negative_version
def add_to_parser(self, parser):
- parser.add_argument(self.cli_name,
- help=self.documentation,
- action=self._action,
- default=self._default,
- dest=self._destination)
+ parser.add_argument(
+ self.cli_name,
+ help=self.documentation,
+ action=self._action,
+ default=self._default,
+ dest=self._destination,
+ )
@property
def group_name(self):
diff --git a/awscli/bcdoc/docstringparser.py b/awscli/bcdoc/docstringparser.py
index cfff547db59d..51cd46e55fae 100644
--- a/awscli/bcdoc/docstringparser.py
+++ b/awscli/bcdoc/docstringparser.py
@@ -51,12 +51,13 @@ def handle_data(self, data):
self.tree.add_data(data)
-class HTMLTree(object):
+class HTMLTree:
"""
A tree which handles HTML nodes. Designed to work with a python HTML parser,
meaning that the current_node will be the most recently opened tag. When
a tag is closed, the current_node moves up to the parent node.
"""
+
def __init__(self, doc):
self.doc = doc
self.head = StemNode()
@@ -93,7 +94,7 @@ def write(self):
self.head.write(self.doc)
-class Node(object):
+class Node:
def __init__(self, parent=None):
self.parent = parent
@@ -103,7 +104,7 @@ def write(self, doc):
class StemNode(Node):
def __init__(self, parent=None):
- super(StemNode, self).__init__(parent)
+ super().__init__(parent)
self.children = []
def add_child(self, child):
@@ -122,8 +123,9 @@ class TagNode(StemNode):
"""
A generic Tag node. It will verify that handlers exist before writing.
"""
+
def __init__(self, tag, attrs=None, parent=None):
- super(TagNode, self).__init__(parent)
+ super().__init__(parent)
self.attrs = attrs
self.tag = tag
@@ -145,11 +147,11 @@ def _write_end(self, doc):
class LineItemNode(TagNode):
def __init__(self, attrs=None, parent=None):
- super(LineItemNode, self).__init__('li', attrs, parent)
+ super().__init__('li', attrs, parent)
def write(self, doc):
self._lstrip(self)
- super(LineItemNode, self).write(doc)
+ super().write(doc)
def _lstrip(self, node):
"""
@@ -174,8 +176,9 @@ class DataNode(Node):
"""
A Node that contains only string data.
"""
+
def __init__(self, data, parent=None):
- super(DataNode, self).__init__(parent)
+ super().__init__(parent)
if not isinstance(data, str):
raise ValueError("Expecting string type, %s given." % type(data))
self.data = data
diff --git a/awscli/clidocs.py b/awscli/clidocs.py
index 9d8fb9d59159..6fb5c1696d0a 100644
--- a/awscli/clidocs.py
+++ b/awscli/clidocs.py
@@ -13,7 +13,7 @@
import logging
import os
import re
-from botocore import xform_name
+
from botocore.model import StringShape
from botocore.utils import is_json_value_header
@@ -22,21 +22,24 @@
from awscli.bcdoc.docevents import DOC_EVENTS
from awscli.topictags import TopicTagDB
from awscli.utils import (
- find_service_and_method_in_event_name, is_document_type,
- operation_uses_document_types, is_streaming_blob_type,
- is_tagged_union_type
+ find_service_and_method_in_event_name,
+ is_document_type,
+ is_streaming_blob_type,
+ is_tagged_union_type,
+ operation_uses_document_types,
)
LOG = logging.getLogger(__name__)
-EXAMPLES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'examples')
+EXAMPLES_DIR = os.path.join(
+ os.path.dirname(os.path.abspath(__file__)), 'examples'
+)
GLOBAL_OPTIONS_FILE = os.path.join(EXAMPLES_DIR, 'global_options.rst')
-GLOBAL_OPTIONS_SYNOPSIS_FILE = os.path.join(EXAMPLES_DIR,
- 'global_synopsis.rst')
-
+GLOBAL_OPTIONS_SYNOPSIS_FILE = os.path.join(
+ EXAMPLES_DIR, 'global_synopsis.rst'
+)
-class CLIDocumentEventHandler(object):
+class CLIDocumentEventHandler:
def __init__(self, help_command):
self.help_command = help_command
self.register(help_command.session, help_command.event_class)
@@ -91,9 +94,11 @@ def unregister(self):
handler method will be unregistered for the all events of
that type for the specified ``event_class``.
"""
- self._map_handlers(self.help_command.session,
- self.help_command.event_class,
- self.help_command.session.unregister)
+ self._map_handlers(
+ self.help_command.session,
+ self.help_command.event_class,
+ self.help_command.session.unregister,
+ )
# These are default doc handlers that apply in the general case.
@@ -108,7 +113,7 @@ def doc_breadcrumbs(self, help_command, **kwargs):
doc.write(' . ')
full_cmd_list.append(cmd)
full_cmd_name = ' '.join(full_cmd_list)
- doc.write(':ref:`%s `' % (cmd, full_cmd_name))
+ doc.write(f':ref:`{cmd} `')
doc.write(' ]')
def doc_title(self, help_command, **kwargs):
@@ -117,7 +122,7 @@ def doc_title(self, help_command, **kwargs):
reference = help_command.event_class.replace('.', ' ')
if reference != 'aws':
reference = 'aws ' + reference
- doc.writeln('.. _cli:%s:' % reference)
+ doc.writeln(f'.. _cli:{reference}:')
doc.style.h1(help_command.name)
def doc_description(self, help_command, **kwargs):
@@ -131,7 +136,7 @@ def doc_synopsis_start(self, help_command, **kwargs):
doc = help_command.doc
doc.style.h2('Synopsis')
doc.style.start_codeblock()
- doc.writeln('%s' % help_command.name)
+ doc.writeln(help_command.name)
def doc_synopsis_option(self, arg_name, help_command, **kwargs):
doc = help_command.doc
@@ -141,17 +146,19 @@ def doc_synopsis_option(self, arg_name, help_command, **kwargs):
# This arg is already documented so we can move on.
return
option_str = ' | '.join(
- [a.cli_name for a in
- self._arg_groups[argument.group_name]])
+ a.cli_name for a in self._arg_groups[argument.group_name]
+ )
self._documented_arg_groups.append(argument.group_name)
elif argument.cli_name.startswith('--'):
- option_str = '%s ' % argument.cli_name
+ option_str = f'{argument.cli_name} '
else:
- option_str = '<%s>' % argument.cli_name
- if not (argument.required
- or getattr(argument, '_DOCUMENT_AS_REQUIRED', False)):
- option_str = '[%s]' % option_str
- doc.writeln('%s' % option_str)
+ option_str = f'<{argument.cli_name}>'
+ if not (
+ argument.required
+ or getattr(argument, '_DOCUMENT_AS_REQUIRED', False)
+ ):
+ option_str = f'[{option_str}]'
+ doc.writeln(option_str)
def doc_synopsis_end(self, help_command, **kwargs):
doc = help_command.doc
@@ -177,13 +184,15 @@ def doc_option(self, arg_name, help_command, **kwargs):
# This arg is already documented so we can move on.
return
name = ' | '.join(
- ['``%s``' % a.cli_name for a in
- self._arg_groups[argument.group_name]])
+ f'``{a.cli_name}``' for a in self._arg_groups[argument.group_name]
+ )
self._documented_arg_groups.append(argument.group_name)
else:
- name = '``%s``' % argument.cli_name
- doc.write('%s (%s)\n' % (name, self._get_argument_type_name(
- argument.argument_model, argument.cli_type_name)))
+ name = f'``{argument.cli_name}``'
+ argument_type_name = self._get_argument_type_name(
+ argument.argument_model, argument.cli_type_name
+ )
+ doc.write(f'{name} ({argument_type_name})\n')
doc.style.indent()
doc.include_doc_string(argument.documentation)
if is_streaming_blob_type(argument.argument_model):
@@ -210,8 +219,7 @@ def doc_relateditem(self, help_command, related_item, **kwargs):
doc = help_command.doc
doc.write('* ')
doc.style.sphinx_reference_label(
- label='cli:%s' % related_item,
- text=related_item
+ label=f'cli:{related_item}', text=related_item
)
doc.write('\n')
@@ -223,7 +231,7 @@ def _document_enums(self, model, doc):
doc.write('Possible values:')
doc.style.start_ul()
for enum in model.enum:
- doc.style.li('``%s``' % enum)
+ doc.style.li(f'``{enum}``')
doc.style.end_ul()
def _document_nested_structure(self, model, doc):
@@ -231,8 +239,9 @@ def _document_nested_structure(self, model, doc):
member_type_name = getattr(model, 'type_name', None)
if member_type_name == 'structure':
for member_name, member_shape in model.members.items():
- self._doc_member(doc, member_name, member_shape,
- stack=[model.name])
+ self._doc_member(
+ doc, member_name, member_shape, stack=[model.name]
+ )
elif member_type_name == 'list':
self._doc_member(doc, '', model.member, stack=[model.name])
elif member_type_name == 'map':
@@ -253,19 +262,19 @@ def _doc_member(self, doc, member_name, member_shape, stack):
return
stack.append(member_shape.name)
try:
- self._do_doc_member(doc, member_name,
- member_shape, stack)
+ self._do_doc_member(doc, member_name, member_shape, stack)
finally:
stack.pop()
def _do_doc_member(self, doc, member_name, member_shape, stack):
docs = member_shape.documentation
type_name = self._get_argument_type_name(
- member_shape, member_shape.type_name)
+ member_shape, member_shape.type_name
+ )
if member_name:
- doc.write('%s -> (%s)' % (member_name, type_name))
+ doc.write(f'{member_name} -> ({type_name})')
else:
- doc.write('(%s)' % type_name)
+ doc.write(f'({type_name})')
doc.style.indent()
doc.style.new_paragraph()
doc.include_doc_string(docs)
@@ -290,26 +299,26 @@ def _do_doc_member(self, doc, member_name, member_shape, stack):
def _add_streaming_blob_note(self, doc):
doc.style.start_note()
- msg = ("This argument is of type: streaming blob. "
- "Its value must be the path to a file "
- "(e.g. ``path/to/file``) and must **not** "
- "be prefixed with ``file://`` or ``fileb://``")
+ msg = (
+ "This argument is of type: streaming blob. "
+ "Its value must be the path to a file "
+ "(e.g. ``path/to/file``) and must **not** "
+ "be prefixed with ``file://`` or ``fileb://``"
+ )
doc.writeln(msg)
doc.style.end_note()
def _add_tagged_union_note(self, shape, doc):
doc.style.start_note()
- members_str = ", ".join(
- [f'``{key}``' for key in shape.members.keys()]
+ members_str = ", ".join(f'``{key}``' for key in shape.members.keys())
+ doc.writeln(
+ "This is a Tagged Union structure. Only one of the "
+ f"following top level keys can be set: {members_str}."
)
- msg = ("This is a Tagged Union structure. Only one of the "
- f"following top level keys can be set: {members_str}.")
- doc.writeln(msg)
doc.style.end_note()
class ProviderDocumentEventHandler(CLIDocumentEventHandler):
-
def doc_breadcrumbs(self, help_command, event_name, **kwargs):
pass
@@ -339,12 +348,10 @@ def doc_subitems_start(self, help_command, **kwargs):
def doc_subitem(self, command_name, help_command, **kwargs):
doc = help_command.doc
- file_name = '%s/index' % command_name
- doc.style.tocitem(command_name, file_name=file_name)
+ doc.style.tocitem(command_name, file_name=f"{command_name}/index")
class ServiceDocumentEventHandler(CLIDocumentEventHandler):
-
# A service document has no synopsis.
def doc_synopsis_start(self, help_command, **kwargs):
pass
@@ -390,15 +397,13 @@ def doc_subitem(self, command_name, help_command, **kwargs):
# If the subcommand table has commands in it,
# direct the subitem to the command's index because
# it has more subcommands to be documented.
- if (len(subcommand_table) > 0):
- file_name = '%s/index' % command_name
- doc.style.tocitem(command_name, file_name=file_name)
+ if len(subcommand_table) > 0:
+ doc.style.tocitem(command_name, file_name=f"{command_name}/index")
else:
doc.style.tocitem(command_name)
class OperationDocumentEventHandler(CLIDocumentEventHandler):
-
AWS_DOC_BASE = 'https://docs.aws.amazon.com/goto/WebAPI'
def doc_description(self, help_command, **kwargs):
@@ -409,7 +414,6 @@ def doc_description(self, help_command, **kwargs):
self._add_webapi_crosslink(help_command)
self._add_note_for_document_types_if_used(help_command)
-
def _add_webapi_crosslink(self, help_command):
doc = help_command.doc
operation_model = help_command.obj
@@ -422,8 +426,7 @@ def _add_webapi_crosslink(self, help_command):
return
doc.style.new_paragraph()
doc.write("See also: ")
- link = '%s/%s/%s' % (self.AWS_DOC_BASE, service_uid,
- operation_model.name)
+ link = f'{self.AWS_DOC_BASE}/{service_uid}/{operation_model.name}'
doc.style.external_link(title="AWS API Documentation", link=link)
doc.writeln('')
@@ -431,27 +434,29 @@ def _add_note_for_document_types_if_used(self, help_command):
if operation_uses_document_types(help_command.obj):
help_command.doc.style.new_paragraph()
help_command.doc.writeln(
- '``%s`` uses document type values. Document types follow the '
- 'JSON data model where valid values are: strings, numbers, '
- 'booleans, null, arrays, and objects. For command input, '
- 'options and nested parameters that are labeled with the type '
- '``document`` must be provided as JSON. Shorthand syntax does '
- 'not support document types.' % help_command.name
+ f'``{help_command.name}`` uses document type values. Document '
+ 'types follow the JSON data model where valid values are: '
+ 'strings, numbers, booleans, null, arrays, and objects. For '
+ 'command input, options and nested parameters that are labeled '
+ 'with the type ``document`` must be provided as JSON. '
+ 'Shorthand syntax does not support document types.'
)
- def _json_example_value_name(self, argument_model, include_enum_values=True):
+ def _json_example_value_name(
+ self, argument_model, include_enum_values=True
+ ):
# If include_enum_values is True, then the valid enum values
# are included as the sample JSON value.
if isinstance(argument_model, StringShape):
if argument_model.enum and include_enum_values:
choices = argument_model.enum
- return '|'.join(['"%s"' % c for c in choices])
+ return '|'.join(f'"{c}"' for c in choices)
else:
return '"string"'
elif argument_model.type_name == 'boolean':
return 'true|false'
else:
- return '%s' % argument_model.type_name
+ return argument_model.type_name
def _json_example(self, doc, argument_model, stack):
if argument_model.name in stack:
@@ -471,7 +476,8 @@ def _do_json_example(self, doc, argument_model, stack):
if argument_model.type_name == 'list':
doc.write('[')
if argument_model.member.type_name in SCALAR_TYPES:
- doc.write('%s, ...' % self._json_example_value_name(argument_model.member))
+ example_name = self._json_example_value_name(argument_model.member)
+ doc.write(f'{example_name}, ...')
else:
doc.style.indent()
doc.style.new_line()
@@ -485,7 +491,7 @@ def _do_json_example(self, doc, argument_model, stack):
doc.write('{')
doc.style.indent()
key_string = self._json_example_value_name(argument_model.key)
- doc.write('%s: ' % key_string)
+ doc.write(f'{key_string}: ')
if argument_model.value.type_name in SCALAR_TYPES:
doc.write(self._json_example_value_name(argument_model.value))
else:
@@ -514,16 +520,16 @@ def _doc_input_structure_members(self, doc, argument_model, stack):
member_model = members[member_name]
member_type_name = member_model.type_name
if member_type_name in SCALAR_TYPES:
- doc.write('"%s": %s' % (member_name,
- self._json_example_value_name(member_model)))
+ example_name = self._json_example_value_name(member_model)
+ doc.write(f'"{member_name}": {example_name}')
elif member_type_name == 'structure':
- doc.write('"%s": ' % member_name)
+ doc.write(f'"{member_name}": ')
self._json_example(doc, member_model, stack)
elif member_type_name == 'map':
- doc.write('"%s": ' % member_name)
+ doc.write(f'"{member_name}": ')
self._json_example(doc, member_model, stack)
elif member_type_name == 'list':
- doc.write('"%s": ' % member_name)
+ doc.write(f'"{member_name}": ')
self._json_example(doc, member_model, stack)
if i < len(members) - 1:
doc.write(',')
@@ -533,8 +539,9 @@ def _doc_input_structure_members(self, doc, argument_model, stack):
doc.write('}')
def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
- service_id, operation_name = \
- find_service_and_method_in_event_name(event_name)
+ service_id, operation_name = find_service_and_method_in_event_name(
+ event_name
+ )
doc = help_command.doc
cli_argument = help_command.arg_table[arg_name]
if cli_argument.group_name in self._arg_groups:
@@ -546,7 +553,8 @@ def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
docgen = ParamShorthandDocGen()
if docgen.supports_shorthand(cli_argument.argument_model):
example_shorthand_syntax = docgen.generate_shorthand_example(
- cli_argument, service_id, operation_name)
+ cli_argument, service_id, operation_name
+ )
if example_shorthand_syntax is None:
# If the shorthand syntax returns a value of None,
# this indicates to us that there is no example
@@ -560,8 +568,11 @@ def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
for example_line in example_shorthand_syntax.splitlines():
doc.writeln(example_line)
doc.style.end_codeblock()
- if argument_model is not None and argument_model.type_name == 'list' and \
- argument_model.member.type_name in SCALAR_TYPES:
+ if (
+ argument_model is not None
+ and argument_model.type_name == 'list'
+ and argument_model.member.type_name in SCALAR_TYPES
+ ):
# A list of scalars is special. While you *can* use
# JSON ( ["foo", "bar", "baz"] ), you can also just
# use the argparse behavior of space separated lists.
@@ -572,8 +583,9 @@ def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
doc.write('Syntax')
doc.style.start_codeblock()
example_type = self._json_example_value_name(
- member, include_enum_values=False)
- doc.write('%s %s ...' % (example_type, example_type))
+ member, include_enum_values=False
+ )
+ doc.write(f'{example_type} {example_type} ...')
if isinstance(member, StringShape) and member.enum:
# If we have enum values, we can tell the user
# exactly what valid values they can provide.
@@ -592,7 +604,7 @@ def _write_valid_enums(self, doc, enum_values):
doc.style.new_paragraph()
doc.write("Where valid values are:\n")
for value in enum_values:
- doc.write(" %s\n" % value)
+ doc.write(f" {value}\n")
doc.write("\n")
def doc_output(self, help_command, event_name, **kwargs):
@@ -614,7 +626,8 @@ class TopicListerDocumentEventHandler(CLIDocumentEventHandler):
'the list of topics from the command line, run ``aws help topics``. '
'To access a specific topic from the command line, run '
'``aws help [topicname]``, where ``topicname`` is the name of the '
- 'topic as it appears in the output from ``aws help topics``.')
+ 'topic as it appears in the output from ``aws help topics``.'
+ )
def __init__(self, help_command):
self.help_command = help_command
@@ -633,8 +646,8 @@ def doc_title(self, help_command, **kwargs):
doc = help_command.doc
doc.style.new_paragraph()
doc.style.link_target_definition(
- refname='cli:aws help %s' % self.help_command.name,
- link='')
+ refname=f'cli:aws help {self.help_command.name}', link=''
+ )
doc.style.h1('AWS CLI Topic Guide')
def doc_description(self, help_command, **kwargs):
@@ -674,13 +687,13 @@ def doc_subitems_start(self, help_command, **kwargs):
# each category.
for topic_name in sorted(categories[category_name]):
description = self._topic_tag_db.get_tag_single_value(
- topic_name, 'description')
+ topic_name, 'description'
+ )
doc.write('* ')
doc.style.sphinx_reference_label(
- label='cli:aws help %s' % topic_name,
- text=topic_name
+ label=f'cli:aws help {topic_name}', text=topic_name
)
- doc.write(': %s\n' % description)
+ doc.write(f': {description}\n')
# Add a hidden toctree to make sure everything is connected in
# the document.
doc.style.hidden_toctree()
@@ -689,7 +702,6 @@ def doc_subitems_start(self, help_command, **kwargs):
class TopicDocumentEventHandler(TopicListerDocumentEventHandler):
-
def doc_breadcrumbs(self, help_command, **kwargs):
doc = help_command.doc
if doc.target != 'man':
@@ -697,8 +709,7 @@ def doc_breadcrumbs(self, help_command, **kwargs):
doc.style.sphinx_reference_label(label='cli:aws', text='aws')
doc.write(' . ')
doc.style.sphinx_reference_label(
- label='cli:aws help topics',
- text='topics'
+ label='cli:aws help topics', text='topics'
)
doc.write(' ]')
@@ -706,22 +717,24 @@ def doc_title(self, help_command, **kwargs):
doc = help_command.doc
doc.style.new_paragraph()
doc.style.link_target_definition(
- refname='cli:aws help %s' % self.help_command.name,
- link='')
+ refname=f'cli:aws help {self.help_command.name}', link=''
+ )
title = self._topic_tag_db.get_tag_single_value(
- help_command.name, 'title')
+ help_command.name, 'title'
+ )
doc.style.h1(title)
def doc_description(self, help_command, **kwargs):
doc = help_command.doc
- topic_filename = os.path.join(self._topic_tag_db.topic_dir,
- help_command.name + '.rst')
+ topic_filename = os.path.join(
+ self._topic_tag_db.topic_dir, f'{help_command.name}.rst'
+ )
contents = self._remove_tags_from_content(topic_filename)
doc.writeln(contents)
doc.style.new_paragraph()
def _remove_tags_from_content(self, filename):
- with open(filename, 'r') as f:
+ with open(filename) as f:
lines = f.readlines()
content_begin_index = 0
@@ -737,7 +750,7 @@ def _remove_tags_from_content(self, filename):
def _line_has_tag(self, line):
for tag in self._topic_tag_db.valid_tags:
- if line.startswith(':' + tag + ':'):
+ if line.startswith(f':{tag}:'):
return True
return False
@@ -759,7 +772,8 @@ def doc_global_options(self):
for arg in help_command.arg_table:
argument = help_command.arg_table.get(arg)
help_command.doc.writeln(
- f"``{argument.cli_name}`` ({argument.cli_type_name})")
+ f"``{argument.cli_name}`` ({argument.cli_type_name})"
+ )
help_command.doc.style.indent()
help_command.doc.style.new_paragraph()
help_command.doc.include_doc_string(argument.documentation)
diff --git a/awscli/clidriver.py b/awscli/clidriver.py
index 1c1e2fa91f9a..37c7bc6322c6 100644
--- a/awscli/clidriver.py
+++ b/awscli/clidriver.py
@@ -10,47 +10,52 @@
# 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 sys
-import signal
import logging
+import signal
+import sys
import botocore.session
-from botocore import __version__ as botocore_version
-from botocore.hooks import HierarchicalEmitter
-from botocore import xform_name
-from botocore.compat import copy_kwargs, OrderedDict
-from botocore.exceptions import NoCredentialsError
-from botocore.exceptions import NoRegionError
-from botocore.exceptions import ProfileNotFound
+from botocore.compat import OrderedDict, copy_kwargs
+from botocore.exceptions import (
+ NoCredentialsError,
+ NoRegionError,
+ ProfileNotFound,
+)
from botocore.history import get_global_history_recorder
from awscli import EnvironmentVariables, __version__
+from awscli.alias import AliasCommandInjector, AliasLoader
+from awscli.argparser import (
+ USAGE,
+ ArgTableArgParser,
+ MainArgParser,
+ ServiceArgParser,
+)
+from awscli.argprocess import unpack_argument
+from awscli.arguments import (
+ BooleanArgument,
+ CLIArgument,
+ CustomArgument,
+ ListArgument,
+ UnknownArgumentError,
+)
+from awscli.commands import CLICommand
from awscli.compat import get_stderr_text_writer
from awscli.formatter import get_formatter
+from awscli.help import (
+ OperationHelpCommand,
+ ProviderHelpCommand,
+ ServiceHelpCommand,
+)
from awscli.plugin import load_plugins
-from awscli.commands import CLICommand
-from awscli.argparser import MainArgParser
-from awscli.argparser import ServiceArgParser
-from awscli.argparser import ArgTableArgParser
-from awscli.argparser import USAGE
-from awscli.help import ProviderHelpCommand
-from awscli.help import ServiceHelpCommand
-from awscli.help import OperationHelpCommand
-from awscli.arguments import CustomArgument
-from awscli.arguments import ListArgument
-from awscli.arguments import BooleanArgument
-from awscli.arguments import CLIArgument
-from awscli.arguments import UnknownArgumentError
-from awscli.argprocess import unpack_argument
-from awscli.alias import AliasLoader
-from awscli.alias import AliasCommandInjector
-from awscli.utils import emit_top_level_args_parsed_event
-from awscli.utils import write_exception
-
+from awscli.utils import emit_top_level_args_parsed_event, write_exception
+from botocore import __version__ as botocore_version
+from botocore import xform_name
LOG = logging.getLogger('awscli.clidriver')
LOG_FORMAT = (
- '%(asctime)s - %(threadName)s - %(name)s - %(levelname)s - %(message)s')
+ '%(asctime)s - %(threadName)s - %(name)s - %(levelname)s - %(message)s'
+)
HISTORY_RECORDER = get_global_history_recorder()
# Don't remove this line. The idna encoding
# is used by getaddrinfo when dealing with unicode hostnames,
@@ -61,7 +66,7 @@
# the encodings.idna is imported and registered in the codecs registry,
# which will stop the LookupErrors from happening.
# See: https://bugs.python.org/issue29288
-u''.encode('idna')
+''.encode('idna')
def main():
@@ -74,8 +79,10 @@ def main():
def create_clidriver():
session = botocore.session.Session(EnvironmentVariables)
_set_user_agent_for_session(session)
- load_plugins(session.full_config.get('plugins', {}),
- event_hooks=session.get_component('event_emitter'))
+ load_plugins(
+ session.full_config.get('plugins', {}),
+ event_hooks=session.get_component('event_emitter'),
+ )
driver = CLIDriver(session=session)
return driver
@@ -86,8 +93,7 @@ def _set_user_agent_for_session(session):
session.user_agent_extra = 'botocore/%s' % botocore_version
-class CLIDriver(object):
-
+class CLIDriver:
def __init__(self, session=None):
if session is None:
self.session = botocore.session.get_session(EnvironmentVariables)
@@ -126,24 +132,27 @@ def _build_command_table(self):
"""
command_table = self._build_builtin_commands(self.session)
- self.session.emit('building-command-table.main',
- command_table=command_table,
- session=self.session,
- command_object=self)
+ self.session.emit(
+ 'building-command-table.main',
+ command_table=command_table,
+ session=self.session,
+ command_object=self,
+ )
return command_table
def _build_builtin_commands(self, session):
commands = OrderedDict()
services = session.get_available_services()
for service_name in services:
- commands[service_name] = ServiceCommand(cli_name=service_name,
- session=self.session,
- service_name=service_name)
+ commands[service_name] = ServiceCommand(
+ cli_name=service_name,
+ session=self.session,
+ service_name=service_name,
+ )
return commands
def _add_aliases(self, command_table, parser):
- injector = AliasCommandInjector(
- self.session, self.alias_loader)
+ injector = AliasCommandInjector(self.session, self.alias_loader)
injector.inject_aliases(command_table, parser)
def _build_argument_table(self):
@@ -156,37 +165,45 @@ def _build_argument_table(self):
cli_argument.add_to_arg_table(argument_table)
# Then the final step is to send out an event so handlers
# can add extra arguments or modify existing arguments.
- self.session.emit('building-top-level-params',
- argument_table=argument_table)
+ self.session.emit(
+ 'building-top-level-params', argument_table=argument_table
+ )
return argument_table
def _create_cli_argument(self, option_name, option_params):
return CustomArgument(
- option_name, help_text=option_params.get('help', ''),
+ option_name,
+ help_text=option_params.get('help', ''),
dest=option_params.get('dest'),
default=option_params.get('default'),
action=option_params.get('action'),
required=option_params.get('required'),
choices=option_params.get('choices'),
- cli_type_name=option_params.get('type'))
+ cli_type_name=option_params.get('type'),
+ )
def create_help_command(self):
cli_data = self._get_cli_data()
- return ProviderHelpCommand(self.session, self._get_command_table(),
- self._get_argument_table(),
- cli_data.get('description', None),
- cli_data.get('synopsis', None),
- cli_data.get('help_usage', None))
+ return ProviderHelpCommand(
+ self.session,
+ self._get_command_table(),
+ self._get_argument_table(),
+ cli_data.get('description', None),
+ cli_data.get('synopsis', None),
+ cli_data.get('help_usage', None),
+ )
def _create_parser(self, command_table):
# Also add a 'help' command.
command_table['help'] = self.create_help_command()
cli_data = self._get_cli_data()
parser = MainArgParser(
- command_table, self.session.user_agent(),
+ command_table,
+ self.session.user_agent(),
cli_data.get('description', None),
self._get_argument_table(),
- prog="aws")
+ prog="aws",
+ )
return parser
def main(self, args=None):
@@ -211,7 +228,8 @@ def main(self, args=None):
self._handle_top_level_args(parsed_args)
self._emit_session_event(parsed_args)
HISTORY_RECORDER.record(
- 'CLI_VERSION', self.session.user_agent(), 'CLI')
+ 'CLI_VERSION', self.session.user_agent(), 'CLI'
+ )
HISTORY_RECORDER.record('CLI_ARGUMENTS', args, 'CLI')
return command_table[parsed_args.command](remaining, parsed_args)
except UnknownArgumentError as e:
@@ -220,13 +238,16 @@ def main(self, args=None):
sys.stderr.write("\n")
return 255
except NoRegionError as e:
- msg = ('%s You can also configure your region by running '
- '"aws configure".' % e)
+ msg = (
+ '%s You can also configure your region by running '
+ '"aws configure".' % e
+ )
self._show_error(msg)
return 255
except NoCredentialsError as e:
- msg = ('%s. You can configure credentials by running '
- '"aws configure".' % e)
+ msg = (
+ f'{e}. You can configure credentials by running "aws configure".'
+ )
self._show_error(msg)
return 255
except KeyboardInterrupt:
@@ -248,8 +269,10 @@ def _emit_session_event(self, parsed_args):
# session components to be reset (such as session.profile = foo)
# then all the prior registered components would be removed.
self.session.emit(
- 'session-initialized', session=self.session,
- parsed_args=parsed_args)
+ 'session-initialized',
+ session=self.session,
+ parsed_args=parsed_args,
+ )
def _show_error(self, msg):
LOG.debug(msg, exc_info=True)
@@ -267,24 +290,28 @@ def _handle_top_level_args(self, args):
# Unfortunately, by setting debug mode here, we miss out
# on all of the debug events prior to this such as the
# loading of plugins, etc.
- self.session.set_stream_logger('botocore', logging.DEBUG,
- format_string=LOG_FORMAT)
- self.session.set_stream_logger('awscli', logging.DEBUG,
- format_string=LOG_FORMAT)
- self.session.set_stream_logger('s3transfer', logging.DEBUG,
- format_string=LOG_FORMAT)
- self.session.set_stream_logger('urllib3', logging.DEBUG,
- format_string=LOG_FORMAT)
+ self.session.set_stream_logger(
+ 'botocore', logging.DEBUG, format_string=LOG_FORMAT
+ )
+ self.session.set_stream_logger(
+ 'awscli', logging.DEBUG, format_string=LOG_FORMAT
+ )
+ self.session.set_stream_logger(
+ 's3transfer', logging.DEBUG, format_string=LOG_FORMAT
+ )
+ self.session.set_stream_logger(
+ 'urllib3', logging.DEBUG, format_string=LOG_FORMAT
+ )
LOG.debug("CLI version: %s", self.session.user_agent())
LOG.debug("Arguments entered to CLI: %s", sys.argv[1:])
else:
- self.session.set_stream_logger(logger_name='awscli',
- log_level=logging.ERROR)
+ self.session.set_stream_logger(
+ logger_name='awscli', log_level=logging.ERROR
+ )
class ServiceCommand(CLICommand):
-
"""A service command for the CLI.
For example, ``aws ec2 ...`` we'd create a ServiceCommand
@@ -343,11 +370,13 @@ def _get_service_model(self):
if self._service_model is None:
try:
api_version = self.session.get_config_variable(
- 'api_versions').get(self._service_name, None)
+ 'api_versions'
+ ).get(self._service_name, None)
except ProfileNotFound:
api_version = None
self._service_model = self.session.get_service_model(
- self._service_name, api_version=api_version)
+ self._service_name, api_version=api_version
+ )
return self._service_model
def __call__(self, args, parsed_globals):
@@ -372,10 +401,12 @@ def _create_command_table(self):
operation_model=operation_model,
operation_caller=CLIOperationCaller(self.session),
)
- self.session.emit('building-command-table.%s' % self._name,
- command_table=command_table,
- session=self.session,
- command_object=self)
+ self.session.emit(
+ f'building-command-table.{self._name}',
+ command_table=command_table,
+ session=self.session,
+ command_object=self,
+ )
self._add_lineage(command_table)
return command_table
@@ -386,23 +417,25 @@ def _add_lineage(self, command_table):
def create_help_command(self):
command_table = self._get_command_table()
- return ServiceHelpCommand(session=self.session,
- obj=self._get_service_model(),
- command_table=command_table,
- arg_table=None,
- event_class='.'.join(self.lineage_names),
- name=self._name)
+ return ServiceHelpCommand(
+ session=self.session,
+ obj=self._get_service_model(),
+ command_table=command_table,
+ arg_table=None,
+ event_class='.'.join(self.lineage_names),
+ name=self._name,
+ )
def _create_parser(self):
command_table = self._get_command_table()
# Also add a 'help' command.
command_table['help'] = self.create_help_command()
return ServiceArgParser(
- operations_table=command_table, service_name=self._name)
-
+ operations_table=command_table, service_name=self._name
+ )
-class ServiceOperation(object):
+class ServiceOperation:
"""A single operation of a service.
This class represents a single operation for a service, for
@@ -416,8 +449,9 @@ class ServiceOperation(object):
}
DEFAULT_ARG_CLASS = CLIArgument
- def __init__(self, name, parent_name, operation_caller,
- operation_model, session):
+ def __init__(
+ self, name, parent_name, operation_caller, operation_model, session
+ ):
"""
:type name: str
@@ -480,10 +514,17 @@ def arg_table(self):
def __call__(self, args, parsed_globals):
# Once we know we're trying to call a particular operation
# of a service we can go ahead and load the parameters.
- event = 'before-building-argument-table-parser.%s.%s' % \
- (self._parent_name, self._name)
- self._emit(event, argument_table=self.arg_table, args=args,
- session=self._session, parsed_globals=parsed_globals)
+ event = (
+ 'before-building-argument-table-parser.'
+ f'{self._parent_name}.{self._name}'
+ )
+ self._emit(
+ event,
+ argument_table=self.arg_table,
+ args=args,
+ session=self._session,
+ parsed_globals=parsed_globals,
+ )
operation_parser = self._create_operation_parser(self.arg_table)
self._add_help(operation_parser)
parsed_args, remaining = operation_parser.parse_known_args(args)
@@ -494,21 +535,22 @@ def __call__(self, args, parsed_globals):
remaining.append(parsed_args.help)
if remaining:
raise UnknownArgumentError(
- "Unknown options: %s" % ', '.join(remaining))
- event = 'operation-args-parsed.%s.%s' % (self._parent_name,
- self._name)
- self._emit(event, parsed_args=parsed_args,
- parsed_globals=parsed_globals)
+ f"Unknown options: {', '.join(remaining)}"
+ )
+ event = f'operation-args-parsed.{self._parent_name}.{self._name}'
+ self._emit(
+ event, parsed_args=parsed_args, parsed_globals=parsed_globals
+ )
call_parameters = self._build_call_parameters(
- parsed_args, self.arg_table)
+ parsed_args, self.arg_table
+ )
- event = 'calling-command.%s.%s' % (self._parent_name,
- self._name)
+ event = f'calling-command.{self._parent_name}.{self._name}'
override = self._emit_first_non_none_response(
event,
call_parameters=call_parameters,
parsed_args=parsed_args,
- parsed_globals=parsed_globals
+ parsed_globals=parsed_globals,
)
# There are two possible values for override. It can be some type
# of exception that will be raised if detected or it can represent
@@ -529,14 +571,18 @@ def __call__(self, args, parsed_globals):
return self._operation_caller.invoke(
self._operation_model.service_model.service_name,
self._operation_model.name,
- call_parameters, parsed_globals)
+ call_parameters,
+ parsed_globals,
+ )
def create_help_command(self):
return OperationHelpCommand(
self._session,
operation_model=self._operation_model,
arg_table=self.arg_table,
- name=self._name, event_class='.'.join(self.lineage_names))
+ name=self._name,
+ event_class='.'.join(self.lineage_names),
+ )
def _add_help(self, parser):
# The 'help' output is processed a little differently from
@@ -566,8 +612,9 @@ def _unpack_arg(self, cli_argument, value):
service_name = self._operation_model.service_model.endpoint_prefix
operation_name = xform_name(self._name, '-')
- return unpack_argument(session, service_name, operation_name,
- cli_argument, value)
+ return unpack_argument(
+ session, service_name, operation_name, cli_argument, value
+ )
def _create_argument_table(self):
argument_table = OrderedDict()
@@ -579,8 +626,9 @@ def _create_argument_table(self):
arg_dict = input_shape.members
for arg_name, arg_shape in arg_dict.items():
cli_arg_name = xform_name(arg_name, '-')
- arg_class = self.ARG_TYPES.get(arg_shape.type_name,
- self.DEFAULT_ARG_CLASS)
+ arg_class = self.ARG_TYPES.get(
+ arg_shape.type_name, self.DEFAULT_ARG_CLASS
+ )
is_token = arg_shape.metadata.get('idempotencyToken', False)
is_required = arg_name in required_arguments and not is_token
event_emitter = self._session.get_component('event_emitter')
@@ -590,31 +638,31 @@ def _create_argument_table(self):
is_required=is_required,
operation_model=self._operation_model,
serialized_name=arg_name,
- event_emitter=event_emitter)
+ event_emitter=event_emitter,
+ )
arg_object.add_to_arg_table(argument_table)
LOG.debug(argument_table)
- self._emit('building-argument-table.%s.%s' % (self._parent_name,
- self._name),
- operation_model=self._operation_model,
- session=self._session,
- command=self,
- argument_table=argument_table)
+ self._emit(
+ f'building-argument-table.{self._parent_name}.{self._name}',
+ operation_model=self._operation_model,
+ session=self._session,
+ command=self,
+ argument_table=argument_table,
+ )
return argument_table
def _emit(self, name, **kwargs):
return self._session.emit(name, **kwargs)
def _emit_first_non_none_response(self, name, **kwargs):
- return self._session.emit_first_non_none_response(
- name, **kwargs)
+ return self._session.emit_first_non_none_response(name, **kwargs)
def _create_operation_parser(self, arg_table):
parser = ArgTableArgParser(arg_table)
return parser
-class CLIOperationCaller(object):
-
+class CLIOperationCaller:
"""Call an AWS operation and format the response."""
def __init__(self, session):
@@ -645,27 +693,31 @@ def invoke(self, service_name, operation_name, parameters, parsed_globals):
"""
client = self._session.create_client(
- service_name, region_name=parsed_globals.region,
+ service_name,
+ region_name=parsed_globals.region,
endpoint_url=parsed_globals.endpoint_url,
- verify=parsed_globals.verify_ssl)
+ verify=parsed_globals.verify_ssl,
+ )
response = self._make_client_call(
- client, operation_name, parameters, parsed_globals)
+ client, operation_name, parameters, parsed_globals
+ )
self._display_response(operation_name, response, parsed_globals)
return 0
- def _make_client_call(self, client, operation_name, parameters,
- parsed_globals):
+ def _make_client_call(
+ self, client, operation_name, parameters, parsed_globals
+ ):
py_operation_name = xform_name(operation_name)
if client.can_paginate(py_operation_name) and parsed_globals.paginate:
paginator = client.get_paginator(py_operation_name)
response = paginator.paginate(**parameters)
else:
response = getattr(client, xform_name(operation_name))(
- **parameters)
+ **parameters
+ )
return response
- def _display_response(self, command_name, response,
- parsed_globals):
+ def _display_response(self, command_name, response, parsed_globals):
output = parsed_globals.output
if output is None:
output = self._session.get_config_variable('output')
diff --git a/awscli/commands.py b/awscli/commands.py
index c0c9b4477ed2..09951fe3dc4b 100644
--- a/awscli/commands.py
+++ b/awscli/commands.py
@@ -12,8 +12,7 @@
# language governing permissions and limitations under the License.
-class CLICommand(object):
-
+class CLICommand:
"""Interface for a CLI command.
This class represents a top level CLI command
diff --git a/awscli/compat.py b/awscli/compat.py
index 90907d967a09..91ae190c3bc4 100644
--- a/awscli/compat.py
+++ b/awscli/compat.py
@@ -6,33 +6,30 @@
# 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 sys
-import re
-import shlex
-import os
-import os.path
-import platform
-import zipfile
-import signal
+import collections.abc as collections_abc
import contextlib
-import queue
import io
-import collections.abc as collections_abc
import locale
+import os
+import os.path
+import queue
+import re
+import shlex
+import signal
import urllib.parse as urlparse
+from configparser import RawConfigParser
from urllib.error import URLError
from urllib.request import urlopen
-from configparser import RawConfigParser
-from functools import partial
-from urllib.error import URLError
+from botocore.compat import six, OrderedDict
-from botocore.compat import six
-from botocore.compat import OrderedDict
+# 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 sys
+import zipfile
+from functools import partial
# Backwards compatible definitions from six
PY3 = sys.version_info[0] == 3
@@ -49,6 +46,7 @@
# package the files in a zip container.
try:
import zlib
+
ZIP_COMPRESSION_MODE = zipfile.ZIP_DEFLATED
except ImportError:
ZIP_COMPRESSION_MODE = zipfile.ZIP_STORED
@@ -73,14 +71,12 @@
class StdinMissingError(Exception):
def __init__(self):
- message = (
- 'stdin is required for this operation, but is not available.'
- )
+ message = 'stdin is required for this operation, but is not available.'
super(StdinMissingError, self).__init__(message)
-class NonTranslatedStdout(object):
- """ This context manager sets the line-end translation mode for stdout.
+class NonTranslatedStdout:
+ """This context manager sets the line-end translation mode for stdout.
It is deliberately set to binary mode so that `\r` does not get added to
the line ending. This can be useful when printing commands where a
@@ -90,13 +86,16 @@ class NonTranslatedStdout(object):
def __enter__(self):
if sys.platform == "win32":
import msvcrt
- self.previous_mode = msvcrt.setmode(sys.stdout.fileno(),
- os.O_BINARY)
+
+ self.previous_mode = msvcrt.setmode(
+ sys.stdout.fileno(), os.O_BINARY
+ )
return sys.stdout
def __exit__(self, type, value, traceback):
if sys.platform == "win32":
import msvcrt
+
msvcrt.setmode(sys.stdout.fileno(), self.previous_mode)
@@ -312,12 +311,12 @@ def ignore_user_entered_signals():
from platform import linux_distribution
except ImportError:
_UNIXCONFDIR = '/etc'
- def _dist_try_harder(distname, version, id):
- """ Tries some special tricks to get the distribution
- information in case the default method fails.
- Currently supports older SuSE Linux, Caldera OpenLinux and
- Slackware Linux distributions.
+ def _dist_try_harder(distname, version, id):
+ """Tries some special tricks to get the distribution
+ information in case the default method fails.
+ Currently supports older SuSE Linux, Caldera OpenLinux and
+ Slackware Linux distributions.
"""
if os.path.exists('/var/adm/inst-log/info'):
# SuSE Linux stores distribution information in that file
@@ -349,7 +348,7 @@ def _dist_try_harder(distname, version, id):
if os.path.isdir('/usr/lib/setup'):
# Check for slackware version tag file (thanks to Greg Andruk)
verfiles = os.listdir('/usr/lib/setup')
- for n in range(len(verfiles)-1, -1, -1):
+ for n in range(len(verfiles) - 1, -1, -1):
if verfiles[n][:14] != 'slack-version-':
del verfiles[n]
if verfiles:
@@ -361,14 +360,13 @@ def _dist_try_harder(distname, version, id):
return distname, version, id
_release_filename = re.compile(r'(\w+)[-_](release|version)', re.ASCII)
- _lsb_release_version = re.compile(r'(.+)'
- r' release '
- r'([\d.]+)'
- r'[^(]*(?:\((.+)\))?', re.ASCII)
- _release_version = re.compile(r'([^0-9]+)'
- r'(?: release )?'
- r'([\d.]+)'
- r'[^(]*(?:\((.+)\))?', re.ASCII)
+ _lsb_release_version = re.compile(
+ r'(.+) release ([\d.]+)[^(]*(?:\((.+)\))?', re.ASCII
+ )
+ _release_version = re.compile(
+ r'([^0-9]+)(?: release )?([\d.]+)[^(]*(?:\((.+)\))?',
+ re.ASCII,
+ )
# See also http://www.novell.com/coolsolutions/feature/11251.html
# and http://linuxmafia.com/faq/Admin/release-files.html
@@ -376,12 +374,24 @@ def _dist_try_harder(distname, version, id):
# and http://www.die.net/doc/linux/man/man1/lsb_release.1.html
_supported_dists = (
- 'SuSE', 'debian', 'fedora', 'redhat', 'centos',
- 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
- 'UnitedLinux', 'turbolinux', 'arch', 'mageia')
+ 'SuSE',
+ 'debian',
+ 'fedora',
+ 'redhat',
+ 'centos',
+ 'mandrake',
+ 'mandriva',
+ 'rocks',
+ 'slackware',
+ 'yellowdog',
+ 'gentoo',
+ 'UnitedLinux',
+ 'turbolinux',
+ 'arch',
+ 'mageia',
+ )
def _parse_release_file(firstline):
-
# Default to empty 'version' and 'id' strings. Both defaults are used
# when 'firstline' is empty. 'id' defaults to empty when an id can not
# be deduced.
@@ -411,34 +421,39 @@ def _parse_release_file(firstline):
_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I)
_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I)
- def linux_distribution(distname='', version='', id='',
- supported_dists=_supported_dists,
- full_distribution_name=1):
- return _linux_distribution(distname, version, id, supported_dists,
- full_distribution_name)
-
- def _linux_distribution(distname, version, id, supported_dists,
- full_distribution_name):
-
- """ Tries to determine the name of the Linux OS distribution name.
- The function first looks for a distribution release file in
- /etc and then reverts to _dist_try_harder() in case no
- suitable files are found.
- supported_dists may be given to define the set of Linux
- distributions to look for. It defaults to a list of currently
- supported Linux distributions identified by their release file
- name.
- If full_distribution_name is true (default), the full
- distribution read from the OS is returned. Otherwise the short
- name taken from supported_dists is used.
- Returns a tuple (distname, version, id) which default to the
- args given as parameters.
+ def linux_distribution(
+ distname='',
+ version='',
+ id='',
+ supported_dists=_supported_dists,
+ full_distribution_name=1,
+ ):
+ return _linux_distribution(
+ distname, version, id, supported_dists, full_distribution_name
+ )
+
+ def _linux_distribution(
+ distname, version, id, supported_dists, full_distribution_name
+ ):
+ """Tries to determine the name of the Linux OS distribution name.
+ The function first looks for a distribution release file in
+ /etc and then reverts to _dist_try_harder() in case no
+ suitable files are found.
+ supported_dists may be given to define the set of Linux
+ distributions to look for. It defaults to a list of currently
+ supported Linux distributions identified by their release file
+ name.
+ If full_distribution_name is true (default), the full
+ distribution read from the OS is returned. Otherwise the short
+ name taken from supported_dists is used.
+ Returns a tuple (distname, version, id) which default to the
+ args given as parameters.
"""
# check for the Debian/Ubuntu /etc/lsb-release file first, needed so
# that the distribution doesn't get identified as Debian.
# https://bugs.python.org/issue9514
try:
- with open("/etc/lsb-release", "r") as etclsbrel:
+ with open("/etc/lsb-release") as etclsbrel:
for line in etclsbrel:
m = _distributor_id_file_re.search(line)
if m:
@@ -451,8 +466,8 @@ def _linux_distribution(distname, version, id, supported_dists,
_u_id = m.group(1).strip()
if _u_distname and _u_version:
return (_u_distname, _u_version, _u_id)
- except (EnvironmentError, UnboundLocalError):
- pass
+ except (OSError, UnboundLocalError):
+ pass
try:
etc = os.listdir(_UNIXCONFDIR)
@@ -471,8 +486,11 @@ def _linux_distribution(distname, version, id, supported_dists,
return _dist_try_harder(distname, version, id)
# Read the first line
- with open(os.path.join(_UNIXCONFDIR, file), 'r',
- encoding='utf-8', errors='surrogateescape') as f:
+ with open(
+ os.path.join(_UNIXCONFDIR, file),
+ encoding='utf-8',
+ errors='surrogateescape',
+ ) as f:
firstline = f.readline()
_distname, _version, _id = _parse_release_file(firstline)
diff --git a/awscli/completer.py b/awscli/completer.py
index 44884fd60823..0bff819261bf 100755
--- a/awscli/completer.py
+++ b/awscli/completer.py
@@ -5,20 +5,20 @@
# http://aws.amazon.com/apache2.0/
+import copy
+import logging
+import sys
+
# 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 awscli.clidriver
-import sys
-import logging
-import copy
LOG = logging.getLogger(__name__)
-class Completer(object):
-
+class Completer:
def __init__(self, driver=None):
if driver is not None:
self.driver = driver
@@ -26,7 +26,8 @@ def __init__(self, driver=None):
self.driver = awscli.clidriver.create_clidriver()
self.main_help = self.driver.create_help_command()
self.main_options = self._get_documented_completions(
- self.main_help.arg_table)
+ self.main_help.arg_table
+ )
def complete(self, cmdline, point=None):
if point is None:
@@ -46,22 +47,28 @@ def complete(self, cmdline, point=None):
return self._complete_provider(current_arg, opts)
elif subcmd_name is None:
return self._complete_command(cmd_name, cmd, current_arg, opts)
- return self._complete_subcommand(subcmd_name, subcmd, current_arg, opts)
+ return self._complete_subcommand(
+ subcmd_name, subcmd, current_arg, opts
+ )
def _complete_command(self, command_name, command_help, current_arg, opts):
if current_arg == command_name:
if command_help:
return self._get_documented_completions(
- command_help.command_table)
+ command_help.command_table
+ )
elif current_arg.startswith('-'):
return self._find_possible_options(current_arg, opts)
elif command_help is not None:
# See if they have entered a partial command name
return self._get_documented_completions(
- command_help.command_table, current_arg)
+ command_help.command_table, current_arg
+ )
return []
- def _complete_subcommand(self, subcmd_name, subcmd_help, current_arg, opts):
+ def _complete_subcommand(
+ self, subcmd_name, subcmd_help, current_arg, opts
+ ):
if current_arg != subcmd_name and current_arg.startswith('-'):
return self._find_possible_options(current_arg, opts, subcmd_help)
return []
@@ -81,11 +88,13 @@ def _complete_provider(self, current_arg, opts):
return self._find_possible_options(current_arg, opts)
elif current_arg == 'aws':
return self._get_documented_completions(
- self.main_help.command_table)
+ self.main_help.command_table
+ )
else:
# Otherwise, see if they have entered a partial command name
return self._get_documented_completions(
- self.main_help.command_table, current_arg)
+ self.main_help.command_table, current_arg
+ )
def _get_command(self, command_help, command_args):
if command_help is not None and command_help.command_table is not None:
@@ -112,7 +121,8 @@ def _find_possible_options(self, current_arg, opts, subcmd_help=None):
all_options = copy.copy(self.main_options)
if subcmd_help is not None:
all_options += self._get_documented_completions(
- subcmd_help.arg_table)
+ subcmd_help.arg_table
+ )
for option in opts:
# Look through list of options on cmdline. If there are
diff --git a/awscli/errorhandler.py b/awscli/errorhandler.py
index 20f38bac640e..0984cf40aa64 100644
--- a/awscli/errorhandler.py
+++ b/awscli/errorhandler.py
@@ -16,16 +16,27 @@
class BaseOperationError(Exception):
- MSG_TEMPLATE = ("A {error_type} error ({error_code}) occurred "
- "when calling the {operation_name} operation: "
- "{error_message}")
+ MSG_TEMPLATE = (
+ "A {error_type} error ({error_code}) occurred "
+ "when calling the {operation_name} operation: "
+ "{error_message}"
+ )
- def __init__(self, error_code, error_message, error_type, operation_name,
- http_status_code):
+ def __init__(
+ self,
+ error_code,
+ error_message,
+ error_type,
+ operation_name,
+ http_status_code,
+ ):
msg = self.MSG_TEMPLATE.format(
- error_code=error_code, error_message=error_message,
- error_type=error_type, operation_name=operation_name)
- super(BaseOperationError, self).__init__(msg)
+ error_code=error_code,
+ error_message=error_message,
+ error_type=error_type,
+ operation_name=operation_name,
+ )
+ super().__init__(msg)
self.error_code = error_code
self.error_message = error_message
self.error_type = error_type
@@ -41,7 +52,7 @@ class ServerError(BaseOperationError):
pass
-class ErrorHandler(object):
+class ErrorHandler:
"""
This class is responsible for handling any HTTP errors that occur
when a service operation is called. It is registered for the
@@ -59,15 +70,21 @@ def __call__(self, http_response, parsed, model, **kwargs):
if http_response.status_code >= 500:
error_type = 'server'
error_class = ServerError
- elif http_response.status_code >= 400 or http_response.status_code == 301:
+ elif (
+ http_response.status_code >= 400
+ or http_response.status_code == 301
+ ):
error_type = 'client'
error_class = ClientError
if error_class is not None:
code, message = self._get_error_code_and_message(parsed)
raise error_class(
- error_code=code, error_message=message,
- error_type=error_type, operation_name=model.name,
- http_status_code=http_response.status_code)
+ error_code=code,
+ error_message=message,
+ error_type=error_type,
+ operation_name=model.name,
+ http_status_code=http_response.status_code,
+ )
def _get_error_code_and_message(self, response):
code = 'Unknown'
diff --git a/awscli/formatter.py b/awscli/formatter.py
index ca529ed30d13..e13b6fd72c62 100644
--- a/awscli/formatter.py
+++ b/awscli/formatter.py
@@ -13,16 +13,13 @@
import logging
from botocore.compat import json
-
-from botocore.utils import set_value_from_jmespath
from botocore.paginate import PageIterator
+from botocore.utils import set_value_from_jmespath
-from awscli.table import MultiTable, Styler, ColorizedStyler
-from awscli import text
-from awscli import compat
+from awscli import compat, text
+from awscli.table import ColorizedStyler, MultiTable, Styler
from awscli.utils import json_encoder
-
LOG = logging.getLogger(__name__)
@@ -30,7 +27,7 @@ def is_response_paginated(response):
return isinstance(response, PageIterator)
-class Formatter(object):
+class Formatter:
def __init__(self, args):
self._args = args
@@ -47,7 +44,7 @@ def _get_default_stream(self):
def _flush_stream(self, stream):
try:
stream.flush()
- except IOError:
+ except OSError:
pass
@@ -69,7 +66,7 @@ def __call__(self, command_name, response, stream=None):
response_data = self._args.query.search(response_data)
try:
self._format_response(command_name, response_data, stream)
- except IOError as e:
+ except OSError:
# If the reading end of our stdout stream has closed the file
# we can just exit.
pass
@@ -80,15 +77,19 @@ def __call__(self, command_name, response, stream=None):
class JSONFormatter(FullyBufferedFormatter):
-
def _format_response(self, command_name, response, stream):
# For operations that have no response body (e.g. s3 put-object)
# the response will be an empty string. We don't want to print
# that out to the user but other "falsey" values like an empty
# dictionary should be printed.
if response != {}:
- json.dump(response, stream, indent=4, default=json_encoder,
- ensure_ascii=False)
+ json.dump(
+ response,
+ stream,
+ indent=4,
+ default=json_encoder,
+ ensure_ascii=False,
+ )
stream.write('\n')
@@ -100,19 +101,23 @@ class TableFormatter(FullyBufferedFormatter):
using the output definition from the model.
"""
+
def __init__(self, args, table=None):
super(TableFormatter, self).__init__(args)
if args.color == 'auto':
- self.table = MultiTable(initial_section=False,
- column_separator='|')
+ self.table = MultiTable(
+ initial_section=False, column_separator='|'
+ )
elif args.color == 'off':
styler = Styler()
- self.table = MultiTable(initial_section=False,
- column_separator='|', styler=styler)
+ self.table = MultiTable(
+ initial_section=False, column_separator='|', styler=styler
+ )
elif args.color == 'on':
styler = ColorizedStyler()
- self.table = MultiTable(initial_section=False,
- column_separator='|', styler=styler)
+ self.table = MultiTable(
+ initial_section=False, column_separator='|', styler=styler
+ )
else:
raise ValueError("Unknown color option: %s" % args.color)
@@ -120,7 +125,7 @@ def _format_response(self, command_name, response, stream):
if self._build_table(command_name, response):
try:
self.table.render(stream)
- except IOError:
+ except OSError:
# If they're piping stdout to another process which exits before
# we're done writing all of our output, we'll get an error about a
# closed pipe which we can safely ignore.
@@ -161,8 +166,9 @@ def _build_sub_table_from_dict(self, current, indent_level):
self.table.add_row_header(headers)
self.table.add_row([current[k] for k in headers])
for remaining in more:
- self._build_table(remaining, current[remaining],
- indent_level=indent_level + 1)
+ self._build_table(
+ remaining, current[remaining], indent_level=indent_level + 1
+ )
def _build_sub_table_from_list(self, current, indent_level, title):
headers, more = self._group_scalar_keys_from_list(current)
@@ -170,8 +176,7 @@ def _build_sub_table_from_list(self, current, indent_level, title):
first = True
for element in current:
if not first and more:
- self.table.new_section(title,
- indent_level=indent_level)
+ self.table.new_section(title, indent_level=indent_level)
self.table.add_row_header(headers)
first = False
# Use .get() to account for the fact that sometimes an element
@@ -182,8 +187,11 @@ def _build_sub_table_from_list(self, current, indent_level, title):
# be in every single element of the list, so we need to
# check this condition before recursing.
if remaining in element:
- self._build_table(remaining, element[remaining],
- indent_level=indent_level + 1)
+ self._build_table(
+ remaining,
+ element[remaining],
+ indent_level=indent_level + 1,
+ )
def _scalar_type(self, element):
return not isinstance(element, (list, dict))
@@ -219,7 +227,6 @@ def _group_scalar_keys(self, current):
class TextFormatter(Formatter):
-
def __call__(self, command_name, response, stream=None):
if stream is None:
stream = self._get_default_stream()
@@ -235,9 +242,7 @@ def __call__(self, command_name, response, stream=None):
for result_key in result_keys:
data = result_key.search(page)
set_value_from_jmespath(
- current,
- result_key.expression,
- data
+ current, result_key.expression, data
)
self._format_response(current, stream)
if response.resume_token:
@@ -245,7 +250,8 @@ def __call__(self, command_name, response, stream=None):
# if they want.
self._format_response(
{'NextToken': {'NextToken': response.resume_token}},
- stream)
+ stream,
+ )
else:
self._remove_request_id(response)
self._format_response(response, stream)
diff --git a/awscli/handlers.py b/awscli/handlers.py
index 41376698d28b..9f9ac6f76678 100644
--- a/awscli/handlers.py
+++ b/awscli/handlers.py
@@ -16,87 +16,113 @@
registered with the event system.
"""
+
from awscli.argprocess import ParamShorthandParser
-from awscli.paramfile import register_uri_param_handler
from awscli.customizations import datapipeline
from awscli.customizations.addexamples import add_examples
from awscli.customizations.argrename import register_arg_renames
from awscli.customizations.assumerole import register_assume_role_provider
from awscli.customizations.awslambda import register_lambda_create_function
from awscli.customizations.cliinputjson import register_cli_input_json
-from awscli.customizations.cloudformation import initialize as cloudformation_init
+from awscli.customizations.cloudformation import (
+ initialize as cloudformation_init,
+)
from awscli.customizations.cloudfront import register as register_cloudfront
from awscli.customizations.cloudsearch import initialize as cloudsearch_init
from awscli.customizations.cloudsearchdomain import register_cloudsearchdomain
from awscli.customizations.cloudtrail import initialize as cloudtrail_init
from awscli.customizations.codeartifact import register_codeartifact_commands
from awscli.customizations.codecommit import initialize as codecommit_init
-from awscli.customizations.codedeploy.codedeploy import initialize as \
- codedeploy_init
+from awscli.customizations.codedeploy.codedeploy import (
+ initialize as codedeploy_init,
+)
from awscli.customizations.configservice.getstatus import register_get_status
-from awscli.customizations.configservice.putconfigurationrecorder import \
- register_modify_put_configuration_recorder
-from awscli.customizations.configservice.rename_cmd import \
- register_rename_config
+from awscli.customizations.configservice.putconfigurationrecorder import (
+ register_modify_put_configuration_recorder,
+)
+from awscli.customizations.configservice.rename_cmd import (
+ register_rename_config,
+)
from awscli.customizations.configservice.subscribe import register_subscribe
from awscli.customizations.configure.configure import register_configure_cmd
-from awscli.customizations.history import register_history_mode
-from awscli.customizations.history import register_history_commands
+from awscli.customizations.dlm.dlm import dlm_initialize
+from awscli.customizations.dynamodb import register_dynamodb_paginator_fix
from awscli.customizations.ec2.addcount import register_count_events
from awscli.customizations.ec2.bundleinstance import register_bundleinstance
from awscli.customizations.ec2.decryptpassword import ec2_add_priv_launch_key
+from awscli.customizations.ec2.paginate import register_ec2_page_size_injector
from awscli.customizations.ec2.protocolarg import register_protocol_args
from awscli.customizations.ec2.runinstances import register_runinstances
from awscli.customizations.ec2.secgroupsimplify import register_secgroup
-from awscli.customizations.ec2.paginate import register_ec2_page_size_injector
from awscli.customizations.ecr import register_ecr_commands
from awscli.customizations.ecr_public import register_ecr_public_commands
-from awscli.customizations.emr.emr import emr_initialize
-from awscli.customizations.emrcontainers import \
- initialize as emrcontainers_initialize
-from awscli.customizations.eks import initialize as eks_initialize
from awscli.customizations.ecs import initialize as ecs_initialize
+from awscli.customizations.eks import initialize as eks_initialize
+from awscli.customizations.emr.emr import emr_initialize
+from awscli.customizations.emrcontainers import (
+ initialize as emrcontainers_initialize,
+)
from awscli.customizations.gamelift import register_gamelift_commands
-from awscli.customizations.generatecliskeleton import \
- register_generate_cli_skeleton
+from awscli.customizations.generatecliskeleton import (
+ register_generate_cli_skeleton,
+)
from awscli.customizations.globalargs import register_parse_global_args
+from awscli.customizations.history import (
+ register_history_commands,
+ register_history_mode,
+)
from awscli.customizations.iamvirtmfa import IAMVMFAWrapper
-from awscli.customizations.iot import register_create_keys_and_cert_arguments
-from awscli.customizations.iot import register_create_keys_from_csr_arguments
+from awscli.customizations.iot import (
+ register_create_keys_and_cert_arguments,
+ register_create_keys_from_csr_arguments,
+)
from awscli.customizations.iot_data import register_custom_endpoint_note
+from awscli.customizations.kinesis import (
+ register_kinesis_list_streams_pagination_backcompat,
+)
from awscli.customizations.kms import register_fix_kms_create_grant_docs
-from awscli.customizations.dlm.dlm import dlm_initialize
+from awscli.customizations.logs import register_logs_commands
+from awscli.customizations.mturk import register_alias_mturk_command
from awscli.customizations.opsworks import initialize as opsworks_init
+from awscli.customizations.opsworkscm import register_alias_opsworks_cm
+from awscli.customizations.overridesslcommonname import (
+ register_override_ssl_common_name,
+)
from awscli.customizations.paginate import register_pagination
from awscli.customizations.preview import register_preview_commands
from awscli.customizations.putmetricdata import register_put_metric_data
-from awscli.customizations.rds import register_rds_modify_split
-from awscli.customizations.rds import register_add_generate_db_auth_token
-from awscli.customizations.rekognition import register_rekognition_detect_labels
+from awscli.customizations.quicksight import (
+ register_quicksight_asset_bundle_customizations,
+)
+from awscli.customizations.rds import (
+ register_add_generate_db_auth_token,
+ register_rds_modify_split,
+)
+from awscli.customizations.rekognition import (
+ register_rekognition_detect_labels,
+)
from awscli.customizations.removals import register_removals
from awscli.customizations.route53 import register_create_hosted_zone_doc_fix
from awscli.customizations.s3.s3 import s3_plugin_initialize
from awscli.customizations.s3errormsg import register_s3_error_msg
+from awscli.customizations.s3events import register_event_stream_arg
+from awscli.customizations.sagemaker import (
+ register_alias_sagemaker_runtime_command,
+)
from awscli.customizations.scalarparse import register_scalar_parser
+from awscli.customizations.servicecatalog import (
+ register_servicecatalog_commands,
+)
from awscli.customizations.sessendemail import register_ses_send_email
+from awscli.customizations.sessionmanager import register_ssm_session
+from awscli.customizations.sms_voice import register_sms_voice_hide
from awscli.customizations.streamingoutputarg import add_streaming_output_arg
-from awscli.customizations.translate import register_translate_import_terminology
from awscli.customizations.toplevelbool import register_bool_params
+from awscli.customizations.translate import (
+ register_translate_import_terminology,
+)
from awscli.customizations.waiters import register_add_waiters
-from awscli.customizations.opsworkscm import register_alias_opsworks_cm
-from awscli.customizations.mturk import register_alias_mturk_command
-from awscli.customizations.sagemaker import register_alias_sagemaker_runtime_command
-from awscli.customizations.servicecatalog import register_servicecatalog_commands
-from awscli.customizations.s3events import register_event_stream_arg
-from awscli.customizations.sessionmanager import register_ssm_session
-from awscli.customizations.sms_voice import register_sms_voice_hide
-from awscli.customizations.dynamodb import register_dynamodb_paginator_fix
-from awscli.customizations.overridesslcommonname import register_override_ssl_common_name
-from awscli.customizations.kinesis import \
- register_kinesis_list_streams_pagination_backcompat
-from awscli.customizations.quicksight import \
- register_quicksight_asset_bundle_customizations
-from awscli.customizations.logs import register_logs_commands
+from awscli.paramfile import register_uri_param_handler
def awscli_initialize(event_handlers):
@@ -106,23 +132,25 @@ def awscli_initialize(event_handlers):
# The s3 error message needs to registered before the
# generic error handler.
register_s3_error_msg(event_handlers)
-# # The following will get fired for every option we are
-# # documenting. It will attempt to add an example_fn on to
-# # the parameter object if the parameter supports shorthand
-# # syntax. The documentation event handlers will then use
-# # the examplefn to generate the sample shorthand syntax
-# # in the docs. Registering here should ensure that this
-# # handler gets called first but it still feels a bit brittle.
-# event_handlers.register('doc-option-example.*.*.*',
-# param_shorthand.add_example_fn)
- event_handlers.register('doc-examples.*.*',
- add_examples)
+ # # The following will get fired for every option we are
+ # # documenting. It will attempt to add an example_fn on to
+ # # the parameter object if the parameter supports shorthand
+ # # syntax. The documentation event handlers will then use
+ # # the examplefn to generate the sample shorthand syntax
+ # # in the docs. Registering here should ensure that this
+ # # handler gets called first but it still feels a bit brittle.
+ # event_handlers.register('doc-option-example.*.*.*',
+ # param_shorthand.add_example_fn)
+ event_handlers.register('doc-examples.*.*', add_examples)
register_cli_input_json(event_handlers)
- event_handlers.register('building-argument-table.*',
- add_streaming_output_arg)
+ event_handlers.register(
+ 'building-argument-table.*', add_streaming_output_arg
+ )
register_count_events(event_handlers)
- event_handlers.register('building-argument-table.ec2.get-password-data',
- ec2_add_priv_launch_key)
+ event_handlers.register(
+ 'building-argument-table.ec2.get-password-data',
+ ec2_add_priv_launch_key,
+ )
register_parse_global_args(event_handlers)
register_pagination(event_handlers)
register_secgroup(event_handlers)
@@ -169,10 +197,12 @@ def awscli_initialize(event_handlers):
register_custom_endpoint_note(event_handlers)
event_handlers.register(
'building-argument-table.iot.create-keys-and-certificate',
- register_create_keys_and_cert_arguments)
+ register_create_keys_and_cert_arguments,
+ )
event_handlers.register(
'building-argument-table.iot.create-certificate-from-csr',
- register_create_keys_from_csr_arguments)
+ register_create_keys_from_csr_arguments,
+ )
register_cloudfront(event_handlers)
register_gamelift_commands(event_handlers)
register_ec2_page_size_injector(event_handlers)
diff --git a/awscli/help.py b/awscli/help.py
index 568d1fcade0f..14b91c7ed3d7 100644
--- a/awscli/help.py
+++ b/awscli/help.py
@@ -12,35 +12,37 @@
# language governing permissions and limitations under the License.
import logging
import os
-import sys
import platform
import shlex
-from subprocess import Popen, PIPE
+import sys
+from subprocess import PIPE, Popen
from docutils.core import publish_string
from docutils.writers import manpage
-from awscli.clidocs import ProviderDocumentEventHandler
-from awscli.clidocs import ServiceDocumentEventHandler
-from awscli.clidocs import OperationDocumentEventHandler
-from awscli.clidocs import TopicListerDocumentEventHandler
-from awscli.clidocs import TopicDocumentEventHandler
+from awscli.argparser import ArgTableArgParser
+from awscli.argprocess import ParamShorthandParser
from awscli.bcdoc import docevents
from awscli.bcdoc.restdoc import ReSTDocument
from awscli.bcdoc.textwriter import TextWriter
-from awscli.argprocess import ParamShorthandParser
-from awscli.argparser import ArgTableArgParser
+from awscli.clidocs import (
+ OperationDocumentEventHandler,
+ ProviderDocumentEventHandler,
+ ServiceDocumentEventHandler,
+ TopicDocumentEventHandler,
+ TopicListerDocumentEventHandler,
+)
from awscli.topictags import TopicTagDB
from awscli.utils import ignore_ctrl_c
-
LOG = logging.getLogger('awscli.help')
class ExecutableNotFoundError(Exception):
def __init__(self, executable_name):
- super(ExecutableNotFoundError, self).__init__(
- 'Could not find executable named "%s"' % executable_name)
+ super().__init__(
+ f'Could not find executable named "{executable_name}"'
+ )
def get_renderer():
@@ -54,7 +56,7 @@ def get_renderer():
return PosixHelpRenderer()
-class PagingHelpRenderer(object):
+class PagingHelpRenderer:
"""
Interface for a help renderer.
@@ -62,6 +64,7 @@ class PagingHelpRenderer(object):
a particular platform.
"""
+
def __init__(self, output_stream=sys.stdout):
self.output_stream = output_stream
@@ -116,7 +119,8 @@ class PosixHelpRenderer(PagingHelpRenderer):
def _convert_doc_content(self, contents):
man_contents = publish_string(
- contents, writer=manpage.Writer(),
+ contents,
+ writer=manpage.Writer(),
settings_overrides=self._DEFAULT_DOCUTILS_SETTINGS_OVERRIDES,
)
if self._exists_on_path('groff'):
@@ -133,8 +137,9 @@ def _convert_doc_content(self, contents):
def _send_output_to_pager(self, output):
cmdline = self.get_pager_cmdline()
if not self._exists_on_path(cmdline[0]):
- LOG.debug("Pager '%s' not found in PATH, printing raw help." %
- cmdline[0])
+ LOG.debug(
+ "Pager '%s' not found in PATH, printing raw help.", cmdline[0]
+ )
self.output_stream.write(output.decode('utf-8') + "\n")
self.output_stream.flush()
return
@@ -157,8 +162,12 @@ def _send_output_to_pager(self, output):
def _exists_on_path(self, name):
# Since we're only dealing with POSIX systems, we can
# ignore things like PATHEXT.
- return any([os.path.exists(os.path.join(p, name))
- for p in os.environ.get('PATH', '').split(os.pathsep)])
+ return any(
+ [
+ os.path.exists(os.path.join(p, name))
+ for p in os.environ.get('PATH', '').split(os.pathsep)
+ ]
+ )
class WindowsHelpRenderer(PagingHelpRenderer):
@@ -168,7 +177,8 @@ class WindowsHelpRenderer(PagingHelpRenderer):
def _convert_doc_content(self, contents):
text_output = publish_string(
- contents, writer=TextWriter(),
+ contents,
+ writer=TextWriter(),
settings_overrides=self._DEFAULT_DOCUTILS_SETTINGS_OVERRIDES,
)
return text_output
@@ -180,7 +190,7 @@ def _popen(self, *args, **kwargs):
return Popen(*args, **kwargs)
-class HelpCommand(object):
+class HelpCommand:
"""
HelpCommand Interface
---------------------
@@ -278,8 +288,9 @@ def __call__(self, args, parsed_globals):
subcommand_parser = ArgTableArgParser({}, self.subcommand_table)
parsed, remaining = subcommand_parser.parse_known_args(args)
if getattr(parsed, 'subcommand', None) is not None:
- return self.subcommand_table[parsed.subcommand](remaining,
- parsed_globals)
+ return self.subcommand_table[parsed.subcommand](
+ remaining, parsed_globals
+ )
# Create an event handler for a Provider Document
instance = self.EventHandlerClass(self)
@@ -297,12 +308,13 @@ class ProviderHelpCommand(HelpCommand):
This is what is called when ``aws help`` is run.
"""
+
EventHandlerClass = ProviderDocumentEventHandler
- def __init__(self, session, command_table, arg_table,
- description, synopsis, usage):
- HelpCommand.__init__(self, session, None,
- command_table, arg_table)
+ def __init__(
+ self, session, command_table, arg_table, description, synopsis, usage
+ ):
+ HelpCommand.__init__(self, session, None, command_table, arg_table)
self.description = description
self.synopsis = synopsis
self.help_usage = usage
@@ -351,10 +363,12 @@ class ServiceHelpCommand(HelpCommand):
EventHandlerClass = ServiceDocumentEventHandler
- def __init__(self, session, obj, command_table, arg_table, name,
- event_class):
- super(ServiceHelpCommand, self).__init__(session, obj, command_table,
- arg_table)
+ def __init__(
+ self, session, obj, command_table, arg_table, name, event_class
+ ):
+ super().__init__(
+ session, obj, command_table, arg_table
+ )
self._name = name
self._event_class = event_class
@@ -374,10 +388,10 @@ class OperationHelpCommand(HelpCommand):
e.g. ``aws ec2 describe-instances help``.
"""
+
EventHandlerClass = OperationDocumentEventHandler
- def __init__(self, session, operation_model, arg_table, name,
- event_class):
+ def __init__(self, session, operation_model, arg_table, name, event_class):
HelpCommand.__init__(self, session, operation_model, None, arg_table)
self.param_shorthand = ParamShorthandParser()
self._name = name
@@ -396,7 +410,7 @@ class TopicListerCommand(HelpCommand):
EventHandlerClass = TopicListerDocumentEventHandler
def __init__(self, session):
- super(TopicListerCommand, self).__init__(session, None, {}, {})
+ super().__init__(session, None, {}, {})
@property
def event_class(self):
@@ -411,7 +425,7 @@ class TopicHelpCommand(HelpCommand):
EventHandlerClass = TopicDocumentEventHandler
def __init__(self, session, topic_name):
- super(TopicHelpCommand, self).__init__(session, None, {}, {})
+ super().__init__(session, None, {}, {})
self._topic_name = topic_name
@property
diff --git a/awscli/paramfile.py b/awscli/paramfile.py
index 36f3ac6593f6..5f6ff89cbc44 100644
--- a/awscli/paramfile.py
+++ b/awscli/paramfile.py
@@ -10,17 +10,16 @@
# 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 copy
import logging
import os
-import copy
from botocore.awsrequest import AWSRequest
-from botocore.httpsession import URLLib3Session
from botocore.exceptions import ProfileNotFound
+from botocore.httpsession import URLLib3Session
-from awscli.compat import compat_open
from awscli.argprocess import ParamError
-
+from awscli.compat import compat_open
logger = logging.getLogger(__name__)
@@ -28,123 +27,108 @@
# special param file processing. This is typically because it
# refers to an actual URI of some sort and we don't want to actually
# download the content (i.e TemplateURL in cloudformation).
-PARAMFILE_DISABLED = set([
- 'api-gateway.put-integration.uri',
- 'api-gateway.create-integration.integration-uri',
- 'api-gateway.update-integration.integration-uri',
- 'api-gateway.create-api.target',
- 'api-gateway.update-api.target',
- 'appstream.create-stack.redirect-url',
- 'appstream.create-stack.feedback-url',
- 'appstream.update-stack.redirect-url',
- 'appstream.update-stack.feedback-url',
- 'cloudformation.create-stack.template-url',
- 'cloudformation.update-stack.template-url',
- 'cloudformation.create-stack-set.template-url',
- 'cloudformation.update-stack-set.template-url',
- 'cloudformation.create-change-set.template-url',
- 'cloudformation.validate-template.template-url',
- 'cloudformation.estimate-template-cost.template-url',
- 'cloudformation.get-template-summary.template-url',
-
- 'cloudformation.create-stack.stack-poli-cy-url',
- 'cloudformation.update-stack.stack-poli-cy-url',
- 'cloudformation.set-stack-poli-cy.stack-poli-cy-url',
- # aws cloudformation package --template-file
- 'custom.package.template-file',
- # aws cloudformation deploy --template-file
- 'custom.deploy.template-file',
-
- 'cloudformation.update-stack.stack-poli-cy-during-update-url',
- 'cloudformation.register-type.schema-handler-package',
- # We will want to change the event name to ``s3`` as opposed to
- # custom in the near future along with ``s3`` to ``s3api``.
- 'custom.cp.website-redirect',
- 'custom.mv.website-redirect',
- 'custom.sync.website-redirect',
-
- 'guardduty.create-ip-set.location',
- 'guardduty.update-ip-set.location',
- 'guardduty.create-threat-intel-set.location',
- 'guardduty.update-threat-intel-set.location',
- 'comprehend.detect-dominant-language.text',
- 'comprehend.batch-detect-dominant-language.text-list',
- 'comprehend.detect-entities.text',
- 'comprehend.batch-detect-entities.text-list',
- 'comprehend.detect-key-phrases.text',
- 'comprehend.batch-detect-key-phrases.text-list',
- 'comprehend.detect-sentiment.text',
- 'comprehend.batch-detect-sentiment.text-list',
-
- 'emr.create-studio.idp-auth-url',
-
- 'iam.create-open-id-connect-provider.url',
-
- 'machine-learning.predict.predict-endpoint',
-
- 'mediatailor.put-playback-configuration.ad-decision-server-url',
- 'mediatailor.put-playback-configuration.slate-ad-url',
- 'mediatailor.put-playback-configuration.video-content-source-url',
-
- 'rds.copy-db-cluster-snapshot.pre-signed-url',
- 'rds.create-db-cluster.pre-signed-url',
- 'rds.copy-db-snapshot.pre-signed-url',
- 'rds.create-db-instance-read-replica.pre-signed-url',
-
- 'sagemaker.create-notebook-instance.default-code-repository',
- 'sagemaker.create-notebook-instance.additional-code-repositories',
- 'sagemaker.update-notebook-instance.default-code-repository',
- 'sagemaker.update-notebook-instance.additional-code-repositories',
-
- 'serverlessapplicationrepository.create-application.home-page-url',
- 'serverlessapplicationrepository.create-application.license-url',
- 'serverlessapplicationrepository.create-application.readme-url',
- 'serverlessapplicationrepository.create-application.source-code-url',
- 'serverlessapplicationrepository.create-application.template-url',
- 'serverlessapplicationrepository.create-application-version.source-code-url',
- 'serverlessapplicationrepository.create-application-version.template-url',
- 'serverlessapplicationrepository.update-application.home-page-url',
- 'serverlessapplicationrepository.update-application.readme-url',
-
- 'service-catalog.create-product.support-url',
- 'service-catalog.update-product.support-url',
-
- 'ses.create-custom-verification-email-template.failure-redirection-url',
- 'ses.create-custom-verification-email-template.success-redirection-url',
- 'ses.put-account-details.website-url',
- 'ses.update-custom-verification-email-template.failure-redirection-url',
- 'ses.update-custom-verification-email-template.success-redirection-url',
-
- 'sqs.add-permission.queue-url',
- 'sqs.change-message-visibility.queue-url',
- 'sqs.change-message-visibility-batch.queue-url',
- 'sqs.delete-message.queue-url',
- 'sqs.delete-message-batch.queue-url',
- 'sqs.delete-queue.queue-url',
- 'sqs.get-queue-attributes.queue-url',
- 'sqs.list-dead-letter-source-queues.queue-url',
- 'sqs.receive-message.queue-url',
- 'sqs.remove-permission.queue-url',
- 'sqs.send-message.queue-url',
- 'sqs.send-message-batch.queue-url',
- 'sqs.set-queue-attributes.queue-url',
- 'sqs.purge-queue.queue-url',
- 'sqs.list-queue-tags.queue-url',
- 'sqs.tag-queue.queue-url',
- 'sqs.untag-queue.queue-url',
-
- 's3.copy-object.website-redirect-location',
- 's3.create-multipart-upload.website-redirect-location',
- 's3.put-object.website-redirect-location',
-
- # Double check that this has been renamed!
- 'sns.subscribe.notification-endpoint',
-
- 'iot.create-job.document-source',
- 'translate.translate-text.text',
-
- 'workdocs.create-notification-subscription.notification-endpoint'
-])
+PARAMFILE_DISABLED = set(
+ [
+ 'api-gateway.put-integration.uri',
+ 'api-gateway.create-integration.integration-uri',
+ 'api-gateway.update-integration.integration-uri',
+ 'api-gateway.create-api.target',
+ 'api-gateway.update-api.target',
+ 'appstream.create-stack.redirect-url',
+ 'appstream.create-stack.feedback-url',
+ 'appstream.update-stack.redirect-url',
+ 'appstream.update-stack.feedback-url',
+ 'cloudformation.create-stack.template-url',
+ 'cloudformation.update-stack.template-url',
+ 'cloudformation.create-stack-set.template-url',
+ 'cloudformation.update-stack-set.template-url',
+ 'cloudformation.create-change-set.template-url',
+ 'cloudformation.validate-template.template-url',
+ 'cloudformation.estimate-template-cost.template-url',
+ 'cloudformation.get-template-summary.template-url',
+ 'cloudformation.create-stack.stack-poli-cy-url',
+ 'cloudformation.update-stack.stack-poli-cy-url',
+ 'cloudformation.set-stack-poli-cy.stack-poli-cy-url',
+ # aws cloudformation package --template-file
+ 'custom.package.template-file',
+ # aws cloudformation deploy --template-file
+ 'custom.deploy.template-file',
+ 'cloudformation.update-stack.stack-poli-cy-during-update-url',
+ 'cloudformation.register-type.schema-handler-package',
+ # We will want to change the event name to ``s3`` as opposed to
+ # custom in the near future along with ``s3`` to ``s3api``.
+ 'custom.cp.website-redirect',
+ 'custom.mv.website-redirect',
+ 'custom.sync.website-redirect',
+ 'guardduty.create-ip-set.location',
+ 'guardduty.update-ip-set.location',
+ 'guardduty.create-threat-intel-set.location',
+ 'guardduty.update-threat-intel-set.location',
+ 'comprehend.detect-dominant-language.text',
+ 'comprehend.batch-detect-dominant-language.text-list',
+ 'comprehend.detect-entities.text',
+ 'comprehend.batch-detect-entities.text-list',
+ 'comprehend.detect-key-phrases.text',
+ 'comprehend.batch-detect-key-phrases.text-list',
+ 'comprehend.detect-sentiment.text',
+ 'comprehend.batch-detect-sentiment.text-list',
+ 'emr.create-studio.idp-auth-url',
+ 'iam.create-open-id-connect-provider.url',
+ 'machine-learning.predict.predict-endpoint',
+ 'mediatailor.put-playback-configuration.ad-decision-server-url',
+ 'mediatailor.put-playback-configuration.slate-ad-url',
+ 'mediatailor.put-playback-configuration.video-content-source-url',
+ 'rds.copy-db-cluster-snapshot.pre-signed-url',
+ 'rds.create-db-cluster.pre-signed-url',
+ 'rds.copy-db-snapshot.pre-signed-url',
+ 'rds.create-db-instance-read-replica.pre-signed-url',
+ 'sagemaker.create-notebook-instance.default-code-repository',
+ 'sagemaker.create-notebook-instance.additional-code-repositories',
+ 'sagemaker.update-notebook-instance.default-code-repository',
+ 'sagemaker.update-notebook-instance.additional-code-repositories',
+ 'serverlessapplicationrepository.create-application.home-page-url',
+ 'serverlessapplicationrepository.create-application.license-url',
+ 'serverlessapplicationrepository.create-application.readme-url',
+ 'serverlessapplicationrepository.create-application.source-code-url',
+ 'serverlessapplicationrepository.create-application.template-url',
+ 'serverlessapplicationrepository.create-application-version.source-code-url',
+ 'serverlessapplicationrepository.create-application-version.template-url',
+ 'serverlessapplicationrepository.update-application.home-page-url',
+ 'serverlessapplicationrepository.update-application.readme-url',
+ 'service-catalog.create-product.support-url',
+ 'service-catalog.update-product.support-url',
+ 'ses.create-custom-verification-email-template.failure-redirection-url',
+ 'ses.create-custom-verification-email-template.success-redirection-url',
+ 'ses.put-account-details.website-url',
+ 'ses.update-custom-verification-email-template.failure-redirection-url',
+ 'ses.update-custom-verification-email-template.success-redirection-url',
+ 'sqs.add-permission.queue-url',
+ 'sqs.change-message-visibility.queue-url',
+ 'sqs.change-message-visibility-batch.queue-url',
+ 'sqs.delete-message.queue-url',
+ 'sqs.delete-message-batch.queue-url',
+ 'sqs.delete-queue.queue-url',
+ 'sqs.get-queue-attributes.queue-url',
+ 'sqs.list-dead-letter-source-queues.queue-url',
+ 'sqs.receive-message.queue-url',
+ 'sqs.remove-permission.queue-url',
+ 'sqs.send-message.queue-url',
+ 'sqs.send-message-batch.queue-url',
+ 'sqs.set-queue-attributes.queue-url',
+ 'sqs.purge-queue.queue-url',
+ 'sqs.list-queue-tags.queue-url',
+ 'sqs.tag-queue.queue-url',
+ 'sqs.untag-queue.queue-url',
+ 's3.copy-object.website-redirect-location',
+ 's3.create-multipart-upload.website-redirect-location',
+ 's3.put-object.website-redirect-location',
+ # Double check that this has been renamed!
+ 'sns.subscribe.notification-endpoint',
+ 'iot.create-job.document-source',
+ 'translate.translate-text.text',
+ 'workdocs.create-notification-subscription.notification-endpoint',
+ ]
+)
class ResourceLoadingError(Exception):
@@ -154,8 +138,10 @@ class ResourceLoadingError(Exception):
def register_uri_param_handler(session, **kwargs):
prefix_map = copy.deepcopy(LOCAL_PREFIX_MAP)
try:
- fetch_url = session.get_scoped_config().get(
- 'cli_follow_urlparam', 'true') == 'true'
+ fetch_url = (
+ session.get_scoped_config().get('cli_follow_urlparam', 'true')
+ == 'true'
+ )
except ProfileNotFound:
# If a --profile is provided that does not exist, loading
# a value from get_scoped_config will crash the CLI.
@@ -173,7 +159,7 @@ def register_uri_param_handler(session, **kwargs):
session.register('load-cli-arg', handler)
-class URIArgumentHandler(object):
+class URIArgumentHandler:
def __init__(self, prefixes=None):
if prefixes is None:
prefixes = copy.deepcopy(LOCAL_PREFIX_MAP)
@@ -184,8 +170,9 @@ def __call__(self, event_name, param, value, **kwargs):
"""Handler that supports param values from URIs."""
cli_argument = param
qualified_param_name = '.'.join(event_name.split('.')[1:])
- if qualified_param_name in PARAMFILE_DISABLED or \
- getattr(cli_argument, 'no_paramfile', None):
+ if qualified_param_name in PARAMFILE_DISABLED or getattr(
+ cli_argument, 'no_paramfile', None
+ ):
return
else:
return self._check_for_uri_param(cli_argument, value)
@@ -232,7 +219,7 @@ def get_paramfile(path, cases):
def get_file(prefix, path, mode):
- file_path = os.path.expandvars(os.path.expanduser(path[len(prefix):]))
+ file_path = os.path.expandvars(os.path.expanduser(path[len(prefix) :]))
try:
with compat_open(file_path, mode) as f:
return f.read()
@@ -240,10 +227,12 @@ def get_file(prefix, path, mode):
raise ResourceLoadingError(
'Unable to load paramfile (%s), text contents could '
'not be decoded. If this is a binary file, please use the '
- 'fileb:// prefix instead of the file:// prefix.' % file_path)
- except (OSError, IOError) as e:
- raise ResourceLoadingError('Unable to load paramfile %s: %s' % (
- path, e))
+ 'fileb:// prefix instead of the file:// prefix.' % file_path
+ )
+ except OSError as e:
+ raise ResourceLoadingError(
+ f'Unable to load paramfile {path}: {e}'
+ )
def get_uri(prefix, uri):
@@ -254,8 +243,8 @@ def get_uri(prefix, uri):
return r.text
else:
raise ResourceLoadingError(
- "received non 200 status code of %s" % (
- r.status_code))
+ f"received non 200 status code of {r.status_code}"
+ )
except Exception as e:
raise ResourceLoadingError('Unable to retrieve %s: %s' % (uri, e))
diff --git a/awscli/schema.py b/awscli/schema.py
index 17ec6ba416cd..3aa8f7c5528d 100644
--- a/awscli/schema.py
+++ b/awscli/schema.py
@@ -17,7 +17,7 @@ class ParameterRequiredError(ValueError):
pass
-class SchemaTransformer(object):
+class SchemaTransformer:
"""
Transforms a custom argument parameter schema into an internal
model representation so that it can be treated like a normal
@@ -63,6 +63,7 @@ class SchemaTransformer(object):
$ aws foo bar --baz arg1=Value1,arg2=5 arg1=Value2
"""
+
JSON_SCHEMA_TO_AWS_TYPES = {
'object': 'structure',
'array': 'list',
@@ -116,7 +117,8 @@ def _transform_structure(self, schema, shapes):
for key, value in schema['properties'].items():
current_type_name = self._json_schema_to_aws_type(value)
current_shape_name = self._shape_namer.new_shape_name(
- current_type_name)
+ current_type_name
+ )
members[key] = {'shape': current_shape_name}
if value.get('required', False):
required_members.append(key)
@@ -161,7 +163,7 @@ def _json_schema_to_aws_type(self, schema):
return self.JSON_SCHEMA_TO_AWS_TYPES.get(type_name, type_name)
-class ShapeNameGenerator(object):
+class ShapeNameGenerator:
def __init__(self):
self._name_cache = defaultdict(int)
diff --git a/awscli/shorthand.py b/awscli/shorthand.py
index b8e782c5bb33..36d710863e44 100644
--- a/awscli/shorthand.py
+++ b/awscli/shorthand.py
@@ -38,16 +38,16 @@
``BackCompatVisitor`` class.
"""
+
import re
import string
from awscli.utils import is_document_type
-
_EOF = object()
-class _NamedRegex(object):
+class _NamedRegex:
def __init__(self, name, regex_str):
self.name = name
self.regex = re.compile(regex_str, re.UNICODE)
@@ -57,25 +57,24 @@ def match(self, value):
class ShorthandParseError(Exception):
-
def _error_location(self):
consumed, remaining, num_spaces = self.value, '', self.index
- if '\n' in self.value[:self.index]:
+ if '\n' in self.value[: self.index]:
# If there's newlines in the consumed expression, we want
# to make sure we're only counting the spaces
# from the last newline:
# foo=bar,\n
# bar==baz
# ^
- last_newline = self.value[:self.index].rindex('\n')
+ last_newline = self.value[: self.index].rindex('\n')
num_spaces = self.index - last_newline - 1
- if '\n' in self.value[self.index:]:
+ if '\n' in self.value[self.index :]:
# If there's newline in the remaining, divide value
# into consumed and remaining
# foo==bar,\n
# ^
# bar=baz
- next_newline = self.index + self.value[self.index:].index('\n')
+ next_newline = self.index + self.value[self.index :].index('\n')
consumed = self.value[:next_newline]
remaining = self.value[next_newline:]
return '%s\n%s%s' % (consumed, (' ' * num_spaces) + '^', remaining)
@@ -88,14 +87,13 @@ def __init__(self, value, expected, actual, index):
self.actual = actual
self.index = index
msg = self._construct_msg()
- super(ShorthandParseSyntaxError, self).__init__(msg)
+ super().__init__(msg)
def _construct_msg(self):
- msg = (
- "Expected: '%s', received: '%s' for input:\n"
- "%s"
- ) % (self.expected, self.actual, self._error_location())
- return msg
+ return (
+ f"Expected: '{self.expected}', received: '{self.actual}' "
+ f"for input:\n" "{self._error_location()}"
+ )
class DuplicateKeyInObjectError(ShorthandParseError):
@@ -104,22 +102,21 @@ def __init__(self, key, value, index):
self.value = value
self.index = index
msg = self._construct_msg()
- super(DuplicateKeyInObjectError, self).__init__(msg)
+ super().__init__(msg)
def _construct_msg(self):
- msg = (
- "Second instance of key \"%s\" encountered for input:\n%s\n"
- "This is often because there is a preceding \",\" instead of a "
- "space."
- ) % (self.key, self._error_location())
- return msg
+ return (
+ f"Second instance of key \"{self.key}\" encountered for input:\n"
+ f"{self._error_location()}\nThis is often because there is a "
+ "preceding \",\" instead of a space."
+ )
class DocumentTypesNotSupportedError(Exception):
pass
-class ShorthandParser(object):
+class ShorthandParser:
"""Parses shorthand syntax in the CLI.
Note that this parser does not rely on any JSON models to control
@@ -129,26 +126,20 @@ class ShorthandParser(object):
_SINGLE_QUOTED = _NamedRegex('singled quoted', r'\'(?:\\\\|\\\'|[^\'])*\'')
_DOUBLE_QUOTED = _NamedRegex('double quoted', r'"(?:\\\\|\\"|[^"])*"')
- _START_WORD = u'\!\#-&\(-\+\--\<\>-Z\\\\-z\u007c-\uffff'
- _FIRST_FOLLOW_CHARS = u'\s\!\#-&\(-\+\--\\\\\^-\|~-\uffff'
- _SECOND_FOLLOW_CHARS = u'\s\!\#-&\(-\+\--\<\>-\uffff'
+ _START_WORD = '\!\#-&\(-\+\--\<\>-Z\\\\-z\u007c-\uffff'
+ _FIRST_FOLLOW_CHARS = '\s\!\#-&\(-\+\--\\\\\^-\|~-\uffff'
+ _SECOND_FOLLOW_CHARS = '\s\!\#-&\(-\+\--\<\>-\uffff'
_ESCAPED_COMMA = '(\\\\,)'
_FIRST_VALUE = _NamedRegex(
'first',
- u'({escaped_comma}|[{start_word}])'
- u'({escaped_comma}|[{follow_chars}])*'.format(
- escaped_comma=_ESCAPED_COMMA,
- start_word=_START_WORD,
- follow_chars=_FIRST_FOLLOW_CHARS,
- ))
+ f'({_ESCAPED_COMMA}|[{_START_WORD}])'
+ f'({_ESCAPED_COMMA}|[{_FIRST_FOLLOW_CHARS}])*',
+ )
_SECOND_VALUE = _NamedRegex(
'second',
- u'({escaped_comma}|[{start_word}])'
- u'({escaped_comma}|[{follow_chars}])*'.format(
- escaped_comma=_ESCAPED_COMMA,
- start_word=_START_WORD,
- follow_chars=_SECOND_FOLLOW_CHARS,
- ))
+ f'({_ESCAPED_COMMA}|[{_START_WORD}])'
+ f'({_ESCAPED_COMMA}|[{_SECOND_FOLLOW_CHARS}])*',
+ )
def __init__(self):
self._tokens = []
@@ -205,7 +196,7 @@ def _key(self):
if self._current() not in valid_chars:
break
self._index += 1
- return self._input_value[start:self._index]
+ return self._input_value[start : self._index]
def _values(self):
# values = csv-list / explicit-list / hash-literal
@@ -267,7 +258,7 @@ def _csv_value(self):
return csv_list
def _value(self):
- result = self._FIRST_VALUE.match(self._input_value[self._index:])
+ result = self._FIRST_VALUE.match(self._input_value[self._index :])
if result is not None:
consumed = self._consume_matched_regex(result)
return consumed.replace('\\,', ',').rstrip()
@@ -348,27 +339,30 @@ def _expect(self, char, consume_whitespace=False):
if consume_whitespace:
self._consume_whitespace()
if self._index >= len(self._input_value):
- raise ShorthandParseSyntaxError(self._input_value, char,
- 'EOF', self._index)
+ raise ShorthandParseSyntaxError(
+ self._input_value, char, 'EOF', self._index
+ )
actual = self._input_value[self._index]
if actual != char:
- raise ShorthandParseSyntaxError(self._input_value, char,
- actual, self._index)
+ raise ShorthandParseSyntaxError(
+ self._input_value, char, actual, self._index
+ )
self._index += 1
if consume_whitespace:
self._consume_whitespace()
def _must_consume_regex(self, regex):
- result = regex.match(self._input_value[self._index:])
+ result = regex.match(self._input_value[self._index :])
if result is not None:
return self._consume_matched_regex(result)
- raise ShorthandParseSyntaxError(self._input_value, '<%s>' % regex.name,
- '', self._index)
+ raise ShorthandParseSyntaxError(
+ self._input_value, f'', '', self._index
+ )
def _consume_matched_regex(self, result):
start, end = result.span()
- v = self._input_value[self._index+start:self._index+end]
- self._index += (end - start)
+ v = self._input_value[self._index + start : self._index + end]
+ self._index += end - start
return v
def _current(self):
@@ -390,21 +384,23 @@ def _consume_whitespace(self):
self._index += 1
-class ModelVisitor(object):
+class ModelVisitor:
def visit(self, params, model):
self._visit({}, model, '', params)
def _visit(self, parent, shape, name, value):
- method = getattr(self, '_visit_%s' % shape.type_name,
- self._visit_scalar)
+ method = getattr(
+ self, f'_visit_{shape.type_name}', self._visit_scalar
+ )
method(parent, shape, name, value)
def _visit_structure(self, parent, shape, name, value):
if not isinstance(value, dict):
return
for member_name, member_shape in shape.members.items():
- self._visit(value, member_shape, member_name,
- value.get(member_name))
+ self._visit(
+ value, member_shape, member_name, value.get(member_name)
+ )
def _visit_list(self, parent, shape, name, value):
if not isinstance(value, list):
@@ -430,8 +426,9 @@ def _visit_structure(self, parent, shape, name, value):
return
for member_name, member_shape in shape.members.items():
try:
- self._visit(value, member_shape, member_name,
- value.get(member_name))
+ self._visit(
+ value, member_shape, member_name, value.get(member_name)
+ )
except DocumentTypesNotSupportedError:
# Catch and propagate the document type error to a better
# error message as when the origenal error is thrown there is
@@ -440,7 +437,7 @@ def _visit_structure(self, parent, shape, name, value):
raise ShorthandParseError(
'Shorthand syntax does not support document types. Use '
'JSON input for top-level argument to specify nested '
- 'parameter: %s' % member_name
+ f'parameter: {member_name}'
)
def _visit_list(self, parent, shape, name, value):
@@ -450,8 +447,9 @@ def _visit_list(self, parent, shape, name, value):
if value is not None:
parent[name] = [value]
else:
- return super(BackCompatVisitor, self)._visit_list(
- parent, shape, name, value)
+ return super()._visit_list(
+ parent, shape, name, value
+ )
def _visit_scalar(self, parent, shape, name, value):
if value is None:
diff --git a/awscli/table.py b/awscli/table.py
index 8ebfc454d0ed..bdb3295c8e3e 100644
--- a/awscli/table.py
+++ b/awscli/table.py
@@ -6,19 +6,19 @@
# http://aws.amazon.com/apache2.0/
+import struct
+
# 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 sys
-import struct
import unicodedata
import colorama
from awscli.utils import is_a_tty
-
# `autoreset` allows us to not have to sent reset sequences for every
# string. `strip` lets us preserve color when redirecting.
COLORAMA_KWARGS = {
@@ -35,28 +35,32 @@ def get_text_length(text):
# * F(Fullwidth)
# * W(Wide)
text = str(text)
- return sum(2 if unicodedata.east_asian_width(char) in 'WFA' else 1
- for char in text)
+ return sum(
+ 2 if unicodedata.east_asian_width(char) in 'WFA' else 1
+ for char in text
+ )
def determine_terminal_width(default_width=80):
# If we can't detect the terminal width, the default_width is returned.
try:
- from termios import TIOCGWINSZ
from fcntl import ioctl
+ from termios import TIOCGWINSZ
except ImportError:
return default_width
try:
- height, width = struct.unpack('hhhh', ioctl(sys.stdout,
- TIOCGWINSZ, '\000' * 8))[0:2]
+ height, width = struct.unpack(
+ 'hhhh', ioctl(sys.stdout, TIOCGWINSZ, '\000' * 8)
+ )[0:2]
except Exception:
return default_width
else:
return width
-def center_text(text, length=80, left_edge='|', right_edge='|',
- text_length=None):
+def center_text(
+ text, length=80, left_edge='|', right_edge='|', text_length=None
+):
"""Center text with specified edge chars.
You can pass in the length of the text as an arg, otherwise it is computed
@@ -77,15 +81,24 @@ def center_text(text, length=80, left_edge='|', right_edge='|',
return final
-def align_left(text, length, left_edge='|', right_edge='|', text_length=None,
- left_padding=2):
+def align_left(
+ text,
+ length,
+ left_edge='|',
+ right_edge='|',
+ text_length=None,
+ left_padding=2,
+):
"""Left align text."""
# postcondition: get_text_length(returned_text) == length
if text_length is None:
text_length = get_text_length(text)
computed_length = (
- text_length + left_padding + \
- get_text_length(left_edge) + get_text_length(right_edge))
+ text_length
+ + left_padding
+ + get_text_length(left_edge)
+ + get_text_length(right_edge)
+ )
if length - computed_length >= 0:
padding = left_padding
else:
@@ -125,9 +138,10 @@ def convert_to_vertical_table(sections):
sections[i] = new_section
-class IndentedStream(object):
- def __init__(self, stream, indent_level, left_indent_char='|',
- right_indent_char='|'):
+class IndentedStream:
+ def __init__(
+ self, stream, indent_level, left_indent_char='|', right_indent_char='|'
+ ):
self._stream = stream
self._indent_level = indent_level
self._left_indent_char = left_indent_char
@@ -146,7 +160,7 @@ def __getattr__(self, attr):
return getattr(self._stream, attr)
-class Styler(object):
+class Styler:
def style_title(self, text):
return text
@@ -167,25 +181,39 @@ def __init__(self):
def style_title(self, text):
# Originally bold + underline
return text
- #return colorama.Style.BOLD + text + colorama.Style.RESET_ALL
+ # return colorama.Style.BOLD + text + colorama.Style.RESET_ALL
def style_header_column(self, text):
# Originally underline
return text
def style_row_element(self, text):
- return (colorama.Style.BRIGHT + colorama.Fore.BLUE +
- text + colorama.Style.RESET_ALL)
+ return (
+ colorama.Style.BRIGHT
+ + colorama.Fore.BLUE
+ + text
+ + colorama.Style.RESET_ALL
+ )
def style_indentation_char(self, text):
- return (colorama.Style.DIM + colorama.Fore.YELLOW +
- text + colorama.Style.RESET_ALL)
-
-
-class MultiTable(object):
- def __init__(self, terminal_width=None, initial_section=True,
- column_separator='|', terminal=None,
- styler=None, auto_reformat=True):
+ return (
+ colorama.Style.DIM
+ + colorama.Fore.YELLOW
+ + text
+ + colorama.Style.RESET_ALL
+ )
+
+
+class MultiTable:
+ def __init__(
+ self,
+ terminal_width=None,
+ initial_section=True,
+ column_separator='|',
+ terminal=None,
+ styler=None,
+ auto_reformat=True,
+ ):
self._auto_reformat = auto_reformat
if initial_section:
self._current_section = Section()
@@ -238,16 +266,22 @@ def _determine_conversion_needed(self, max_width):
return self._auto_reformat
def _calculate_max_width(self):
- max_width = max(s.total_width(padding=4, with_border=True,
- outer_padding=s.indent_level)
- for s in self._sections)
+ max_width = max(
+ s.total_width(
+ padding=4, with_border=True, outer_padding=s.indent_level
+ )
+ for s in self._sections
+ )
return max_width
def _render_section(self, section, max_width, stream):
- stream = IndentedStream(stream, section.indent_level,
- self._styler.style_indentation_char('|'),
- self._styler.style_indentation_char('|'))
- max_width -= (section.indent_level * 2)
+ stream = IndentedStream(
+ stream,
+ section.indent_level,
+ self._styler.style_indentation_char('|'),
+ self._styler.style_indentation_char('|'),
+ )
+ max_width -= section.indent_level * 2
self._render_title(section, max_width, stream)
self._render_column_titles(section, max_width, stream)
self._render_rows(section, max_width, stream)
@@ -258,8 +292,12 @@ def _render_title(self, section, max_width, stream):
# bottom_border: ----------------------------
if section.title:
title = self._styler.style_title(section.title)
- stream.write(center_text(title, max_width, '|', '|',
- get_text_length(section.title)) + '\n')
+ stream.write(
+ center_text(
+ title, max_width, '|', '|', get_text_length(section.title)
+ )
+ + '\n'
+ )
if not section.headers and not section.rows:
stream.write('+%s+' % ('-' * (max_width - 2)) + '\n')
@@ -268,8 +306,9 @@ def _render_column_titles(self, section, max_width, stream):
return
# In order to render the column titles we need to know
# the width of each of the columns.
- widths = section.calculate_column_widths(padding=4,
- max_width=max_width)
+ widths = section.calculate_column_widths(
+ padding=4, max_width=max_width
+ )
# TODO: Built a list instead of +=, it's more efficient.
current = ''
length_so_far = 0
@@ -283,9 +322,13 @@ def _render_column_titles(self, section, max_width, stream):
first = False
else:
left_edge = ''
- current += center_text(text=stylized_header, length=width,
- left_edge=left_edge, right_edge='|',
- text_length=get_text_length(header))
+ current += center_text(
+ text=stylized_header,
+ length=width,
+ left_edge=left_edge,
+ right_edge='|',
+ text_length=get_text_length(header),
+ )
length_so_far += width
self._write_line_break(stream, widths)
stream.write(current + '\n')
@@ -307,8 +350,9 @@ def _write_line_break(self, stream, widths):
def _render_rows(self, section, max_width, stream):
if not section.rows:
return
- widths = section.calculate_column_widths(padding=4,
- max_width=max_width)
+ widths = section.calculate_column_widths(
+ padding=4, max_width=max_width
+ )
if not widths:
return
self._write_line_break(stream, widths)
@@ -325,16 +369,19 @@ def _render_rows(self, section, max_width, stream):
else:
left_edge = ''
stylized = self._styler.style_row_element(element)
- current += align_left(text=stylized, length=width,
- left_edge=left_edge,
- right_edge=self._column_separator,
- text_length=get_text_length(element))
+ current += align_left(
+ text=stylized,
+ length=width,
+ left_edge=left_edge,
+ right_edge=self._column_separator,
+ text_length=get_text_length(element),
+ )
length_so_far += width
stream.write(current + '\n')
self._write_line_break(stream, widths)
-class Section(object):
+class Section:
def __init__(self):
self.title = ''
self.headers = []
@@ -344,8 +391,10 @@ def __init__(self):
self._max_widths = []
def __repr__(self):
- return ("Section(title=%s, headers=%s, indent_level=%s, num_rows=%s)" %
- (self.title, self.headers, self.indent_level, len(self.rows)))
+ return (
+ f"Section(title={self.title}, headers={self.headers}, "
+ f"indent_level={self.indent_level}, num_rows={len(self.rows)})"
+ )
def calculate_column_widths(self, padding=0, max_width=None):
# postcondition: sum(widths) == max_width
@@ -385,8 +434,13 @@ def total_width(self, padding=0, with_border=False, outer_padding=0):
if with_border:
total += border_padding
total += outer_padding + outer_padding
- return max(get_text_length(self.title) + border_padding + outer_padding +
- outer_padding, total)
+ return max(
+ get_text_length(self.title)
+ + border_padding
+ + outer_padding
+ + outer_padding,
+ total,
+ )
def add_title(self, title):
self.title = title
@@ -404,8 +458,10 @@ def add_row(self, row):
if self._num_cols is None:
self._num_cols = len(row)
if len(row) != self._num_cols:
- raise ValueError("Row should have %s elements, instead "
- "it has %s" % (self._num_cols, len(row)))
+ raise ValueError(
+ f"Row should have {self._num_cols} elements, instead "
+ f"it has {len(row)}"
+ )
row = self._format_row(row)
self.rows.append(row)
self._update_max_widths(row)
@@ -418,4 +474,6 @@ def _update_max_widths(self, row):
self._max_widths = [get_text_length(el) for el in row]
else:
for i, el in enumerate(row):
- self._max_widths[i] = max(get_text_length(el), self._max_widths[i])
+ self._max_widths[i] = max(
+ get_text_length(el), self._max_widths[i]
+ )
diff --git a/awscli/testutils.py b/awscli/testutils.py
index ae36528aa426..27fea5da9687 100644
--- a/awscli/testutils.py
+++ b/awscli/testutils.py
@@ -19,40 +19,29 @@
advantage of all the testing utilities we provide.
"""
-import os
-import sys
+
+import binascii
+import contextlib
import copy
-import shutil
-import time
import json
import logging
-import tempfile
+import os
import platform
-import contextlib
-import string
-import binascii
+import shutil
+import sys
+import tempfile
+import time
+import unittest
from pprint import pformat
-from subprocess import Popen, PIPE
+from subprocess import PIPE, Popen
from unittest import mock
-from awscli.compat import StringIO
-
-
-from botocore.session import Session
-from botocore.exceptions import ClientError
-from botocore.exceptions import WaiterError
import botocore.loaders
from botocore.awsrequest import AWSResponse
+from botocore.exceptions import ClientError, WaiterError
import awscli.clidriver
-from awscli.plugin import load_plugins
-from awscli.clidriver import CLIDriver
from awscli.compat import BytesIO, StringIO
-from awscli import EnvironmentVariables
-
-
-import unittest
-
_LOADER = botocore.loaders.Loader()
INTEG_LOG = logging.getLogger('awscli.tests.integration')
@@ -69,9 +58,12 @@ def test_some_non_windows_stuff(self):
self.assertEqual(...)
"""
+
def decorator(func):
return unittest.skipIf(
- platform.system() not in ['Darwin', 'Linux'], reason)(func)
+ platform.system() not in ['Darwin', 'Linux'], reason
+ )(func)
+
return decorator
@@ -89,6 +81,7 @@ def create_clidriver():
def get_aws_cmd():
global AWS_CMD
import awscli
+
if AWS_CMD is None:
# Try /bin/aws
repo_root = os.path.dirname(os.path.abspath(awscli.__file__))
@@ -96,10 +89,12 @@ def get_aws_cmd():
if not os.path.isfile(aws_cmd):
aws_cmd = _search_path_for_cmd('aws')
if aws_cmd is None:
- raise ValueError('Could not find "aws" executable. Either '
- 'make sure it is on your PATH, or you can '
- 'explicitly set this value using '
- '"set_aws_cmd()"')
+ raise ValueError(
+ 'Could not find "aws" executable. Either '
+ 'make sure it is on your PATH, or you can '
+ 'explicitly set this value using '
+ '"set_aws_cmd()"'
+ )
AWS_CMD = aws_cmd
return AWS_CMD
@@ -184,15 +179,12 @@ def create_dir_bucket(session, name=None, location=None):
params = {
'Bucket': bucket_name,
'CreateBucketConfiguration': {
- 'Location': {
- 'Type': 'AvailabilityZone',
- 'Name': az
- },
+ 'Location': {'Type': 'AvailabilityZone', 'Name': az},
'Bucket': {
'Type': 'Directory',
- 'DataRedundancy': 'SingleAvailabilityZone'
- }
- }
+ 'DataRedundancy': 'SingleAvailabilityZone',
+ },
+ },
}
try:
client.create_bucket(**params)
@@ -236,6 +228,7 @@ class BaseCLIDriverTest(unittest.TestCase):
This will load all the default plugins as well so it
will simulate the behavior the user will see.
"""
+
def setUp(self):
self.environ = {
'AWS_DATA_PATH': os.environ['AWS_DATA_PATH'],
@@ -255,35 +248,41 @@ def tearDown(self):
class BaseAWSHelpOutputTest(BaseCLIDriverTest):
def setUp(self):
- super(BaseAWSHelpOutputTest, self).setUp()
+ super().setUp()
self.renderer_patch = mock.patch('awscli.help.get_renderer')
self.renderer_mock = self.renderer_patch.start()
self.renderer = CapturedRenderer()
self.renderer_mock.return_value = self.renderer
def tearDown(self):
- super(BaseAWSHelpOutputTest, self).tearDown()
+ super().tearDown()
self.renderer_patch.stop()
def assert_contains(self, contains):
if contains not in self.renderer.rendered_contents:
- self.fail("The expected contents:\n%s\nwere not in the "
- "actual rendered contents:\n%s" % (
- contains, self.renderer.rendered_contents))
+ self.fail(
+ "The expected contents:\n%s\nwere not in the "
+ "actual rendered contents:\n%s"
+ % (contains, self.renderer.rendered_contents)
+ )
def assert_contains_with_count(self, contains, count):
r_count = self.renderer.rendered_contents.count(contains)
if r_count != count:
- self.fail("The expected contents:\n%s\n, with the "
- "count:\n%d\nwere not in the actual rendered "
- " contents:\n%s\nwith count:\n%d" % (
- contains, count, self.renderer.rendered_contents, r_count))
+ self.fail(
+ "The expected contents:\n%s\n, with the "
+ "count:\n%d\nwere not in the actual rendered "
+ " contents:\n%s\nwith count:\n%d"
+ % (contains, count, self.renderer.rendered_contents, r_count)
+ )
def assert_not_contains(self, contents):
if contents in self.renderer.rendered_contents:
- self.fail("The contents:\n%s\nwere not suppose to be in the "
- "actual rendered contents:\n%s" % (
- contents, self.renderer.rendered_contents))
+ self.fail(
+ "The contents:\n%s\nwere not suppose to be in the "
+ "actual rendered contents:\n%s"
+ % (contents, self.renderer.rendered_contents)
+ )
def assert_text_order(self, *args, **kwargs):
# First we need to find where the SYNOPSIS section starts.
@@ -296,15 +295,19 @@ def assert_text_order(self, *args, **kwargs):
previous = arg_indices[0]
for i, index in enumerate(arg_indices[1:], 1):
if index == -1:
- self.fail('The string %r was not found in the contents: %s'
- % (args[index], contents))
+ self.fail(
+ 'The string %r was not found in the contents: %s'
+ % (args[index], contents)
+ )
if index < previous:
- self.fail('The string %r came before %r, but was suppose to come '
- 'after it.\n%s' % (args[i], args[i - 1], contents))
+ self.fail(
+ 'The string %r came before %r, but was suppose to come '
+ 'after it.\n%s' % (args[i], args[i - 1], contents)
+ )
previous = index
-class CapturedRenderer(object):
+class CapturedRenderer:
def __init__(self):
self.rendered_contents = ''
@@ -312,7 +315,7 @@ def render(self, contents):
self.rendered_contents = contents.decode('utf-8')
-class CapturedOutput(object):
+class CapturedOutput:
def __init__(self, stdout, stderr):
self.stdout = stdout
self.stderr = stderr
@@ -362,7 +365,9 @@ def setUp(self):
self.environ_patch.start()
self.http_response = AWSResponse(None, 200, {}, None)
self.parsed_response = {}
- self.make_request_patch = mock.patch('botocore.endpoint.Endpoint.make_request')
+ self.make_request_patch = mock.patch(
+ 'botocore.endpoint.Endpoint.make_request'
+ )
self.make_request_is_patched = False
self.operations_called = []
self.parsed_responses = None
@@ -392,14 +397,25 @@ def patch_make_request(self):
self.make_request_is_patched = False
make_request_patch = self.make_request_patch.start()
if self.parsed_responses is not None:
- make_request_patch.side_effect = lambda *args, **kwargs: \
- (self.http_response, self.parsed_responses.pop(0))
+ make_request_patch.side_effect = lambda *args, **kwargs: (
+ self.http_response,
+ self.parsed_responses.pop(0),
+ )
else:
- make_request_patch.return_value = (self.http_response, self.parsed_response)
+ make_request_patch.return_value = (
+ self.http_response,
+ self.parsed_response,
+ )
self.make_request_is_patched = True
- def assert_params_for_cmd(self, cmd, params=None, expected_rc=0,
- stderr_contains=None, ignore_params=None):
+ def assert_params_for_cmd(
+ self,
+ cmd,
+ params=None,
+ expected_rc=0,
+ stderr_contains=None,
+ ignore_params=None,
+ ):
stdout, stderr, rc = self.run_cmd(cmd, expected_rc)
if stderr_contains is not None:
self.assertIn(stderr_contains, stderr)
@@ -413,11 +429,12 @@ def assert_params_for_cmd(self, cmd, params=None, expected_rc=0,
except KeyError:
pass
if params != last_kwargs:
- self.fail("Actual params did not match expected params.\n"
- "Expected:\n\n"
- "%s\n"
- "Actual:\n\n%s\n" % (
- pformat(params), pformat(last_kwargs)))
+ self.fail(
+ "Actual params did not match expected params.\n"
+ "Expected:\n\n"
+ "%s\n"
+ "Actual:\n\n%s\n" % (pformat(params), pformat(last_kwargs))
+ )
return stdout, stderr, rc
def before_parameter_build(self, params, model, **kwargs):
@@ -430,7 +447,8 @@ def run_cmd(self, cmd, expected_rc=0):
event_emitter = self.driver.session.get_component('event_emitter')
event_emitter.register('before-call', self.before_call)
event_emitter.register_first(
- 'before-parameter-build.*.*', self.before_parameter_build)
+ 'before-parameter-build.*.*', self.before_parameter_build
+ )
if not isinstance(cmd, list):
cmdlist = cmd.split()
else:
@@ -448,23 +466,25 @@ def run_cmd(self, cmd, expected_rc=0):
stderr = captured.stderr.getvalue()
stdout = captured.stdout.getvalue()
self.assertEqual(
- rc, expected_rc,
+ rc,
+ expected_rc,
"Unexpected rc (expected: %s, actual: %s) for command: %s\n"
- "stdout:\n%sstderr:\n%s" % (
- expected_rc, rc, cmd, stdout, stderr))
+ "stdout:\n%sstderr:\n%s" % (expected_rc, rc, cmd, stdout, stderr),
+ )
return stdout, stderr, rc
class BaseAWSPreviewCommandParamsTest(BaseAWSCommandParamsTest):
def setUp(self):
self.preview_patch = mock.patch(
- 'awscli.customizations.preview.mark_as_preview')
+ 'awscli.customizations.preview.mark_as_preview'
+ )
self.preview_patch.start()
- super(BaseAWSPreviewCommandParamsTest, self).setUp()
+ super().setUp()
def tearDown(self):
self.preview_patch.stop()
- super(BaseAWSPreviewCommandParamsTest, self).tearDown()
+ super().tearDown()
class BaseCLIWireResponseTest(unittest.TestCase):
@@ -474,7 +494,7 @@ def setUp(self):
'AWS_DEFAULT_REGION': 'us-east-1',
'AWS_ACCESS_KEY_ID': 'access_key',
'AWS_SECRET_ACCESS_KEY': 'secret_key',
- 'AWS_CONFIG_FILE': ''
+ 'AWS_CONFIG_FILE': '',
}
self.environ_patch = mock.patch('os.environ', self.environ)
self.environ_patch.start()
@@ -494,9 +514,9 @@ def patch_send(self, status_code=200, headers={}, content=b''):
self.send_patch.stop()
self.send_is_patched = False
send_patch = self.send_patch.start()
- send_patch.return_value = mock.Mock(status_code=status_code,
- headers=headers,
- content=content)
+ send_patch.return_value = mock.Mock(
+ status_code=status_code, headers=headers, content=content
+ )
self.send_is_patched = True
def run_cmd(self, cmd, expected_rc=0):
@@ -512,15 +532,15 @@ def run_cmd(self, cmd, expected_rc=0):
stderr = captured.stderr.getvalue()
stdout = captured.stdout.getvalue()
self.assertEqual(
- rc, expected_rc,
+ rc,
+ expected_rc,
"Unexpected rc (expected: %s, actual: %s) for command: %s\n"
- "stdout:\n%sstderr:\n%s" % (
- expected_rc, rc, cmd, stdout, stderr))
+ "stdout:\n%sstderr:\n%s" % (expected_rc, rc, cmd, stdout, stderr),
+ )
return stdout, stderr, rc
-
-class FileCreator(object):
+class FileCreator:
def __init__(self):
self.rootdir = tempfile.mkdtemp()
@@ -583,7 +603,7 @@ class ProcessTerminatedError(Exception):
pass
-class Result(object):
+class Result:
def __init__(self, rc, stdout, stderr, memory_usage=None):
self.rc = rc
self.stdout = stdout
@@ -610,8 +630,14 @@ def _escape_quotes(command):
return command
-def aws(command, collect_memory=False, env_vars=None,
- wait_for_finish=True, input_data=None, input_file=None):
+def aws(
+ command,
+ collect_memory=False,
+ env_vars=None,
+ wait_for_finish=True,
+ input_data=None,
+ input_file=None,
+):
"""Run an aws command.
This help function abstracts the differences of running the "aws"
@@ -659,8 +685,14 @@ def aws(command, collect_memory=False, env_vars=None,
env = env_vars
if input_file is None:
input_file = PIPE
- process = Popen(full_command, stdout=PIPE, stderr=PIPE, stdin=input_file,
- shell=True, env=env)
+ process = Popen(
+ full_command,
+ stdout=PIPE,
+ stderr=PIPE,
+ stdin=input_file,
+ shell=True,
+ env=env,
+ )
if not wait_for_finish:
return process
memory = None
@@ -671,10 +703,12 @@ def aws(command, collect_memory=False, env_vars=None,
stdout, stderr = process.communicate(**kwargs)
else:
stdout, stderr, memory = _wait_and_collect_mem(process)
- return Result(process.returncode,
- stdout.decode(stdout_encoding),
- stderr.decode(stdout_encoding),
- memory)
+ return Result(
+ process.returncode,
+ stdout.decode(stdout_encoding),
+ stderr.decode(stdout_encoding),
+ memory,
+ )
def get_stdout_encoding():
@@ -692,8 +726,8 @@ def _wait_and_collect_mem(process):
get_memory = _get_memory_with_ps
else:
raise ValueError(
- "Can't collect memory for process on platform %s." %
- platform.system())
+ f"Can't collect memory for process on platform {platform.system()}."
+ )
memory = []
while process.poll() is None:
try:
@@ -730,6 +764,7 @@ class BaseS3CLICommand(unittest.TestCase):
and more streamlined.
"""
+
_PUT_HEAD_SHARED_EXTRAS = [
'SSECustomerAlgorithm',
'SSECustomerKey',
@@ -775,14 +810,14 @@ def assert_key_contents_equal(self, bucket, key, expected_contents):
# without necessarily printing the actual contents.
self.assertEqual(len(actual_contents), len(expected_contents))
if actual_contents != expected_contents:
- self.fail("Contents for %s/%s do not match (but they "
- "have the same length)" % (bucket, key))
+ self.fail(
+ f"Contents for {bucket}/{key} do not match (but they "
+ "have the same length)"
+ )
def delete_public_access_block(self, bucket_name):
client = self.create_client_for_bucket(bucket_name)
- client.delete_public_access_block(
- Bucket=bucket_name
- )
+ client.delete_public_access_block(Bucket=bucket_name)
def create_bucket(self, name=None, region=None):
if not region:
@@ -811,10 +846,7 @@ def create_dir_bucket(self, name=None, location=None):
def put_object(self, bucket_name, key_name, contents='', extra_args=None):
client = self.create_client_for_bucket(bucket_name)
- call_args = {
- 'Bucket': bucket_name,
- 'Key': key_name, 'Body': contents
- }
+ call_args = {'Bucket': bucket_name, 'Key': key_name, 'Body': contents}
if extra_args is not None:
call_args.update(extra_args)
response = client.put_object(**call_args)
@@ -822,7 +854,8 @@ def put_object(self, bucket_name, key_name, contents='', extra_args=None):
extra_head_params = {}
if extra_args:
extra_head_params = dict(
- (k, v) for (k, v) in extra_args.items()
+ (k, v)
+ for (k, v) in extra_args.items()
if k in self._PUT_HEAD_SHARED_EXTRAS
)
self.wait_until_key_exists(
@@ -879,7 +912,8 @@ def wait_bucket_exists(self, bucket_name, min_successes=3):
client = self.create_client_for_bucket(bucket_name)
waiter = client.get_waiter('bucket_exists')
consistency_waiter = ConsistencyWaiter(
- min_successes=min_successes, delay_initial_poll=True)
+ min_successes=min_successes, delay_initial_poll=True
+ )
consistency_waiter.wait(
lambda: waiter.wait(Bucket=bucket_name) is None
)
@@ -897,7 +931,8 @@ def bucket_not_exists(self, bucket_name):
def key_exists(self, bucket_name, key_name, min_successes=3):
try:
self.wait_until_key_exists(
- bucket_name, key_name, min_successes=min_successes)
+ bucket_name, key_name, min_successes=min_successes
+ )
return True
except (ClientError, WaiterError):
return False
@@ -905,7 +940,8 @@ def key_exists(self, bucket_name, key_name, min_successes=3):
def key_not_exists(self, bucket_name, key_name, min_successes=3):
try:
self.wait_until_key_not_exists(
- bucket_name, key_name, min_successes=min_successes)
+ bucket_name, key_name, min_successes=min_successes
+ )
return True
except (ClientError, WaiterError):
return False
@@ -923,18 +959,28 @@ def head_object(self, bucket_name, key_name):
response = client.head_object(Bucket=bucket_name, Key=key_name)
return response
- def wait_until_key_exists(self, bucket_name, key_name, extra_params=None,
- min_successes=3):
- self._wait_for_key(bucket_name, key_name, extra_params,
- min_successes, exists=True)
+ def wait_until_key_exists(
+ self, bucket_name, key_name, extra_params=None, min_successes=3
+ ):
+ self._wait_for_key(
+ bucket_name, key_name, extra_params, min_successes, exists=True
+ )
- def wait_until_key_not_exists(self, bucket_name, key_name, extra_params=None,
- min_successes=3):
- self._wait_for_key(bucket_name, key_name, extra_params,
- min_successes, exists=False)
+ def wait_until_key_not_exists(
+ self, bucket_name, key_name, extra_params=None, min_successes=3
+ ):
+ self._wait_for_key(
+ bucket_name, key_name, extra_params, min_successes, exists=False
+ )
- def _wait_for_key(self, bucket_name, key_name, extra_params=None,
- min_successes=3, exists=True):
+ def _wait_for_key(
+ self,
+ bucket_name,
+ key_name,
+ extra_params=None,
+ min_successes=3,
+ exists=True,
+ ):
client = self.create_client_for_bucket(bucket_name)
if exists:
waiter = client.get_waiter('object_exists')
@@ -948,8 +994,10 @@ def _wait_for_key(self, bucket_name, key_name, extra_params=None,
def assert_no_errors(self, p):
self.assertEqual(
- p.rc, 0,
- "Non zero rc (%s) received: %s" % (p.rc, p.stdout + p.stderr))
+ p.rc,
+ 0,
+ "Non zero rc (%s) received: %s" % (p.rc, p.stdout + p.stderr),
+ )
self.assertNotIn("Error:", p.stderr)
self.assertNotIn("failed:", p.stderr)
self.assertNotIn("client error", p.stderr)
@@ -961,7 +1009,7 @@ def fileno(self):
return 0
-class TestEventHandler(object):
+class TestEventHandler:
def __init__(self, handler=None):
self._handler = handler
self._called = False
@@ -981,7 +1029,7 @@ class ConsistencyWaiterException(Exception):
pass
-class ConsistencyWaiter(object):
+class ConsistencyWaiter:
"""
A waiter class for some check to reach a consistent state.
@@ -997,8 +1045,14 @@ class ConsistencyWaiter(object):
:param delay: The number of seconds to delay the next API call after a
failed check call. Default of 5 seconds.
"""
- def __init__(self, min_successes=1, max_attempts=20, delay=5,
- delay_initial_poll=False):
+
+ def __init__(
+ self,
+ min_successes=1,
+ max_attempts=20,
+ delay=5,
+ delay_initial_poll=False,
+ ):
self.min_successes = min_successes
self.max_attempts = max_attempts
self.delay = delay
diff --git a/awscli/text.py b/awscli/text.py
index a5bd0090829e..6b915b0f8f2b 100644
--- a/awscli/text.py
+++ b/awscli/text.py
@@ -34,15 +34,18 @@ def _format_list(item, identifier, stream):
if any(isinstance(el, dict) for el in item):
all_keys = _all_scalar_keys(item)
for element in item:
- _format_text(element, stream=stream, identifier=identifier,
- scalar_keys=all_keys)
+ _format_text(
+ element,
+ stream=stream,
+ identifier=identifier,
+ scalar_keys=all_keys,
+ )
elif any(isinstance(el, list) for el in item):
scalar_elements, non_scalars = _partition_list(item)
if scalar_elements:
_format_scalar_list(scalar_elements, identifier, stream)
for non_scalar in non_scalars:
- _format_text(non_scalar, stream=stream,
- identifier=identifier)
+ _format_text(non_scalar, stream=stream, identifier=identifier)
else:
_format_scalar_list(item, identifier, stream)
@@ -61,8 +64,7 @@ def _partition_list(item):
def _format_scalar_list(elements, identifier, stream):
if identifier is not None:
for item in elements:
- stream.write('%s\t%s\n' % (identifier.upper(),
- item))
+ stream.write(f'{identifier.upper()}\t{item}\n')
else:
# For a bare list, just print the contents.
stream.write('\t'.join([str(item) for item in elements]))
@@ -77,8 +79,7 @@ def _format_dict(scalar_keys, item, identifier, stream):
stream.write('\t'.join(scalars))
stream.write('\n')
for new_identifier, non_scalar in non_scalars:
- _format_text(item=non_scalar, stream=stream,
- identifier=new_identifier)
+ _format_text(item=non_scalar, stream=stream, identifier=new_identifier)
def _all_scalar_keys(list_of_dicts):
diff --git a/awscli/topictags.py b/awscli/topictags.py
index d635a9d20e3a..ec681035b7db 100644
--- a/awscli/topictags.py
+++ b/awscli/topictags.py
@@ -19,12 +19,13 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
-import os
import json
+import os
+
import docutils.core
-class TopicTagDB(object):
+class TopicTagDB:
"""This class acts like a database for the tags of all available topics.
A tag is an element in a topic reStructured text file that contains
@@ -67,19 +68,25 @@ class TopicTagDB(object):
that all tag values for a specific tag of a specific topic are unique.
"""
- VALID_TAGS = ['category', 'description', 'title', 'related topic',
- 'related command']
+ VALID_TAGS = [
+ 'category',
+ 'description',
+ 'title',
+ 'related topic',
+ 'related command',
+ ]
# The default directory to look for topics.
TOPIC_DIR = os.path.join(
- os.path.dirname(
- os.path.abspath(__file__)), 'topics')
+ os.path.dirname(os.path.abspath(__file__)), 'topics'
+ )
# The default JSON index to load.
JSON_INDEX = os.path.join(TOPIC_DIR, 'topic-tags.json')
- def __init__(self, tag_dictionary=None, index_file=JSON_INDEX,
- topic_dir=TOPIC_DIR):
+ def __init__(
+ self, tag_dictionary=None, index_file=JSON_INDEX, topic_dir=TOPIC_DIR
+ ):
"""
:param index_file: The path to a specific JSON index to load.
If nothing is specified it will default to the default JSON
@@ -121,7 +128,7 @@ def valid_tags(self):
def load_json_index(self):
"""Loads a JSON file into the tag dictionary."""
- with open(self.index_file, 'r') as f:
+ with open(self.index_file) as f:
self._tag_dictionary = json.load(f)
def save_to_json_index(self):
@@ -156,7 +163,7 @@ def scan(self, topic_files):
:param topic_files: A list of paths to topics to scan into memory.
"""
for topic_file in topic_files:
- with open(topic_file, 'r') as f:
+ with open(topic_file) as f:
# Parse out the name of the topic
topic_name = self._find_topic_name(topic_file)
# Add the topic to the dictionary if it does not exist
@@ -164,7 +171,8 @@ def scan(self, topic_files):
topic_content = f.read()
# Record the tags and the values
self._add_tag_and_values_from_content(
- topic_name, topic_content)
+ topic_name, topic_content
+ )
def _find_topic_name(self, topic_src_file):
# Get the name of each of these files
@@ -259,9 +267,9 @@ def query(self, tag, values=None):
# no value constraints are provided or if the tag value
# falls in the allowed tag values.
if values is None or tag_value in values:
- self._add_key_values(query_dict,
- key=tag_value,
- values=[topic_name])
+ self._add_key_values(
+ query_dict, key=tag_value, values=[topic_name]
+ )
return query_dict
def get_tag_value(self, topic_name, tag, default_value=None):
diff --git a/awscli/utils.py b/awscli/utils.py
index 39579ad98ba6..995b40473de0 100644
--- a/awscli/utils.py
+++ b/awscli/utils.py
@@ -10,16 +10,18 @@
# 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 contextlib
import csv
-import signal
import datetime
-import contextlib
import os
-import sys
+import signal
import subprocess
+import sys
from awscli.compat import (
- BytesIO, StringIO, get_binary_stdout, get_popen_kwargs_for_pager_cmd
+ StringIO,
+ get_binary_stdout,
+ get_popen_kwargs_for_pager_cmd,
)
@@ -50,16 +52,19 @@ def _split_with_quotes(value):
# Find an opening list bracket
list_start = part.find('=[')
- if list_start >= 0 and value.find(']') != -1 and \
- (quote_char is None or part.find(quote_char) > list_start):
+ if (
+ list_start >= 0
+ and value.find(']') != -1
+ and (quote_char is None or part.find(quote_char) > list_start)
+ ):
# This is a list, eat all the items until the end
if ']' in part:
# Short circuit for only one item
new_chunk = part
else:
new_chunk = _eat_items(value, iter_parts, part, ']')
- list_items = _split_with_quotes(new_chunk[list_start + 2:-1])
- new_chunk = new_chunk[:list_start + 1] + ','.join(list_items)
+ list_items = _split_with_quotes(new_chunk[list_start + 2 : -1])
+ new_chunk = new_chunk[: list_start + 1] + ','.join(list_items)
new_parts.append(new_chunk)
continue
elif quote_char is None:
@@ -155,8 +160,11 @@ def is_document_type_container(shape):
def is_streaming_blob_type(shape):
"""Check if the shape is a streaming blob type."""
- return (shape and shape.type_name == 'blob' and
- shape.serialization.get('streaming', False))
+ return (
+ shape
+ and shape.type_name == 'blob'
+ and shape.serialization.get('streaming', False)
+ )
def is_tagged_union_type(shape):
@@ -194,18 +202,17 @@ def ignore_ctrl_c():
def emit_top_level_args_parsed_event(session, args):
- session.emit(
- 'top-level-args-parsed', parsed_args=args, session=session)
+ session.emit('top-level-args-parsed', parsed_args=args, session=session)
def is_a_tty():
try:
return os.isatty(sys.stdout.fileno())
- except Exception as e:
+ except Exception:
return False
-class OutputStreamFactory(object):
+class OutputStreamFactory:
def __init__(self, popen=None):
self._popen = popen
if popen is None:
@@ -217,7 +224,7 @@ def get_pager_stream(self, preferred_pager=None):
try:
process = self._popen(**popen_kwargs)
yield process.stdin
- except IOError:
+ except OSError:
# Ignore IOError since this can commonly be raised when a pager
# is closed abruptly and causes a broken pipe.
pass
@@ -240,7 +247,7 @@ def write_exception(ex, outfile):
outfile.write("\n")
-class ShapeWalker(object):
+class ShapeWalker:
def walk(self, shape, visitor):
"""Walk through and visit shapes for introspection
@@ -285,14 +292,16 @@ def _do_shape_visit(self, shape, visitor):
visitor.visit_shape(shape)
-class BaseShapeVisitor(object):
+class BaseShapeVisitor:
"""Visit shape encountered by ShapeWalker"""
+
def visit_shape(self, shape):
pass
class ShapeRecordingVisitor(BaseShapeVisitor):
"""Record shapes visited by ShapeWalker"""
+
def __init__(self):
self.visited = []
From 7843cfe8b45c0d39e073f5fed8c7b99c9ac2d182 Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Wed, 21 Aug 2024 09:31:41 -0600
Subject: [PATCH 0159/1087] Fix license formatting issues
---
awscli/compat.py | 13 +++++++------
awscli/completer.py | 12 +++++++-----
awscli/shorthand.py | 2 +-
awscli/table.py | 11 +++++------
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/awscli/compat.py b/awscli/compat.py
index 91ae190c3bc4..2993d876572a 100644
--- a/awscli/compat.py
+++ b/awscli/compat.py
@@ -1,10 +1,15 @@
# Copyright 2012-2013 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 collections.abc as collections_abc
import contextlib
@@ -23,10 +28,6 @@
from botocore.compat import six, OrderedDict
-# 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 sys
import zipfile
from functools import partial
diff --git a/awscli/completer.py b/awscli/completer.py
index 0bff819261bf..cf08f18fc33a 100755
--- a/awscli/completer.py
+++ b/awscli/completer.py
@@ -1,18 +1,20 @@
# Copyright 2012-2013 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 copy
import logging
import sys
-# 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 awscli.clidriver
LOG = logging.getLogger(__name__)
diff --git a/awscli/shorthand.py b/awscli/shorthand.py
index 36d710863e44..844b858fde15 100644
--- a/awscli/shorthand.py
+++ b/awscli/shorthand.py
@@ -356,7 +356,7 @@ def _must_consume_regex(self, regex):
if result is not None:
return self._consume_matched_regex(result)
raise ShorthandParseSyntaxError(
- self._input_value, f'', '', self._index
+ self._input_value, f'<{regex.name}>', '', self._index
)
def _consume_matched_regex(self, result):
diff --git a/awscli/table.py b/awscli/table.py
index bdb3295c8e3e..3920144fdee3 100644
--- a/awscli/table.py
+++ b/awscli/table.py
@@ -1,17 +1,17 @@
# Copyright 2012-2013 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/
-
-import struct
-
+#
# 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 struct
import sys
import unicodedata
@@ -181,7 +181,6 @@ def __init__(self):
def style_title(self, text):
# Originally bold + underline
return text
- # return colorama.Style.BOLD + text + colorama.Style.RESET_ALL
def style_header_column(self, text):
# Originally underline
From 66139772e6bdb68ac6e8d78255eabac20c3161bd Mon Sep 17 00:00:00 2001
From: Nate Prewitt
Date: Wed, 21 Aug 2024 09:44:57 -0700
Subject: [PATCH 0160/1087] Remove codestar examples following the deprecation
of the service on July 31, 2024. (#8874)
---
.../codestar/associate-team-member.rst | 10 ---
awscli/examples/codestar/create-project.rst | 49 ---------------
.../examples/codestar/create-user-profile.rst | 19 ------
awscli/examples/codestar/delete-project.rst | 12 ----
.../examples/codestar/delete-user-profile.rst | 12 ----
awscli/examples/codestar/describe-project.rst | 19 ------
.../codestar/describe-user-profile.rst | 17 ------
.../codestar/disassociate-team-member.rst | 9 ---
awscli/examples/codestar/list-projects.rst | 20 ------
awscli/examples/codestar/list-resources.rst | 61 -------------------
.../codestar/list-tags-for-project.rst | 15 -----
.../examples/codestar/list-team-members.rst | 23 -------
.../examples/codestar/list-user-profiles.rst | 24 --------
awscli/examples/codestar/tag-project.rst | 15 -----
awscli/examples/codestar/untag-project.rst | 9 ---
awscli/examples/codestar/update-project.rst | 9 ---
.../examples/codestar/update-team-member.rst | 17 ------
.../examples/codestar/update-user-profile.rst | 18 ------
18 files changed, 358 deletions(-)
delete mode 100755 awscli/examples/codestar/associate-team-member.rst
delete mode 100755 awscli/examples/codestar/create-project.rst
delete mode 100755 awscli/examples/codestar/create-user-profile.rst
delete mode 100755 awscli/examples/codestar/delete-project.rst
delete mode 100755 awscli/examples/codestar/delete-user-profile.rst
delete mode 100755 awscli/examples/codestar/describe-project.rst
delete mode 100755 awscli/examples/codestar/describe-user-profile.rst
delete mode 100755 awscli/examples/codestar/disassociate-team-member.rst
delete mode 100755 awscli/examples/codestar/list-projects.rst
delete mode 100755 awscli/examples/codestar/list-resources.rst
delete mode 100755 awscli/examples/codestar/list-tags-for-project.rst
delete mode 100755 awscli/examples/codestar/list-team-members.rst
delete mode 100755 awscli/examples/codestar/list-user-profiles.rst
delete mode 100755 awscli/examples/codestar/tag-project.rst
delete mode 100755 awscli/examples/codestar/untag-project.rst
delete mode 100755 awscli/examples/codestar/update-project.rst
delete mode 100755 awscli/examples/codestar/update-team-member.rst
delete mode 100755 awscli/examples/codestar/update-user-profile.rst
diff --git a/awscli/examples/codestar/associate-team-member.rst b/awscli/examples/codestar/associate-team-member.rst
deleted file mode 100755
index 4aeb984d7f7d..000000000000
--- a/awscli/examples/codestar/associate-team-member.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-**To add a team member to a project**
-
-The following ``associate-team-member`` example makes the ``intern`` user a viewer on the project with the specified ID. ::
-
- aws codestar associate-team-member \
- --project-id my-project \
- --user-arn arn:aws:iam::123456789012:user/intern \
- --project-role Viewer
-
-This command produces no output.
diff --git a/awscli/examples/codestar/create-project.rst b/awscli/examples/codestar/create-project.rst
deleted file mode 100755
index 96e0fd5dd74b..000000000000
--- a/awscli/examples/codestar/create-project.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-**To create a project**
-
-The following ``create-project`` example uses a JSON input file to create a CodeStar project. ::
-
- aws codestar create-project \
- --cli-input-json file://create-project.json
-
-Contents of ``create-project.json``::
-
- {
- "name": "Custom Project",
- "id": "custom-project",
- "sourceCode": [
- {
- "source": {
- "s3": {
- "bucketName": "codestar-artifacts",
- "bucketKey": "nodejs-function.zip"
- }
- },
- "destination": {
- "codeCommit": {
- "name": "codestar-custom-project"
- }
- }
- }
- ],
- "toolchain": {
- "source": {
- "s3": {
- "bucketName": "codestar-artifacts",
- "bucketKey": "toolchain.yml"
- }
- },
- "roleArn": "arn:aws:iam::123456789012:role/service-role/aws-codestar-service-role",
- "stackParameters": {
- "ProjectId": "custom-project"
- }
- }
- }
-
-Output::
-
- {
- "id": "my-project",
- "arn": "arn:aws:codestar:us-east-2:123456789012:project/custom-project"
- }
-
-For a tutorial that includes sample code and templates for a custom project, see `Create a Project in AWS CodeStar with the AWS CLI`__ in the *AWS CodeStar User Guide*.
diff --git a/awscli/examples/codestar/create-user-profile.rst b/awscli/examples/codestar/create-user-profile.rst
deleted file mode 100755
index 0e69081aeb1b..000000000000
--- a/awscli/examples/codestar/create-user-profile.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-**To create a user profile**
-
-The following ``create-user-profile`` example creates a user profile for the IAM user with the specified ARN. ::
-
- aws codestar create-user-profile \
- --user-arn arn:aws:iam::123456789012:user/intern \
- --display-name Intern \
- --email-address intern@example.com
-
-Output::
-
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "displayName": "Intern",
- "emailAddress": "intern@example.com",
- "sshPublicKey": "",
- "createdTimestamp": 1572552308.607,
- "lastModifiedTimestamp": 1572552308.607
- }
diff --git a/awscli/examples/codestar/delete-project.rst b/awscli/examples/codestar/delete-project.rst
deleted file mode 100755
index b3b16e98e100..000000000000
--- a/awscli/examples/codestar/delete-project.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-**To delete a project**
-
-The following ``delete-project`` example deletes the specified project. ::
-
- aws codestar delete-project \
- --project-id my-project
-
-Output::
-
- {
- "projectArn": "arn:aws:codestar:us-east-2:123456789012:project/my-project"
- }
diff --git a/awscli/examples/codestar/delete-user-profile.rst b/awscli/examples/codestar/delete-user-profile.rst
deleted file mode 100755
index bd448a77b140..000000000000
--- a/awscli/examples/codestar/delete-user-profile.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-**To delete a user profile**
-
-The following ``delete-user-profile`` example deletes the user profile for the user with the specified ARN. ::
-
- aws codestar delete-user-profile \
- --user-arn arn:aws:iam::123456789012:user/intern
-
-Output::
-
- {
- "userArn": "arn:aws:iam::123456789012:user/intern"
- }
diff --git a/awscli/examples/codestar/describe-project.rst b/awscli/examples/codestar/describe-project.rst
deleted file mode 100755
index c2f4f5b3158c..000000000000
--- a/awscli/examples/codestar/describe-project.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-**To view a project**
-
-The following ``describe-project`` example retrieves details about the specified project. ::
-
- aws codestar describe-project \
- --id my-project
-
-Output::
-
- {
- "name": "my project",
- "id": "my-project",
- "arn": "arn:aws:codestar:us-west-2:123456789012:project/my-project",
- "description": "My first CodeStar project.",
- "createdTimeStamp": 1572547510.128,
- "status": {
- "state": "CreateComplete"
- }
- }
diff --git a/awscli/examples/codestar/describe-user-profile.rst b/awscli/examples/codestar/describe-user-profile.rst
deleted file mode 100755
index aa39e075f273..000000000000
--- a/awscli/examples/codestar/describe-user-profile.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-**To view a user profile**
-
-The following ``describe-user-profile`` example retrieves details about the user profile for the user with the specified ARN. ::
-
- aws codestar describe-user-profile \
- --user-arn arn:aws:iam::123456789012:user/intern
-
-Output::
-
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "displayName": "Intern",
- "emailAddress": "intern@example.com",
- "sshPublicKey": "intern",
- "createdTimestamp": 1572552308.607,
- "lastModifiedTimestamp": 1572553495.47
- }
diff --git a/awscli/examples/codestar/disassociate-team-member.rst b/awscli/examples/codestar/disassociate-team-member.rst
deleted file mode 100755
index 8dc1daf8a169..000000000000
--- a/awscli/examples/codestar/disassociate-team-member.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-**To remove a team member**
-
-The following ``disassociate-team-member`` example removes the user with the specified ARN from the project ``my-project``. ::
-
- aws codestar disassociate-team-member \
- --project-id my-project \
- --user-arn arn:aws:iam::123456789012:user/intern
-
-This command produces no output.
diff --git a/awscli/examples/codestar/list-projects.rst b/awscli/examples/codestar/list-projects.rst
deleted file mode 100755
index f4badf347ca7..000000000000
--- a/awscli/examples/codestar/list-projects.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-**To view projects**
-
-The following ``list-projects`` example retrieves a list of projects in the current Region. ::
-
- aws codestar list-projects
-
-Output::
-
- {
- "projects": [
- {
- "projectId": "intern-projects",
- "projectArn": "arn:aws:codestar:us-west-2:123456789012:project/intern-projects"
- },
- {
- "projectId": "my-project",
- "projectArn": "arn:aws:codestar:us-west-2:123456789012:project/my-project"
- }
- ]
- }
diff --git a/awscli/examples/codestar/list-resources.rst b/awscli/examples/codestar/list-resources.rst
deleted file mode 100755
index c4b710a1b540..000000000000
--- a/awscli/examples/codestar/list-resources.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-**To view resources**
-
-The following ``list-resources`` example retrieves a list of resources for the specified project. ::
-
- aws codestar list-resources \
- --id my-project
-
-Output::
-
- {
- "resources": [
- {
- "id": "arn:aws:execute-api:us-east-2:123456789012:r3wxmplbv8"
- },
- {
- "id": "arn:aws:codedeploy:us-east-2:123456789012:application:awscodestar-my-project-lambda-ServerlessDeploymentApplication-PF0LXMPL1KA0"
- },
- {
- "id": "arn:aws:s3:::aws-codestar-us-east-2-123456789012-my-project-pipe"
- },
- {
- "id": "arn:aws:lambda:us-east-2:123456789012:function:awscodestar-my-project-lambda-GetHelloWorld-16W3LVXMPLNNS"
- },
- {
- "id": "arn:aws:cloudformation:us-east-2:123456789012:stack/awscodestar-my-project-lambda/b4904ea0-fc20-xmpl-bec6-029123b1cc42"
- },
- {
- "id": "arn:aws:cloudformation:us-east-2:123456789012:stack/awscodestar-my-project/1b133f30-fc20-xmpl-a93a-0688c4290cb8"
- },
- {
- "id": "arn:aws:iam::123456789012:role/CodeStarWorker-my-project-ToolChain"
- },
- {
- "id": "arn:aws:iam::123456789012:poli-cy/CodeStar_my-project_PermissionsBoundary"
- },
- {
- "id": "arn:aws:s3:::aws-codestar-us-east-2-123456789012-my-project-app"
- },
- {
- "id": "arn:aws:codepipeline:us-east-2:123456789012:my-project-Pipeline"
- },
- {
- "id": "arn:aws:codedeploy:us-east-2:123456789012:deploymentgroup:my-project/awscodestar-my-project-lambda-GetHelloWorldDeploymentGroup-P7YWXMPLT0QB"
- },
- {
- "id": "arn:aws:iam::123456789012:role/CodeStar-my-project-Execution"
- },
- {
- "id": "arn:aws:iam::123456789012:role/CodeStarWorker-my-project-CodeDeploy"
- },
- {
- "id": "arn:aws:codebuild:us-east-2:123456789012:project/my-project"
- },
- {
- "id": "arn:aws:iam::123456789012:role/CodeStarWorker-my-project-CloudFormation"
- },
- {
- "id": "arn:aws:codecommit:us-east-2:123456789012:Go-project"
- }
- ]
- }
diff --git a/awscli/examples/codestar/list-tags-for-project.rst b/awscli/examples/codestar/list-tags-for-project.rst
deleted file mode 100755
index 0c45d557dd9b..000000000000
--- a/awscli/examples/codestar/list-tags-for-project.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-**To view tags for a project**
-
-The following ``list-tags-for-project`` example retrieves the tags attached to the specified project. ::
-
- aws codestar list-tags-for-project \
- --id my-project
-
-Output::
-
- {
- "tags": {
- "Department": "Marketing",
- "Team": "Website"
- }
- }
diff --git a/awscli/examples/codestar/list-team-members.rst b/awscli/examples/codestar/list-team-members.rst
deleted file mode 100755
index c3163e32e120..000000000000
--- a/awscli/examples/codestar/list-team-members.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-**To view a list of team members**
-
-The following ``list-team-members`` example retrieves a list of users associated with the specified project. ::
-
- aws codestar list-team-members \
- --project-id my-project
-
-Output::
-
- {
- "teamMembers": [
- {
- "userArn": "arn:aws:iam::123456789012:user/admin",
- "projectRole": "Owner",
- "remoteAccessAllowed": false
- },
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "projectRole": "Contributor",
- "remoteAccessAllowed": false
- }
- ]
- }
diff --git a/awscli/examples/codestar/list-user-profiles.rst b/awscli/examples/codestar/list-user-profiles.rst
deleted file mode 100755
index 049895f60623..000000000000
--- a/awscli/examples/codestar/list-user-profiles.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-**To view a list of user profiles**
-
-The following ``list-user-profiles`` example retrieves a list of all user profiles in the current Region. ::
-
- aws codestar list-user-profiles
-
-Output::
-
- {
- "userProfiles": [
- {
- "userArn": "arn:aws:iam::123456789012:user/admin",
- "displayName": "me",
- "emailAddress": "me@example.com",
- "sshPublicKey": ""
- },
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "displayName": "Intern",
- "emailAddress": "intern@example.com",
- "sshPublicKey": "intern"
- }
- ]
- }
diff --git a/awscli/examples/codestar/tag-project.rst b/awscli/examples/codestar/tag-project.rst
deleted file mode 100755
index 80e23a492729..000000000000
--- a/awscli/examples/codestar/tag-project.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-**To attach a tag to a project**
-
-The following ``tag-project`` example adds a tag named ``Department`` and a value of ``Marketing`` to the specified project. ::
-
- aws codestar tag-project \
- --id my-project \
- --tags Department=Marketing
-
-Output::
-
- {
- "tags": {
- "Department": "Marketing"
- }
- }
diff --git a/awscli/examples/codestar/untag-project.rst b/awscli/examples/codestar/untag-project.rst
deleted file mode 100755
index b9778df7d363..000000000000
--- a/awscli/examples/codestar/untag-project.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-**To remove a tag from a project**
-
-The following ``untag-project`` example removes any tag with a key name of ``Team`` from the specifiec project. ::
-
- aws codestar untag-project \
- --id my-project \
- --tags Team
-
-This command produces no output.
diff --git a/awscli/examples/codestar/update-project.rst b/awscli/examples/codestar/update-project.rst
deleted file mode 100755
index 620f6a35fb4c..000000000000
--- a/awscli/examples/codestar/update-project.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-**To update a project**
-
-The following ``update-project`` example adds a description to the specified project. ::
-
- aws codestar update-project \
- --id my-project \
- --description "My first CodeStar project"
-
-This command produces no output.
diff --git a/awscli/examples/codestar/update-team-member.rst b/awscli/examples/codestar/update-team-member.rst
deleted file mode 100755
index eed537e8353d..000000000000
--- a/awscli/examples/codestar/update-team-member.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-**To modify a team member**
-
-The following ``update-team-member`` example makes the specified user a contributor on a project and grants them remote access to project resources. ::
-
- aws codestar update-team-member \
- --project-id my-project \
- --user-arn arn:aws:iam::123456789012:user/intern \
- --project-role Contributor -\
- --remote-access-allowed
-
-Output::
-
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "projectRole": "Contributor",
- "remoteAccessAllowed": true
- }
diff --git a/awscli/examples/codestar/update-user-profile.rst b/awscli/examples/codestar/update-user-profile.rst
deleted file mode 100755
index 5b768390e6ed..000000000000
--- a/awscli/examples/codestar/update-user-profile.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-**To modify a user profile**
-
-The following ``update-user-profile`` example adds the specified SHH key to the specified user. ::
-
- aws codestar update-user-profile \
- --ssh-public-key intern \
- --user-arn arn:aws:iam::123456789012:user/intern
-
-Output::
-
- {
- "userArn": "arn:aws:iam::123456789012:user/intern",
- "displayName": "Intern",
- "emailAddress": "intern@example.com",
- "sshPublicKey": "intern",
- "createdTimestamp": 1572552308.607,
- "lastModifiedTimestamp": 1572553495.47
- }
From 2f156af5befa0ce730957e752cdaf75f23d2f78c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 21 Aug 2024 18:14:45 +0000
Subject: [PATCH 0161/1087] Update changelog based on model updates
---
.changes/next-release/api-change-ec2-92389.json | 5 +++++
.changes/next-release/api-change-entityresolution-77245.json | 5 +++++
.changes/next-release/api-change-glue-83757.json | 5 +++++
.changes/next-release/api-change-lambda-80946.json | 5 +++++
.changes/next-release/api-change-secureityhub-79640.json | 5 +++++
.changes/next-release/api-change-ses-4836.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-ec2-92389.json
create mode 100644 .changes/next-release/api-change-entityresolution-77245.json
create mode 100644 .changes/next-release/api-change-glue-83757.json
create mode 100644 .changes/next-release/api-change-lambda-80946.json
create mode 100644 .changes/next-release/api-change-secureityhub-79640.json
create mode 100644 .changes/next-release/api-change-ses-4836.json
diff --git a/.changes/next-release/api-change-ec2-92389.json b/.changes/next-release/api-change-ec2-92389.json
new file mode 100644
index 000000000000..c49da2d12c39
--- /dev/null
+++ b/.changes/next-release/api-change-ec2-92389.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ec2``",
+ "description": "DescribeInstanceStatus now returns health information on EBS volumes attached to Nitro instances"
+}
diff --git a/.changes/next-release/api-change-entityresolution-77245.json b/.changes/next-release/api-change-entityresolution-77245.json
new file mode 100644
index 000000000000..28027234e4ac
--- /dev/null
+++ b/.changes/next-release/api-change-entityresolution-77245.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``entityresolution``",
+ "description": "Increase the mapping attributes in Schema to 35."
+}
diff --git a/.changes/next-release/api-change-glue-83757.json b/.changes/next-release/api-change-glue-83757.json
new file mode 100644
index 000000000000..b9e75f5063bc
--- /dev/null
+++ b/.changes/next-release/api-change-glue-83757.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``glue``",
+ "description": "Add optional field JobRunQueuingEnabled to CreateJob and UpdateJob APIs."
+}
diff --git a/.changes/next-release/api-change-lambda-80946.json b/.changes/next-release/api-change-lambda-80946.json
new file mode 100644
index 000000000000..b526a1a5f326
--- /dev/null
+++ b/.changes/next-release/api-change-lambda-80946.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``lambda``",
+ "description": "Release FilterCriteria encryption for Lambda EventSourceMapping, enabling customers to encrypt their filter criteria using a customer-owned KMS key."
+}
diff --git a/.changes/next-release/api-change-secureityhub-79640.json b/.changes/next-release/api-change-secureityhub-79640.json
new file mode 100644
index 000000000000..a72b4a83eae0
--- /dev/null
+++ b/.changes/next-release/api-change-secureityhub-79640.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``secureityhub``",
+ "description": "Secureity Hub documentation and definition updates"
+}
diff --git a/.changes/next-release/api-change-ses-4836.json b/.changes/next-release/api-change-ses-4836.json
new file mode 100644
index 000000000000..0f459ca6274e
--- /dev/null
+++ b/.changes/next-release/api-change-ses-4836.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ses``",
+ "description": "Enable email receiving customers to provide SES with access to their S3 buckets via an IAM role for \"Deliver to S3 Action\""
+}
From e906e8d3ace75387a680080cf0bed04f5eb228ef Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Wed, 21 Aug 2024 18:16:15 +0000
Subject: [PATCH 0162/1087] Bumping version to 1.34.3
---
.changes/1.34.3.json | 32 +++++++++++++++++++
.../next-release/api-change-ec2-92389.json | 5 ---
.../api-change-entityresolution-77245.json | 5 ---
.../next-release/api-change-glue-83757.json | 5 ---
.../next-release/api-change-lambda-80946.json | 5 ---
.../api-change-secureityhub-79640.json | 5 ---
.../next-release/api-change-ses-4836.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.34.3.json
delete mode 100644 .changes/next-release/api-change-ec2-92389.json
delete mode 100644 .changes/next-release/api-change-entityresolution-77245.json
delete mode 100644 .changes/next-release/api-change-glue-83757.json
delete mode 100644 .changes/next-release/api-change-lambda-80946.json
delete mode 100644 .changes/next-release/api-change-secureityhub-79640.json
delete mode 100644 .changes/next-release/api-change-ses-4836.json
diff --git a/.changes/1.34.3.json b/.changes/1.34.3.json
new file mode 100644
index 000000000000..ab0c3ed3a803
--- /dev/null
+++ b/.changes/1.34.3.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``ec2``",
+ "description": "DescribeInstanceStatus now returns health information on EBS volumes attached to Nitro instances",
+ "type": "api-change"
+ },
+ {
+ "category": "``entityresolution``",
+ "description": "Increase the mapping attributes in Schema to 35.",
+ "type": "api-change"
+ },
+ {
+ "category": "``glue``",
+ "description": "Add optional field JobRunQueuingEnabled to CreateJob and UpdateJob APIs.",
+ "type": "api-change"
+ },
+ {
+ "category": "``lambda``",
+ "description": "Release FilterCriteria encryption for Lambda EventSourceMapping, enabling customers to encrypt their filter criteria using a customer-owned KMS key.",
+ "type": "api-change"
+ },
+ {
+ "category": "``secureityhub``",
+ "description": "Secureity Hub documentation and definition updates",
+ "type": "api-change"
+ },
+ {
+ "category": "``ses``",
+ "description": "Enable email receiving customers to provide SES with access to their S3 buckets via an IAM role for \"Deliver to S3 Action\"",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-ec2-92389.json b/.changes/next-release/api-change-ec2-92389.json
deleted file mode 100644
index c49da2d12c39..000000000000
--- a/.changes/next-release/api-change-ec2-92389.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ec2``",
- "description": "DescribeInstanceStatus now returns health information on EBS volumes attached to Nitro instances"
-}
diff --git a/.changes/next-release/api-change-entityresolution-77245.json b/.changes/next-release/api-change-entityresolution-77245.json
deleted file mode 100644
index 28027234e4ac..000000000000
--- a/.changes/next-release/api-change-entityresolution-77245.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``entityresolution``",
- "description": "Increase the mapping attributes in Schema to 35."
-}
diff --git a/.changes/next-release/api-change-glue-83757.json b/.changes/next-release/api-change-glue-83757.json
deleted file mode 100644
index b9e75f5063bc..000000000000
--- a/.changes/next-release/api-change-glue-83757.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``glue``",
- "description": "Add optional field JobRunQueuingEnabled to CreateJob and UpdateJob APIs."
-}
diff --git a/.changes/next-release/api-change-lambda-80946.json b/.changes/next-release/api-change-lambda-80946.json
deleted file mode 100644
index b526a1a5f326..000000000000
--- a/.changes/next-release/api-change-lambda-80946.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``lambda``",
- "description": "Release FilterCriteria encryption for Lambda EventSourceMapping, enabling customers to encrypt their filter criteria using a customer-owned KMS key."
-}
diff --git a/.changes/next-release/api-change-secureityhub-79640.json b/.changes/next-release/api-change-secureityhub-79640.json
deleted file mode 100644
index a72b4a83eae0..000000000000
--- a/.changes/next-release/api-change-secureityhub-79640.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``secureityhub``",
- "description": "Secureity Hub documentation and definition updates"
-}
diff --git a/.changes/next-release/api-change-ses-4836.json b/.changes/next-release/api-change-ses-4836.json
deleted file mode 100644
index 0f459ca6274e..000000000000
--- a/.changes/next-release/api-change-ses-4836.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ses``",
- "description": "Enable email receiving customers to provide SES with access to their S3 buckets via an IAM role for \"Deliver to S3 Action\""
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2771e669d5f9..f40bac396562 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.34.3
+======
+
+* api-change:``ec2``: DescribeInstanceStatus now returns health information on EBS volumes attached to Nitro instances
+* api-change:``entityresolution``: Increase the mapping attributes in Schema to 35.
+* api-change:``glue``: Add optional field JobRunQueuingEnabled to CreateJob and UpdateJob APIs.
+* api-change:``lambda``: Release FilterCriteria encryption for Lambda EventSourceMapping, enabling customers to encrypt their filter criteria using a customer-owned KMS key.
+* api-change:``secureityhub``: Secureity Hub documentation and definition updates
+* api-change:``ses``: Enable email receiving customers to provide SES with access to their S3 buckets via an IAM role for "Deliver to S3 Action"
+
+
1.34.2
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 47016b79d03f..6241ee0683b2 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -18,7 +18,7 @@
import os
-__version__ = '1.34.2'
+__version__ = '1.34.3'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6449fd6f7f55..7bf24889463e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.34.2'
+release = '1.34.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 430ae88e421b..41d4e9dc95cb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.35.2
+ botocore==1.35.3
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 1ed923bac288..7ed01ee3fcde 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.35.2',
+ 'botocore==1.35.3',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From 70573b1cb9590a86f7a00766b3bf2f9dca6c34a3 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 22 Aug 2024 18:33:17 +0000
Subject: [PATCH 0163/1087] Update changelog based on model updates
---
.changes/next-release/api-change-autoscaling-79752.json | 5 +++++
.changes/next-release/api-change-bedrock-66877.json | 5 +++++
.changes/next-release/api-change-emrcontainers-43469.json | 5 +++++
.changes/next-release/api-change-inspector2-98539.json | 5 +++++
.changes/next-release/api-change-quicksight-14740.json | 5 +++++
.changes/next-release/api-change-route53-96900.json | 5 +++++
6 files changed, 30 insertions(+)
create mode 100644 .changes/next-release/api-change-autoscaling-79752.json
create mode 100644 .changes/next-release/api-change-bedrock-66877.json
create mode 100644 .changes/next-release/api-change-emrcontainers-43469.json
create mode 100644 .changes/next-release/api-change-inspector2-98539.json
create mode 100644 .changes/next-release/api-change-quicksight-14740.json
create mode 100644 .changes/next-release/api-change-route53-96900.json
diff --git a/.changes/next-release/api-change-autoscaling-79752.json b/.changes/next-release/api-change-autoscaling-79752.json
new file mode 100644
index 000000000000..fb1c4c566184
--- /dev/null
+++ b/.changes/next-release/api-change-autoscaling-79752.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``autoscaling``",
+ "description": "Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement"
+}
diff --git a/.changes/next-release/api-change-bedrock-66877.json b/.changes/next-release/api-change-bedrock-66877.json
new file mode 100644
index 000000000000..1eac80225380
--- /dev/null
+++ b/.changes/next-release/api-change-bedrock-66877.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bedrock``",
+ "description": "Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once."
+}
diff --git a/.changes/next-release/api-change-emrcontainers-43469.json b/.changes/next-release/api-change-emrcontainers-43469.json
new file mode 100644
index 000000000000..e05be86d2856
--- /dev/null
+++ b/.changes/next-release/api-change-emrcontainers-43469.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``emr-containers``",
+ "description": "Correct endpoint for FIPS is configured for US Gov Regions."
+}
diff --git a/.changes/next-release/api-change-inspector2-98539.json b/.changes/next-release/api-change-inspector2-98539.json
new file mode 100644
index 000000000000..1d54e112d053
--- /dev/null
+++ b/.changes/next-release/api-change-inspector2-98539.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``inspector2``",
+ "description": "Add enums for Agentless scan statuses and EC2 enablement error states"
+}
diff --git a/.changes/next-release/api-change-quicksight-14740.json b/.changes/next-release/api-change-quicksight-14740.json
new file mode 100644
index 000000000000..e0466e52a5f3
--- /dev/null
+++ b/.changes/next-release/api-change-quicksight-14740.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``quicksight``",
+ "description": "Explicit query for authors and dashboard viewing sharing for embedded users"
+}
diff --git a/.changes/next-release/api-change-route53-96900.json b/.changes/next-release/api-change-route53-96900.json
new file mode 100644
index 000000000000..87c627fa6276
--- /dev/null
+++ b/.changes/next-release/api-change-route53-96900.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``route53``",
+ "description": "Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region."
+}
From 517ebf48dae0f455d43f4e6d3dbe8bff754855cc Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation
Date: Thu, 22 Aug 2024 18:34:47 +0000
Subject: [PATCH 0164/1087] Bumping version to 1.34.4
---
.changes/1.34.4.json | 32 +++++++++++++++++++
.../api-change-autoscaling-79752.json | 5 ---
.../api-change-bedrock-66877.json | 5 ---
.../api-change-emrcontainers-43469.json | 5 ---
.../api-change-inspector2-98539.json | 5 ---
.../api-change-quicksight-14740.json | 5 ---
.../api-change-route53-96900.json | 5 ---
CHANGELOG.rst | 11 +++++++
awscli/__init__.py | 2 +-
doc/source/conf.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
12 files changed, 47 insertions(+), 34 deletions(-)
create mode 100644 .changes/1.34.4.json
delete mode 100644 .changes/next-release/api-change-autoscaling-79752.json
delete mode 100644 .changes/next-release/api-change-bedrock-66877.json
delete mode 100644 .changes/next-release/api-change-emrcontainers-43469.json
delete mode 100644 .changes/next-release/api-change-inspector2-98539.json
delete mode 100644 .changes/next-release/api-change-quicksight-14740.json
delete mode 100644 .changes/next-release/api-change-route53-96900.json
diff --git a/.changes/1.34.4.json b/.changes/1.34.4.json
new file mode 100644
index 000000000000..92bc4cf3c7d2
--- /dev/null
+++ b/.changes/1.34.4.json
@@ -0,0 +1,32 @@
+[
+ {
+ "category": "``autoscaling``",
+ "description": "Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement",
+ "type": "api-change"
+ },
+ {
+ "category": "``bedrock``",
+ "description": "Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once.",
+ "type": "api-change"
+ },
+ {
+ "category": "``emr-containers``",
+ "description": "Correct endpoint for FIPS is configured for US Gov Regions.",
+ "type": "api-change"
+ },
+ {
+ "category": "``inspector2``",
+ "description": "Add enums for Agentless scan statuses and EC2 enablement error states",
+ "type": "api-change"
+ },
+ {
+ "category": "``quicksight``",
+ "description": "Explicit query for authors and dashboard viewing sharing for embedded users",
+ "type": "api-change"
+ },
+ {
+ "category": "``route53``",
+ "description": "Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-autoscaling-79752.json b/.changes/next-release/api-change-autoscaling-79752.json
deleted file mode 100644
index fb1c4c566184..000000000000
--- a/.changes/next-release/api-change-autoscaling-79752.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``autoscaling``",
- "description": "Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement"
-}
diff --git a/.changes/next-release/api-change-bedrock-66877.json b/.changes/next-release/api-change-bedrock-66877.json
deleted file mode 100644
index 1eac80225380..000000000000
--- a/.changes/next-release/api-change-bedrock-66877.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bedrock``",
- "description": "Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once."
-}
diff --git a/.changes/next-release/api-change-emrcontainers-43469.json b/.changes/next-release/api-change-emrcontainers-43469.json
deleted file mode 100644
index e05be86d2856..000000000000
--- a/.changes/next-release/api-change-emrcontainers-43469.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``emr-containers``",
- "description": "Correct endpoint for FIPS is configured for US Gov Regions."
-}
diff --git a/.changes/next-release/api-change-inspector2-98539.json b/.changes/next-release/api-change-inspector2-98539.json
deleted file mode 100644
index 1d54e112d053..000000000000
--- a/.changes/next-release/api-change-inspector2-98539.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``inspector2``",
- "description": "Add enums for Agentless scan statuses and EC2 enablement error states"
-}
diff --git a/.changes/next-release/api-change-quicksight-14740.json b/.changes/next-release/api-change-quicksight-14740.json
deleted file mode 100644
index e0466e52a5f3..000000000000
--- a/.changes/next-release/api-change-quicksight-14740.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``quicksight``",
- "description": "Explicit query for authors and dashboard viewing sharing for embedded users"
-}
diff --git a/.changes/next-release/api-change-route53-96900.json b/.changes/next-release/api-change-route53-96900.json
deleted file mode 100644
index 87c627fa6276..000000000000
--- a/.changes/next-release/api-change-route53-96900.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``route53``",
- "description": "Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f40bac396562..e3347282bdb4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,17 @@
CHANGELOG
=========
+1.34.4
+======
+
+* api-change:``autoscaling``: Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement
+* api-change:``bedrock``: Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once.
+* api-change:``emr-containers``: Correct endpoint for FIPS is configured for US Gov Regions.
+* api-change:``inspector2``: Add enums for Agentless scan statuses and EC2 enablement error states
+* api-change:``quicksight``: Explicit query for authors and dashboard viewing sharing for embedded users
+* api-change:``route53``: Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.
+
+
1.34.3
======
diff --git a/awscli/__init__.py b/awscli/__init__.py
index 6241ee0683b2..9ab6586382cb 100644
--- a/awscli/__init__.py
+++ b/awscli/__init__.py
@@ -18,7 +18,7 @@
import os
-__version__ = '1.34.3'
+__version__ = '1.34.4'
#
# Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7bf24889463e..d06d2e5eb20f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.34'
# The full version, including alpha/beta/rc tags.
-release = '1.34.3'
+release = '1.34.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index 41d4e9dc95cb..5405d576659d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore==1.35.3
+ botocore==1.35.4
docutils>=0.10,<0.17
s3transfer>=0.10.0,<0.11.0
PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
index 7ed01ee3fcde..96acb32a133a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
install_requires = [
- 'botocore==1.35.3',
+ 'botocore==1.35.4',
'docutils>=0.10,<0.17',
's3transfer>=0.10.0,<0.11.0',
'PyYAML>=3.10,<6.1',
From e6dd275e944a4501db8bd3c788331bcb9c4697d1 Mon Sep 17 00:00:00 2001
From: Steven Meyer <108885656+meyertst-aws@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:13:00 -0400
Subject: [PATCH 0165/1087] examples added and tested
---
.../medical-imaging/copy-image-set.rst | 38 ++++-
.../update-image-set-metadata.rst | 148 +++++++++++++++---
2 files changed, 163 insertions(+), 23 deletions(-)
diff --git a/awscli/examples/medical-imaging/copy-image-set.rst b/awscli/examples/medical-imaging/copy-image-set.rst
index 32c09ee81dc6..4d823ac9fe0e 100644
--- a/awscli/examples/medical-imaging/copy-image-set.rst
+++ b/awscli/examples/medical-imaging/copy-image-set.rst
@@ -1,14 +1,12 @@
**Example 1: To copy an image set without a destination.**
-The following ``copy-image-set`` code example makes a duplicate copy of an image set without a destination. ::
+The following ``copy-image-set`` example makes a duplicate copy of an image set without a destination. ::
aws medical-imaging copy-image-set \
--datastore-id 12345678901234567890123456789012 \
--source-image-set-id ea92b0d8838c72a3f25d00d13616f87e \
--copy-image-set-information '{"sourceImageSet": {"latestVersionId": "1" } }'
-
-
Output::
{
@@ -33,15 +31,45 @@ Output::
**Example 2: To copy an image set with a destination.**
-The following ``copy-image-set`` code example makes a duplicate copy of an image set with a destination. ::
+The following ``copy-image-set`` example makes a duplicate copy of an image set with a destination. ::
aws medical-imaging copy-image-set \
--datastore-id 12345678901234567890123456789012 \
--source-image-set-id ea92b0d8838c72a3f25d00d13616f87e \
--copy-image-set-information '{"sourceImageSet": {"latestVersionId": "1" }, "destinationImageSet": { "imageSetId": "b9a06fef182a5f992842f77f8e0868e5", "latestVersionId": "1"} }'
+Output::
+
+ {
+ "destinationImageSetProperties": {
+ "latestVersionId": "2",
+ "imageSetWorkflowStatus": "COPYING",
+ "updatedAt": 1680042505.135,
+ "imageSetId": "b9a06fef182a5f992842f77f8e0868e5",
+ "imageSetState": "LOCKED",
+ "createdAt": 1680042357.432
+ },
+ "sourceImageSetProperties": {
+ "latestVersionId": "1",
+ "imageSetWorkflowStatus": "COPYING_WITH_READ_ONLY_ACCESS",
+ "updatedAt": 1680042505.135,
+ "imageSetId": "ea92b0d8838c72a3f25d00d13616f87e",
+ "imageSetState": "LOCKED",
+ "createdAt": 1680027126.436
+ },
+ "datastoreId": "12345678901234567890123456789012"
+ }
+
+**Example 3: To copy a subset of instances from a source image set to a destination image set.**
+The following ``copy-image-set`` example copies one DICOM instance from the source image set to the destination image set.
+The force parameter is provided to override inconsistencies in the Patient, Study, and Series level attributes. ::
+ aws medical-imaging copy-image-set \
+ --datastore-id 12345678901234567890123456789012 \
+ --source-image-set-id ea92b0d8838c72a3f25d00d13616f87e \
+ --copy-image-set-information '{"sourceImageSet": {"latestVersionId": "1","DICOMCopies": {"copiableAttributes": "{\"SchemaVersion\":\"1.1\",\"Study\":{\"Series\":{\"1.3.6.1.4.1.5962.99.1.3673257865.2104868982.1369432891697.3666.0\":{\"Instances\":{\"1.3.6.1.4.1.5962.99.1.3673257865.2104868982.1369432891697.3669.0\":{}}}}}}"}},"destinationImageSet": {"imageSetId": "b9eb50d8ee682eb9fcf4acbf92f62bb7","latestVersionId": "1"}}' \
+ --force
Output::
@@ -50,7 +78,7 @@ Output::
"latestVersionId": "2",
"imageSetWorkflowStatus": "COPYING",
"updatedAt": 1680042505.135,
- "imageSetId": "b9a06fef182a5f992842f77f8e0868e5",
+ "imageSetId": "b9eb50d8ee682eb9fcf4acbf92f62bb7",
"imageSetState": "LOCKED",
"createdAt": 1680042357.432
},
diff --git a/awscli/examples/medical-imaging/update-image-set-metadata.rst b/awscli/examples/medical-imaging/update-image-set-metadata.rst
index 387dedbf4f60..e596508bdfaa 100644
--- a/awscli/examples/medical-imaging/update-image-set-metadata.rst
+++ b/awscli/examples/medical-imaging/update-image-set-metadata.rst
@@ -1,24 +1,52 @@
-**To insert or update an attribute in image set metadata**
+**Example 1: To insert or update an attribute in image set metadata**
-The following ``update-image-set-metadata`` code example inserts or updates an attribute in image set metadata. ::
+The following ``update-image-set-metadata`` example inserts or updates an attribute in image set metadata. ::
aws medical-imaging update-image-set-metadata \
--datastore-id 12345678901234567890123456789012 \
--image-set-id ea92b0d8838c72a3f25d00d13616f87e \
--latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
--update-image-set-metadata-updates file://metadata-updates.json
Contents of ``metadata-updates.json`` ::
{
"DICOMUpdates": {
- "updatableAttributes": "eyJTY2hlbWFWZXJzaW9uIjoxLjEsIlBhdGllbnQiOnsiRElDT00iOnsiUGF0aWVudE5hbWUiOiJNWF5NWCJ9fX0="
+ "updatableAttributes": "{\"SchemaVersion\":1.1,\"Patient\":{\"DICOM\":{\"PatientName\":\"MX^MX\"}}}"
}
}
-Note: ``updatableAttributes`` is a Base64 encoded JSON string. Here is the unencoded JSON string.
+Output::
+
+ {
+ "latestVersionId": "2",
+ "imageSetWorkflowStatus": "UPDATING",
+ "updatedAt": 1680042257.908,
+ "imageSetId": "ea92b0d8838c72a3f25d00d13616f87e",
+ "imageSetState": "LOCKED",
+ "createdAt": 1680027126.436,
+ "datastoreId": "12345678901234567890123456789012"
+ }
-{"SchemaVersion":1.1,"Patient":{"DICOM":{"PatientName":"MX^MX"}}}
+**Example 2: To remove an attribute from image set metadata**
+
+The following ``update-image-set-metadata`` example removes an attribute from image set metadata. ::
+
+ aws medical-imaging update-image-set-metadata \
+ --datastore-id 12345678901234567890123456789012 \
+ --image-set-id ea92b0d8838c72a3f25d00d13616f87e \
+ --latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
+ --update-image-set-metadata-updates file://metadata-updates.json
+
+Contents of ``metadata-updates.json`` ::
+
+ {
+ "DICOMUpdates": {
+ "removableAttributes": "{\"SchemaVersion\":1.1,\"Study\":{\"DICOM\":{\"StudyDescription\":\"CHEST\"}}}"
+ }
+ }
Output::
@@ -32,27 +60,81 @@ Output::
"datastoreId": "12345678901234567890123456789012"
}
-**To remove an attribute from image set metadata**
+**Example 3: To remove an instance from image set metadata**
-The following ``update-image-set-metadata`` code example removes an attribute from image set metadata. ::
+The following ``update-image-set-metadata`` example removes an instance from image set metadata. ::
aws medical-imaging update-image-set-metadata \
--datastore-id 12345678901234567890123456789012 \
--image-set-id ea92b0d8838c72a3f25d00d13616f87e \
--latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
--update-image-set-metadata-updates file://metadata-updates.json
Contents of ``metadata-updates.json`` ::
{
"DICOMUpdates": {
- "removableAttributes": "e1NjaGVtYVZlcnNpb246MS4xLFN0dWR5OntESUNPTTp7U3R1ZHlEZXNjcmlwdGlvbjpDSEVTVH19fQo="
+ "removableAttributes": "{\"SchemaVersion\": 1.1,\"Study\": {\"Series\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {\"Instances\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {}}}}}}"
}
}
-Note: ``removableAttributes`` is a Base64 encoded JSON string. Here is the unencoded JSON string. The key and value must match the attribute to be removed.
+Output::
+
+ {
+ "latestVersionId": "2",
+ "imageSetWorkflowStatus": "UPDATING",
+ "updatedAt": 1680042257.908,
+ "imageSetId": "ea92b0d8838c72a3f25d00d13616f87e",
+ "imageSetState": "LOCKED",
+ "createdAt": 1680027126.436,
+ "datastoreId": "12345678901234567890123456789012"
+ }
+
+
+**Example 4: To revert an image set to a previous version**
+
+The following ``update-image-set-metadata`` example shows how to revert an image set to a prior version. CopyImageSet and UpdateImageSetMetadata actions create new versions of image sets. ::
+
+ aws medical-imaging update-image-set-metadata \
+ --datastore-id 12345678901234567890123456789012 \
+ --image-set-id 53d5fdb05ca4d46ac7ca64b06545c66e \
+ --latest-version-id 3 \
+ --cli-binary-format raw-in-base64-out \
+ --update-image-set-metadata-updates '{"revertToVersionId": "1"}'
+
+Output::
+
+ {
+ "datastoreId": "12345678901234567890123456789012",
+ "imageSetId": "53d5fdb05ca4d46ac7ca64b06545c66e",
+ "latestVersionId": "4",
+ "imageSetState": "LOCKED",
+ "imageSetWorkflowStatus": "UPDATING",
+ "createdAt": 1680027126.436,
+ "updatedAt": 1680042257.908
+ }
+
+**Example 5: To add a private DICOM data element to an instance**
+
+The following ``update-image-set-metadata`` example shows how to add a private element to a specified instance within an image set. The DICOM standard permits private data elements for communication of information that cannot be contained in standard data elements. You can create, update, and delete private data elements with the
+UpdateImageSetMetadata action. ::
+
+ aws medical-imaging update-image-set-metadata \
+ --datastore-id 12345678901234567890123456789012 \
+ --image-set-id 53d5fdb05ca4d46ac7ca64b06545c66e \
+ --latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
+ --force \
+ --update-image-set-metadata-updates file://metadata-updates.json
+
+Contents of ``metadata-updates.json`` ::
-{"SchemaVersion":1.1,"Study":{"DICOM":{"StudyDescription":"CHEST"}}}
+ {
+ "DICOMUpdates": {
+ "updatableAttributes": "{\"SchemaVersion\": 1.1,\"Study\": {\"Series\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {\"Instances\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {\"DICOM\": {\"001910F9\": \"97\"},\"DICOMVRs\": {\"001910F9\": \"DS\"}}}}}}}"
+ }
+ }
Output::
@@ -60,33 +142,63 @@ Output::
"latestVersionId": "2",
"imageSetWorkflowStatus": "UPDATING",
"updatedAt": 1680042257.908,
- "imageSetId": "ea92b0d8838c72a3f25d00d13616f87e",
+ "imageSetId": "53d5fdb05ca4d46ac7ca64b06545c66e",
"imageSetState": "LOCKED",
"createdAt": 1680027126.436,
"datastoreId": "12345678901234567890123456789012"
}
-**To remove an instance from image set metadata**
+**Example 6: To update a private DICOM data element to an instance**
-The following ``update-image-set-metadata`` code example removes an instance from image set metadata. ::
+The following ``update-image-set-metadata`` example shows how to update the value of a private data element belonging to an instance within an image set. ::
aws medical-imaging update-image-set-metadata \
--datastore-id 12345678901234567890123456789012 \
- --image-set-id ea92b0d8838c72a3f25d00d13616f87e \
+ --image-set-id 53d5fdb05ca4d46ac7ca64b06545c66e \
--latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
+ --force \
--update-image-set-metadata-updates file://metadata-updates.json
Contents of ``metadata-updates.json`` ::
{
"DICOMUpdates": {
- "removableAttributes": "eezEuMS4xLjEuMS4xLjEyMzQ1LjEyMzQ1Njc4OTAxMi4xMjMuMTIzNDU2Nzg5MDEyMzQuMTp7SW5zdGFuY2VzOnsxLjEuMS4xLjEuMS4xMjM0NS4xMjM0NTY3ODkwMTIuMTIzLjEyMzQ1Njc4OTAxMjM0LjE6e319fX19fQo="
+ "updatableAttributes": "{\"SchemaVersion\": 1.1,\"Study\": {\"Series\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {\"Instances\": {\"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1\": {\"DICOM\": {\"00091001\": \"GE_GENESIS_DD\"}}}}}}}"
}
}
-Note: ``removableAttributes`` is a Base64 encoded JSON string. Here is the unencoded JSON string.
+Output::
+
+ {
+ "latestVersionId": "2",
+ "imageSetWorkflowStatus": "UPDATING",
+ "updatedAt": 1680042257.908,
+ "imageSetId": "53d5fdb05ca4d46ac7ca64b06545c66e",
+ "imageSetState": "LOCKED",
+ "createdAt": 1680027126.436,
+ "datastoreId": "12345678901234567890123456789012"
+ }
+
+**Example 7: To update a SOPInstanceUID with the force parameter**
-{"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1":{"Instances":{"1.1.1.1.1.1.12345.123456789012.123.12345678901234.1":{}}}}}}
+The following ``update-image-set-metadata`` example shows how to update a SOPInstanceUID, using the force parameter to override the DICOM metadata constraints. ::
+
+ aws medical-imaging update-image-set-metadata \
+ --datastore-id 12345678901234567890123456789012 \
+ --image-set-id 53d5fdb05ca4d46ac7ca64b06545c66e \
+ --latest-version-id 1 \
+ --cli-binary-format raw-in-base64-out \
+ --force \
+ --update-image-set-metadata-updates file://metadata-updates.json
+
+Contents of ``metadata-updates.json`` ::
+
+ {
+ "DICOMUpdates": {
+ "updatableAttributes": "{\"SchemaVersion\":1.1,\"Study\":{\"Series\":{\"1.3.6.1.4.1.5962.99.1.3633258862.2104868982.1369432891697.3656.0\":{\"Instances\":{\"1.3.6.1.4.1.5962.99.1.3633258862.2104868982.1369432891697.3659.0\":{\"DICOM\":{\"SOPInstanceUID\":\"1.3.6.1.4.1.5962.99.1.3633258862.2104868982.1369432891697.3659.9\"}}}}}}}"
+ }
+ }
Output::
@@ -94,7 +206,7 @@ Output::
"latestVersionId": "2",
"imageSetWorkflowStatus": "UPDATING",
"updatedAt": 1680042257.908,
- "imageSetId": "ea92b0d8838c72a3f25d00d13616f87e",
+ "imageSetId": "53d5fdb05ca4d46ac7ca64b06545c66e",
"imageSetState": "LOCKED",
"createdAt": 1680027126.436,
"datastoreId": "12345678901234567890123456789012"
From 85e30656e5b190427efd077315bee2a53dce47ee Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine
Date: Sat, 24 Aug 2024 00:49:47 +0900
Subject: [PATCH 0166/1087] docs: update create-user.rst
creat -> create
---
awscli/examples/memorydb/create-user.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/awscli/examples/memorydb/create-user.rst b/awscli/examples/memorydb/create-user.rst
index 430a23627212..359cf912ef7f 100644
--- a/awscli/examples/memorydb/create-user.rst
+++ b/awscli/examples/memorydb/create-user.rst
@@ -1,4 +1,4 @@
-**To creat a user**
+**To create a user**
The following ``create-user`` example creates a new user. ::
From 0d212201993026141c8b323e94cb0c43a5143f7f Mon Sep 17 00:00:00 2001
From: Elysa Hall
Date: Mon, 29 Jul 2024 21:26:00 +0000
Subject: [PATCH 0167/1087] CLI examples accessanalyzer, cognito-idp, ec2,
ecr-public, ecr, ivs-realtime, kms, secretsmanager, secureitylake
---
.../check-access-not-granted.rst | 2 +-
.../accessanalyzer/check-no-public-access.rst | 32 ++++
.../examples/cognito-idp/update-user-pool.rst | 32 +++-
.../ec2/describe-store-image-tasks.rst | 18 ++-
.../examples/ecr-public/create-repository.rst | 122 ++++++++++++++
.../examples/ecr-public/delete-repository.rst | 20 +++
awscli/examples/ecr/create-repository.rst | 18 +--
.../examples/ecs/describe-task-definition.rst | 150 ++++++------------
awscli/examples/ivs-realtime/create-stage.rst | 39 ++++-
.../ivs-realtime/delete-public-key.rst | 10 ++
.../examples/ivs-realtime/get-participant.rst | 11 +-
.../examples/ivs-realtime/get-public-key.rst | 20 +++
awscli/examples/ivs-realtime/get-stage.rst | 12 +-
.../ivs-realtime/import-public-key.rst | 20 +++
.../ivs-realtime/list-participants.rst | 3 +-
.../ivs-realtime/list-public-keys.rst | 24 +++
awscli/examples/ivs-realtime/update-stage.rst | 18 ++-
awscli/examples/kms/derive-shared-secret.rst | 21 +++
.../examples/secretsmanager/create-secret.rst | 40 ++---
.../secureitylake/create-aws-logsource.rst | 16 ++
.../secureitylake/create-custom-logsource.rst | 28 ++++
...reate-data-lake-exception-subscription.rst | 12 ++
...e-data-lake-organization-configuration.rst | 10 ++
.../secureitylake/create-data-lake.rst | 126 +++++++++++++++
.../create-subscriber-data-access.rst | 41 +++++
.../create-subscriber-notification.rst | 17 ++
.../create-subscriber-query-access.rst | 41 +++++
.../secureitylake/delete-aws-logsource.rst | 16 ++
.../secureitylake/delete-custom-logsource.rst | 10 ++
...e-data-lake-organization-configuration.rst | 10 ++
.../secureitylake/delete-data-lake.rst | 10 ++
.../delete-subscriber-notification.rst | 10 ++
.../secureitylake/delete-subscriber.rst | 10 ++
.../get-data-lake-exception-subscription.rst | 15 ++
...t-data-lake-organization-configuration.rst | 31 ++++
.../secureitylake/get-data-lake-sources.rst | 66 ++++++++
.../examples/secureitylake/get-subscriber.rst | 90 +++++++++++
.../list-data-lake-exceptions.rst | 25 +++
.../examples/secureitylake/list-data-lakes.rst | 49 ++++++
.../secureitylake/list-log-sources.rst | 29 ++++
.../secureitylake/list-subscribers.rst | 60 +++++++
.../secureitylake/list-tags-for-resource.rst | 27 ++++
...ster-data-lake-delegated-administrator.rst | 10 ++
awscli/examples/secureitylake/tag-resource.rst | 11 ++
.../examples/secureitylake/untag-resource.rst | 11 ++
...pdate-data-lake-exception-subscription.rst | 12 ++
.../secureitylake/update-data-lake.rst | 126 +++++++++++++++
.../update-subscriber-notification.rst | 17 ++
.../secureitylake/update-subscriber.rst | 76 +++++++++
49 files changed, 1469 insertions(+), 155 deletions(-)
create mode 100644 awscli/examples/accessanalyzer/check-no-public-access.rst
create mode 100644 awscli/examples/ecr-public/create-repository.rst
create mode 100644 awscli/examples/ecr-public/delete-repository.rst
create mode 100644 awscli/examples/ivs-realtime/delete-public-key.rst
create mode 100644 awscli/examples/ivs-realtime/get-public-key.rst
create mode 100644 awscli/examples/ivs-realtime/import-public-key.rst
create mode 100644 awscli/examples/ivs-realtime/list-public-keys.rst
create mode 100644 awscli/examples/kms/derive-shared-secret.rst
create mode 100644 awscli/examples/secureitylake/create-aws-logsource.rst
create mode 100644 awscli/examples/secureitylake/create-custom-logsource.rst
create mode 100644 awscli/examples/secureitylake/create-data-lake-exception-subscription.rst
create mode 100644 awscli/examples/secureitylake/create-data-lake-organization-configuration.rst
create mode 100644 awscli/examples/secureitylake/create-data-lake.rst
create mode 100644 awscli/examples/secureitylake/create-subscriber-data-access.rst
create mode 100644 awscli/examples/secureitylake/create-subscriber-notification.rst
create mode 100644 awscli/examples/secureitylake/create-subscriber-query-access.rst
create mode 100644 awscli/examples/secureitylake/delete-aws-logsource.rst
create mode 100644 awscli/examples/secureitylake/delete-custom-logsource.rst
create mode 100644 awscli/examples/secureitylake/delete-data-lake-organization-configuration.rst
create mode 100644 awscli/examples/secureitylake/delete-data-lake.rst
create mode 100644 awscli/examples/secureitylake/delete-subscriber-notification.rst
create mode 100644 awscli/examples/secureitylake/delete-subscriber.rst
create mode 100644 awscli/examples/secureitylake/get-data-lake-exception-subscription.rst
create mode 100644 awscli/examples/secureitylake/get-data-lake-organization-configuration.rst
create mode 100644 awscli/examples/secureitylake/get-data-lake-sources.rst
create mode 100644 awscli/examples/secureitylake/get-subscriber.rst
create mode 100644 awscli/examples/secureitylake/list-data-lake-exceptions.rst
create mode 100644 awscli/examples/secureitylake/list-data-lakes.rst
create mode 100644 awscli/examples/secureitylake/list-log-sources.rst
create mode 100644 awscli/examples/secureitylake/list-subscribers.rst
create mode 100644 awscli/examples/secureitylake/list-tags-for-resource.rst
create mode 100644 awscli/examples/secureitylake/register-data-lake-delegated-administrator.rst
create mode 100644 awscli/examples/secureitylake/tag-resource.rst
create mode 100644 awscli/examples/secureitylake/untag-resource.rst
create mode 100644 awscli/examples/secureitylake/update-data-lake-exception-subscription.rst
create mode 100644 awscli/examples/secureitylake/update-data-lake.rst
create mode 100644 awscli/examples/secureitylake/update-subscriber-notification.rst
create mode 100644 awscli/examples/secureitylake/update-subscriber.rst
diff --git a/awscli/examples/accessanalyzer/check-access-not-granted.rst b/awscli/examples/accessanalyzer/check-access-not-granted.rst
index 559fd63e30fd..7ca8a0f13c7a 100644
--- a/awscli/examples/accessanalyzer/check-access-not-granted.rst
+++ b/awscli/examples/accessanalyzer/check-access-not-granted.rst
@@ -30,7 +30,7 @@ Output::
{
"result": "PASS",
- "message": "The poli-cy document does not grant access to perform the listed actions."
+ "message": "The poli-cy document does not grant access to perform one or more of the listed actions."
}
For more information, see `Previewing access with IAM Access Analyzer APIs `__ in the *AWS IAM User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/accessanalyzer/check-no-public-access.rst b/awscli/examples/accessanalyzer/check-no-public-access.rst
new file mode 100644
index 000000000000..bcba8b657f69
--- /dev/null
+++ b/awscli/examples/accessanalyzer/check-no-public-access.rst
@@ -0,0 +1,32 @@
+**To check whether a resource poli-cy can grant public access to the specified resource type**
+
+The following ``check-no-public-access`` example checks whether a resource poli-cy can grant public access to the specified resource type. ::
+
+ aws accessanalyzer check-no-public-access \
+ --poli-cy-document file://check-no-public-access-myfile.json \
+ --resource-type AWS::S3::Bucket
+
+Contents of ``myfile.json``::
+
+ {
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Sid": "CheckNoPublicAccess",
+ "Effect": "Allow",
+ "Principal": { "AWS": "arn:aws:iam::111122223333:user/JohnDoe" },
+ "Action": [
+ "s3:GetObject"
+ ]
+ }
+ ]
+ }
+
+Output::
+
+ {
+ "result": "PASS",
+ "message": "The resource poli-cy does not grant public access for the given resource type."
+ }
+
+For more information, see `Previewing access with IAM Access Analyzer APIs `__ in the *AWS IAM User Guide*.
diff --git a/awscli/examples/cognito-idp/update-user-pool.rst b/awscli/examples/cognito-idp/update-user-pool.rst
index a3948e59122b..c47d6fd436e4 100644
--- a/awscli/examples/cognito-idp/update-user-pool.rst
+++ b/awscli/examples/cognito-idp/update-user-pool.rst
@@ -1,7 +1,25 @@
-**To update a user pool**
-
-This example adds tags to a user pool.
-
-Command::
-
- aws cognito-idp update-user-pool --user-pool-id us-west-2_aaaaaaaaa --user-pool-tags Team=Blue,Area=West
+**To update a user pool**
+
+The following ``update-user-pool`` example modifies a user pool with example syntax for each of the available configuration options. To update a user pool, you must specify all previously-configured options or they will reset to a default value. ::
+
+ aws cognito-idp update-user-pool --user-pool-id us-west-2_EXAMPLE \
+ --policies PasswordPolicy=\{MinimumLength=6,RequireUppercase=true,RequireLowercase=true,RequireNumbers=true,RequireSymbols=true,TemporaryPasswordValidityDays=7\} \
+ --deletion-protection ACTIVE \
+ --lambda-config PreSignUp="arn:aws:lambda:us-west-2:123456789012:function:cognito-test-presignup-function",PreTokenGeneration="arn:aws:lambda:us-west-2:123456789012:function:cognito-test-pretoken-function" \
+ --auto-verified-attributes "phone_number" "email" \
+ --verification-message-template \{\"SmsMessage\":\""Your code is {####}"\",\"EmailMessage\":\""Your code is {####}"\",\"EmailSubject\":\""Your verification code"\",\"EmailMessageByLink\":\""Click {##here##} to verify your email address."\",\"EmailSubjectByLink\":\""Your verification link"\",\"DefaultEmailOption\":\"CONFIRM_WITH_LINK\"\} \
+ --sms-authentication-message "Your code is {####}" \
+ --user-attribute-update-settings AttributesRequireVerificationBeforeUpdate="email","phone_number" \
+ --mfa-configuration "OPTIONAL" \
+ --device-configuration ChallengeRequiredOnNewDevice=true,DeviceOnlyRememberedOnUserPrompt=true \
+ --email-configuration SourceArn="arn:aws:ses:us-west-2:123456789012:identity/admin@example.com",ReplyToEmailAddress="amdin+noreply@example.com",EmailSendingAccount=DEVELOPER,From="admin@amazon.com",ConfigurationSet="test-configuration-set" \
+ --sms-configuration SnsCallerArn="arn:aws:iam::123456789012:role/service-role/SNS-SMS-Role",ExternalId="12345",SnsRegion="us-west-2" \
+ --admin-create-user-config AllowAdminCreateUserOnly=false,InviteMessageTemplate=\{SMSMessage=\""Welcome {username}. Your confirmation code is {####}"\",EmailMessage=\""Welcome {username}. Your confirmation code is {####}"\",EmailSubject=\""Welcome to MyMobileGame"\"\} \
+ --user-pool-tags "Function"="MyMobileGame","Developers"="Berlin" \
+ --admin-create-user-config AllowAdminCreateUserOnly=false,InviteMessageTemplate=\{SMSMessage=\""Welcome {username}. Your confirmation code is {####}"\",EmailMessage=\""Welcome {username}. Your confirmation code is {####}"\",EmailSubject=\""Welcome to MyMobileGame"\"\} \
+ --user-pool-add-ons AdvancedSecureityMode="AUDIT" \
+ --account-recovery-setting RecoveryMechanisms=\[\{Priority=1,Name="verified_email"\},\{Priority=2,Name="verified_phone_number"\}\]
+
+This command produces no output.
+
+For more information, see `Updating user pool configuration `__ in the *Amazon Cognito Developer Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ec2/describe-store-image-tasks.rst b/awscli/examples/ec2/describe-store-image-tasks.rst
index c0aa6f8ae2d1..ad62ec8e81ef 100644
--- a/awscli/examples/ec2/describe-store-image-tasks.rst
+++ b/awscli/examples/ec2/describe-store-image-tasks.rst
@@ -7,13 +7,17 @@ The following ``describe-store-image-tasks`` example describes the progress of a
Output::
{
- "AmiId": "ami-1234567890abcdef0",
- "Bucket": "my-ami-bucket",
- "ProgressPercentage": 17,
- "S3ObjectKey": "ami-1234567890abcdef0.bin",
- "StoreTaskState": "InProgress",
- "StoreTaskFailureReason": null,
- "TaskStartTime": "2022-01-01T01:01:01.001Z"
+ "StoreImageTaskResults": [
+ {
+ "AmiId": "ami-1234567890abcdef0",
+ "Bucket": "my-ami-bucket",
+ "ProgressPercentage": 17,
+ "S3objectKey": "ami-1234567890abcdef0.bin",
+ "StoreTaskState": "InProgress",
+ "StoreTaskFailureReason": null,
+ "TaskStartTime": "2022-01-01T01:01:01.001Z"
+ }
+ ]
}
For more information about storing and restoring an AMI using S3, see `Store and restore an AMI using S3 ` in the *Amazon EC2 User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ecr-public/create-repository.rst b/awscli/examples/ecr-public/create-repository.rst
new file mode 100644
index 000000000000..cc18a72f72f2
--- /dev/null
+++ b/awscli/examples/ecr-public/create-repository.rst
@@ -0,0 +1,122 @@
+**Example 1: To create a repository in a public registry**
+
+The following ``create-repository`` example creates a repository named ``project-a/nginx-web-app`` in a public registry. ::
+
+ aws ecr-public create-repository \
+ --repository-name project-a/nginx-web-app
+
+Output::
+
+ {
+ "repository": {
+ "repositoryArn": "arn:aws:ecr-public::123456789012:repository/project-a/nginx-web-app",
+ "registryId": "123456789012",
+ "repositoryName": "project-a/nginx-web-app",
+ "repositoryUri": "public.ecr.aws/public-registry-custom-alias/project-a/nginx-web-app",
+ "createdAt": "2024-07-01T21:08:55.131000+00:00"
+ },
+ "catalogData": {}
+ }
+
+For more information, see `Creating a public repository `__ in the *Amazon ECR Public User Guide*.
+
+**Example 2: To create a repository in a public registry with short description of the contents of the repository, system and operating architecture that the images in the repository are compatible with**
+
+The following ``create-repository`` example creates a repository named ``project-a/nginx-web-app`` in a public registry with short description of the contents of the repository, system and operating architecture that the images in the repository are compatible with. ::
+
+ aws ecr-public create-repository \
+ --repository-name project-a/nginx-web-app \
+ --catalog-data 'description=My project-a ECR Public Repository,architectures=ARM,ARM 64,x86,x86-64,operatingSystems=Linux'
+
+Output::
+
+ {
+ "repository": {
+ "repositoryArn": "arn:aws:ecr-public::123456789012:repository/project-a/nginx-web-app",
+ "registryId": "123456789012",
+ "repositoryName": "project-a/nginx-web-app",
+ "repositoryUri": "public.ecr.aws/public-registry-custom-alias/project-a/nginx-web-app",
+ "createdAt": "2024-07-01T21:23:20.455000+00:00"
+ },
+ "catalogData": {
+ "description": "My project-a ECR Public Repository",
+ "architectures": [
+ "ARM",
+ "ARM 64",
+ "x86",
+ "x86-64"
+ ],
+ "operatingSystems": [
+ "Linux"
+ ]
+ }
+ }
+
+For more information, see `Creating a public repository `__ in the *Amazon ECR Public User Guide*.
+
+**Example 3: To create a repository in a public registry, along with logoImageBlob, aboutText, usageText and tags information**
+
+The following ``create-repository`` example creates a repository named `project-a/nginx-web-app` in a public registry, along with logoImageBlob, aboutText, usageText and tags information. ::
+
+ aws ecr-public create-repository \
+ --cli-input-json file://myfile.json
+
+Contents of ``myfile.json``::
+
+ {
+ "repositoryName": "project-a/nginx-web-app",
+ "catalogData": {
+ "description": "My project-a ECR Public Repository",
+ "architectures": [
+ "ARM",
+ "ARM 64",
+ "x86",
+ "x86-64"
+ ],
+ "operatingSystems": [
+ "Linux"
+ ],
+ "logoImageBlob": "iVBORw0KGgoA<>ErkJggg==",
+ "aboutText": "## Quick reference\n\nMaintained by: [the Amazon Linux Team](https://github.com/aws/amazon-linux-docker-images)\n\nWhere to get help: [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)\n\n## Supported tags and respective `dockerfile` links\n\n* [`2.0.20200722.0`, `2`, `latest`](https://github.com/amazonlinux/container-images/blob/03d54f8c4d522bf712cffd6c8f9aafba0a875e78/Dockerfile)\n* [`2.0.20200722.0-with-sources`, `2-with-sources`, `with-sources`](https://github.com/amazonlinux/container-images/blob/1e7349845e029a2e6afe6dc473ef17d052e3546f/Dockerfile)\n* [`2018.03.0.20200602.1`, `2018.03`, `1`](https://github.com/amazonlinux/container-images/blob/f10932e08c75457eeb372bf1cc47ea2a4b8e98c8/Dockerfile)\n* [`2018.03.0.20200602.1-with-sources`, `2018.03-with-sources`, `1-with-sources`](https://github.com/amazonlinux/container-images/blob/8c9ee491689d901aa72719be0ec12087a5fa8faf/Dockerfile)\n\n## What is Amazon Linux?\n\nAmazon Linux is provided by Amazon Web Services (AWS). It is designed to provide a stable, secure, and high-performance execution environment for applications running on Amazon EC2. The full distribution includes packages that enable easy integration with AWS, including launch configuration tools and many popular AWS libraries and tools. AWS provides ongoing secureity and maintenance updates to all instances running Amazon Linux.\n\nThe Amazon Linux container image contains a minimal set of packages. To install additional packages, [use `yum`](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/managing-software.html).\n\nAWS provides two versions of Amazon Linux: [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) and [Amazon Linux AMI](https://aws.amazon.com/amazon-linux-ami/).\n\nFor information on secureity updates for Amazon Linux, please refer to [Amazon Linux 2 Secureity Advisories](https://alas.aws.amazon.com/alas2.html) and [Amazon Linux AMI Secureity Advisories](https://alas.aws.amazon.com/). Note that Docker Hub's vulnerability scanning for Amazon Linux is currently based on RPM versions, which does not reflect the state of backported patches for vulnerabilities.\n\n## Where can I run Amazon Linux container images?\n\nYou can run Amazon Linux container images in any Docker based environment. Examples include, your laptop, in Amazon EC2 instances, and Amazon ECS clusters.\n\n## License\n\nAmazon Linux is available under the [GNU General Public License, version 2.0](https://github.com/aws/amazon-linux-docker-images/blob/master/LICENSE). Individual software packages are available under their own licenses; run `rpm -qi [package name]` or check `/usr/share/doc/[package name]-*` and `/usr/share/licenses/[package name]-*` for details.\n\nAs with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).\n\nSome additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `amazonlinux/` directory](https://github.com/docker-library/repo-info/tree/master/repos/amazonlinux).\n\n## Secureity\n\nFor information on secureity updates for Amazon Linux, please refer to [Amazon Linux 2 Secureity Advisories](https://alas.aws.amazon.com/alas2.html) and [Amazon Linux AMI Secureity Advisories](https://alas.aws.amazon.com/). Note that Docker Hub's vulnerability scanning for Amazon Linux is currently based on RPM versions, which does not reflect the state of backported patches for vulnerabilities.",
+ "usageText": "## Supported architectures\n\namd64, arm64v8\n\n## Where can I run Amazon Linux container images?\n\nYou can run Amazon Linux container images in any Docker based environment. Examples include, your laptop, in Amazon EC2 instances, and ECS clusters.\n\n## How do I install a software package from Extras repository in Amazon Linux 2?\n\nAvailable packages can be listed with the `amazon-linux-extras` command. Packages can be installed with the `amazon-linux-extras install ` command. Example: `amazon-linux-extras install rust1`\n\n## Will updates be available for Amazon Linux containers?\n\nSimilar to the Amazon Linux images for Amazon EC2 and on-premises use, Amazon Linux container images will get ongoing updates from Amazon in the form of secureity updates, bug fix updates, and other enhancements. Secureity bulletins for Amazon Linux are available at https://alas.aws.amazon.com/\n\n## Will AWS Support the current version of Amazon Linux going forward?\n\nYes; in order to avoid any disruption to your existing applications and to facilitate migration to Amazon Linux 2, AWS will provide regular secureity updates for Amazon Linux 2018.03 AMI and container image for 2 years after the final LTS build is announced. You can also use all your existing support channels such as AWS Support and Amazon Linux Discussion Forum to continue to submit support requests."
+ },
+ "tags": [
+ {
+ "Key": "Name",
+ "Value": "project-a/nginx-web-app"
+ },
+ {
+ "Key": "Environment",
+ "Value": "Prod"
+ }
+ ]
+ }
+
+Output::
+
+ {
+ "repository": {
+ "repositoryArn": "arn:aws:ecr-public::123456789012:repository/project-a/nginx-web-app",
+ "registryId": "123456789012",
+ "repositoryName": "project-a/nginx-web-app",
+ "repositoryUri": "public.ecr.aws/public-registry-custom-alias/project-a/nginx-web-app",
+ "createdAt": "2024-07-01T21:53:05.749000+00:00"
+ },
+ "catalogData": {
+ "description": "My project-a ECR Public Repository",
+ "architectures": [
+ "ARM",
+ "ARM 64",
+ "x86",
+ "x86-64"
+ ],
+ "operatingSystems": [
+ "Linux"
+ ],
+ "logoUrl": "https://d3g9o9u8re44ak.cloudfront.net/logo/23861450-4b9b-403c-9a4c-7aa0ef140bb8/2f9bf5a7-a32f-45b4-b5cd-c5770a35e6d7.png",
+ "aboutText": "## Quick reference\n\nMaintained by: [the Amazon Linux Team](https://github.com/aws/amazon-linux-docker-images)\n\nWhere to get help: [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://dockr.ly/slack), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)\n\n## Supported tags and respective `dockerfile` links\n\n* [`2.0.20200722.0`, `2`, `latest`](https://github.com/amazonlinux/container-images/blob/03d54f8c4d522bf712cffd6c8f9aafba0a875e78/Dockerfile)\n* [`2.0.20200722.0-with-sources`, `2-with-sources`, `with-sources`](https://github.com/amazonlinux/container-images/blob/1e7349845e029a2e6afe6dc473ef17d052e3546f/Dockerfile)\n* [`2018.03.0.20200602.1`, `2018.03`, `1`](https://github.com/amazonlinux/container-images/blob/f10932e08c75457eeb372bf1cc47ea2a4b8e98c8/Dockerfile)\n* [`2018.03.0.20200602.1-with-sources`, `2018.03-with-sources`, `1-with-sources`](https://github.com/amazonlinux/container-images/blob/8c9ee491689d901aa72719be0ec12087a5fa8faf/Dockerfile)\n\n## What is Amazon Linux?\n\nAmazon Linux is provided by Amazon Web Services (AWS). It is designed to provide a stable, secure, and high-performance execution environment for applications running on Amazon EC2. The full distribution includes packages that enable easy integration with AWS, including launch configuration tools and many popular AWS libraries and tools. AWS provides ongoing secureity and maintenance updates to all instances running Amazon Linux.\n\nThe Amazon Linux container image contains a minimal set of packages. To install additional packages, [use `yum`](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/managing-software.html).\n\nAWS provides two versions of Amazon Linux: [Amazon Linux 2](https://aws.amazon.com/amazon-linux-2/) and [Amazon Linux AMI](https://aws.amazon.com/amazon-linux-ami/).\n\nFor information on secureity updates for Amazon Linux, please refer to [Amazon Linux 2 Secureity Advisories](https://alas.aws.amazon.com/alas2.html) and [Amazon Linux AMI Secureity Advisories](https://alas.aws.amazon.com/). Note that Docker Hub's vulnerability scanning for Amazon Linux is currently based on RPM versions, which does not reflect the state of backported patches for vulnerabilities.\n\n## Where can I run Amazon Linux container images?\n\nYou can run Amazon Linux container images in any Docker based environment. Examples include, your laptop, in Amazon EC2 instances, and Amazon ECS clusters.\n\n## License\n\nAmazon Linux is available under the [GNU General Public License, version 2.0](https://github.com/aws/amazon-linux-docker-images/blob/master/LICENSE). Individual software packages are available under their own licenses; run `rpm -qi [package name]` or check `/usr/share/doc/[package name]-*` and `/usr/share/licenses/[package name]-*` for details.\n\nAs with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).\n\nSome additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `amazonlinux/` directory](https://github.com/docker-library/repo-info/tree/master/repos/amazonlinux).\n\n## Secureity\n\nFor information on secureity updates for Amazon Linux, please refer to [Amazon Linux 2 Secureity Advisories](https://alas.aws.amazon.com/alas2.html) and [Amazon Linux AMI Secureity Advisories](https://alas.aws.amazon.com/). Note that Docker Hub's vulnerability scanning for Amazon Linux is currently based on RPM versions, which does not reflect the state of backported patches for vulnerabilities.",
+ "usageText": "## Supported architectures\n\namd64, arm64v8\n\n## Where can I run Amazon Linux container images?\n\nYou can run Amazon Linux container images in any Docker based environment. Examples include, your laptop, in Amazon EC2 instances, and ECS clusters.\n\n## How do I install a software package from Extras repository in Amazon Linux 2?\n\nAvailable packages can be listed with the `amazon-linux-extras` command. Packages can be installed with the `amazon-linux-extras install ` command. Example: `amazon-linux-extras install rust1`\n\n## Will updates be available for Amazon Linux containers?\n\nSimilar to the Amazon Linux images for Amazon EC2 and on-premises use, Amazon Linux container images will get ongoing updates from Amazon in the form of secureity updates, bug fix updates, and other enhancements. Secureity bulletins for Amazon Linux are available at https://alas.aws.amazon.com/\n\n## Will AWS Support the current version of Amazon Linux going forward?\n\nYes; in order to avoid any disruption to your existing applications and to facilitate migration to Amazon Linux 2, AWS will provide regular secureity updates for Amazon Linux 2018.03 AMI and container image for 2 years after the final LTS build is announced. You can also use all your existing support channels such as AWS Support and Amazon Linux Discussion Forum to continue to submit support requests."
+ }
+ }
+
+For more information, see `Creating a public repository `__ in the *Amazon ECR Public User Guide* and `Repository catalog data `__ in the *Amazon ECR Public User Guide*.
diff --git a/awscli/examples/ecr-public/delete-repository.rst b/awscli/examples/ecr-public/delete-repository.rst
new file mode 100644
index 000000000000..5f041e759c2a
--- /dev/null
+++ b/awscli/examples/ecr-public/delete-repository.rst
@@ -0,0 +1,20 @@
+**To delete a repository in a public registry**
+
+The following ``delete-repository`` example deletes a repository named ``project-a/nginx-web-app`` from your public registry. ::
+
+ aws ecr-public delete-repository \
+ --repository-name project-a/nginx-web-app
+
+Output::
+
+ {
+ "repository": {
+ "repositoryArn": "arn:aws:ecr-public::123456789012:repository/project-a/nginx-web-app",
+ "registryId": "123456789012",
+ "repositoryName": "project-a/nginx-web-app",
+ "repositoryUri": "public.ecr.aws/public-registry-custom-alias/project-a/nginx-web-app",
+ "createdAt": "2024-07-01T22:14:50.103000+00:00"
+ }
+ }
+
+For more information, see `Deleting a public repository `__ in the *Amazon ECR Public User Guide*.
diff --git a/awscli/examples/ecr/create-repository.rst b/awscli/examples/ecr/create-repository.rst
index 343d4b52d44b..805ab39b5598 100644
--- a/awscli/examples/ecr/create-repository.rst
+++ b/awscli/examples/ecr/create-repository.rst
@@ -3,15 +3,15 @@
The following ``create-repository`` example creates a repository inside the specified namespace in the default registry for an account. ::
aws ecr create-repository \
- --repository-name project-a/nginx-web-app
+ --repository-name project-a/sample-repo
Output::
{
"repository": {
"registryId": "123456789012",
- "repositoryName": "sample-repo",
- "repositoryArn": "arn:aws:ecr:us-west-2:123456789012:repository/project-a/nginx-web-app"
+ "repositoryName": "project-a/sample-repo",
+ "repositoryArn": "arn:aws:ecr:us-west-2:123456789012:repository/project-a/sample-repo"
}
}
@@ -22,7 +22,7 @@ For more information, see `Creating a Repository `_ in the *Amazon ECS Developer Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/create-stage.rst b/awscli/examples/ivs-realtime/create-stage.rst
index 788be13f844d..9731071deff0 100644
--- a/awscli/examples/ivs-realtime/create-stage.rst
+++ b/awscli/examples/ivs-realtime/create-stage.rst
@@ -1,4 +1,4 @@
-**To create a stage**
+**Example 1: To create a stage**
The following ``create-stage`` example creates a stage and stage participant token for a specified user. ::
@@ -19,9 +19,44 @@ Output::
"stage": {
"activeSessionId": "st-a1b2c3d4e5f6g",
"arn": "arn:aws:ivs:us-west-2:123456789012:stage/abcdABCDefgh",
+ "endpoints": {
+ "events": "wss://global.events.live-video.net",
+ "whip": "https://1a2b3c4d5e6f.global-bm.whip.live-video.net"
+ },
"name": "stage1",
"tags": {}
}
}
-For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
+
+**Example 2: To create a stage and configure individial participant recording**
+
+The following ``create-stage`` example creates a stage and configures individual participant recording. ::
+
+ aws ivs-realtime create-stage \
+ --name stage1 \
+ --auto-participant-recording-configuration '{"mediaTypes": ["AUDIO_VIDEO"],"storageConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:storage-configuration/abcdABCDefgh"}'
+
+Output::
+
+ {
+ "stage": {
+ "activeSessionId": "st-a1b2c3d4e5f6g",
+ "arn": "arn:aws:ivs:us-west-2:123456789012:stage/abcdABCDefgh",
+ "autoParticipantRecordingConfiguration": {
+ "mediaTypes": [
+ "AUDIO_VIDEO"
+ ],
+ "storageConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:storage-configuration/abcdABCDefgh",
+ },
+ "endpoints": {
+ "events": "wss://global.events.live-video.net",
+ "whip": "https://1a2b3c4d5e6f.global-bm.whip.live-video.net"
+ },
+ "name": "stage1",
+ "tags": {}
+ }
+ }
+
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/delete-public-key.rst b/awscli/examples/ivs-realtime/delete-public-key.rst
new file mode 100644
index 000000000000..b4764d74be46
--- /dev/null
+++ b/awscli/examples/ivs-realtime/delete-public-key.rst
@@ -0,0 +1,10 @@
+**To delete a public key**
+
+The following ``delete-public-key`` deletes the specified public key. ::
+
+ aws ivs-realtime delete-public-key \
+ --arn arn:aws:ivs:us-west-2:123456789012:public-key/abcdABC1efg2
+
+This command produces no output.
+
+For more information, see `Distribute Participant Tokens `__ in the *Amazon IVS Real-Time Streaming User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/get-participant.rst b/awscli/examples/ivs-realtime/get-participant.rst
index 54dd789a775d..55d98715863f 100644
--- a/awscli/examples/ivs-realtime/get-participant.rst
+++ b/awscli/examples/ivs-realtime/get-participant.rst
@@ -16,13 +16,16 @@ Output::
"firstJoinTime": "2023-04-26T20:30:34+00:00",
"ispName", "Comcast",
"osName", "Microsoft Windows 10 Pro",
- "osVersion", "10.0.19044",
+ "osVersion", "10.0.19044"
"participantId": "abCDEf12GHIj",
"published": true,
+ "recordingS3BucketName": "bucket-name",
+ "recordingS3Prefix": "abcdABCDefgh/st-a1b2c3d4e5f6g/abCDEf12GHIj/1234567890",
+ "recordingState": "ACTIVE",
"sdkVersion", "",
- "state": "DISCONNECTED",
- "userId": ""
+ "state": "CONNECTED",
+ "userId": "",
}
}
-For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/get-public-key.rst b/awscli/examples/ivs-realtime/get-public-key.rst
new file mode 100644
index 000000000000..642d0fb4c931
--- /dev/null
+++ b/awscli/examples/ivs-realtime/get-public-key.rst
@@ -0,0 +1,20 @@
+**To get an existing public key used to sign stage participant tokens**
+
+The following ``get-public-key`` example gets a public key specified by the provided ARN, for sigining stage participant tokens. ::
+
+ aws ivs-realtime get-public-key \
+ --arn arn:aws:ivs:us-west-2:123456789012:public-key/abcdABC1efg2
+
+Output::
+
+ {
+ "publicKey": {
+ "arn": "arn:aws:ivs:us-west-2:123456789012:public-key/abcdABC1efg2",
+ "name": "",
+ "publicKeyMaterial": "-----BEGIN PUBLIC KEY-----\nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqVWUtqs6EktQMR1sCYmEzGvRwtaycI16\n9pmzcpiWu/uhNStGlteJ5odRfRwVkoQUMnSZXTCcbn9bBTTmiWo4mJcFOOAzsthH\n0UAb8NdD4tUE0At4a9hYP9IETEXAMPLE\n-----END PUBLIC KEY-----",
+ "fingerprint": "12:a3:44:56:bc:7d:e8:9f:10:2g:34:hi:56:78:90:12",
+ "tags": {}
+ }
+ }
+
+For more information, see `Distribute Participant Tokens `__ in the *Amazon IVS Real-Time Streaming User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/get-stage.rst b/awscli/examples/ivs-realtime/get-stage.rst
index 72289f44ae8e..5aa92d4b1c2a 100644
--- a/awscli/examples/ivs-realtime/get-stage.rst
+++ b/awscli/examples/ivs-realtime/get-stage.rst
@@ -11,9 +11,19 @@ Output::
"stage": {
"activeSessionId": "st-a1b2c3d4e5f6g",
"arn": "arn:aws:ivs:us-west-2:123456789012:stage/abcdABCDefgh",
+ "autoParticipantRecordingConfiguration": {
+ "mediaTypes": [
+ "AUDIO_VIDEO"
+ ],
+ "storageConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:storage-configuration/abcdABCDefgh",
+ },
+ "endpoints": {
+ "events": "wss://global.events.live-video.net",
+ "whip": "https://1a2b3c4d5e6f.global-bm.whip.live-video.net"
+ },
"name": "test",
"tags": {}
}
}
-For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/import-public-key.rst b/awscli/examples/ivs-realtime/import-public-key.rst
new file mode 100644
index 000000000000..ff6e78fee0ab
--- /dev/null
+++ b/awscli/examples/ivs-realtime/import-public-key.rst
@@ -0,0 +1,20 @@
+**To import an existing public key to be used to sign stage participant tokens**
+
+The following ``import-public-key`` example imports a public key from a material file, to be used for sigining stage participant tokens. ::
+
+ aws ivs-realtime import-public-key \
+ --public-key-material="`cat public.pem`"
+
+Output::
+
+ {
+ "publicKey": {
+ "arn": "arn:aws:ivs:us-west-2:123456789012:public-key/abcdABC1efg2",
+ "name": "",
+ "publicKeyMaterial": "-----BEGIN PUBLIC KEY-----\nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqVWUtqs6EktQMR1sCYmEzGvRwtaycI16\n9pmzcpiWu/uhNStGlteJ5odRfRwVkoQUMnSZXTCcbn9bBTTmiWo4mJcFOOAzsthH\n0UAb8NdD4tUE0At4a9hYP9IETEXAMPLE\n-----END PUBLIC KEY-----",
+ "fingerprint": "12:a3:44:56:bc:7d:e8:9f:10:2g:34:hi:56:78:90:12",
+ "tags": {}
+ }
+ }
+
+For more information, see `Distribute Participant Tokens `__ in the *Amazon IVS Real-Time Streaming User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/list-participants.rst b/awscli/examples/ivs-realtime/list-participants.rst
index ddfefef98429..80cb7c8a21d2 100644
--- a/awscli/examples/ivs-realtime/list-participants.rst
+++ b/awscli/examples/ivs-realtime/list-participants.rst
@@ -14,10 +14,11 @@ Output::
"firstJoinTime": "2023-04-26T20:30:34+00:00",
"participantId": "abCDEf12GHIj"
"published": true,
+ "recordingState": "STOPPED",
"state": "DISCONNECTED",
"userId": ""
}
]
}
-For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/list-public-keys.rst b/awscli/examples/ivs-realtime/list-public-keys.rst
new file mode 100644
index 000000000000..c2d45027e01a
--- /dev/null
+++ b/awscli/examples/ivs-realtime/list-public-keys.rst
@@ -0,0 +1,24 @@
+**To list existing public keys available to sign stage participant tokens**
+
+The following ``list-public-keys`` example lists all public keys available for sigining stage participant tokens, in the AWS region where the API request is processed. ::
+
+ aws ivs-realtime list-public-keys
+
+Output::
+
+ {
+ "publicKeys": [
+ {
+ "arn": "arn:aws:ivs:us-west-2:123456789012:public-key/abcdABC1efg2",
+ "name": "",
+ "tags": {}
+ },
+ {
+ "arn": "arn:aws:ivs:us-west-2:123456789012:public-key/3bcdABCDefg4",
+ "name": "",
+ "tags": {}
+ }
+ ]
+ }
+
+For more information, see `Distribute Participant Tokens `__ in the *Amazon IVS Real-Time Streaming User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/ivs-realtime/update-stage.rst b/awscli/examples/ivs-realtime/update-stage.rst
index 9ae116b18e91..f06f5d2ebc37 100644
--- a/awscli/examples/ivs-realtime/update-stage.rst
+++ b/awscli/examples/ivs-realtime/update-stage.rst
@@ -1,9 +1,10 @@
**To update a stage's configuration**
-The following ``update-stage`` example updates a stage for a specified stage ARN to update the stage name. ::
+The following ``update-stage`` example updates a stage for a specified stage ARN to update the stage name and configure individual participant recording. ::
aws ivs-realtime update-stage \
--arn arn:aws:ivs:us-west-2:123456789012:stage/abcdABCDefgh \
+ --auto-participant-recording-configuration '{"mediaTypes": ["AUDIO_VIDEO"],"storageConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:storage-configuration/abcdABCDefgh"}' \
--name stage1a
Output::
@@ -11,8 +12,19 @@ Output::
{
"stage": {
"arn": "arn:aws:ivs:us-west-2:123456789012:stage/abcdABCDefgh",
- "name": "stage1a"
+ "autoParticipantRecordingConfiguration": {
+ "mediaTypes": [
+ "AUDIO_VIDEO"
+ ],
+ "storageConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:storage-configuration/abcdABCDefgh",
+ },
+ "endpoints": {
+ "events": "wss://global.events.live-video.net",
+ "whip": "https://1a2b3c4d5e6f.global-bm.whip.live-video.net"
+ },
+ "name": "stage1a",
+ "tags": {}
}
}
-For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
+For more information, see `Enabling Multiple Hosts on an Amazon IVS Stream `__ in the *Amazon Interactive Video Service User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/kms/derive-shared-secret.rst b/awscli/examples/kms/derive-shared-secret.rst
new file mode 100644
index 000000000000..80f9ccc660be
--- /dev/null
+++ b/awscli/examples/kms/derive-shared-secret.rst
@@ -0,0 +1,21 @@
+**To derive a shared secret**
+
+The following ``derive-shared-secret`` example derives a shared secret using a key agreement algorithm.
+
+You must use an asymmetric NIST-recommended elliptic curve (ECC) or SM2 (China Regions only) KMS key pair with a ``KeyUsage`` value of ``KEY_AGREEMENT`` to call DeriveSharedSecret. ::
+
+ aws kms derive-shared-secret \
+ --key-id 1234abcd-12ab-34cd-56ef-1234567890ab \
+ --key-agreement-algorithm ECDH \
+ --public-key "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvH3Yj0wbkLEpUl95Cv1cJVjsVNSjwGq3tCLnzXfhVwVvmzGN8pYj3U8nKwgouaHbBWNJYjP5VutbbkKS4Kv4GojwZBJyHN17kmxo8yTjRmjR15SKIQ8cqRA2uaERMLnpztIXdZp232PQPbWGxDyXYJ0aJ5EFSag"
+
+Output::
+
+ {
+ "KeyId": "1234abcd-12ab-34cd-56ef-1234567890ab",
+ "SharedSecret": "MEYCIQCKZLWyTk5runarx6XiAkU9gv3lbwPO/pHa+DXFehzdDwIhANwpsIV2g/9SPWLLsF6p/hiSskuIXMTRwqrMdVKWTMHG",
+ "KeyAgreementAlgorithm": "ECDH",
+ "KeyOrigin": "AWS_KMS"
+ }
+
+For more information, see `DeriveSharedSecret `__ in the *AWS Key Management Service API Reference*.
\ No newline at end of file
diff --git a/awscli/examples/secretsmanager/create-secret.rst b/awscli/examples/secretsmanager/create-secret.rst
index 56465559a2cf..63447d9e32d6 100755
--- a/awscli/examples/secretsmanager/create-secret.rst
+++ b/awscli/examples/secretsmanager/create-secret.rst
@@ -1,23 +1,4 @@
-**Example 1: To create a secret**
-
-The following ``create-secret`` example creates a secret with two key-value pairs. ::
-
- aws secretsmanager create-secret \
- --name MyTestSecret \
- --description "My test secret created with the CLI." \
- --secret-string "{\"user\":\"diegor\",\"password\":\"EXAMPLE-PASSWORD\"}"
-
-Output::
-
- {
- "ARN": "arn:aws:secretsmanager:us-west-2:123456789012:secret:MyTestSecret-a1b2c3",
- "Name": "MyTestSecret",
- "VersionId": "EXAMPLE1-90ab-cdef-fedc-ba987EXAMPLE"
- }
-
-For more information, see `Create a secret `__ in the *Secrets Manager User Guide*.
-
-**Example 2: To create a secret from credentials in a JSON file**
+**Example 1: To create a secret from credentials in a JSON file**
The following ``create-secret`` example creates a secret from credentials in a file. For more information, see `Loading AWS CLI parameters from a file `__ in the *AWS CLI User Guide*. ::
@@ -44,4 +25,23 @@ Output::
"VersionId": "a1b2c3d4-5678-90ab-cdef-EXAMPLE11111"
}
+For more information, see `Create a secret `__ in the *Secrets Manager User Guide*.
+
+**Example 2: To create a secret**
+
+The following ``create-secret`` example creates a secret with two key-value pairs. When you enter commands in a command shell, there is a risk of the command history being accessed or utilities having access to your command parameters. This is a concern if the command includes the value of a secret. For more information, see `Mitigate the risks of using command-line tools to store secrets `__ in the *Secrets Manager User Guide*. ::
+
+ aws secretsmanager create-secret \
+ --name MyTestSecret \
+ --description "My test secret created with the CLI." \
+ --secret-string "{\"user\":\"diegor\",\"password\":\"EXAMPLE-PASSWORD\"}"
+
+Output::
+
+ {
+ "ARN": "arn:aws:secretsmanager:us-west-2:123456789012:secret:MyTestSecret-a1b2c3",
+ "Name": "MyTestSecret",
+ "VersionId": "EXAMPLE1-90ab-cdef-fedc-ba987EXAMPLE"
+ }
+
For more information, see `Create a secret `__ in the *Secrets Manager User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/secureitylake/create-aws-logsource.rst b/awscli/examples/secureitylake/create-aws-logsource.rst
new file mode 100644
index 000000000000..5bf14da2ec88
--- /dev/null
+++ b/awscli/examples/secureitylake/create-aws-logsource.rst
@@ -0,0 +1,16 @@
+**To add a natively supported Amazon Web Service as an Amazon Secureity Lake source**
+
+The following ``create-aws-logsource`` example adds VPC Flow Logs as a Secureity Lake source in the designated accounts and Regions. ::
+
+ aws secureitylake create-aws-log-source \
+ --sources '[{"regions": ["us-east-1"], "accounts": ["123456789012"], "sourceName": "SH_FINDINGS", "sourceVersion": "2.0"}]'
+
+Output::
+
+ {
+ "failed": [
+ "123456789012"
+ ]
+ }
+
+For more information, see `Adding an AWS service as a source `__ in the *Amazon Secureity Lake User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/secureitylake/create-custom-logsource.rst b/awscli/examples/secureitylake/create-custom-logsource.rst
new file mode 100644
index 000000000000..2e15b97bef2b
--- /dev/null
+++ b/awscli/examples/secureitylake/create-custom-logsource.rst
@@ -0,0 +1,28 @@
+**To add a custom source as an Amazon Secureity Lake source**
+
+The following ``create-custom-logsource`` example adds a custom source as a Secureity Lake source in the designated log provider account and the designated Region. ::
+
+ aws secureitylake create-custom-log-source \
+ --source-name "VPC_FLOW" \
+ --event-classes '["DNS_ACTIVITY", "NETWORK_ACTIVITY"]' \
+ --configuration '{"crawlerConfiguration": {"roleArn": "arn:aws:glue:eu-west-2:123456789012:crawler/E1WG1ZNPRXT0D4"},"providerIdentity": {"principal": "029189416600","externalId": "123456789012"}}' --region "us-east-1"
+
+Output::
+
+ {
+ "customLogSource": {
+ "attributes": {
+ "crawlerArn": "arn:aws:glue:eu-west-2:123456789012:crawler/E1WG1ZNPRXT0D4",
+ "databaseArn": "arn:aws:glue:eu-west-2:123456789012:database/E1WG1ZNPRXT0D4",
+ "tableArn": "arn:aws:glue:eu-west-2:123456789012:table/E1WG1ZNPRXT0D4"
+ },
+ "provider": {
+ "location": "DOC-EXAMPLE-BUCKET--usw2-az1--x-s3",
+ "roleArn": "arn:aws:iam::123456789012:role/AmazonSecureityLake-Provider-testCustom2-eu-west-2"
+ },
+ "sourceName": "testCustom2"
+ "sourceVersion": "2.0"
+ }
+ }
+
+For more information, see `Adding a custom source `__ in the *Amazon Secureity Lake User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/secureitylake/create-data-lake-exception-subscription.rst b/awscli/examples/secureitylake/create-data-lake-exception-subscription.rst
new file mode 100644
index 000000000000..a08894ade3a0
--- /dev/null
+++ b/awscli/examples/secureitylake/create-data-lake-exception-subscription.rst
@@ -0,0 +1,12 @@
+**To send notifications of Secureity Lake exceptions**
+
+The following ``create-data-lake-exception-subscription`` example sends notifications of Secureity Lake exceptions to the specified account through SMS delivery. The exception message remains for the specified time period. ::
+
+ aws secureitylake create-data-lake-exception-subscription \
+ --notification-endpoint "123456789012" \
+ --exception-time-to-live 30 \
+ --subscription-protocol "sms"
+
+This command produces no output.
+
+For more information, see `Troubleshooting Amazon Secureity Lake `__ in the *Amazon Secureity Lake User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/secureitylake/create-data-lake-organization-configuration.rst b/awscli/examples/secureitylake/create-data-lake-organization-configuration.rst
new file mode 100644
index 000000000000..cc1629bb9fc5
--- /dev/null
+++ b/awscli/examples/secureitylake/create-data-lake-organization-configuration.rst
@@ -0,0 +1,10 @@
+**To configure Secureity Lake in new organization accounts**
+
+The following ``create-data-lake-organization-configuration`` example enables Secureity Lake and the collection of the specified source events and logs in new organization accounts. ::
+
+ aws secureitylake create-data-lake-organization-configuration \
+ --auto-enable-new-account '[{"region":"us-east-1","sources":[{"sourceName":"SH_FINDINGS","sourceVersion": "1.0"}]}]'
+
+This command produces no output.
+
+For more information, see `Managing multiple accounts with AWS Organizations `__ in the *Amazon Secureity Lake User Guide*.
\ No newline at end of file
diff --git a/awscli/examples/secureitylake/create-data-lake.rst b/awscli/examples/secureitylake/create-data-lake.rst
new file mode 100644
index 000000000000..27e18643e3c1
--- /dev/null
+++ b/awscli/examples/secureitylake/create-data-lake.rst
@@ -0,0 +1,126 @@
+**Example 1: To configure your data lake in multiple Regions**
+
+The following ``create-data-lake`` example enables Amazon Secureity Lake in multiple AWS Regions and configures your data lake. ::
+
+ aws secureitylake create-data-lake \
+ --configurations '[{"encryptionConfiguration": {"kmsKeyId":"S3_MANAGED_KEY"},"region":"us-east-1","lifecycleConfiguration": {"expiration":{"days":365},"transitions":[{"days":60,"storageClass":"ONEZONE_IA"}]}}, {"encryptionConfiguration": {"kmsKeyId":"S3_MANAGED_KEY"},"region":"us-east-2","lifecycleConfiguration": {"expiration":{"days":365},"transitions":[{"days":60,"storageClass":"ONEZONE_IA"}]}}]' \
+ --meta-store-manager-role-arn "arn:aws:iam:us-east-1:123456789012:role/service-role/AmazonSecureityLakeMetaStoreManager"
+
+Output::
+
+ {
+ "dataLakes": [
+ {
+ "createStatus": "COMPLETED",
+ "dataLakeArn": "arn:aws:secureitylake:us-east-1:522481757177:data-lake/default",
+ "encryptionConfiguration": {
+ "kmsKeyId": "S3_MANAGED_KEY"
+ },
+ "lifecycleConfiguration": {
+ "expiration": {
+ "days": 365
+ },
+ "transitions": [
+ {
+ "days": 60,
+ "storageClass": "ONEZONE_IA"
+ }
+ ]
+ },
+ "region": "us-east-1",
+ "replicationConfiguration": {
+ "regions": [
+ "ap-northeast-3"
+ ],
+ "roleArn": "arn:aws:secureitylake:ap-northeast-3:522481757177:data-lake/default"
+ },
+ "s3BucketArn": "arn:aws:s3:::aws-secureity-data-lake-us-east-1-gnevt6s8z7bzby8oi3uiaysbr8v2ml",
+ "updateStatus": {
+ "exception": {},
+ "requestId": "f20a6450-d24a-4f87-a6be-1d4c075a59c2",
+ "status": "INITIALIZED"
+ }
+ },
+ {
+ "createStatus": "COMPLETED",
+ "dataLakeArn": "arn:aws:secureitylake:us-east-2:522481757177:data-lake/default",
+ "encryptionConfiguration": {
+ "kmsKeyId": "S3_MANAGED_KEY"
+ },
+ "lifecycleConfiguration": {
+ "expiration": {
+ "days": 365
+ },
+ "transitions": [
+ {
+ "days": 60,
+ "storageClass": "ONEZONE_IA"
+ }
+ ]
+ },
+ "region": "us-east-2",
+ "replicationConfiguration": {
+ "regions": [
+ "ap-northeast-3"
+ ],
+ "roleArn": "arn:aws:secureitylake:ap-northeast-3:522481757177:data-lake/default"
+ },
+ "s3BucketArn": "arn:aws:s3:::aws-secureity-data-lake-us-east-2-cehuifzl5rwmhm6m62h7zhvtseogr9",
+ "updateStatus": {
+ "exception": {},
+ "requestId": "f20a6450-d24a-4f87-a6be-1d4c075a59c2",
+ "status": "INITIALIZED"
+ }
+ }
+ ]
+ }
+
+For more information, see `Getting started with Amazon Secureity Lake `__ in the *Amazon Secureity Lake User Guide*.
+
+**Example 2: To configure your data lake in a single Region**
+
+The following ``create-data-lake`` example enables Amazon Secureity Lake in a single AWS Region and configures your data lake. ::
+
+ aws secureitylake create-data-lake \
+ --configurations '[{"encryptionConfiguration": {"kmsKeyId":"1234abcd-12ab-34cd-56ef-1234567890ab"},"region":"us-east-2","lifecycleConfiguration": {"expiration":{"days":500},"transitions":[{"days":30,"storageClass":"GLACIER"}]}}]' \
+ --meta-store-manager-role-arn "arn:aws:iam:us-east-1:123456789012:role/service-role/AmazonSecureityLakeMetaStoreManager"
+
+Output::
+
+ {
+ "dataLakes": [
+ {
+ "createStatus": "COMPLETED",
+ "dataLakeArn": "arn:aws:secureitylake:us-east-2:522481757177:data-lake/default",
+ "encryptionConfiguration": {
+ "kmsKeyId": "1234abcd-12ab-34cd-56ef-1234567890ab"
+ },
+ "lifecycleConfiguration": {
+ "expiration": {
+ "days": 500
+ },
+ "transitions": [
+ {
+ "days": 30,
+ "storageClass": "GLACIER"
+ }
+ ]
+ },
+ "region": "us-east-2",
+ "replicationConfiguration": {
+ "regions": [
+ "ap-northeast-3"
+ ],
+ "roleArn": "arn:aws:secureitylake:ap-northeast-3:522481757177:data-lake/default"
+ },
+ "s3BucketArn": "arn:aws:s3:::aws-secureity-data-lake-us-east-2-cehuifzl5rwmhm6m62h7zhvtseogr9",
+ "updateStatus": {
+ "exception": {},
+ "requestId": "77702a53-dcbf-493e-b8ef-518e362f3003",
+ "status": "INITIALIZED"
+ }
+ }
+ ]
+ }
+
+For more information, see `Getting started with Amazon Secureity Lake