Fix config output and add config and command tests (#163)

Author: satterly

alertaclient/config.py

@@ -25,8 +25,9 @@ class Config:
     def __init__(self, config_file):
         self.options = default_config
         self.parser = configparser.RawConfigParser(defaults=self.options)
-        config_file = config_file or os.environ.get('ALERTA_CONF_FILE') or self.options['config_file']
-        self.parser.read(os.path.expanduser(config_file))
+
+        self.options['config_file'] = config_file or os.environ.get('ALERTA_CONF_FILE') or self.options['config_file']
+        self.parser.read(os.path.expanduser(self.options['config_file']))
 
     def get_config_for_profle(self, profile=None):
         want_profile = profile or os.environ.get('ALERTA_DEFAULT_PROFILE') or self.parser.defaults().get('profile')
@@ -44,6 +45,10 @@ def get_config_for_profle(self, profile=None):
                 except (ValueError, AttributeError):
                     self.options[opt] = self.parser.get('DEFAULT', opt)
 
+        self.options['profile'] = want_profile
+        self.options['endpoint'] = os.environ.get('ALERTA_ENDPOINT', self.options['endpoint'])
+        self.options['key'] = os.environ.get('ALERTA_API_KEY', self.options['key'])
+
     def get_remote_config(self):
         config_url = '{}/config'.format(self.options['endpoint'])
         try:

tests/test_commands.py

@@ -0,0 +1,49 @@
+import unittest
+
+import requests_mock
+from click.testing import CliRunner
+
+from alertaclient.api import Client
+from alertaclient.commands.cmd_whoami import cli as whoami
+from alertaclient.config import Config
+
+
+class CommandsTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+        config = Config(config_file=None)
+        self.obj = config.options
+        self.obj['client'] = self.client
+
+        self.runner = CliRunner()
+
+    @requests_mock.mock()
+    def test_whoami_cmd(self, m):
+
+        whoami_response = """
+        {
+          "aud": "736147134702-glkb1pesv716j1utg4llg7c3rr7nnhli.apps.googleusercontent.com",
+          "customers": [],
+          "email": "admin@alerta.io",
+          "exp": 1543264150,
+          "iat": 1542054550,
+          "iss": "https://alerta-api.herokuapp.com/",
+          "jti": "54bfe4fd-5ed3-4d43-abc5-09cea407af94",
+          "name": "admin@alerta.io",
+          "nbf": 1542054550,
+          "preferred_username": "admin@alerta.io",
+          "provider": "basic",
+          "roles": [
+            "admin"
+          ],
+          "scope": "admin read write",
+          "sub": "df97c902-9b66-42f1-97b8-efb37ad942d6"
+        }
+        """
+
+        m.get('/userinfo', text=whoami_response)
+        result = self.runner.invoke(whoami, ['-u'], obj=self.obj)
+        self.assertIn('preferred_username  : admin@alerta.io', result.output)
+        self.assertEqual(result.exit_code, 0)

tests/test_config.py

@@ -0,0 +1,78 @@
+import contextlib
+import os
+import unittest
+
+from alertaclient.api import Client
+from alertaclient.config import Config
+
+
+@contextlib.contextmanager
+def mod_env(*remove, **update):
+    """
+    See https://stackoverflow.com/questions/2059482#34333710
+
+    Temporarily updates the ``os.environ`` dictionary in-place.
+
+    The ``os.environ`` dictionary is updated in-place so that the modification
+    is sure to work in all situations.
+
+    :param remove: Environment variables to remove.
+    :param update: Dictionary of environment variables and values to add/update.
+    """
+    env = os.environ
+    update = update or {}
+    remove = remove or []
+
+    # List of environment variables being updated or removed.
+    stomped = (set(update.keys()) | set(remove)) & set(env.keys())
+    # Environment variables and values to restore on exit.
+    update_after = {k: env[k] for k in stomped}
+    # Environment variables and values to remove on exit.
+    remove_after = frozenset(k for k in update if k not in env)
+
+    try:
+        env.update(update)
+        [env.pop(k, None) for k in remove]
+        yield
+    finally:
+        env.update(update_after)
+        [env.pop(k) for k in remove_after]
+
+
+class CommandsTestCase(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    def test_env_vars(self):
+
+        config = Config(config_file=None)
+        self.assertEqual(config.options['config_file'], '~/.alerta.conf')
+
+        with mod_env(
+                ALERTA_CONF_FILE='~/.alerta.test.conf',
+                ALERTA_DEFAULT_PROFILE='test-profile',
+                ALERTA_ENDPOINT='http://foo/bar/baz',
+                ALERTA_API_KEY='test-key',
+                REQUESTS_CA_BUNDLE='',
+                CLICOLOR='',
+                DEBUG='1'
+        ):
+
+            # conf file
+            config = Config(config_file=None)
+            self.assertEqual(config.options['config_file'], '~/.alerta.test.conf', os.environ)
+            config = Config(config_file='/dev/null')
+            self.assertEqual(config.options['config_file'], '/dev/null')
+
+            # profile
+            config = Config(config_file=None)
+            config.get_config_for_profle()
+            self.assertEqual(config.options['profile'], 'test-profile', os.environ)
+
+            # endpoint
+            self.client = Client()
+            self.assertEqual(self.client.endpoint, 'http://foo/bar/baz')
+
+            # api key
+            self.assertEqual(config.options['key'], 'test-key')