Merge remote-tracking branch 'origin/main' into feature/CCM-11164-rc-api-post

Author: alexnuttall

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

@@ -11,6 +11,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
   cancel-in-progress: false
 
+permissions:
+  id-token: write
+  contents: write
+  packages: read
 
 jobs:
   metadata:
@@ -77,9 +81,23 @@ jobs:
           export DOES_PULL_REQUEST_EXIST="${{ steps.pr_exists.outputs.does_pull_request_exist }}"
           export IS_VERSION_PRERELEASE="${{ steps.variables.outputs.is_version_prerelease }}"
           make list-variables
+
+  dependencies:
+    name: Install / cache dependencies
+    needs: [metadata]
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/[email protected]
+      - name: "Install / cache node_modules"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
+          skip_restore: true
+
   commit-stage: # Recommended maximum execution time is 2 minutes
     name: "Commit stage"
-    needs: [metadata]
+    needs: [metadata, dependencies]
     uses: ./.github/workflows/stage-1-commit.yaml
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
@@ -92,7 +110,7 @@ jobs:
     secrets: inherit
   test-stage: # Recommended maximum execution time is 5 minutes
     name: "Test stage"
-    needs: [metadata, commit-stage]
+    needs: [metadata, dependencies, commit-stage]
     uses: ./.github/workflows/stage-2-test.yaml
     with:
       build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
@@ -105,7 +123,7 @@ jobs:
     secrets: inherit
   acceptance-stage: # Recommended maximum execution time is 10 minutes
     name: "Acceptance stage"
-    needs: [metadata, test-stage]
+    needs: [metadata, dependencies, test-stage]
     uses: ./.github/workflows/stage-4-acceptance.yaml
     if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened')) || (github.event_name == 'push' && github.ref == 'refs/heads/main')
     secrets: inherit

.github/workflows/pr_closed.yaml

@@ -99,9 +99,29 @@ jobs:
             echo "version_changed=true" >> $GITHUB_OUTPUT
           fi
 
+  test-contract-provider:
+    name: "Test contracts (provider)"
+    needs: check-event-schemas-version-change
+    if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: "Checkout code"
+        uses: actions/[email protected]
+      - name: "Install dependencies"
+        run: npm ci
+      - name: "Run provider contract tests"
+        run: make test-contract-provider
+        env:
+          GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   publish-event-schemas:
     name: Publish event schemas package to GitHub package registry
-    needs: check-event-schemas-version-change
+    needs:
+      - check-event-schemas-version-change
+      - test-contract-provider
     if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
     runs-on: ubuntu-latest
     permissions:

.github/workflows/stage-1-commit.yaml

@@ -72,7 +72,7 @@ jobs:
     needs: detect-terraform-changes
     if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
     permissions:
-        contents: write
+      contents: write
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
@@ -149,7 +149,7 @@ jobs:
   trivy:
     name: "Trivy Scan"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     needs: detect-terraform-changes
     if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
     steps:
@@ -248,8 +248,10 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v4
 
-      - name: Install dependencies
-        run: npm ci
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
 
       - name: Re-generate schemas
         run: npm --workspace packages/event-schemas run generate-json-schemas

.github/workflows/stage-2-test.yaml

@@ -41,19 +41,6 @@ permissions:
   contents: read  # This is required for actions/checkout
 
 jobs:
-  install-dependencies:
-    name: "Install dependencies"
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/[email protected]
-      - name: "Restore node_modules from cache"
-        uses: ./.github/actions/node-modules-cache
-        with:
-          node_version: "${{ inputs.nodejs_version }}"
-          skip_restore: true
-
   discover-workspaces:
     runs-on: ubuntu-latest
     outputs:
@@ -70,7 +57,6 @@ jobs:
     name: "Check generated dependencies"
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
@@ -87,7 +73,7 @@ jobs:
     name: "Unit tests"
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [install-dependencies, discover-workspaces]
+    needs: [discover-workspaces]
     strategy:
       fail-fast: false
       matrix:
@@ -130,7 +116,6 @@ jobs:
     name: "Linting"
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
@@ -149,7 +134,6 @@ jobs:
     name: "Typecheck"
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
@@ -164,6 +148,25 @@ jobs:
         run: |
           make test-typecheck
 
+  test-contract-provider:
+    name: "Test contracts (provider)"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: "Checkout code"
+        uses: actions/[email protected]
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
+      - name: "Run provider contract tests"
+        run: make test-contract-provider
+        env:
+          GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
   merge-coverage:
     name: "Merge coverage"
     runs-on: ubuntu-latest
@@ -195,26 +198,26 @@ jobs:
           name: code-coverage-report
           path: .reports/lcov.info
 
-  perform-static-analysis:
-    name: "Perform static analysis"
-    needs: [test-unit, merge-coverage]
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/[email protected]
-        with:
-          fetch-depth: 0 # Full history is needed to improving relevancy of reporting
-      - name: "Download coverage report for SONAR"
-        uses: actions/download-artifact@v5
-        with:
-          name: code-coverage-report
-      - name: "Perform static analysis"
-        uses: ./.github/actions/perform-static-analysis
-        with:
-          sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
-          sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
-          sonar_token: "${{ secrets.SONAR_TOKEN }}"
+  # perform-static-analysis:
+  #   name: "Perform static analysis"
+  #   needs: [test-unit, merge-coverage]
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     id-token: write
+  #     contents: read
+  #   timeout-minutes: 5
+  #   steps:
+  #     - name: "Checkout code"
+  #       uses: actions/[email protected]
+  #       with:
+  #         fetch-depth: 0 # Full history is needed to improving relevancy of reporting
+  #     - name: "Download coverage report for SONAR"
+  #       uses: actions/download-artifact@v5
+  #       with:
+  #         name: code-coverage-report
+  #     - name: "Perform static analysis"
+  #       uses: ./.github/actions/perform-static-analysis
+  #       with:
+  #         sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
+  #         sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
+  #         sonar_token: "${{ secrets.SONAR_TOKEN }}"

.gitleaksignore

@@ -7,3 +7,4 @@ b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:15
 b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25
+306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92

frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap

@@ -1,9 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage 1`] = `
+exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignId field when campaignIds is not available 1`] = `
 <LetterTemplateForm
+  campaignIds={
+    [
+      "campaign-id",
+    ]
+  }
+  initialState={
+    {
+      "campaignId": "campaign-id",
+      "language": "en",
+      "letterType": "x0",
+      "name": "",
+      "templateType": "LETTER",
+    }
+  }
+/>
+`;
+
+exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignIds field when available 1`] = `
+<LetterTemplateForm
+  campaignIds={
+    [
+      "campaign-id",
+      "other-campaign-id",
+    ]
+  }
   initialState={
     {
+      "campaignId": "",
       "language": "en",
       "letterType": "x0",
       "name": "",