Merge remote-tracking branch 'origin/main' into feature/CCM-15256-invalid-attachment-received-event

Author: ScottFullerton-NHSE

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

@@ -15,7 +15,7 @@ on:
 permissions:
   id-token: write
   contents: write
-  packages: read
+  packages: write
 
 jobs:
   metadata:

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

@@ -146,6 +146,48 @@ jobs:
             src/**/coverage.xml
             utils/**/coverage.xml
             lambdas/**/coverage.xml
+  test-contract:
+    name: "Contract tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 4
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+      - uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Install dependencies"
+        run: npm ci --ignore-scripts
+      - name: "Cache generated dependencies"
+        id: schema-cache
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: |
+            schemas/digital-letters/
+            output/digital-letters/
+            src/digital-letters-events/types/
+            src/digital-letters-events/validators/
+            src/digital-letters-events/digital_letters_events/models/
+            src/digital-letters-events/guard-functions/
+          key: generated-deps-${{ runner.os }}-${{ hashFiles('src/cloudevents/**', 'src/typescript-schema-generator/**', 'src/python-schema-generator/**') }}
+      - name: "Generate dependencies"
+        if: steps.schema-cache.outputs.cache-hit != 'true'
+        run: |
+          npm run generate-dependencies
+      - name: "Run contract test suite"
+        run: |
+          make test-contract
+      - name: "Upload generated contracts"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: pact-contracts
+          path: "tests/pact-tests/.pacts"
+          include-hidden-files: true
+
   test-lint:
     name: "Linting"
     runs-on: ubuntu-latest

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

@@ -22,19 +22,6 @@ on:
         type: string
 
 jobs:
-  test-contract:
-    name: "Contract test"
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
-      - name: "Run contract test"
-        run: |
-          make test-contract
-      - name: "Save result"
-        run: |
-          echo "Nothing to save"
   test-security:
     name: "Security test"
     runs-on: ubuntu-latest

.github/workflows/stage-5-publish.yaml

@@ -40,21 +40,36 @@ jobs:
     name: "Publish packages"
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    permissions:
+      contents: write
+      packages: write
 
     steps:
       - name: "Checkout code"
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+      - uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ github.token }}
       - name: "Get artifacts: jekyll docs"
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           path: ./artifacts/jekyll-docs-${{ inputs.version }}
           name: jekyll-docs-${{ inputs.version }}
-
       - name: "Get artifacts: schema"
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           path: ./artifacts/schemas-${{ inputs.version }}
           name: schemas-${{ inputs.version }}
+      - name: "Get artifacts: pact contracts"
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
+        with:
+          path: ./pact-contracts/pacts
+          name: pact-contracts
+      - name: "Publish pact contracts package"
+        run: |
+          export BRANCH_NAME=${GITHUB_HEAD_REF:-$(echo $GITHUB_REF | sed 's#refs/heads/##')}
+          scripts/publish-pact-contracts.sh
 
 
       - name: Draft Release

.gitignore

@@ -57,6 +57,8 @@ coverage.xml
 *.coverage
 coverage/
 coverage-*/
+**/.pacts
+/pact-contracts/pacts
 **/playwright-report
 **/test-results
 plugin-cache

docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.1)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -14,15 +14,15 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.2)
     cgi (0.5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     csv (3.3.5)
     drb (2.2.3)
     em-websocket (0.5.3)
@@ -66,7 +66,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jekyll (4.4.1)
       addressable (~> 2.4)
@@ -112,7 +112,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.15.2)
+    json (2.19.4)
     just-the-docs (0.10.1)
       jekyll (>= 3.8.5)
       jekyll-include-cache
@@ -130,22 +130,24 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
     mercenary (0.4.0)
-    minitest (5.26.0)
-    nokogiri (1.18.10-aarch64-linux-gnu)
+    minitest (6.0.4)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    nokogiri (1.19.2-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-aarch64-linux-musl)
+    nokogiri (1.19.2-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-gnu)
+    nokogiri (1.19.2-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-musl)
+    nokogiri (1.19.2-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm64-darwin)
+    nokogiri (1.19.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-darwin)
+    nokogiri (1.19.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-musl)
+    nokogiri (1.19.2-x86_64-linux-musl)
       racc (~> 1.4)
     parallel (1.27.0)
     parser (3.3.10.0)
@@ -154,7 +156,7 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     prism (1.6.0)
-    public_suffix (6.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -202,7 +204,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
-    uri (1.1.0)
+    uri (1.1.1)
     webrick (1.9.1)
 
 PLATFORMS
@@ -234,4 +236,4 @@ DEPENDENCIES
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.6.9
+   2.4.1

eslint.config.mjs

@@ -224,6 +224,12 @@ export default defineConfig([
       'import-x/no-relative-packages': 0,
     },
   },
+  {
+    files: ['tests/pact-tests/**'],
+    rules: {
+      'no-relative-import-paths/no-relative-import-paths': 0,
+    },
+  },
   {
     files: ['scripts/**'],
     rules: {