Merge branch 'main' into feature/CCM-12185-addGetMiEndpoint

Author: RossFaulds171

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

@@ -72,19 +72,6 @@ runs:
           echo "TARGET_DOMAIN=suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
         fi
 
-        if [ -z $PR_NUMBER ]
-        then
-          echo "INSTANCE=$PROXYGEN_API_NAME" >> $GITHUB_ENV
-          echo "TARGET=https://main.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=latest" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls" >> $GITHUB_ENV
-        else
-          echo "TARGET=https://pr$PR_NUMBER.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "INSTANCE=$PROXYGEN_API_NAME-PR-$PR_NUMBER" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=pr$PR_NUMBER" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls-pr$PR_NUMBER" >> $GITHUB_ENV
-        fi
-
     - name: Set APIM_ENV
       shell: bash
       run: |

.github/actions/test-types.json

@@ -1,5 +1,4 @@
 [
   "component",
-  "e2e",
-  "sandbox"
+  "e2e"
 ]

specification/api/components/environments/int/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://main.suppliers.nonprod.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: notify-supplier-mtls-int
+  secret: nhs-notify-supplier-mtls-int

specification/api/components/environments/internal-dev-pr/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://suppliers.dev.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: nhs-notify-supplier-mtls
+  secret: nhs-notify-supplier-mtls-internal-dev-prNNN # Will be dynamically set via the proxy-deploy workflow in the internal repo

specification/api/components/environments/internal-dev/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://suppliers.dev.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: nhs-notify-supplier-mtls
+  secret: nhs-notify-supplier-mtls-internal-dev

specification/api/components/environments/ref/target.yml

@@ -3,4 +3,4 @@ healthcheck: /_status
 url: https://main.suppliers.nonprod.nhsnotify.national.nhs.uk
 security:
   type: mtls
-  secret: notify-supplier-mtls-ref
+  secret: nhs-notify-supplier-mtls-ref