Merge branch 'main' into CCM-10160_minorFixes

Author: m-houston

.devcontainer/devcontainer.json

@@ -76,6 +76,9 @@
       "installDockerComposeSwitch": true,
       "moby": true,
       "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/dotnet:2.4.0": {
+      "version": "8.0"
     }
   },
   "mounts": [

.editorconfig

@@ -67,3 +67,6 @@ trim_trailing_whitespace = unset
 indent_style = unset
 indent_size = unset
 generated_code = true
+
+[/internal/events/**/*.schema.json]
+insert_final_newline = unset

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

@@ -49,7 +49,6 @@ runs:
       run: |
         make build VERSION="${{ inputs.version }}"
 
-
     - name: Upload API OAS specification artifact
       uses: actions/upload-artifact@v4
       with:
@@ -86,13 +85,6 @@ runs:
         path: "sdk/csharp"
         name: sdk-csharp-${{ inputs.version }}
 
-    # - name: Upload artifact
-    #   # Automatically uploads an artifact from the './_site' directory by default
-    #   uses: actions/upload-pages-artifact@v3
-    #   with:
-    #     path: "docs/_site/"
-    #     name: jekyll-docs-${{ inputs.version }}
-
     - name: Upload artifact
       uses: actions/upload-pages-artifact@v3
       with:

.github/workflows/cicd-1-pull-request.yaml

@@ -30,7 +30,7 @@ jobs:
       pr_number: ${{ steps.pr_exists.outputs.pr_number }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: "Set CI/CD variables"
         id: variables
         run: |

.github/workflows/cicd-3-deploy.yaml

@@ -37,7 +37,7 @@ jobs:
       # tag: ${{ steps.variables.outputs.tag }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: "Set CI/CD variables"
         id: variables
         run: |
@@ -70,7 +70,7 @@ jobs:
     needs: metadata
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: "Get version"
         id: get-asset-version
@@ -103,7 +103,7 @@ jobs:
         run: |
           gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
           path: artifact.tar

.github/workflows/manual-proxy-environment-deploy.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
 

.github/workflows/pr_closed.yaml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Updating Main Environment
         env:

.github/workflows/pr_create_dynamic_env.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v5
       - name: Trigger dynamic environment creation
         env:
           APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -8,13 +8,17 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: false
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
-  create-dynamic-environment:
+  destroy-dynamic-environment:
     name: Destroy Dynamic Environment
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5.0.0
+      - uses: actions/checkout@v5
 
       - name: Trigger dynamic environment destruction
         env:
@@ -32,3 +36,25 @@ jobs:
             --terraformAction "destroy" \
             --overrideProjectName "nhs" \
             --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
+
+  destroy-dynamic-proxy:
+    name: Destroy Dynamic Proxy
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Trigger dynamic proxy destruction
+        env:
+          APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
+          APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
+        shell: bash
+        run: |
+          .github/scripts/dispatch_internal_repo_workflow.sh \
+          --infraRepoName "nhs-notify-supplier-api" \
+          --releaseVersion "main" \
+          --targetComponent "api" \
+          --targetWorkflow "proxy-destroy.yaml" \
+          --targetEnvironment "pr${{ github.event.number }}" \
+          --apimEnvironment "internal-dev-sandbox" \
+          --boundedContext "notify-supplier"

.github/workflows/release_created.yaml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy Nonprod Environment
         env: