Fixes from Copilot review

Author: stevebux

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

@@ -10,6 +10,18 @@ runs:
   using: "composite"
 
   steps:
+    - name: "Set PR NUMBER"
+      id: set_pr_number
+      shell: bash
+      run: |
+        env="${{ inputs.targetEnvironment }}"
+        if [[ "$env" == main ]]; then
+          echo "pr_number=" >> $GITHUB_OUTPUT
+        elif [[ "$env" == pr* ]]; then
+          echo "pr_number=${env#pr}" >> $GITHUB_OUTPUT
+        else
+          echo "pr_number=$env" >> $GITHUB_OUTPUT
+        fi
 
     - name: Determine if proxy has been deployed
       id: check_proxy_deployed

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -295,6 +295,7 @@ trigger_response=$(curl -s -L \
 
 if [[ $? -ne 0 ]]; then
   echo "[ERROR] Failed to trigger workflow. Response: $trigger_response"
+  exit 1
 fi
 
 echo "[INFO] Workflow trigger request sent successfully, waiting for completion..."

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

@@ -207,7 +207,7 @@ jobs:
         with:
           version: "${{ inputs.version }}"
           environment: ${{ needs.pr-create-dynamic-environment.outputs.environment_name }}
-          apimEnv: "${{ inputs.pr_number != '' && 'internal-dev' || '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 }}

tests/e2e-tests/api/headers/test_x_request_id.py

@@ -6,7 +6,6 @@
 
 METHODS = ["get", "post"]
 
-
 @pytest.mark.test
 @pytest.mark.devtest
 @pytest.mark.inttest
@@ -19,8 +18,10 @@ def test_header_letters_endpoint(
     endpoints,
     authentication_secret
 ):
+    auth_header = {"apikey": authentication_secret.value} if authentication_secret.auth_type == "apikey" \
+        else {"Authorization": authentication_secret.value}
     resp = getattr(requests, method)(f"{url}/{endpoints}", headers={
-        "Authorization": authentication_secret.value,
+        **auth_header,
         "X-Request-ID": None
     })
 
@@ -35,8 +36,10 @@ def test_header_mi_endpoint(
     url,
     authentication_secret
 ):
+    auth_header = {"apikey": authentication_secret.value} if authentication_secret.auth_type == "apikey" \
+        else {"Authorization": authentication_secret.value}
     resp = getattr(requests, "post")(f"{url}/{MI_ENDPOINT}", headers={
-        "Authorization": authentication_secret.value,
+        **auth_header,
         "X-Request-ID": ""
     })
 

tests/e2e-tests/lib/authentication.py

@@ -98,6 +98,7 @@ def generate_and_test_new_token(self, api_key, private_key, url, kid, test_url):
             return new_token
 
         print("Could not generate token")
+        raise RuntimeError("Could not generate token")
 
     def generate_new_token(self, api_key, private_key, url, kid):
         pk_pem = None

tests/e2e-tests/lib/generators.py

@@ -1,4 +1,5 @@
 class Generators:
+    @staticmethod
     def generate_valid_create_message_body(environment="sandbox"):
         return {
             "data": {