Credential commands resolve the identifier now

sudorandom · sudorandom · commit 530bc56902e6 · 2014-12-09T15:28:35.000-06:00
Also re-adds the -h flag to show help for CLI commands.
diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py
@@ -70,16 +70,16 @@ def get_command(self, ctx, name):
              epilog="""To use most commands your SoftLayer
 username and api_key need to be configured. The easiest way to do that is to
 use: 'sl config setup'""",
-             cls=CommandLoader)
+             cls=CommandLoader,
+             context_settings={'help_option_names': ['-h', '--help']})
 @click.pass_context
 @click.option('--format',
               default=DEFAULT_FORMAT,
               help="Output format",
               type=click.Choice(VALID_FORMATS))
 @click.option('--config', '-C',
               required=False,
-              default=click.get_app_dir('softlayer',
-                                        force_posix=True),
+              default=click.get_app_dir('softlayer', force_posix=True),
               help="Config file location",
               type=click.Path(resolve_path=True))
 @click.option('--debug',
diff --git a/SoftLayer/CLI/server/credentials.py b/SoftLayer/CLI/server/credentials.py
@@ -3,6 +3,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 import click
 
@@ -13,9 +14,13 @@
 def cli(env, identifier):
     """List virtual server credentials."""
 
-    hardware = SoftLayer.HardwareManager(env.client)
-    result = hardware.get_hardware(identifier)
+    manager = SoftLayer.HardwareManager(env.client)
+    hardware_id = helpers.resolve_id(manager.resolve_ids,
+                                     identifier,
+                                     'hardware')
+    instance = manager.get_hardware(hardware_id)
+
     table = formatting.Table(['username', 'password'])
-    for item in result['operatingSystem']['passwords']:
+    for item in instance['operatingSystem']['passwords']:
         table.add_row([item['username'], item['password']])
     return table
diff --git a/SoftLayer/CLI/virt/credentials.py b/SoftLayer/CLI/virt/credentials.py
@@ -3,6 +3,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 import click
 
@@ -14,8 +15,10 @@ def cli(env, identifier):
     """List virtual server credentials."""
 
     vsi = SoftLayer.VSManager(env.client)
-    result = vsi.get_instance(identifier)
+    vs_id = helpers.resolve_id(vsi.resolve_ids, identifier, 'VS')
+    instance = vsi.get_instance(vs_id)
+
     table = formatting.Table(['username', 'password'])
-    for item in result['operatingSystem']['passwords']:
+    for item in instance['operatingSystem']['passwords']:
         table.add_row([item['username'], item['password']])
     return table
