fix build_ref, add test for sessionCookieEnabled false

bcgov · Oct 16, 2024 · dc2f68e · dc2f68e
1 parent 7fdc717
commit dc2f68e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/microservices/kubeApi/routers/routes.py b/microservices/kubeApi/routers/routes.py
@@ -249,4 +249,4 @@ def in_list (match, list):
     return False
 
 def build_ref(v):
-    return "%s%s%s%s" % (v['name'], v['selectTag'], v['host'], v['dataPlane'], v['sessionCookieEnabled'])
+    return "%s%s%s%s%s" % (v['name'], v['selectTag'], v['host'], v['dataPlane'], v['sessionCookieEnabled'])
diff --git a/microservices/kubeApi/tests/routers/test_bulk_sync.py b/microservices/kubeApi/tests/routers/test_bulk_sync.py
@@ -7,7 +7,7 @@ def test_bulk_sync(client):
                 "name": "wild-ns-example",
                 "labels": {
                     "aps-select-tag": "ns.EXAMPLE-NS",
-                    "aps-template-version": "v1"
+                    "aps-template-version": "v2"
                 }
             },
             "spec": {
@@ -30,7 +30,7 @@ def test_bulk_sync(client):
                     "selectTag": "ns.EXAMPLE-NS",
                     "dataPlane": "data-plane-1",
                     "host": "abc.api.gov.bc.ca",
-                    "sessionCookieEnabled": True
+                    "sessionCookieEnabled": False
                 }]
                 response = client.post('/namespaces/examplens/routes/sync', json=data)
                 assert response.status_code == 200

diff --git a/microservices/kubeApi/tests/routers/test_bulk_sync_new_route.py b/microservices/kubeApi/tests/routers/test_bulk_sync_new_route.py
@@ -72,7 +72,8 @@ def test_bulk_sync_new_route(client):
                             "name": "wild-ns-example",
                             "selectTag": "ns.EXAMPLE-NS",
                             "dataPlane": "data-plane-1",
-                            "host": "abc.api.gov.bc.ca"
+                            "host": "abc.api.gov.bc.ca",
+                            "sessionCookieEnabled": False
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200

diff --git a/microservices/kubeApi/tests/routers/test_bulk_sync_session_cookie.py b/microservices/kubeApi/tests/routers/test_bulk_sync_session_cookie.py
@@ -0,0 +1,37 @@
+from unittest import mock
+
+def test_bulk_sync(client):
+    with mock.patch("routers.routes.get_gwa_ocp_routes") as call:
+        call.return_value = [{
+            "metadata": {
+                "name": "wild-ns-example",
+                "labels": {
+                    "aps-select-tag": "ns.EXAMPLE-NS",
+                    "aps-template-version": "v1"
+                }
+            },
+            "spec": {
+                "host": "abc.api.gov.bc.ca",
+                "to": {
+                    "name": "data-plane-1"
+                }
+            }
+        }]
+
+
+        with mock.patch("routers.routes.prepare_apply_routes") as call_apply:
+            call_apply.return_value = 0
+
+            with mock.patch("routers.routes.apply_routes") as call_mismatch_routes:
+                call_mismatch_routes.return_value = None
+
+                data = [{
+                    "name": "wild-ns-example",
+                    "selectTag": "ns.EXAMPLE-NS",
+                    "dataPlane": "data-plane-1",
+                    "host": "abc.api.gov.bc.ca",
+                    "sessionCookieEnabled": True
+                }]
+                response = client.post('/namespaces/examplens/routes/sync', json=data)
+                assert response.status_code == 200
+                assert response.json()['message'] == 'synced'