Working to eliminate hard-coded provider references. Incorporating patch for zsh completion.

garnaat · garnaat · commit fea05c8abb2d · 2013-01-25T12:46:51.000-08:00
diff --git a/README.md b/README.md
@@ -62,6 +62,14 @@ For tcsh:
 
 You should add this to your startup scripts to enable it for future sessions.
 
+For zsh please refer to bin/zsh_complete.sh.  Source that file:
+
+    $ source bin/zsh_complete.sh
+
+For now the bash compatibility auto completion (bashcompinit) is used.
+For further details please refer to the top of bin/zsh_complete.sh.
+
+
 Getting Started
 ---------------
 Before using aws-cli, you need to tell it about your AWS credentials.  You
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -19,13 +19,6 @@
 
 __version__ = '0.4.5'
 
-EnvironmentVariables = {
-    'profile': (None, 'AWS_DEFAULT_PROFILE'),
-    'region': ('region', 'AWS_DEFAULT_REGION'),
-    'data_path': ('data_path', 'AWS_DATA_PATH'),
-    'config_file': (None, 'AWS_CONFIG_FILE')
-    }
-
 #
 # Get our data path to be added to botocore's search path
 #
@@ -38,3 +31,11 @@
         path = os.path.expanduser(path)
         awscli_data_path.append(path)
 os.environ['AWS_DATA_PATH'] = ':'.join(awscli_data_path)
+
+
+EnvironmentVariables = {
+    'profile': (None, 'AWS_DEFAULT_PROFILE', None),
+    'region': ('region', 'AWS_DEFAULT_REGION', None),
+    'data_path': ('data_path', 'AWS_DATA_PATH', None),
+    'config_file': (None, 'AWS_CONFIG_FILE', None)
+    }
diff --git a/awscli/clidriver.py b/awscli/clidriver.py
@@ -66,8 +66,7 @@ class CLIDriver(object):
         'jsondoc': str,
         'file': str}
 
-    def __init__(self, provider_name='aws'):
-        self.provider_name = provider_name
+    def __init__(self):
         self.session = botocore.session.get_session(EnvironmentVariables)
         self.session.user_agent_name = 'aws-cli'
         self.session.user_agent_version = __version__
@@ -98,7 +97,9 @@ def create_main_parser(self):
             if 'choices' in option_data:
                 choices = option_data['choices']
                 if not isinstance(choices, list):
-                    choices = self.session.get_data(option_data['choices'])
+                    provider = self.session.get_variable('provider')
+                    choices_path = choices.format(provider=provider)
+                    choices = self.session.get_data(choices_path)
                 if isinstance(choices, dict):
                     choices = list(choices.keys())
                 option_data['help'] = self.create_choice_help(choices)
@@ -281,17 +282,11 @@ def get_error_code_and_message(self, response):
 
     def call(self, args):
         try:
-            if self.args.region is not None:
-                self.region = self.args.region
-            elif self.session.get_config():
-                self.region = self.session.get_config().get('region', None)
-            if self.region is None:
-                msg = self.session.get_data('messages/NoRegionError')
-                raise ValueError(msg)
             params = {}
             self.build_call_parameters(args, params)
-            self.endpoint = self.service.get_endpoint(self.region,
+            self.endpoint = self.service.get_endpoint(self.args.region,
                                                       endpoint_url=self.args.endpoint_url)
+            self.endpoint.verify = not self.args.no_verify_ssl
             http_response, response_data = self.operation.call(self.endpoint,
                                                                **params)
             self.formatter(self.operation, response_data)
@@ -336,7 +331,8 @@ def main(self):
         self.create_main_parser()
         self.args, remaining = self.parser.parse_known_args()
         if self.args.service_name == 'help':
-            get_help(self.session, provider='aws', style='cli')
+            provider = self.session.get_variable('provider')
+            get_help(self.session, provider=provider, style='cli')
             sys.exit(0)
         else:
             if self.args.debug:
diff --git a/awscli/data/cli.json b/awscli/data/cli.json
@@ -9,13 +9,17 @@
             "help": "Override service's default URL with the given URL",
 	    "metavar": "endpoint_url"
         },
