Update cli to support service id events

awscli/argprocess.py

@@ -245,7 +245,7 @@ def _is_complex_shape(model):
 
 class ParamShorthand(object):
 
-    def _uses_old_list_case(self, service_name, operation_name, argument_name):
+    def _uses_old_list_case(self, service_id, operation_name, argument_name):
         """
         Determines whether a given operation for a service needs to use the
         deprecated shorthand parsing case for lists of structures that only have
@@ -260,14 +260,14 @@ def _uses_old_list_case(self, service_name, operation_name, argument_name):
                 'rebuild-workspaces': ['rebuild-workspace-requests'],
                 'terminate-workspaces': ['terminate-workspace-requests']
             },
-            'elb': {
+            'elastic-load-balancing': {
                 'remove-tags': ['tags'],
                 'describe-instance-health': ['instances'],
                 'deregister-instances-from-load-balancer': ['instances'],
                 'register-instances-with-load-balancer': ['instances']
             }
         }
-        cases = cases.get(service_name, {}).get(operation_name, [])
+        cases = cases.get(service_id, {}).get(operation_name, [])
         return argument_name in cases
 
 
@@ -308,18 +308,18 @@ def __call__(self, cli_argument, value, event_name, **kwargs):
         if not self._should_parse_as_shorthand(cli_argument, value):
             return
         else:
-            service_name, operation_name = \
+            service_id, operation_name = \
                 find_service_and_method_in_event_name(event_name)
             return self._parse_as_shorthand(
-                cli_argument, value, service_name, operation_name)
+                cli_argument, value, service_id, operation_name)
 
-    def _parse_as_shorthand(self, cli_argument, value, service_name,
+    def _parse_as_shorthand(self, cli_argument, value, service_id,
                             operation_name):
         try:
             LOG.debug("Parsing param %s as shorthand",
                         cli_argument.cli_name)
             handled_value = self._handle_special_cases(
-                cli_argument, value, service_name, operation_name)
+                cli_argument, value, service_id, operation_name)
             if handled_value is not None:
                 return handled_value
             if isinstance(value, list):
@@ -344,15 +344,15 @@ def _parse_as_shorthand(self, cli_argument, value, service_name,
             raise ParamError(cli_argument.cli_name, str(e))
         return parsed
 
-    def _handle_special_cases(self, cli_argument, value, service_name,
+    def _handle_special_cases(self, cli_argument, value, service_id,
                               operation_name):
         # We need to handle a few special cases that the previous
         # parser handled in order to stay backwards compatible.
         model = cli_argument.argument_model
         if model.type_name == 'list' and \
            model.member.type_name == 'structure' and \
            len(model.member.members) == 1 and \
-           self._uses_old_list_case(service_name, operation_name, cli_argument.name):
+           self._uses_old_list_case(service_id, operation_name, cli_argument.name):
             # First special case is handling a list of structures
             # of a single element such as:
             #
@@ -411,7 +411,7 @@ def supports_shorthand(self, argument_model):
             return _is_complex_shape(argument_model)
         return False
 
-    def generate_shorthand_example(self, cli_argument, service_name,
+    def generate_shorthand_example(self, cli_argument, service_id,
                                    operation_name):
         """Generate documentation for a CLI argument.
 
@@ -427,7 +427,7 @@ def generate_shorthand_example(self, cli_argument, service_name,
 
         """
         docstring = self._handle_special_cases(
-            cli_argument, service_name, operation_name)
+            cli_argument, service_id, operation_name)
         if docstring is self._DONT_DOC:
             return None
         elif docstring:
@@ -445,13 +445,13 @@ def generate_shorthand_example(self, cli_argument, service_name,
         except TooComplexError:
             return ''
 
-    def _handle_special_cases(self, cli_argument, service_name, operation_name):
+    def _handle_special_cases(self, cli_argument, service_id, operation_name):
         model = cli_argument.argument_model
         if model.type_name == 'list' and \
                 model.member.type_name == 'structure' and \
                 len(model.member.members) == 1 and \
                 self._uses_old_list_case(
-                    service_name, operation_name, cli_argument.name):
+                    service_id, operation_name, cli_argument.name):
             member_name = list(model.member.members)[0]
             return '%s %s1 %s2 %s3' % (cli_argument.cli_name, member_name,
                                        member_name, member_name)

awscli/clidocs.py

@@ -420,7 +420,7 @@ def _doc_input_structure_members(self, doc, argument_model, stack):
         doc.write('}')
 
     def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
-        service_name, operation_name = \
+        service_id, operation_name = \
             find_service_and_method_in_event_name(event_name)
         doc = help_command.doc
         cli_argument = help_command.arg_table[arg_name]
@@ -433,7 +433,7 @@ def doc_option_example(self, arg_name, help_command, event_name, **kwargs):
         docgen = ParamShorthandDocGen()
         if docgen.supports_shorthand(cli_argument.argument_model):
             example_shorthand_syntax = docgen.generate_shorthand_example(
-                cli_argument, service_name, operation_name)
+                cli_argument, service_id, operation_name)
             if example_shorthand_syntax is None:
                 # If the shorthand syntax returns a value of None,
                 # this indicates to us that there is no example

awscli/paramfile.py

@@ -30,9 +30,9 @@
 # refers to an actual URI of some sort and we don't want to actually
 # download the content (i.e TemplateURL in cloudformation).
 PARAMFILE_DISABLED = set([
-    'apigateway.put-integration.uri',
-    'appstream2.create-stack.redirect-url',
-    'appstream2.update-stack.redirect-url',
+    'api-gateway.put-integration.uri',
+    'appstream.create-stack.redirect-url',
+    'appstream.update-stack.redirect-url',
     'cloudformation.create-stack.template-url',
     'cloudformation.update-stack.template-url',
     'cloudformation.create-stack-set.template-url',
@@ -72,26 +72,26 @@
 
     'iam.create-open-id-connect-provider.url',
 
-    'machinelearning.predict.predict-endpoint',
+    'machine-learning.predict.predict-endpoint',
 
-    'api.mediatailor.put-playback-configuration.ad-decision-server-url',
-    'api.mediatailor.put-playback-configuration.slate-ad-url',
-    'api.mediatailor.put-playback-configuration.video-content-source-url',
+    'mediatailor.put-playback-configuration.ad-decision-server-url',
+    'mediatailor.put-playback-configuration.slate-ad-url',
+    'mediatailor.put-playback-configuration.video-content-source-url',
 
     'rds.copy-db-cluster-snapshot.pre-signed-url',
     'rds.create-db-cluster.pre-signed-url',
     'rds.copy-db-snapshot.pre-signed-url',
     'rds.create-db-instance-read-replica.pre-signed-url',
 
-    'serverlessrepo.create-application.home-page-url',
-    'serverlessrepo.create-application.license-url',
-    'serverlessrepo.create-application.readme-url',
-    'serverlessrepo.create-application.source-code-url',
-    'serverlessrepo.create-application.template-url',
-    'serverlessrepo.create-application-version.source-code-url',
-    'serverlessrepo.create-application-version.template-url',
-    'serverlessrepo.update-application.home-page-url',
-    'serverlessrepo.update-application.readme-url',
+    'serverlessapplicationrepository.create-application.home-page-url',
+    'serverlessapplicationrepository.create-application.license-url',
+    'serverlessapplicationrepository.create-application.readme-url',
+    'serverlessapplicationrepository.create-application.source-code-url',
+    'serverlessapplicationrepository.create-application.template-url',
+    'serverlessapplicationrepository.create-application-version.source-code-url',
+    'serverlessapplicationrepository.create-application-version.template-url',
+    'serverlessapplicationrepository.update-application.home-page-url',
+    'serverlessapplicationrepository.update-application.readme-url',
 
     'sqs.add-permission.queue-url',
     'sqs.change-message-visibility.queue-url',
@@ -121,7 +121,7 @@
     'iot.create-job.document-source',
     'translate.translate-text.text',
 
-    'workdocs.create-notification-subscription.notification-endpoint',
+    'workdocs.create-notification-subscription.notification-endpoint'
 ])
 
 

awscli/utils.py

@@ -116,7 +116,7 @@ def _find_quote_char_in_part(part):
 
 def find_service_and_method_in_event_name(event_name):
     """
-    Grabs the service name and the operation name from an event name.
+    Grabs the service id and the operation name from an event name.
     This is making the assumption that the event name is in the form
     event.service.operation.
     """

tests/unit/test_argprocess.py

@@ -271,7 +271,7 @@ def test_simplify_map_scalar(self):
     def test_list_structure_scalars(self):
         p = self.get_param_model(
             'elb.RegisterInstancesWithLoadBalancer.Instances')
-        event_name = ('process-cli-arg.elb'
+        event_name = ('process-cli-arg.elastic-load-balancing'
                       '.register-instances-with-load-balancer')
         # Because this is a list type param, we'll use nargs
         # with argparse which means the value will be presented
@@ -532,11 +532,12 @@ def setUp(self):
         self.shorthand_documenter = ParamShorthandDocGen()
         self.service_name = 'foo'
         self.operation_name = 'bar'
+        self.service_id = 'baz'
 
     def get_generated_example_for(self, argument):
         # Returns a string containing the generated documentation.
         return self.shorthand_documenter.generate_shorthand_example(
-            argument, self.service_name, self.operation_name)
+            argument, self.service_id, self.operation_name)
 
     def assert_generated_example_is(self, argument, expected_docs):
         generated_docs = self.get_generated_example_for(argument)
@@ -556,6 +557,7 @@ def test_gen_map_type_docs(self):
 
     def test_gen_list_scalar_docs(self):
         self.service_name = 'elb'
+        self.service_id = 'elastic-load-balancing'
         self.operation_name = 'register-instances-with-load-balancer'
         argument = self.get_param_model(
             'elb.RegisterInstancesWithLoadBalancer.Instances')