Merge ~mthaddon/charm-k8s-openldap/+git/charm-k8s-openldap:tests into charm-k8s-openldap:master

[Tom Haddon]

Updates to make tests pass - options in config.yaml are always present at least as an empty string

Updates to make tests pass - options in config.yaml are always present at least as an empty string

[Benjamin Allot (ballot)]

LGTM

review: Approve

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

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

[David Lawson (deej)]

+1

review: Approve

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

Change successfully merged at revision 6aaccd7c6a52a4f1b06941ef3507235a2722744a

diff --git a/src/charm.py b/src/charm.py
index bba484a..069d3dd 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -109,7 +109,11 @@ class OpenLDAPK8sCharm(CharmBase):
         missing settings; otherwise return an empty list."""
         config = self.model.config
 
-        missing = {setting for setting in REQUIRED_SETTINGS if setting not in config}
+        # Options in config.yaml are always present as at least ""
+        # so config[setting] will not fail with a KeyError if unset via juju.
+        # We define missing in terms of being required by the charm and explicitly
+        # set rather than default from config.yaml.
+        missing = {setting for setting in REQUIRED_SETTINGS if not config[setting]}
 
         return sorted(missing)
 
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 22746f9..717c937 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -88,6 +88,7 @@ class TestOpenLDAPK8sCharmHooksDisabled(unittest.TestCase):
         self.harness.update_config(CONFIG_NO_ADMIN_PASSWORD)
         self.harness.charm._state.postgres = DB_URI
         expected = {
+            'LDAP_ADMIN_PASSWORD': '',
             'POSTGRES_NAME': 'openldap',
             'POSTGRES_USER': 'ldap_user',
             'POSTGRES_PASSWORD': 'ldap_password',