Further support

Author: dlzhry2nhs

.github/workflows/run-e2e-automation-tests.yml

@@ -217,6 +217,7 @@ jobs:
           callback_url: "https://oauth.pstmn.io/v1/callback"
           username: ${{ secrets.CIS2_E2E_USERNAME }}
           scope: "nhs-cis2"
+          sub_environment: ${{ inputs.sub_environment }}
           USE_STATIC_APPS: ${{ inputs.apigee_environment == 'int' && 'True' || 'False' }}
           Postman_Auth_client_Id: ${{ secrets.Postman_Auth_client_Id }} # The following static app values are only needed in INT
           Postman_Auth_client_Secret: ${{ secrets.Postman_Auth_client_Secret }}

tests/e2e_automation/.env.example.static

@@ -37,6 +37,8 @@ callback_url=https://oauth.pstmn.io/v1/callback
 S3_env=internal-qa
 aws_profile_name={your-aws-profile}
 PROXY_NAME=immunisation-fhir-api-internal-qa
+# This will only not match S3_env in preprod, where we have a blue/green environment
+SUB_ENVIRONMENT=internal-qa
 ## Id/Secret values - please contact Dev or Test team to get these values
 username=
 scope=

tests/e2e_automation/features/APITests/status.feature

@@ -8,6 +8,7 @@ Scenario: Verify that the /ping endpoint works
 
 @smoke @sandbox
 Scenario: Verify that the /status endpoint works
+    Given the status API key is available in the given environment
     When I send a request to the status endpoint
     Then The request will be successful with the status code '200'
     And The status response will contain a passing healthcheck

tests/e2e_automation/features/APITests/steps/test_status_steps.py

@@ -2,7 +2,8 @@
 
 import pytest
 import requests
-from pytest_bdd import scenarios, then, when
+from pytest_bdd import given, scenarios, then, when
+from utilities.apigee.apigee_env_helpers import INT_PROXY_NAME, get_proxy_name
 from utilities.context import ScenarioContext
 from utilities.http_requests_session import http_requests_session
 
@@ -11,6 +12,13 @@
 CONNECTION_ABORTED_ERROR_MSG = "<ExceptionInfo ConnectionError(ProtocolError('Connection aborted.', RemoteDisconnected('Remote end closed connection without response'))) tblen=6>"
 
 
+@given("the status API key is available in the given environment")
+def status_api_key_is_available(context: ScenarioContext):
+    """The status API key is available in all environments except for INT/PREPROD"""
+    if get_proxy_name() == INT_PROXY_NAME:
+        pytest.skip("Status API test skipped in INT environment")
+
+
 @when("I send a request to the ping endpoint")
 def send_request_to_ping_endpoint(context: ScenarioContext) -> None:
     context.response = http_requests_session.get(context.baseUrl + "/_ping")

tests/e2e_automation/features/conftest.py

@@ -89,6 +89,7 @@ def context(request, global_context, temp_apigee_apps: list[ApigeeApp] | None) -
         "username",
         "scope",
         "S3_env",
+        "sub_environment",
         "LOCAL_RUN_WITHOUT_S3_UPLOAD",
     ]
     for var in env_vars:

tests/e2e_automation/utilities/batch_S3_buckets.py

@@ -21,7 +21,8 @@ def upload_file_to_S3(context):
 
 def wait_for_file_to_move_archive(context, timeout=120, interval=5):
     s3 = boto3.client("s3")
-    source_bucket = f"immunisation-batch-{context.S3_env}-data-sources"
+    bucket_scope = context.S3_env if context.S3_env != "preprod" else context.sub_environment
+    source_bucket = f"immunisation-batch-{bucket_scope}-data-sources"
     archive_key = f"archive/{context.filename}"
     print(f"Waiting for file in archive: s3://{source_bucket}/{archive_key}")
     elapsed = 0

tests/e2e_automation/utilities/context.py

@@ -36,6 +36,7 @@ def __init__(self):
         self.expected_version = 1
         self.eTag = None
         self.S3_env = None
+        self.sub_environment = None
         self.fileName = None
         self.vaccine_df = None
         self.file_extension = "csv"