Merge branch 'release-1.22.49'

aws-sdk-python-automation · aws-sdk-python-automation · commit b1e887881d48 · 2022-02-04T19:49:08.000Z
* release-1.22.49: Bumping version to 1.22.49 Update changelog based on model updates fix unit tests doc updates wording changes, deploy(... disable_rollback=False ...), disable_rollback added to docstring #3712 add --disable-rollback to `aws cloudformation deploy`
diff --git a/.changes/1.22.49.json b/.changes/1.22.49.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``lakeformation``",
+    "description": "Add support for calling Update Table Objects without a TransactionId.",
+    "type": "api-change"
+  },
+  {
+    "category": "``athena``",
+    "description": "You can now optionally specify the account ID that you expect to be the owner of your query results output location bucket in Athena. If the account ID of the query results bucket owner does not match the specified account ID, attempts to output to the bucket will fail with an S3 permissions error.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "updates for RDS Custom for Oracle 12.1 support",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.22.49
+=======
+
+* api-change:``lakeformation``: Add support for calling Update Table Objects without a TransactionId.
+* api-change:``athena``: You can now optionally specify the account ID that you expect to be the owner of your query results output location bucket in Athena. If the account ID of the query results bucket owner does not match the specified account ID, attempts to output to the bucket will fail with an S3 permissions error.
+* api-change:``rds``: updates for RDS Custom for Oracle 12.1 support
+
+
 1.22.48
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.22.48'
+__version__ = '1.22.49'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/awscli/customizations/cloudformation/deploy.py b/awscli/customizations/cloudformation/deploy.py
@@ -169,6 +169,30 @@ class DeployCommand(BasicCommand):
                 ' execute it to implement your changes.'
             )
         },
+        {
+            'name': 'disable-rollback',
+            'required': False,
+            'action': 'store_true',
+            'group_name': 'disable-rollback',
+            'dest': 'disable_rollback',
+            'default': False,
+            'help_text': (
+                'Preserve the state of previously provisioned resources when '
+                'the execute-change-set operation fails.'
+            )
+        },
+        {
+            'name': 'no-disable-rollback',
+            'required': False,
+            'action': 'store_false',
+            'group_name': 'disable-rollback',
+            'dest': 'disable_rollback',
+            'default': True,
+            'help_text': (
+                'Roll back all resource changes when the execute-change-set '
+                'operation fails.'
+            )
+        },
         {
             'name': 'role-arn',
             'required': False,
@@ -291,13 +315,13 @@ def _run_main(self, parsed_args, parsed_globals):
                            parameters, parsed_args.capabilities,
                            parsed_args.execute_changeset, parsed_args.role_arn,
                            parsed_args.notification_arns, s3_uploader,
-                           tags,
-                           parsed_args.fail_on_empty_changeset)
+                           tags, parsed_args.fail_on_empty_changeset,
+                           parsed_args.disable_rollback)
 
     def deploy(self, deployer, stack_name, template_str,
                parameters, capabilities, execute_changeset, role_arn,
                notification_arns, s3_uploader, tags,
-               fail_on_empty_changeset=True):
+               fail_on_empty_changeset=True, disable_rollback=False):
         try:
             result = deployer.create_and_wait_for_changeset(
                 stack_name=stack_name,
@@ -316,7 +340,8 @@ def deploy(self, deployer, stack_name, template_str,
             return 0
 
         if execute_changeset:
-            deployer.execute_changeset(result.changeset_id, stack_name)
+            deployer.execute_changeset(result.changeset_id, stack_name,
+                                       disable_rollback)
             deployer.wait_for_execute(stack_name, result.changeset_type)
             sys.stdout.write(self.MSG_EXECUTE_SUCCESS.format(
                     stack_name=stack_name))
diff --git a/awscli/customizations/cloudformation/deployer.py b/awscli/customizations/cloudformation/deployer.py
@@ -177,17 +177,20 @@ def wait_for_changeset(self, changeset_id, stack_name):
                                "Status: {1}. Reason: {2}"
                                .format(ex, status, reason))
 
-    def execute_changeset(self, changeset_id, stack_name):
+    def execute_changeset(self, changeset_id, stack_name,
+                          disable_rollback=False):
         """
         Calls CloudFormation to execute changeset
 
         :param changeset_id: ID of the changeset
         :param stack_name: Name or ID of the stack
+        :param disable_rollback: Disable rollback of all resource changes
         :return: Response from execute-change-set call
         """
         return self._client.execute_change_set(
                 ChangeSetName=changeset_id,
-                StackName=stack_name)
+                StackName=stack_name,
+                DisableRollback=disable_rollback)
 
     def wait_for_execute(self, stack_name, changeset_type):
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.22.'
 # The full version, including alpha/beta/rc tags.
