feat(test): FTRS-1542 Combine automated apim tests into main automated tests

Author: lukeb-nhs

.github/actions/service-automation-apim-test/action.yaml

@@ -23,6 +23,13 @@ inputs:
   ref:
     description: "The branch, tag or SHA to build and deploy from"
     required: false
+  api_name:
+    description: "API name for APIM proxy generation, required if test_type is apim"
+    required: false
+  apim_env:
+    description: "APIM environment for proxy generation, required if test_type is apim"
+    required: false
+
 
 runs:
   using: "composite"
@@ -38,6 +45,8 @@ runs:
         TEST_TYPE: ${{ inputs.test_type }}
         COMMIT_HASH: ${{ inputs.commit_hash }}
         REF: ${{ inputs.ref }}
+        API_NAME: ${{ inputs.api_name }}
+        APIM_ENV: ${{ inputs.apim_env }}
       run: |
         set -euo pipefail
         /bin/bash ./scripts/workflow/service-automation-tests.sh

.github/actions/service-automation-test/action.yaml

@@ -323,10 +323,9 @@ jobs:
             type: "api"
           - tag: "data-migration"
             type: "data-migration"
-          - tag: "apim-dos-search"
+          - tag: "is-apim"
             type: "apim"
             api_name: "dos-search"
-            apim_env: ""
     needs:
       - metadata
       - deploy-application-infrastructure
@@ -352,7 +351,6 @@ jobs:
       test_tag: ${{ matrix.tag }}
       test_type: ${{ matrix.type }}
       api_name: ${{ matrix.api_name || '' }}
-      apim_env: ${{ matrix.type == 'apim' && (needs.metadata.outputs.environment == 'dev' && 'internal-dev' || needs.metadata.outputs.environment == 'test' && 'internal-qa' || needs.metadata.outputs.environment) || '' }}
       type: app
       deployment_type: "development"
     secrets: inherit

.github/workflows/pipeline-deploy-application.yaml

@@ -167,16 +167,22 @@ jobs:
         run: make install
         working-directory: "tests/service_automation"
 
-      - name: Install Python dependencies for JWT
-        if: inputs.test_type == 'apim'
-        shell: bash
-        run: |
-          set -euo pipefail
-          python -m pip install --upgrade pip
-          pip install pyjwt cryptography
+      - name: Authenticate with APIM
+        uses: ./.github/actions/authenticate-apim
+        id: apim-auth
+        with:
+          api_name: ${{ inputs.api_name }}
+          environment: ${{ inputs.environment }}
+          aws_region: ${{ vars.AWS_REGION }}
+
+      - name: Get Apigee access token
+        uses: ./.github/actions/authenticate-apim-pytest
+        with:
+          api_name: ${{ inputs.api_name }}
+          access_token: ${{ steps.apim-auth.outputs.access_token }}
+          proxygen_base_url: ${{ secrets.PROXYGEN_URL }}
 
       - name: Run ${{ inputs.test_tag }} service automation tests
-        if: inputs.test_type != 'apim'
         id: run-service_automation-tests
         uses: ./.github/actions/service-automation-test
         with:
@@ -185,24 +191,11 @@ jobs:
           workspace: ${{ inputs.workspace }}
           test_tag: ${{ inputs.test_tag }}
           test_type: ${{ inputs.test_type }}
+          api_name: ${{ inputs.api_name }}
+          apim_env: ${{ inputs.environment == 'dev' && 'internal-dev' || inputs.environment == 'test' && 'internal-qa' || inputs.environment }}
           commit_hash: ${{ inputs.commit_hash || github.sha }}
           ref: ${{ inputs.ref }}
 
-      - name: Run APIM service automation tests
-        if: inputs.test_type == 'apim'
-        id: run-service_automation-apim-tests
-        uses: ./.github/actions/service-automation-apim-test
-        env:
-          PROXYGEN_URL: ${{ secrets.PROXYGEN_URL }}
-        with:
-          aws_region: ${{ vars.AWS_REGION }}
-          environment: ${{ inputs.environment }}
-          workspace: ${{ inputs.workspace }}
-          api_name: ${{ inputs.api_name }}
-          apim_env: ${{ inputs.apim_env }}
-          commit_hash: ${{ inputs.commit_hash }}
-          tag: ${{ inputs.tag }}
-
       - name: Upload allure report
         if: always()
         id: upload_allure_report