Tidy up

Author: stevebux

.github/actions/build-proxies/action.yml

@@ -113,7 +113,6 @@ runs:
           --targetComponent "${{ inputs.targetComponent }}" \
           --targetWorkflow "proxy-deploy.yaml" \
           --targetEnvironment "${{ inputs.environment }}" \
-          --internalRef "feature/CCM-14778" \
           --runId "${{ inputs.runId }}" \
           --buildSandbox ${{ inputs.buildSandbox }} \
           --apimEnvironment "${{ env.APIM_ENV }}" \

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -6,7 +6,7 @@
 #   ./dispatch_internal_repo_workflow.sh \
 #     --infraRepoName <repo> \
 #     --releaseVersion <version> \
-#     --targetWorkflow "deploy.yaml" \
+#     --targetWorkflow <workflow.yaml> \
 #     --targetEnvironment <env> \
 #     --targetComponent <component> \
 #     --targetAccountGroup <group> \
@@ -285,23 +285,16 @@ echo "[INFO] Triggering workflow '$targetWorkflow' in nhs-notify-internal..."
 echo "[DEBUG] Dispatch event payload: $DISPATCH_EVENT"
 
 trigger_response=$(curl -s -L \
-  -w "\nHTTP_STATUS:%{http_code}" \
+  --fail \
   -X POST \
   -H "Accept: application/vnd.github+json" \
   -H "Authorization: Bearer ${PR_TRIGGER_PAT}" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
   "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/$targetWorkflow/dispatches" \
   -d "$DISPATCH_EVENT" 2>&1)
 
-http_status=$(echo "$trigger_response" | grep "HTTP_STATUS:" | cut -d: -f2)
-body=$(echo "$trigger_response" | grep -v "HTTP_STATUS:")
-
-echo "[DEBUG] HTTP status: $http_status"
-echo "[DEBUG] Response body: $body"
-
-if [[ "$http_status" -lt 200 || "$http_status" -ge 300 ]]; then
-  echo "[ERROR] Failed to trigger workflow. HTTP $http_status. Response: $body"
-  exit 1
+if [[ $? -ne 0 ]]; then
+  echo "[ERROR] Failed to trigger workflow. Response: $trigger_response"
 fi
 
 echo "[INFO] Workflow trigger request sent successfully, waiting for completion..."

.github/workflows/stage-3-build.yaml

@@ -189,8 +189,8 @@ jobs:
             --terraformAction "apply" \
             --overrideProjectName "nhs" \
             --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
-  artefact-proxy:
-    name: "Build proxy"
+  artefact-proxies:
+    name: "Build proxies"
     runs-on: ubuntu-latest
     if: always() && !failure() && inputs.deploy_proxy == 'true'
     needs: [artefact-oas-spec, pr-create-dynamic-environment]
@@ -207,7 +207,7 @@ jobs:
         with:
           version: "${{ inputs.version }}"
           environment: ${{ needs.pr-create-dynamic-environment.outputs.environment_name }}
-          apimEnv: "internal-dev-pr"
+          apimEnv: "${{ inputs.pr_number != '' && 'internal-dev' || 'internal-dev-pr' }}"
           runId: "${{ github.run_id }}"
           buildSandbox: true
           releaseVersion: ${{ github.head_ref || github.ref_name }}

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

@@ -77,7 +77,6 @@ jobs:
             --targetWorkflow "dispatch-contextual-tests-dynamic-env.yaml" \
             --infraRepoName "nhs-notify-supplier-api" \
             --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
-            --internalRef "feature/CCM-14778" \
             --overrideProjectName "nhs" \
             --targetEnvironment "$ENVIRONMENT" \
             --targetAccountGroup "nhs-notify-supplier-api-dev" \

tests/e2e-tests/lib/authentication.py

@@ -16,12 +16,12 @@ def __init__(self):
         self.consecutive_tests = 4
 
         # Number of seconds before trying a test again
-        self.time_between_tests = 0
+        self.time_between_tests = 10
 
         # Number of attempts before giving up. It can take up to 5 minutes for the
         # addition of a product to an application to take effect.
         # time_between_tests * max_tests = 300 seconds = 5 minutes.
-        self.max_tests = 1
+        self.max_tests = 30
 
         # How long the token will stay valid
         self.token_validity = 180