Merge branch 'release-1.24.7'

* release-1.24.7:
  Bumping version to 1.24.7
  Update changelog based on model updates
  Change S3 bucket names in tests to use only permitted chars
  Update createcluster.py
  add test.
  Adding to CloudFormation's URL parameters
  Lambda and Serverless properties for CFN deploy

.changes/1.24.7.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "Stop Protection feature enables customers to protect their instances from accidental stop actions.",
+    "type": "api-change"
+  },
+  {
+    "category": "``cognito-idp``",
+    "description": "Amazon Cognito now supports requiring attribute verification (ex. email and phone number) before update.",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediaconvert``",
+    "description": "AWS Elemental MediaConvert SDK has added support for rules that constrain Automatic-ABR rendition selection when generating ABR package ladders.",
+    "type": "api-change"
+  },
+  {
+    "category": "``networkmanager``",
+    "description": "This release adds Multi Account API support for a TGW Global Network, to enable and disable AWSServiceAccess with AwsOrganizations for Network Manager service and dependency CloudFormation StackSets service.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ivschat``",
+    "description": "Doc-only update. For MessageReviewHandler structure, added timeout period in the description of the fallbackResult field",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.24.7
+======
+
+* api-change:``ec2``: Stop Protection feature enables customers to protect their instances from accidental stop actions.
+* api-change:``cognito-idp``: Amazon Cognito now supports requiring attribute verification (ex. email and phone number) before update.
+* api-change:``mediaconvert``: AWS Elemental MediaConvert SDK has added support for rules that constrain Automatic-ABR rendition selection when generating ABR package ladders.
+* api-change:``networkmanager``: This release adds Multi Account API support for a TGW Global Network, to enable and disable AWSServiceAccess with AwsOrganizations for Network Manager service and dependency CloudFormation StackSets service.
+* api-change:``ivschat``: Doc-only update. For MessageReviewHandler structure, added timeout period in the description of the fallbackResult field
+
+
 1.24.6
 ======
 

awscli/__init__.py

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

awscli/customizations/emr/createcluster.py

@@ -497,7 +497,7 @@ def _build_bootstrap_actions(
             bootstrap_actions.append(ba_config)
 
         result = cluster_ba_list + bootstrap_actions
-        if len(result) > 0:
+        if result:
             cluster['BootstrapActions'] = result
 
         return cluster
@@ -519,9 +519,9 @@ def _build_enable_debugging(self, parsed_args, parsed_globals):
             args=args)
 
     def _update_cluster_dict(self, cluster, key, value):
-        if key in cluster.keys():
+        if key in cluster:
             cluster[key] += value
-        elif value is not None and len(value) > 0:
+        elif value:
             cluster[key] = value
         return cluster
 
@@ -554,14 +554,14 @@ def _validate_required_applications(self, parsed_args):
             if constants.HBASE not in specified_apps:
                 missing_apps.add(constants.HBASE.title())
 
-        if len(missing_apps) != 0:
+        if missing_apps:
             raise exceptions.MissingApplicationsError(
                 applications=missing_apps)
 
     def _get_missing_applications_for_steps(self, specified_apps, parsed_args):
         allowed_app_steps = set([constants.HIVE, constants.PIG,
                                  constants.IMPALA])
-        missing_apps = set([])
+        missing_apps = set()
         if parsed_args.steps is not None:
             for step in parsed_args.steps:
                 if len(missing_apps) == len(allowed_app_steps):

awscli/examples/cloudformation/_package_description.rst

@@ -13,7 +13,10 @@ This command can upload local artifacts referenced in the following places:
 
     - ``BodyS3Location`` property for the ``AWS::ApiGateway::RestApi`` resource
     - ``Code`` property for the ``AWS::Lambda::Function`` resource
+    - ``Content`` property for the ``AWS::Lambda::LayerVersion`` resource
     - ``CodeUri`` property for the ``AWS::Serverless::Function`` resource
+    - ``ContentUri`` property for the ``AWS::Serverless::LayerVersion`` resource
+    - ``Location`` property for the ``AWS::Serverless::Application`` resource
     - ``DefinitionS3Location`` property for the ``AWS::AppSync::GraphQLSchema`` resource
     - ``RequestMappingTemplateS3Location`` property for the ``AWS::AppSync::Resolver`` resource
     - ``ResponseMappingTemplateS3Location`` property for the ``AWS::AppSync::Resolver`` resource

awscli/paramfile.py

@@ -57,6 +57,7 @@
     'custom.deploy.template-file',
 
     'cloudformation.update-stack.stack-policy-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',

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.24'
 # The full version, including alpha/beta/rc tags.
-release = '1.24.6'
+release = '1.24.7'
 
 # 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.26.6
+        botocore==1.26.7
         docutils>=0.10,<0.17
         s3transfer>=0.5.0,<0.6.0
         PyYAML>=3.10,<5.5

setup.py

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

tests/functional/cloudformation/test_register_type.py

@@ -0,0 +1,28 @@
+# Copyright 2021 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 BaseAWSCommandParamsTest
+
+
+class TestRegisterType(BaseAWSCommandParamsTest):
+
+    prefix = 'cloudformation register-type'
+
+    def test_schema_handler_package_during_register_url(self):
+        cmdline = self.prefix
+        cmdline += ' --type-name test-type-name '
+        cmdline += '--schema-handler-package s3://bucket-name/my-organization-resource_name.zip'
+        result = {
+            'TypeName': 'test-type-name',
+            'SchemaHandlerPackage': 's3://bucket-name/my-organization-resource_name.zip'
+        }
+        self.assert_params_for_cmd(cmdline, result)