merge

Author: Namitha-Prabhu

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 /.github/                   @NHSDigital/nhs-notify-supplier-api-admins
 *.code-workspace            @NHSDigital/nhs-notify-supplier-api-admins
 /docs/                      @NHSDigital/nhs-notify-supplier-api
-/infrastructure/terraform/  @NHSDigital/nhs-notify-platform
+/infrastructure/terraform/  @NHSDigital/nhs-notify-platform @NHSDigital/nhs-notify-supplier-api-admins
 
 # Codeowners must be final check
 /.github/CODEOWNERS         @NHSDigital/nhs-notify-code-owners

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

@@ -11,7 +11,7 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 22
     - name: Npm cli install
       working-directory: .
       run: npm ci

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

@@ -11,7 +11,7 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 24
+        node-version: 22
 
     - name: Npm install
       working-directory: .

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

@@ -25,6 +25,9 @@ inputs:
     description: "Name of the Component to deploy"
     required: true
     default: 'api'
+  nodejs_version:
+    description: "Node.js version, set by the CI/CD pipeline workflow"
+    required: true
 
 runs:
   using: composite
@@ -34,7 +37,16 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 24
+        node-version: ${{ inputs.nodejs_version }}
+
+    - name: "Cache node_modules"
+      uses: actions/cache@v4
+      with:
+        path: |
+          **/node_modules
+        key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
 
     - name: Npm install
       working-directory: .

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

@@ -12,7 +12,7 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 24
+        node-version: 22
 
     - name: Npm install
       working-directory: .

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

@@ -11,7 +11,7 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 22
 
     - name: Npm install
       working-directory: .

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

@@ -11,7 +11,7 @@ runs:
       uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 24
+        node-version: 22
 
     - name: Npm install
       working-directory: .

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

@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: 24
+          node-version: 22
 
       - name: Npm install
         working-directory: .

.github/workflows/pr_closed.yaml

@@ -62,3 +62,90 @@ jobs:
             --targetAccountGroup "nhs-notify-supplier-api-dev" \
             --targetComponent "${{ matrix.component }}" \
             --terraformAction "apply"
+
+  check-event-schemas-version-change:
+    name: Check for event schemas package version change
+    needs: check-merge-or-workflow-dispatch
+    if: needs.check-merge-or-workflow-dispatch.outputs.deploy == 'true'
+    outputs:
+      version_changed: ${{ steps.check-version.outputs.version_changed }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+
+      - name: check if local version differs from latest published version
+        id: check-version
+        run: |
+          published_version=$(npm view @nhsdigital/nhs-notify-event-schemas-supplier-api --json 2>/dev/null | jq -r '.["dist-tags"].latest // "null"')
+          echo "Published version: $published_version"
+
+          local_version=$(jq -r '.version' internal/events/package.json)
+          echo "Local version: $local_version"
+
+          if [[ $local_version = $published_version ]]; then
+            echo "Local version is the same as the latest published version - skipping publish"
+            echo "version_changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "Local version is different to the latest published version - publishing new version"
+            echo "version_changed=true" >> $GITHUB_OUTPUT
+          fi
+
+  test-contract:
+    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: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+      - name: "Install dependencies"
+        run: npm ci
+      - name: "Run provider contract tests"
+        run: make test-contract
+        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
+      - test-contract
+    if: needs.check-event-schemas-version-change.outputs.version_changed == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          registry-url: 'https://npm.pkg.github.com'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Publish to GitHub Packages
+        run: npm publish --workspace internal/events
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -228,7 +228,7 @@ jobs:
             echo "changed=true" >> $GITHUB_OUTPUT
           fi
 
-          if content=$(git show origin/main:internal/events/schemas/package.json 2>/dev/null); then
+          if content=$(git show origin/main:internal/events/package.json 2>/dev/null); then
             version=$(jq -r .version <<< $content);
           else
             version=null;
@@ -237,34 +237,33 @@ jobs:
           echo "Detected package version $version in main branch"
           echo "main_version=$version" >> $GITHUB_OUTPUT
 
-  check-schemas-generated:
-    name: Check event schemas have been regenerated
-    needs: detect-event-schema-package-changes
-    if: needs.detect-event-schema-package-changes.outputs.changed == 'true'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-
-      # Simplified caching - template management has more complex caching of installed modules from another build step
-      - name: "Cache node_modules"
-        uses: actions/cache@v4
-        with:
-          path: |
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
-
-      - name: "Re-generate schemas"
-        run: |
-          npm ci --workspace internal/events
-          npm --workspace internal/events run gen:jsonschema
-
-      - name: Check for schema changes
-        run: git diff --quiet internal/events/schemas
+#  check-schemas-generated:
+#    name: Check event schemas have been regenerated
+#    needs: detect-event-schema-package-changes
+#    if: needs.detect-event-schema-package-changes.outputs.changed == 'true'
+#    runs-on: ubuntu-latest
+#    permissions:
+#      contents: read
+#    steps:
+#      - name: "Checkout code"
+#        uses: actions/checkout@v4
+#
+#      - name: "Cache node_modules"
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#            **/node_modules
+#          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
+#          restore-keys: |
+#            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+#
+#      - name: "Re-generate schemas"
+#        run: |
+#          npm ci
+#          npm --workspace internal/events run gen:jsonschema
+#
+#      - name: Check for schema changes
+#        run: git diff --quiet internal/events/schemas
 
   check-schema-version-change:
     name: Check event schema version has been updated