Re-enable end-to-end tests, sourcing status endpoint from github secret, rather than fetching from APIM

Author: stevebux

.github/actions/e2e-tests/action.yml

@@ -19,4 +19,5 @@ runs:
         export PROXY_NAME=nhs-notify-supplier--internal-dev--nhs-notify-supplier
         export API_ENVIRONMENT=internal-dev
         export NON_PROD_PRIVATE_KEY="${GITHUB_WORKSPACE}/internal-dev-test-1.pem"
+        export STATUS_ENDPOINT_API_KEY="${STATUS_ENDPOINT_API_KEY}"
         make .internal-dev-test

.github/workflows/stage-4-acceptance.yaml

@@ -90,11 +90,10 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: "Run e2e tests"
-        #uses: ./.github/actions/e2e-tests
+        uses: ./.github/actions/e2e-tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NON_PROD_API_KEY: ${{ secrets.NON_PROD_API_KEY }}
           INTERNAL_DEV_TEST_PEM: ${{ secrets.INTERNAL_DEV_TEST_PEM }}
+          STATUS_ENDPOINT_API_KEY: ${{ secrets.STATUS_ENDPOINT_API_KEY }}
         shell: bash
-        run: |
-          echo "E2E tests are currently disabled. See CCM-14778"

Makefile

@@ -131,6 +131,7 @@ ${VERBOSE}.SILENT: \
 #####################
 
 TEST_CMD := APIGEE_ACCESS_TOKEN="$(APIGEE_ACCESS_TOKEN)" \
+	STATUS_ENDPOINT_API_KEY="$(STATUS_ENDPOINT_API_KEY)" \
 	PYTHONPATH=. poetry run pytest --disable-warnings -vv \
 	--color=yes \
 	-n 4 \

tests/e2e-tests/api/test_endpoint.py

@@ -1,22 +1,19 @@
 import pytest
 import requests
-from os import getenv
 from lib.errorhandler import ErrorHandler
-
-def _get(url, headers=None, timeout=10):
-    return requests.get(url, headers=headers or {}, timeout=timeout)
+from lib.fixtures import *  # NOSONAR
 
 @pytest.mark.smoketest
-def test_ping(nhsd_apim_proxy_url):
-    resp = requests.get(nhsd_apim_proxy_url + "/_ping")
+def test_ping(url):
+    resp = requests.get(url + "/_ping")
     assert resp.status_code == 200
 
 @pytest.mark.smoketest
 @pytest.mark.sandboxtest
 @pytest.mark.devtest
-def test_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
+def test_status(url, status_endpoint_api_key):
     resp = requests.get(
-        f"{nhsd_apim_proxy_url}/_status", headers=status_endpoint_auth_headers
+        f"{url}/_status", headers={"apikey": status_endpoint_api_key}
     )
 
     ErrorHandler.handle_retry(resp)
@@ -25,9 +22,9 @@ def test_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
 @pytest.mark.smoketest
 @pytest.mark.sandboxtest
 @pytest.mark.devtest
-def test_401_status_without_api_key(nhsd_apim_proxy_url):
+def test_401_status_without_api_key(url):
     resp = requests.get(
-        f"{nhsd_apim_proxy_url}/_status"
+        f"{url}/_status"
     )
 
     ErrorHandler.handle_retry(resp)

tests/e2e-tests/lib/fixtures.py

@@ -62,3 +62,33 @@ def bearer_token(authentication_cache):
     else:
         url = f"https://{environment}.api.service.nhs.uk/nhs-notify-supplier"
     return authentication_cache.generate_authentication(environment, url)
+
+@pytest.fixture(scope='session')
+def status_endpoint_api_key():
+    """
+    Fetch the API key used to authenticate against the /_status endpoint.
+    Checks STATUS_ENDPOINT_API_KEY env var first, then falls back to
+    retrieving it from the mock-jwks proxy using NON_PROD_API_KEY.
+    """
+    import requests
+
+    key = os.environ.get("STATUS_ENDPOINT_API_KEY", "")
+    if key:
+        return key
+
+    environment = os.environ["API_ENVIRONMENT"]
+    non_prod_api_key = os.environ["NON_PROD_API_KEY"]
+
+    if environment == "prod":
+        mock_jwks_base = "https://api.service.nhs.uk"
+    elif environment == "ref":
+        mock_jwks_base = "https://internal-dev.api.service.nhs.uk"
+    else:
+        mock_jwks_base = f"https://{environment}.api.service.nhs.uk"
+
+    resp = requests.get(
+        f"{mock_jwks_base}/mock-jwks/status-endpoint-api-key",
+        headers={"apikey": non_prod_api_key},
+    )
+    resp.raise_for_status()
+    return resp.text