+	"--no-verify-ssl": {
+	    "help": "Override default behavior of verifying SSL certificates",
+	    "action": "store_true"
+	},
         "--profile": {
             "help": "Use a specific profile from your credential file",
             "metavar": "profile_name"
         },
 	"--region": {
 	    "metavar": "region_name",
-	    "choices": "aws/_regions"
+	    "choices": "{provider}/_regions"
 	},
 	"--output": {
 	    "choices": ["json", "text"],
@@ -27,7 +31,7 @@
 	    "help": "Display the version of this tool"
 	},
 	"service_name": {
-	    "choices": "aws/_services",
+	    "choices": "{provider}/_services",
 	    "metavar": "service_name"
 	}
     }
diff --git a/awscli/help.py b/awscli/help.py
@@ -200,8 +200,10 @@ def do_parameters(self, operation):
         msg = self.session.get_data('messages/Synopsis')
         self.add_paragraph().write(self.style.h2(msg))
         self.indent()
-        self.add_paragraph().write('aws %s %s' % (operation.service.cli_name,
-                                                  operation.cli_name))
+        provider_name = self.session.get_variable('provider')
+        self.add_paragraph().write('%s %s %s' % (provider_name,
+                                                 operation.service.cli_name,
+                                                 operation.cli_name))
         self.indent()
         for param in required:
             para = self.add_paragraph()
@@ -274,7 +276,7 @@ def do_service_names(self, provider_name):
             self.get_current_paragraph().write(service_name)
             self.style.end_li()
 
-    def do_options(self, options):
+    def do_options(self, options, provider_name):
         self.add_paragraph().write(self.style.h2('Options'))
         self.indent()
         for option in options:
@@ -291,18 +293,19 @@ def do_options(self, options):
                 if 'choices' in option_data:
                     choices = option_data['choices']
                     if not isinstance(choices, list):
-                        choices = self.session.get_data(choices)
+                        choices_path = choices.format(provider=provider_name)
+                        choices = self.session.get_data(choices_path)
                     for choice in sorted(choices):
                         self.style.start_li()
                         self.get_current_paragraph().write(choice)
                         self.style.end_li()
         self.dedent()
 
-    def build(self, provider_name='aws'):
+    def build(self, provider_name):
         cli = self.session.get_data('cli')
         self.do_usage(cli['description'])
         self.do_service_names(provider_name)
-        self.do_options(cli['options'])
+        self.do_options(cli['options'], provider_name)
 
 
 def get_help(session, provider=None,
diff --git a/bin/aws b/bin/aws
@@ -16,7 +16,7 @@ import awscli.clidriver
 
 
 def main():
-    driver = awscli.clidriver.CLIDriver(provider_name='aws')
+    driver = awscli.clidriver.CLIDriver()
     driver.main()
 
 
diff --git a/bin/aws.cmd b/bin/aws.cmd
@@ -50,7 +50,7 @@ import awscli.clidriver
 
 
 def main():
-    driver = awscli.clidriver.CLIDriver(provider_name='aws')
+    driver = awscli.clidriver.CLIDriver()
     driver.main()
 
 
diff --git a/setup.py b/setup.py
@@ -31,7 +31,8 @@
     author='Mitch Garnaat',
     author_email='garnaat@amazon.com',
     url='http://aws.amazon.com/cli/',
-    scripts=['bin/aws', 'bin/aws_completer', 'bin/aws.cmd'],
+    scripts=['bin/aws', 'bin/aws.cmd',
+             'bin/aws_completer', 'bin/zsh_complete.sh'],
     packages=packages,
     package_data={'awscli': ['data/*.json']},
     package_dir={'awscli': 'awscli'},
