Merge branch 'release-1.25.1'

* release-1.25.1:
  Bumping version to 1.25.1
  Update changelog based on model updates
  Add CodeCommit::Repository to cfn package command
  Support exporting DefinitionUri in AWS::Serverless::StateMachine resource

.changes/1.25.1.json

@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``route53``",
+    "description": "Add new APIs to support Route 53 IP Based Routing",
+    "type": "api-change"
+  },
+  {
+    "category": "``forecast``",
+    "description": "Added Format field to Import and Export APIs in Amazon Forecast. Added TimeSeriesSelector to Create Forecast API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``chime-sdk-meetings``",
+    "description": "Adds support for centrally controlling each participant's ability to send and receive audio, video and screen share within a WebRTC session.  Attendee capabilities can be specified when the attendee is created and updated during the session with the new BatchUpdateAttendeeCapabilitiesExcept API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``backup-gateway``",
+    "description": "Adds GetGateway and UpdateGatewaySoftwareNow API and adds hypervisor name to UpdateHypervisor API",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.25.1
+======
+
+* api-change:``route53``: Add new APIs to support Route 53 IP Based Routing
+* api-change:``forecast``: Added Format field to Import and Export APIs in Amazon Forecast. Added TimeSeriesSelector to Create Forecast API.
+* api-change:``chime-sdk-meetings``: Adds support for centrally controlling each participant's ability to send and receive audio, video and screen share within a WebRTC session.  Attendee capabilities can be specified when the attendee is created and updated during the session with the new BatchUpdateAttendeeCapabilitiesExcept API.
+* api-change:``backup-gateway``: Adds GetGateway and UpdateGatewaySoftwareNow API and adds hypervisor name to UpdateHypervisor API
+
+
 1.25.0
 ======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.25.0'
+__version__ = '1.25.1'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/cloudformation/artifact_exporter.py

@@ -426,6 +426,15 @@ class StepFunctionsStateMachineDefinitionResource(ResourceWithS3UrlDict):
     PACKAGE_NULL_PROPERTY = False
 
 
+class ServerlessStateMachineDefinitionResource(ResourceWithS3UrlDict):
+    RESOURCE_TYPE = "AWS::Serverless::StateMachine"
+    PROPERTY_NAME = "DefinitionUri"
+    BUCKET_NAME_PROPERTY = "Bucket"
+    OBJECT_KEY_PROPERTY = "Key"
+    VERSION_PROPERTY = "Version"
+    PACKAGE_NULL_PROPERTY = False
+
+
 class CloudFormationStackResource(Resource):
     """
     Represents CloudFormation::Stack resource that can refer to a nested
@@ -497,6 +506,20 @@ class GlueJobCommandScriptLocationResource(Resource):
     PROPERTY_NAME = "Command.ScriptLocation"
 
 
+class CodeCommitRepositoryS3Resource(ResourceWithS3UrlDict):
+    """
+    Represents CodeCommit::Repository resource.
+    """
+    RESOURCE_TYPE = "AWS::CodeCommit::Repository"
+    PROPERTY_NAME = "Code.S3"
+    BUCKET_NAME_PROPERTY = "Bucket"
+    OBJECT_KEY_PROPERTY = "Key"
+    VERSION_PROPERTY = "ObjectVersion"
+    # Don't package the directory if S3 is omitted.
+    PACKAGE_NULL_PROPERTY = False
+    FORCE_ZIP = True
+
+
 RESOURCES_EXPORT_LIST = [
     ServerlessFunctionResource,
     ServerlessApiResource,
@@ -513,7 +536,9 @@ class GlueJobCommandScriptLocationResource(Resource):
     ServerlessLayerVersionResource,
     LambdaLayerVersionResource,
     GlueJobCommandScriptLocationResource,
-    StepFunctionsStateMachineDefinitionResource
+    StepFunctionsStateMachineDefinitionResource,
+    ServerlessStateMachineDefinitionResource,
+    CodeCommitRepositoryS3Resource
 ]
 
 METADATA_EXPORT_LIST = [

awscli/examples/cloudformation/_package_description.rst

@@ -28,6 +28,8 @@ This command can upload local artifacts referenced in the following places:
     - ``TemplateURL`` property for the ``AWS::CloudFormation::Stack`` resource
     - ``Command.ScriptLocation`` property for the ``AWS::Glue::Job`` resource
     - ``DefinitionS3Location`` property for the ``AWS::StepFunctions::StateMachine`` resource
+    - ``DefinitionUri`` property for the ``AWS::Serverless::StateMachine`` resource
+    - ``S3`` property for the ``AWS::CodeCommit::Repository`` resource
 
 
 To specify a local artifact in your template, specify a path to a local file or folder,

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.25'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.0'
+release = '1.25.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.27.0
+        botocore==1.27.1
         docutils>=0.10,<0.17
         s3transfer>=0.6.0,<0.7.0
         PyYAML>=3.10,<5.5

setup.py

@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.27.0',
+    'botocore==1.27.1',
     'docutils>=0.10,<0.17',
     's3transfer>=0.6.0,<0.7.0',
     'PyYAML>=3.10,<5.5',

tests/unit/customizations/cloudformation/test_artifact_exporter.py

@@ -27,7 +27,9 @@
     AppSyncFunctionConfigurationRequestTemplateResource, \
     AppSyncFunctionConfigurationResponseTemplateResource, \
     GlueJobCommandScriptLocationResource, \
-    StepFunctionsStateMachineDefinitionResource
+    StepFunctionsStateMachineDefinitionResource, \
+    ServerlessStateMachineDefinitionResource, \
+    CodeCommitRepositoryS3Resource
 
 
 VALID_CASES = [
@@ -159,6 +161,12 @@ def test_is_invalid_s3_url(url):
             "Bucket": "foo", "Key": "bar", "Version": "baz"
         }
     },
+    {
+        "class": ServerlessStateMachineDefinitionResource,
+        "expected_result": {
+            "Bucket": "foo", "Key": "bar", "Version": "baz"
+        }
+    },
 ]