summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorTerryHowe <terrylhowe@gmail.com>2015-07-19 12:15:04 -0600
committerTerryHowe <terrylhowe@gmail.com>2015-07-23 13:00:59 -0600
commit43942871a9d1515b6ed261e5093001850c2232be (patch)
tree731c37a612a068fb5a7f7855d8247cae6c86c62a /openstackclient
parent64334c0dc95ed5cdb10fefe5100d5a1e486132f1 (diff)
downloadpython-openstackclient-43942871a9d1515b6ed261e5093001850c2232be.tar.gz
Add configuration show command
Create a `configuration show` command that displays the current configuration of the CLI. Different configurations can be displayed using options such as --os-cloud. Passwords and tokens are redacted by default unless the --unmask option is specified. Closes-Bug: #1476729 Change-Id: I0792365d0c5fa526cd09c0ed88c6bb1e2cb813a7
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/common/clientmanager.py4
-rw-r--r--openstackclient/common/configuration.py58
-rw-r--r--openstackclient/tests/common/test_configuration.py79
-rw-r--r--openstackclient/tests/fakes.py12
4 files changed, 153 insertions, 0 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 742509e4..d8e7e1a9 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -15,6 +15,7 @@
"""Manage access to the clients, including authenticating when needed."""
+import copy
import logging
import pkg_resources
import sys
@@ -203,6 +204,9 @@ class ClientManager(object):
interface=interface)
return endpoint
+ def get_configuration(self):
+ return copy.deepcopy(self._cli_options.config)
+
# Plugin Support
diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py
new file mode 100644
index 00000000..83df73e2
--- /dev/null
+++ b/openstackclient/common/configuration.py
@@ -0,0 +1,58 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is 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.
+#
+
+"""Configuration action implementations"""
+
+import logging
+
+from cliff import show
+import six
+
+REDACTED = "<redacted>"
+
+
+class ShowConfiguration(show.ShowOne):
+ """Display configuration details"""
+
+ log = logging.getLogger(__name__ + '.ShowConfiguration')
+
+ def get_parser(self, prog_name):
+ parser = super(ShowConfiguration, self).get_parser(prog_name)
+ mask_group = parser.add_mutually_exclusive_group()
+ mask_group.add_argument(
+ "--mask",
+ dest="mask",
+ action="store_true",
+ default=True,
+ help="Attempt to mask passwords (default)",
+ )
+ mask_group.add_argument(
+ "--unmask",
+ dest="mask",
+ action="store_false",
+ help="Show password in clear text",
+ )
+ return parser
+
+ def take_action(self, parsed_args):
+ self.log.debug('take_action(%s)', parsed_args)
+
+ info = self.app.client_manager.get_configuration()
+ for key, value in six.iteritems(info.pop('auth', {})):
+ if parsed_args.mask:
+ if 'password' in key.lower():
+ value = REDACTED
+ if 'token' in key.lower():
+ value = REDACTED
+ info['auth.' + key] = value
+ return zip(*sorted(six.iteritems(info)))
diff --git a/openstackclient/tests/common/test_configuration.py b/openstackclient/tests/common/test_configuration.py
new file mode 100644
index 00000000..3b942533
--- /dev/null
+++ b/openstackclient/tests/common/test_configuration.py
@@ -0,0 +1,79 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is 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.
+#
+
+from openstackclient.common import configuration
+from openstackclient.tests import fakes
+from openstackclient.tests import utils
+
+
+class TestConfiguration(utils.TestCommand):
+
+ def test_show(self):
+ arglist = []
+ verifylist = [('mask', True)]
+ cmd = configuration.ShowConfiguration(self.app, None)
+ parsed_args = self.check_parser(cmd, arglist, verifylist)
+
+ columns, data = cmd.take_action(parsed_args)
+
+ collist = ('auth.password', 'auth.token', 'auth.username',
+ 'identity_api_version', 'region')
+ self.assertEqual(collist, columns)
+ datalist = (
+ configuration.REDACTED,
+ configuration.REDACTED,
+ fakes.USERNAME,
+ fakes.VERSION,
+ fakes.REGION_NAME,
+ )
+ self.assertEqual(datalist, tuple(data))
+
+ def test_show_unmask(self):
+ arglist = ['--unmask']
+ verifylist = [('mask', False)]
+ cmd = configuration.ShowConfiguration(self.app, None)
+ parsed_args = self.check_parser(cmd, arglist, verifylist)
+
+ columns, data = cmd.take_action(parsed_args)
+
+ collist = ('auth.password', 'auth.token', 'auth.username',
+ 'identity_api_version', 'region')
+ self.assertEqual(collist, columns)
+ datalist = (
+ fakes.PASSWORD,
+ fakes.AUTH_TOKEN,
+ fakes.USERNAME,
+ fakes.VERSION,
+ fakes.REGION_NAME,
+ )
+ self.assertEqual(datalist, tuple(data))
+
+ def test_show_mask(self):
+ arglist = ['--mask']
+ verifylist = [('mask', True)]
+ cmd = configuration.ShowConfiguration(self.app, None)
+ parsed_args = self.check_parser(cmd, arglist, verifylist)
+
+ columns, data = cmd.take_action(parsed_args)
+
+ collist = ('auth.password', 'auth.token', 'auth.username',
+ 'identity_api_version', 'region')
+ self.assertEqual(collist, columns)
+ datalist = (
+ configuration.REDACTED,
+ configuration.REDACTED,
+ fakes.USERNAME,
+ fakes.VERSION,
+ fakes.REGION_NAME,
+ )
+ self.assertEqual(datalist, tuple(data))
diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py
index ff69c190..979f9481 100644
--- a/openstackclient/tests/fakes.py
+++ b/openstackclient/tests/fakes.py
@@ -28,6 +28,7 @@ PASSWORD = "scratchy"
PROJECT_NAME = "poochie"
REGION_NAME = "richie"
INTERFACE = "catchy"
+VERSION = "3"
TEST_RESPONSE_DICT = fixture.V2Token(token_id=AUTH_TOKEN,
user_name=USERNAME)
@@ -102,6 +103,17 @@ class FakeClientManager(object):
self.auth_ref = None
self.auth_plugin_name = None
+ def get_configuration(self):
+ return {
+ 'auth': {
+ 'username': USERNAME,
+ 'password': PASSWORD,
+ 'token': AUTH_TOKEN,
+ },
+ 'region': REGION_NAME,
+ 'identity_api_version': VERSION,
+ }
+
class FakeModule(object):
def __init__(self, name, version):