Merge customizations for EMR

Author: aws-sdk-python-automation

.changes/next-release/enhancement-EMR-86454.json

@@ -0,0 +1,5 @@
+{
+  "type": "enhancement",
+  "category": "EMR",
+  "description": "Updated create-cluster and describe-cluster commands to support --extended-support and --no-extended-support arguments"
+}

awscli/customizations/emr/createcluster.py

@@ -213,6 +213,17 @@ class CreateCluster(Command):
             'schema': argumentschema.AUTO_TERMINATION_POLICY_SCHEMA,
             'help_text': helptext.AUTO_TERMINATION_POLICY,
         },
+        {
+            'name': 'extended-support',
+            'action': 'store_true',
+            'group_name': 'extended-support',
+            'help_text': helptext.EXTENDED_SUPPORT,
+        },
+        {
+            'name': 'no-extended-support',
+            'action': 'store_true',
+            'group_name': 'extended-support',
+        },
     ]
     SYNOPSIS = BasicCommand.FROM_FILE('emr', 'create-cluster-synopsis.txt')
     EXAMPLES = BasicCommand.FROM_FILE('emr', 'create-cluster-examples.rst')
@@ -514,6 +525,14 @@ def _run_main_command(self, parsed_args, parsed_globals):
         if parsed_args.step_concurrency_level is not None:
             params['StepConcurrencyLevel'] = parsed_args.step_concurrency_level
 
+        if parsed_args.extended_support or parsed_args.no_extended_support:
+            params['ExtendedSupport'] = emrutils.apply_boolean_options(
+                parsed_args.extended_support,
+                '--extended-support',
+                parsed_args.no_extended_support,
+                '--no-extended-support',
+            )
+
         if parsed_args.managed_scaling_policy is not None:
             emrutils.apply_dict(
                 params,

awscli/customizations/emr/helptext.py

@@ -11,10 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from awscli.customizations.emr.createdefaultroles import (
-    EC2_ROLE_NAME,
-    EMR_ROLE_NAME,
-)
 
 TERMINATE_CLUSTERS = (
     'Shuts down one or more clusters, each specified by cluster ID. '
@@ -572,3 +568,5 @@
 UNHEALTHY_NODE_REPLACEMENT = (
     '<p>Unhealthy node replacement for an Amazon EMR cluster.</p> '
 )
+
+EXTENDED_SUPPORT = '<p>Reserved.</p> '

awscli/examples/emr/create-cluster-synopsis.txt

@@ -32,3 +32,4 @@
      [--managed-scaling-policy <value>]
      [--placement-group-configs <value>]
      [--auto-termination-policy <value>]
+     [--extended-support | --no-extended-support]

tests/unit/customizations/emr/test_create_cluster_ami_version.py

@@ -10,11 +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.
+
 import copy
 import json
 import os
 
-from awscli.testutils import mock
+from awscli.testutils import mock, unittest
 from tests.unit.customizations.emr import (
     EMRBaseAWSCommandParamsTest as BaseAWSCommandParamsTest,
 )
@@ -589,6 +590,27 @@ def test_visible_to_all_users_and_no_visible_to_all_users(self):
         result = self.run_cmd(cmd, 252)
         self.assertEqual(expected_error_msg, result[1])
 
+    def test_extended_support(self):
+        cmd = DEFAULT_CMD + '--extended-support'
+        result = copy.deepcopy(DEFAULT_RESULT)
+        result['ExtendedSupport'] = True
+        self.assert_params_for_cmd(cmd, result)
+
+    def test_no_extended_support(self):
+        cmd = DEFAULT_CMD + '--no-extended-support'
+        result = copy.deepcopy(DEFAULT_RESULT)
+        result['ExtendedSupport'] = False
+        self.assert_params_for_cmd(cmd, result)
+
+    def test_extended_support_and_no_extended_support(self):
+        cmd = DEFAULT_CMD + '--extended-support --no-extended-support'
+        expected_error_msg = (
+            '\naws: error: cannot use both --extended-support'
+            ' and --no-extended-support options together.\n'
+        )
+        result = self.run_cmd(cmd, 252)
+        self.assertEqual(expected_error_msg, result[1])
+
     def test_tags(self):
         cmd = DEFAULT_CMD.split() + ['--tags', 'k1=v1', 'k2', 'k3=spaces  v3']
         result = copy.deepcopy(DEFAULT_RESULT)
@@ -803,10 +825,6 @@ def test_instance_groups_missing_instance_type_error(self):
             '--instance-groups '
             'Name=Master,InstanceGroupType=MASTER,InstanceCount=1'
         )
-        expect_error_msg = (
-            '\nThe following required parameters are missing'
-            ' for structure:: InstanceType\n'
-        )
         stderr = self.run_cmd(cmd, 252)[1]
         self.assert_error_message_has_field_name(stderr, 'InstanceType')
 

tests/unit/customizations/emr/test_create_cluster_release_label.py

@@ -16,7 +16,7 @@
 
 from botocore.compat import OrderedDict, json
 
-from awscli.testutils import mock
+from awscli.testutils import mock, unittest
 from tests.unit.customizations.emr import (
     EMRBaseAWSCommandParamsTest as BaseAWSCommandParamsTest,
 )
@@ -557,6 +557,27 @@ def test_visible_to_all_users_and_no_visible_to_all_users(self):
         result = self.run_cmd(cmd, 252)
         self.assertEqual(expected_error_msg, result[1])
 
+    def test_extended_support(self):
+        cmd = DEFAULT_CMD + '--extended-support'
+        result = copy.deepcopy(DEFAULT_RESULT)
+        result['ExtendedSupport'] = True
+        self.assert_params_for_cmd(cmd, result)
+
+    def test_no_extended_support(self):
+        cmd = DEFAULT_CMD + '--no-extended-support'
+        result = copy.deepcopy(DEFAULT_RESULT)
+        result['ExtendedSupport'] = False
+        self.assert_params_for_cmd(cmd, result)
+
+    def test_extended_support_and_no_extended_support(self):
+        cmd = DEFAULT_CMD + '--extended-support --no-extended-support'
+        expected_error_msg = (
+            '\naws: error: cannot use both --extended-support'
+            ' and --no-extended-support options together.\n'
+        )
+        result = self.run_cmd(cmd, 252)
+        self.assertEqual(expected_error_msg, result[1])
+
     def test_tags(self):
         cmd = DEFAULT_CMD.split() + ['--tags', 'k1=v1', 'k2', 'k3=spaces  v3']
         result = copy.deepcopy(DEFAULT_RESULT)
@@ -762,10 +783,6 @@ def test_instance_groups_missing_instance_type_error(self):
             '--instance-groups '
             'Name=Master,InstanceGroupType=MASTER,InstanceCount=1'
         )
-        expect_error_msg = (
-            '\nThe following required parameters are missing'
-            ' for structure:: InstanceType\n'
-        )
         stderr = self.run_cmd(cmd, 252)[1]
         self.assert_error_message_has_field_name(stderr, 'InstanceType')