-release = '1.22.48'
+release = '1.22.49'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.23.48
+        botocore==1.23.49
         docutils>=0.10,<0.16
         s3transfer>=0.5.0,<0.6.0
         PyYAML>=3.10,<5.5
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.23.48',
+    'botocore==1.23.49',
     'docutils>=0.10,<0.16',
     's3transfer>=0.5.0,<0.6.0',
     'PyYAML>=3.10,<5.5',
diff --git a/tests/unit/customizations/cloudformation/test_deploy.py b/tests/unit/customizations/cloudformation/test_deploy.py
@@ -52,6 +52,7 @@ def setUp(self):
                                                          "Key2=Value2"],
                                     no_execute_changeset=False,
                                     execute_changeset=True,
+                                    disable_rollback=True,
                                     capabilities=None,
                                     role_arn=None,
                                     notification_arns=[],
@@ -119,6 +120,7 @@ def test_command_invoked(self, mock_yaml_parse):
                     [],
                     None,
                     fake_tags,
+                    True,
                     True
                 )
 
@@ -205,6 +207,7 @@ def test_s3_uploader_is_configured_properly(self, s3UploaderMock,
                 [],
                 s3UploaderObject,
                 [{"Key": "tagkey1", "Value": "tagvalue1"}],
+                True,
                 True
             )
 
@@ -257,7 +260,7 @@ def test_deploy_success(self):
                                                      tags=tags)
 
         # since execute_changeset is set to True, deploy() will execute changeset
-        self.deployer.execute_changeset.assert_called_once_with(changeset_id, stack_name)
+        self.deployer.execute_changeset.assert_called_once_with(changeset_id, stack_name, False)
         self.deployer.wait_for_execute.assert_called_once_with(stack_name, changeset_type)
 
 
diff --git a/tests/unit/customizations/cloudformation/test_deployer.py b/tests/unit/customizations/cloudformation/test_deployer.py
@@ -261,13 +261,30 @@ def test_execute_changeset(self):
 
         expected_params = {
             "ChangeSetName": changeset_id,
-            "StackName": stack_name
+            "StackName": stack_name,
+            "DisableRollback": False
         }
 
         self.stub_client.add_response("execute_change_set", {}, expected_params)
         with self.stub_client:
             self.deployer.execute_changeset(changeset_id, stack_name)
 
+    def test_execute_changeset_disable_rollback(self):
+        stack_name = "stack_name"
+        changeset_id = "changeset_id"
+        disable_rollback = True
+
+        expected_params = {
+            "ChangeSetName": changeset_id,
+            "StackName": stack_name,
+            "DisableRollback": disable_rollback
+        }
+
+        self.stub_client.add_response("execute_change_set", {}, expected_params)
+        with self.stub_client:
+            self.deployer.execute_changeset(changeset_id, stack_name,
+                                            disable_rollback)
+
     def test_execute_changeset_exception(self):
         stack_name = "stack_name"
         changeset_id = "changeset_id"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"""`
`18`	`18`	`import os`
`19`	`19`
`20`		`-__version__ = '1.22.48'`
	`20`	`+__version__ = '1.22.49'`
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Get our data path to be added to botocore's search path`