fix kube-api tests

Author: rustyjux

microservices/gatewayJobScheduler/app.py

@@ -35,7 +35,7 @@ def transform_data_by_ns(routes, certs):
 
                 for host in route_obj['hosts']:
                     # Look for a matching certificate by SNI for custom domains
-                    cert_id = None
+                    cert_id = 'default'
                     custom_cert_found = False
                     if is_host_custom_domain(host):
                         logger.debug("%s - Searching for custom cert for %s" % (namespace, host))
@@ -54,7 +54,7 @@ def transform_data_by_ns(routes, certs):
                                                "sessionCookieEnabled": session_cookie_enabled,
                                                "dataClass": data_class,
                                                "dataPlane": os.getenv('DATA_PLANE'),
-                                               "customCertificateId": cert_id})
+                                               "sslCertificateId": cert_id})
         return ns_dict
     except Exception as err:
         traceback.print_exc()

microservices/gatewayJobScheduler/tests/test_transform_data_by_ns.py

@@ -16,7 +16,7 @@ def test_happy_transform_data_by_ns():
             }
         ]
         certs = []
-        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": null, "dataPlane": "test-dp", "customCertificateId": null}]}'
+        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": null, "dataPlane": "test-dp", "sslCertificateId": "default"}]}'
 
 def test_happy_transform_data_by_ns_with_override_session_cookie():
     with mock.patch('clients.namespace.admin_api') as mock_admin_api:
@@ -32,7 +32,7 @@ def test_happy_transform_data_by_ns_with_override_session_cookie():
             }
         ]
         certs = []
-        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": true, "dataClass": null, "dataPlane": "test-dp", "customCertificateId": null}]}'
+        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": true, "dataClass": null, "dataPlane": "test-dp", "sslCertificateId": "default"}]}'
 
 def test_happy_transform_data_by_ns_with_override_data_plane():
     with mock.patch('clients.namespace.admin_api') as mock_admin_api:
@@ -48,7 +48,7 @@ def test_happy_transform_data_by_ns_with_override_data_plane():
             }
         ]
         certs = []
-        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": "high", "dataPlane": "test-dp", "customCertificateId": null}]}'
+        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.api.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.api.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": "high", "dataPlane": "test-dp", "sslCertificateId": "default"}]}'
 
 def test_happy_transform_data_by_ns_with_custom_domain():
     with mock.patch('clients.namespace.admin_api') as mock_admin_api:
@@ -76,7 +76,7 @@ def test_happy_transform_data_by_ns_with_custom_domain():
                 "key": "KEY"
             }
         ]
-        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.custom.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.custom.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": null, "dataPlane": "test-dp", "customCertificateId": "41d14845-669f-4dcd-aff2-926fb32a4b25"}]}'
+        assert json.dumps(transform_data_by_ns(routes, certs)) == '{"ns1": [{"name": "wild-ns-ns1-test.custom.gov.bc.ca", "selectTag": "ns.ns1", "host": "test.custom.gov.bc.ca", "sessionCookieEnabled": false, "dataClass": null, "dataPlane": "test-dp", "sslCertificateId": "41d14845-669f-4dcd-aff2-926fb32a4b25"}]}'
 
 
 def set_mock_admin_api_response(dt):

microservices/kubeApi/clients/ocp_routes.py

@@ -182,7 +182,7 @@ def prepare_apply_routes(ns, select_tag, hosts, root_path, data_plane, ns_templa
 
             # Modified certificate selection logic
             ssl_ref = "tls"
-            cert_id = ''
+            custom_cert_label= ''
             custom_cert_found = False
 
             if is_host_custom_domain(host):

microservices/kubeApi/routers/routes.py

@@ -44,6 +44,8 @@ class BulkSyncRequest(BaseModel):
     sessionCookieEnabled: bool
     # Data class for Emerald Cluster routes
     dataClass: str
+    # SSL Certificate ID for custom domains
+    sslCertificateId: str
 
 
 @router.put("/namespaces/{namespace}/routes", status_code=201, dependencies=[Depends(verify_credentials)])
@@ -176,7 +178,7 @@ async def verify_and_create_routes(namespace: str, request: Request):
                 "dataPlane": route["spec"]["to"]["name"],
                 "sessionCookieEnabled": True if route["metadata"]["labels"].get("aps-template-version") == "v1" else False,
                 "dataClass": route["metadata"]["annotations"].get("aviinfrasetting.ako.vmware.com/name").split("-")[-1] if route["metadata"]["annotations"].get("aviinfrasetting.ako.vmware.com/name") else None,
-                "customCertificateId": route["metadata"]["labels"].get("aps-certificate-id")
+                "sslCertificateId": route["metadata"]["labels"].get("aps-certificate-id", "default")
             }
         )
 
