merge feature/CCM-12997 into my branch

Author: Vlasis-Perdikidis

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

@@ -53,6 +53,15 @@ jobs:
           registry-url: "https://npm.pkg.github.com"
           scope: "@nhsdigital"
 
+      - name: "Set environment"
+        shell: bash
+        run: |
+          if [ "${{ inputs.pr_number }}" != "" ]; then
+            echo "ENVIRONMENT=pr${{ inputs.pr_number }}" >> $GITHUB_ENV
+          else
+            echo "ENVIRONMENT=main" >> $GITHUB_ENV
+          fi
+
       - name: Trigger Acceptance Tests
         shell: bash
         env:
@@ -65,6 +74,6 @@ jobs:
             --infraRepoName "nhs-notify-supplier-api" \
             --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             --overrideProjectName "nhs" \
-            --targetEnvironment "pr${{ inputs.pr_number }}" \
+            --targetEnvironment "$ENVIRONMENT" \
             --targetAccountGroup "nhs-notify-supplier-api-dev" \
             --targetComponent "api"

.gitleaksignore

@@ -24,3 +24,5 @@ debc75a97cfe551a69fd1e8694be483213322a9d:pact-contracts/pacts/letter-rendering/s
 793b2ab7a3e698f5848fbe24d2718f88664ec0fc:.npmrc:npm-access-token:8
 793b2ab7a3e698f5848fbe24d2718f88664ec0fc:.npmrc:github-pat:6
 777eb4047ad06b9e939a292ee18664a0ffee4f29:tests/resources/prepared-letter.json:generic-api-key:4
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:github-pat:7
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:npm-access-token:9

infrastructure/terraform/components/api/variables.tf

@@ -141,12 +141,6 @@ variable "eventpub_control_plane_bus_arn" {
   default     = ""
 }
 
-variable "disable_gateway_execute_endpoint" {
-  type        = bool
-  description = "Disable the execution endpoint for the API Gateway"
-  default     = true
-}
-
 variable "letter_variant_map" {
   type = map(object({ supplierId = string, specId = string }))
   default = {
@@ -156,6 +150,12 @@ variable "letter_variant_map" {
   }
 }
 
+variable "disable_gateway_execute_endpoint" {
+  type        = bool
+  description = "Disable the execution endpoint for the API Gateway"
+  default     = true
+}
+
 variable "core_account_id" {
   type        = string
   description = "AWS Account ID for Core"