Merge ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:master into charm-k8s-unifi-poller:master

[Tom Haddon]

Prevent duplicate entries in extra_configs

Prevent duplicate entries in extra_configs

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Gareth Woolridge (moon127)]

Agreed we should be checking for duplicate config options in the extra_config data.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c40952d1bfcdfa00e71f5f5c3d928911e4945f00

diff --git a/src/charm.py b/src/charm.py
index 20a530a..96b72c2 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -71,10 +71,14 @@ class UnifiPollerCharm(CharmBase):
         """Check extra_config configuration_settings."""
         config = self.model.config
 
-        errors = []
+        errors, config_keys = [], []
         if config['extra_configs']:
             for c in yaml.safe_load(config['extra_configs']):
                 k, value = c.split('=', 1)
+                if k in config_keys:
+                    errors.append('{} is duplicated'.format(k))
+                else:
+                    config_keys.append(k)
                 if not re.match(r'^UP_', k.upper()):
                     errors.append(k)
                 if re.match(r'.*_URL', k.upper()):
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 42b6066..50cfd9e 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -92,6 +92,10 @@ CONFIG_INVALID_EXTRA_CONFIG_NO_NETLOC = {
     'extra_configs': "[up_unifi_controller_1_url=http://valid-url, up_unifi_controller_2_url=https:no-netloc]",
 }
 
+CONFIG_INVALID_EXTRA_CONFIG_DUPLICATES = {
+    'extra_configs': "[up_dup=1, up_dup=2]",
+}
+
 
 class TestCharm(unittest.TestCase):
     def setUp(self):
@@ -122,6 +126,12 @@ class TestCharm(unittest.TestCase):
         expected = 'invalid extra_config setting(s): up_unifi_controller_2_url'
         self.assertEqual(self.harness.charm._check_for_config_problems(), expected)
 
+    def test_check_for_invalid_extra_configs_duplicates(self):
+        """Check for correctly reports duplicate entries in extra_configs options."""
+        self.harness.update_config(CONFIG_INVALID_EXTRA_CONFIG_DUPLICATES)
+        expected = ['up_dup is duplicated']
+        self.assertEqual(self.harness.charm._bad_extra_config_charm_settings(), expected)
+
     def test_check_for_missing_image_invalid_extra_config(self):
         """Check for correctly reports invalid extra_configs options."""
         self.harness.update_config(CONFIG_INVALID_EXTRA_CONFIG_NO_IMAGE)