Merge pull request #214 from bcgov/dev

Feature/scheduler fix (#213)

Author: Elson9

microservices/gatewayJobScheduler/app.py

@@ -60,7 +60,7 @@ def _get_certificate_for_host(host, namespace, cert_snis, certs):
 
     for sni in cert_snis:
         if host in sni['name']:
-            cert_id = sni['certificate']
+            cert_id = sni['certificate']['id']
             logger.debug("%s - Found custom cert with SNI match for %s - %s" % (namespace, host, cert_id))
             cert = next((cert for cert in certs if cert['id'] == cert_id), None)
             if cert is None:

microservices/gatewayJobScheduler/tests/test_get_certificate.py

@@ -32,7 +32,9 @@ def test_get_certificate_custom_domain_found():
         "name": "test.custom.gov.bc.ca",
         "id": "79009c9e-0f4d-40b5-9707-bf2fe9f50502",
         "created_at": 1731713874,
-        "certificate": cert_id,
+        "certificate": {
+            "id": cert_id
+        },
         "tags": ["ns.test-ns"]
     }]
 
@@ -47,7 +49,9 @@ def test_get_certificate_custom_domain_sni_not_found():
     namespace = "test-ns"
     cert_snis = [{
         "name": "other.custom.gov.bc.ca",
-        "certificate": "some-cert-id"
+        "certificate": {
+            "id": "some-cert-id"
+        }
     }]
     certs = []
 
@@ -63,7 +67,9 @@ def test_get_certificate_missing_cert():
 
     cert_snis = [{
         "name": host,
-        "certificate": cert_id
+        "certificate": {
+            "id": cert_id
+        }
     }]
     certs = []  # Empty certs list, so cert won't be found
 

microservices/gatewayJobScheduler/tests/test_transform_data_by_ns.py

@@ -122,7 +122,9 @@ def test_happy_transform_data_by_ns_with_custom_domain():
                 "name": "test.custom.gov.bc.ca",
                 "id": "79009c9e-0f4d-40b5-9707-bf2fe9f50502",
                 "created_at": 1731713874,
-                "certificate": "41d14845-669f-4dcd-aff2-926fb32a4b25",
+                "certificate": {
+                    "id": "41d14845-669f-4dcd-aff2-926fb32a4b25"
+                },
                 "tags": [
                     "ns.ns1"
                 ]
@@ -184,7 +186,9 @@ def test_missing_cert_transform_data_by_ns_with_custom_domain(caplog):
                 "name": "other.custom.gov.bc.ca",
                 "id": "79009c9e-0f4d-40b5-9707-bf2fe9f50502",
                 "created_at": 1731713874,
-                "certificate": "41d14845-669f-4dcd-aff2-926fb32a4b25",
+                "certificate": {
+                    "id": "41d14845-669f-4dcd-aff2-926fb32a4b25"
+                },
                 "tags": [
                     "ns.ns1"
                 ]