@@ -267,7 +269,7 @@ def in_list(match, list):
     return False
 
 def build_ref(v):
-    return "%s%s%s%s%s%s" % (v['name'], v['selectTag'], v['host'], v['dataPlane'], v['sessionCookieEnabled'], v['dataClass'], v['customCertificateId'])
+    return f"{v['name']}{v['selectTag']}{v['host']}{v['dataPlane']}{v['sessionCookieEnabled']}{v['dataClass']}{v['sslCertificateId']}"
 
 def in_list_by_name(match, list):
     for item in list:

microservices/kubeApi/tests/routers/test_add_route.py

@@ -21,6 +21,7 @@
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v2"
+
 spec:
   host: abc.api.gov.bc.ca
   port:

microservices/kubeApi/tests/routers/test_add_route_override.py

@@ -19,6 +19,7 @@
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v1"
+
 spec:
   host: abc.api.gov.bc.ca
   port:
@@ -105,6 +106,7 @@ def test_add_route_override_session_cookie(client):
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v2"
+
 spec:
   host: abc.api.gov.bc.ca
   port:

microservices/kubeApi/tests/routers/test_bulk_sync.py

@@ -33,7 +33,8 @@ def test_bulk_sync(client):
                     "dataPlane": "data-plane-1",
                     "host": "abc.api.gov.bc.ca",
                     "sessionCookieEnabled": False,
-                    "dataClass": None
+                    "dataClass": None,
+                    "sslCertificateId": "default"
                 }]
                 response = client.post('/namespaces/examplens/routes/sync', json=data)
                 assert response.status_code == 200
@@ -80,7 +81,8 @@ def test_bulk_sync_change_host(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": False,
-                            "dataClass": None
+                            "dataClass": None,
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200

microservices/kubeApi/tests/routers/test_bulk_sync_new_route.py

@@ -21,6 +21,7 @@
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v2"
+
 spec:
   host: abc.api.gov.bc.ca
   port:
@@ -75,7 +76,8 @@ def test_bulk_sync_new_route(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": False,
-                            "dataClass": None
+                            "dataClass": None,
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200

microservices/kubeApi/tests/routers/test_bulk_sync_override.py

@@ -32,7 +32,8 @@ def test_bulk_sync_no_change(client):
                     "dataPlane": "data-plane-1",
                     "host": "abc.api.gov.bc.ca",
                     "sessionCookieEnabled": True,
-                    "dataClass": None
+                    "dataClass": None,
+                    "sslCertificateId": "default"
                 }]
                 response = client.post('/namespaces/examplens/routes/sync', json=data)
                 assert response.status_code == 200
@@ -56,6 +57,7 @@ def test_bulk_sync_no_change(client):
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v1"
+
 spec:
   host: abc.api.gov.bc.ca
   port:
@@ -109,7 +111,8 @@ def test_bulk_sync_new_route_session_cookie(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": True,
-                            "dataClass": None
+                            "dataClass": None,
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200
@@ -154,7 +157,8 @@ def test_bulk_sync_change_session_cookie(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": True,
-                            "dataClass": None
+                            "dataClass": None,
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200
@@ -182,6 +186,7 @@ def test_bulk_sync_change_session_cookie(client):
     aps-ssl: "data-api.tls"
     aps-data-plane: "data-plane-1"
     aps-template-version: "v2"
+
 spec:
   host: abc.api.gov.bc.ca
   port:
@@ -236,7 +241,8 @@ def test_bulk_sync_new_route_data_class(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": False,
-                            "dataClass": "high"
+                            "dataClass": "high",
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200
@@ -281,7 +287,8 @@ def test_bulk_sync_add_data_class(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": False,
-                            "dataClass": "high"
+                            "dataClass": "high",
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200
@@ -328,7 +335,8 @@ def test_bulk_sync_remove_data_class(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": True,
-                            "dataClass": None
+                            "dataClass": None,
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200
@@ -375,7 +383,8 @@ def test_bulk_sync_change_data_class(client):
                             "dataPlane": "data-plane-1",
                             "host": "abc.api.gov.bc.ca",
                             "sessionCookieEnabled": False,
-                            "dataClass": "high"
+                            "dataClass": "high",
+                            "sslCertificateId": "default"
                         }]
                         response = client.post('/namespaces/examplens/routes/sync', json=data)
                         assert response.status_code == 200