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

[Tom Haddon]

Add some more tests for ingress conditions, remove conditional for annotations, which is always True in _update_pod_spec_for_k8s_ingress

Add some more tests for ingress conditions, remove conditional for annotations, which is always True in _update_pod_spec_for_k8s_ingress.

Takes overall test coverage from 60% to 61%...

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

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

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[Paul Collins (pjdc)]

lgtm re annotations

review: Approve

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

Change successfully merged at revision cda8e5377822ee813691ec45405662f9b0214642

diff --git a/src/charm.py b/src/charm.py
index 34f8922..c3f2eda 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -311,8 +311,7 @@ class MattermostK8sCharm(CharmBase):
         if ingress_whitelist_source_range:
             annotations['nginx.ingress.kubernetes.io/whitelist-source-range'] = ingress_whitelist_source_range
 
-        if annotations:
-            ingress['annotations'] = annotations
+        ingress['annotations'] = annotations
 
         # Due to https://github.com/canonical/operator/issues/293 we
         # can't use pod.set_spec's k8s_resources argument.
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index f1a5da1..5295dce 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -292,6 +292,43 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         pod_spec = {}
         self.harness.charm._update_pod_spec_for_k8s_ingress(pod_spec)
         self.assertEqual(pod_spec, expected)
+        # And now test with an ingress_whitelist_source_range, and an http
+        # rather than https site_url to test a few more ingress conditions.
+        self.harness.update_config(
+            {'ingress_whitelist_source_range': '10.10.10.10/24', 'site_url': 'http://chat.example.com'}
+        )
+        expected = {
+            'kubernetesResources': {
+                'ingressResources': [
+                    {
+                        'name': ingress_name,
+                        'spec': {
+                            'rules': [
+                                {
+                                    'host': 'chat.example.com',
+                                    'http': {
+                                        'paths': [
+                                            {
+                                                'path': '/',
+                                                'backend': {'serviceName': 'mattermost', 'servicePort': 8065},
+                                            }
+                                        ]
+                                    },
+                                }
+                            ],
+                        },
+                        'annotations': {
+                            'nginx.ingress.kubernetes.io/proxy-body-size': '5m',
+                            'nginx.ingress.kubernetes.io/ssl-redirect': 'false',
+                            'nginx.ingress.kubernetes.io/whitelist-source-range': '10.10.10.10/24',
+                        },
+                    }
+                ]
+            }
+        }
+        pod_spec = {}
+        self.harness.charm._update_pod_spec_for_k8s_ingress(pod_spec)
+        self.assertEqual(pod_spec, expected)
 
     def test_update_pod_spec_for_performance_monitoring(self):
         """envConfig is updated, and pre-existing annotations are not clobbered."""