Merge ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master into charm-k8s-bind:master

[Barry Price]

This takes us from 90% to 100% test coverage

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

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

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision 2835c005267fe68a342ddf3e954b69c2c3dfed92

diff --git a/src/charm.py b/src/charm.py
index 0faf651..14198c7 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -135,5 +135,5 @@ class BindK8sCharm(CharmBase):
         return spec
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main(BindK8sCharm)
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index dc53ac0..85fe103 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -38,6 +38,16 @@ CONFIG_VALID = {
     'https_proxy': '',
 }
 
+CONFIG_VALID_WITH_CREDS = {
+    'bind_image_path': 'secure.example.com/bind:v1',
+    'bind_image_username': 'test-user',
+    'bind_image_password': 'test-password',
+    'container_config': '',
+    'container_secrets': '',
+    'custom_config_repo': '',
+    'https_proxy': '',
+}
+
 CONFIG_VALID_WITH_CONTAINER_CONFIG = {
     'bind_image_path': 'example.com/bind:v1',
     'bind_image_username': '',
@@ -58,6 +68,16 @@ CONFIG_VALID_WITH_CONTAINER_CONFIG_AND_SECRETS = {
     'https_proxy': '',
 }
 
+CONFIG_VALID_WITH_CUSTOM_CONFIG_REPO_AND_PROXY = {
+    'bind_image_path': 'example.com/bind:v1',
+    'bind_image_username': '',
+    'bind_image_password': '',
+    'container_config': '',
+    'container_secrets': '',
+    'custom_config_repo': 'https://git.example.com/example-bind-config.git',
+    'https_proxy': 'http://webproxy.example.com:3128/',
+}
+
 
 class TestBindK8s(unittest.TestCase):
     maxDiff = None
@@ -110,6 +130,30 @@ class TestBindK8s(unittest.TestCase):
         }
         self.assertEqual(self.harness.charm.make_pod_spec(), expected)
 
+    def test_make_pod_spec_with_creds(self):
+        """Confirm that we generate the expected pod spec from config containing credentials."""
+        self.harness.update_config(CONFIG_VALID_WITH_CREDS)
+        expected = {
+            'version': 2,
+            'containers': [
+                {
+                    'name': 'bind',
+                    'imageDetails': {
+                        'imagePath': 'secure.example.com/bind:v1',
+                        'username': 'test-user',
+                        'password': 'test-password',
+                    },
+                    'ports': [
+                        {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
+                        {'containerPort': 53, 'name': 'domain-udp', 'protocol': 'UDP'},
+                    ],
+                    'config': {},
+                    'kubernetes': {'readinessProbe': {'exec': {'command': ['/usr/local/bin/dns-check.sh']}}},
+                }
+            ],
+        }
+        self.assertEqual(self.harness.charm.make_pod_spec(), expected)
+
     def test_make_pod_spec_with_extra_config(self):
         """Confirm that we generate the expected pod spec from a more involved valid config."""
         self.harness.update_config(CONFIG_VALID_WITH_CONTAINER_CONFIG)
@@ -150,6 +194,30 @@ class TestBindK8s(unittest.TestCase):
         }
         self.assertEqual(self.harness.charm.make_pod_spec(), expected)
 
+    def test_make_pod_spec_with_custom_config_repo(self):
+        """Confirm that we generate the expected pod spec from a config that includes a custom repo."""
+        self.harness.update_config(CONFIG_VALID_WITH_CUSTOM_CONFIG_REPO_AND_PROXY)
+        expected = {
+            'version': 2,
+            'containers': [
+                {
+                    'name': 'bind',
+                    'imageDetails': {'imagePath': 'example.com/bind:v1'},
+                    'ports': [
+                        {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
+                        {'containerPort': 53, 'name': 'domain-udp', 'protocol': 'UDP'},
+                    ],
+                    'config': {
+                        'CUSTOM_CONFIG_REPO': 'https://git.example.com/example-bind-config.git',
+                        'http_proxy': 'http://webproxy.example.com:3128/',
+                        'https_proxy': 'http://webproxy.example.com:3128/',
+                    },
+                    'kubernetes': {'readinessProbe': {'exec': {'command': ['/usr/local/bin/dns-check.sh']}}},
+                }
+            ],
+        }
+        self.assertEqual(self.harness.charm.make_pod_spec(), expected)
+
     def test_configure_pod_as_leader(self):
         """Confirm that our status is set correctly when we're the leader."""
         self.harness.enable_hooks()