Merge "Make configuration show not require auth"

Author: Zuul

openstackclient/common/configuration.py

@@ -25,6 +25,8 @@
 class ShowConfiguration(command.ShowOne):
     _description = _("Display configuration details")
 
+    auth_required = False
+
     def get_parser(self, prog_name):
         parser = super(ShowConfiguration, self).get_parser(prog_name)
         mask_group = parser.add_mutually_exclusive_group()
@@ -45,13 +47,21 @@ def get_parser(self, prog_name):
 
     def take_action(self, parsed_args):
 
-        auth_plg_name = self.app.client_manager.auth_plugin_name
-        secret_opts = [o.dest for o in base.get_plugin_options(auth_plg_name)
-                       if o.secret]
-
         info = self.app.client_manager.get_configuration()
+
+        # Assume a default secret list in case we do not have an auth_plugin
+        secret_opts = ["password", "token"]
+
+        if getattr(self.app.client_manager, "auth_plugin_name", None):
+            auth_plg_name = self.app.client_manager.auth_plugin_name
+            secret_opts = [
+                o.dest for o in base.get_plugin_options(auth_plg_name)
+                if o.secret
+            ]
+
         for key, value in six.iteritems(info.pop('auth', {})):
             if parsed_args.mask and key.lower() in secret_opts:
-                    value = REDACTED
+                value = REDACTED
             info['auth.' + key] = value
+
         return zip(*sorted(six.iteritems(info)))

openstackclient/tests/functional/base.py

@@ -45,9 +45,17 @@ class TestCase(testtools.TestCase):
     @classmethod
     def openstack(cls, cmd, cloud=ADMIN_CLOUD, fail_ok=False):
         """Executes openstackclient command for the given action."""
-        return execute(
-            'openstack --os-cloud={cloud} '.format(cloud=cloud) +
-            cmd, fail_ok=fail_ok)
+        if cloud is not None:
+            return execute(
+                'openstack --os-cloud={cloud} '.format(cloud=cloud) + cmd,
+                fail_ok=fail_ok
+            )
+        else:
+            # Execute command with no auth
+            return execute(
+                'openstack --os-auth-type none ' + cmd,
+                fail_ok=fail_ok
+            )
 
     @classmethod
     def is_service_enabled(cls, service):

openstackclient/tests/functional/common/test_configuration.py

@@ -37,6 +37,10 @@ def test_configuration_show(self):
             configuration.REDACTED,
             cmd_output['auth.password']
         )
+        self.assertIn(
+            'auth.password',
+            cmd_output.keys(),
+        )
 
         # Test show --mask
         cmd_output = json.loads(self.openstack(
@@ -65,3 +69,26 @@ def test_configuration_show(self):
                 configuration.REDACTED,
                 cmd_output['auth.password']
             )
+
+
+class ConfigurationTestsNoAuth(base.TestCase):
+    """Functional test for configuration with no auth"""
+
+    def test_configuration_show(self):
+
+        # Test show without option
+        raw_output = self.openstack(
+            'configuration show',
+            cloud=None,
+        )
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, BASIC_CONFIG_HEADERS)
+
+        cmd_output = json.loads(self.openstack(
+            'configuration show -f json',
+            cloud=None,
+        ))
+        self.assertNotIn(
+            'auth.password',
+            cmd_output,
+        )

openstackclient/tests/unit/integ/cli/test_project.py

@@ -36,10 +36,10 @@ def setUp(self):
 
     def test_project_id_env(self):
         _shell = shell.OpenStackShell()
-        _shell.run("configuration show".split())
+        _shell.run("extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -57,10 +57,10 @@ def test_project_id_env(self):
 
     def test_project_id_arg(self):
         _shell = shell.OpenStackShell()
-        _shell.run("--os-project-id wsx configuration show".split())
+        _shell.run("--os-project-id wsx extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -94,10 +94,10 @@ def setUp(self):
 
     def test_project_name_env(self):
         _shell = shell.OpenStackShell()
-        _shell.run("configuration show".split())
+        _shell.run("extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -115,10 +115,10 @@ def test_project_name_env(self):
 
     def test_project_name_arg(self):
         _shell = shell.OpenStackShell()
-        _shell.run("--os-project-name qaz configuration show".split())
+        _shell.run("--os-project-name qaz extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -154,10 +154,10 @@ def setUp(self):
 
     def test_project_id_env(self):
         _shell = shell.OpenStackShell()
-        _shell.run("configuration show".split())
+        _shell.run("extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -173,10 +173,10 @@ def test_project_id_env(self):
 
     def test_project_id_arg(self):
         _shell = shell.OpenStackShell()
-        _shell.run("--os-project-id wsx configuration show".split())
+        _shell.run("--os-project-id wsx extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -210,10 +210,10 @@ def setUp(self):
 
     def test_project_name_env(self):
         _shell = shell.OpenStackShell()
-        _shell.run("configuration show".split())
+        _shell.run("extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(
@@ -234,10 +234,10 @@ def test_project_name_env(self):
 
     def test_project_name_arg(self):
         _shell = shell.OpenStackShell()
-        _shell.run("--os-project-name wsx configuration show".split())
+        _shell.run("--os-project-name wsx extension list".split())
 
         # Check general calls
-        self.assertEqual(len(self.requests_mock.request_history), 2)
+        self.assertNotEqual(len(self.requests_mock.request_history), 0)
 
         # Check discovery request
         self.assertEqual(