Merge branch 'release'

NHSDigital · Jul 5, 2024 · b4454de · b4454de
2 parents 661e19d + 881d902
commit b4454de
Show file tree

Hide file tree

Showing 130 changed files with 4,387 additions and 2,170 deletions.
diff --git a/azure/azure-build-pipeline.yml b/azure/azure-build-pipeline.yml
@@ -23,7 +23,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 variables:
   - template: project.yml

diff --git a/azure/azure-pr-pipeline.yml b/azure/azure-pr-pipeline.yml
@@ -9,7 +9,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
   pipelines:
   - pipeline: build_pipeline
     source: "Communications-Manager-Build"

diff --git a/azure/azure-release-pipeline.yml b/azure/azure-release-pipeline.yml
@@ -9,7 +9,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
   pipelines:
     - pipeline: build_pipeline
       source: "Communications-Manager-Build"

diff --git a/azure/nightly-int-dev-pipeline.yml b/azure/nightly-int-dev-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-int-qa-pipeline.yml b/azure/nightly-int-qa-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-int-sandbox-pipeline.yml b/azure/nightly-int-sandbox-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-integration-pipeline.yml b/azure/nightly-integration-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-internal-dev-end-to-end-pipeline.yml b/azure/nightly-internal-dev-end-to-end-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-prod-pipeline.yml b/azure/nightly-prod-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-prod-sandbox-pipeline.yml b/azure/nightly-prod-sandbox-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-uat-end-to-end-pipeline.yml b/azure/nightly-uat-end-to-end-pipeline.yml
@@ -15,7 +15,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 2 * * *

diff --git a/azure/nightly-zap-scan-pipeline.yml b/azure/nightly-zap-scan-pipeline.yml
@@ -9,7 +9,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: 0 3 * * *

diff --git a/azure/periodic-mtls-pipeline.yml b/azure/periodic-mtls-pipeline.yml
@@ -9,7 +9,7 @@ resources:
       type: github
       name: NHSDigital/api-management-utils
       ref: refs/heads/edge
-      endpoint: NHSDigital (63)
+      endpoint: NHSDigital
 
 schedules:
   - cron: '*/10 * * * *'

diff --git a/azure/templates/run-tests.yml b/azure/templates/run-tests.yml
@@ -21,10 +21,12 @@ steps:
     parameters:
       secret_file_ids:
       - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
+      - ptl/api-deployment/communications-manager/NON_PROD_PRIVATE_KEY
       - ptl/api-deployment/communications-manager/INTEGRATION_PRIVATE_KEY
       - ptl/azure-devops/communications-manager/PRODUCTION_PRIVATE_KEY
       secret_ids:
       - ptl/app-credentials/communications-manager-testing-app/non-prod/SANDBOX_APP_ID
+      - ptl/api-deployment/communications-manager/NON_PROD_API_KEY
       - ptl/api-deployment/communications-manager/INTEGRATION_API_KEY
       - ptl/azure-devops/communications-manager/PRODUCTION_API_KEY
       - ptl/api-deployment/communications-manager/GUKN_API_KEY
@@ -123,6 +125,8 @@ steps:
           apigee_password: $(APIGEE_PASSWORD)
       - bash: |
           export PROXY_NAME="communications-manager-${{parameters.environment}}"
+          export NON_PROD_PRIVATE_KEY="$(Pipeline.Workspace)/secrets/$(NON_PROD_PRIVATE_KEY)"
+          export NON_PROD_API_KEY="$(NON_PROD_API_KEY)"
           export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
           export APIGEE_APP_ID="$(SANDBOX_APP_ID)"
           export STATUS_ENDPOINT_API_KEY="$(STATUS_ENDPOINT_API_KEY)"
@@ -149,6 +153,8 @@ steps:
         export APIGEE_APP_ID="$(SANDBOX_APP_ID)"
         export STATUS_ENDPOINT_API_KEY="$(STATUS_ENDPOINT_API_KEY)"
         export SOURCE_COMMIT_ID="$(Build.SourceVersion)"
+        export NON_PROD_PRIVATE_KEY="$(Pipeline.Workspace)/secrets/$(NON_PROD_PRIVATE_KEY)"
+        export NON_PROD_API_KEY="$(NON_PROD_API_KEY)"
         export INTEGRATION_PRIVATE_KEY="$(Pipeline.Workspace)/secrets/$(INTEGRATION_PRIVATE_KEY)"
         export INTEGRATION_API_KEY="$(INTEGRATION_API_KEY)"
         export PRODUCTION_PRIVATE_KEY="$(Pipeline.Workspace)/secrets/$(PRODUCTION_PRIVATE_KEY)"