From adcd60cc8bb595cca934919216e69bce5f0389fd Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Wed, 13 Dec 2023 19:45:59 +0000 Subject: [PATCH 1/3] Update to latest models --- .../next-release/api-change-drs-13769.json | 5 +++ .../drs/2020-02-26/endpoint-rule-set-1.json | 40 +++++++++---------- botocore/data/drs/2020-02-26/service-2.json | 12 ++++++ 3 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 .changes/next-release/api-change-drs-13769.json diff --git a/.changes/next-release/api-change-drs-13769.json b/.changes/next-release/api-change-drs-13769.json new file mode 100644 index 0000000000..624052b803 --- /dev/null +++ b/.changes/next-release/api-change-drs-13769.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``drs``", + "description": "Adding AgentVersion to SourceServer and RecoveryInstance structures" +} diff --git a/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json b/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json index 28091fefce..7a53d04f4c 100644 --- a/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json +++ b/botocore/data/drs/2020-02-26/endpoint-rule-set-1.json @@ -40,7 +40,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -83,7 +82,8 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -96,7 +96,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -110,7 +109,6 @@ "assign": "PartitionResult" } ], - "type": "tree", "rules": [ { "conditions": [ @@ -133,7 +131,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -168,7 +165,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -179,14 +175,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS and DualStack are enabled, but this partition does not support one or both", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -200,14 +198,12 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ @@ -216,11 +212,11 @@ }, "supportsFIPS" ] - } + }, + true ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -231,14 +227,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS is enabled but this partition does not support FIPS", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -252,7 +250,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -272,7 +269,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -283,14 +279,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "DualStack is enabled but this partition does not support DualStack", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [], @@ -301,9 +299,11 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" } - ] + ], + "type": "tree" }, { "conditions": [], diff --git a/botocore/data/drs/2020-02-26/service-2.json b/botocore/data/drs/2020-02-26/service-2.json index f8004c29d6..80032f9f93 100644 --- a/botocore/data/drs/2020-02-26/service-2.json +++ b/botocore/data/drs/2020-02-26/service-2.json @@ -979,6 +979,10 @@ "max":50, "min":0 }, + "AgentVersion":{ + "type":"string", + "pattern":"^[0-9]{1,5}.[0-9]{1,5}.[0-9]{1,5}(.[0-9]{4}.[0-9]{3}.[0-9]{4})?$" + }, "AssociateSourceNetworkStackRequest":{ "type":"structure", "required":[ @@ -3157,6 +3161,10 @@ "RecoveryInstance":{ "type":"structure", "members":{ + "agentVersion":{ + "shape":"AgentVersion", + "documentation":"

The version of the DRS agent installed on the recovery instance

" + }, "arn":{ "shape":"ARN", "documentation":"

The ARN of the Recovery Instance.

" @@ -4079,6 +4087,10 @@ "SourceServer":{ "type":"structure", "members":{ + "agentVersion":{ + "shape":"AgentVersion", + "documentation":"

The version of the DRS agent installed on the source server

" + }, "arn":{ "shape":"ARN", "documentation":"

The ARN of the Source Server.

" From dfae8cce7aca8d6893d08491aa67ecf56168aa3f Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Wed, 13 Dec 2023 19:45:59 +0000 Subject: [PATCH 2/3] Update to latest partitions and endpoints --- botocore/data/endpoints.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index b91dfc0544..e100270b5e 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -6843,6 +6843,7 @@ "deprecated" : true, "hostname" : "emr-serverless-fips.us-west-2.amazonaws.com" }, + "me-central-1" : { }, "me-south-1" : { }, "sa-east-1" : { }, "us-east-1" : { @@ -20285,6 +20286,12 @@ "cn-northwest-1" : { } } }, + "pipes" : { + "endpoints" : { + "cn-north-1" : { }, + "cn-northwest-1" : { } + } + }, "polly" : { "endpoints" : { "cn-northwest-1" : { } From aef4376fd0c4040f977c2ab08f7047a559f9a91c Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Wed, 13 Dec 2023 19:46:11 +0000 Subject: [PATCH 3/3] Bumping version to 1.34.0 --- .changes/1.34.0.json | 12 ++++++++++++ .changes/next-release/api-change-drs-13769.json | 5 ----- .changes/next-release/feature-Python-21065.json | 5 ----- CHANGELOG.rst | 7 +++++++ botocore/__init__.py | 2 +- docs/source/conf.py | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 .changes/1.34.0.json delete mode 100644 .changes/next-release/api-change-drs-13769.json delete mode 100644 .changes/next-release/feature-Python-21065.json diff --git a/.changes/1.34.0.json b/.changes/1.34.0.json new file mode 100644 index 0000000000..05b2393010 --- /dev/null +++ b/.changes/1.34.0.json @@ -0,0 +1,12 @@ +[ + { + "category": "Python", + "description": "End of support for Python 3.7", + "type": "feature" + }, + { + "category": "``drs``", + "description": "Adding AgentVersion to SourceServer and RecoveryInstance structures", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-drs-13769.json b/.changes/next-release/api-change-drs-13769.json deleted file mode 100644 index 624052b803..0000000000 --- a/.changes/next-release/api-change-drs-13769.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``drs``", - "description": "Adding AgentVersion to SourceServer and RecoveryInstance structures" -} diff --git a/.changes/next-release/feature-Python-21065.json b/.changes/next-release/feature-Python-21065.json deleted file mode 100644 index c21896b745..0000000000 --- a/.changes/next-release/feature-Python-21065.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "feature", - "category": "Python", - "description": "End of support for Python 3.7" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e065ce9bd5..caacc75984 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +1.34.0 +====== + +* feature:Python: End of support for Python 3.7 +* api-change:``drs``: Adding AgentVersion to SourceServer and RecoveryInstance structures + + 1.33.13 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 272e37d542..dc249a5762 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.33.13' +__version__ = '1.34.0' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index 61a718c225..45ee9628a7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,9 +57,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.13' +release = '1.34.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.