Merge branch 'main' into feature/test-data-variations

Author: masl2

.github/actions/build-oas-spec/action.yml

@@ -46,18 +46,24 @@ runs:
       run: npm ci
       shell: bash
 
-    - name: Build ${{ inputs.apimEnv }} oas
+    - name: Build OAS File
       working-directory: .
       env:
         APIM_ENV: ${{ inputs.apimEnv }}
       shell: bash
       run: |
         if [ ${{ env.APIM_ENV }} == "internal-dev-sandbox" ] && [ ${{ inputs.buildSandbox }} == true ]
         then
-          echo "Building sandbox OAS spec"
+          echo "Building JSON sandbox OAS spec"
           make build-json-oas-spec APIM_ENV=sandbox
+
+          echo "Building YML sandbox OAS spec"
+          make build-yml-oas-spec APIM_ENV=sandbox
         else
-          echo "Building env specific OAS spec"
+          echo "Building env specific JSON OAS spec"
+          make build-json-oas-spec APIM_ENV=${{ env.APIM_ENV }}
+
+          echo "Building env specific YML OAS spec"
           make build-yml-oas-spec APIM_ENV=${{ env.APIM_ENV }}
         fi
 

.github/actions/trivy-iac/action.yaml

@@ -8,7 +8,8 @@ runs:
       run: |
         components_exit_code=0
         modules_exit_code=0
-
+        asdf plugin add trivy || true
+        asdf install trivy || true
         ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/components || components_exit_code=$?
         ./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/modules || modules_exit_code=$?
 

.github/actions/trivy-package/action.yaml

@@ -7,7 +7,8 @@ runs:
       shell: bash
       run: |
         exit_code=0
-
+        asdf plugin add trivy || true
+        asdf install trivy || true
         ./scripts/terraform/trivy-scan.sh --mode package . || exit_code=$?
 
         if [ $exit_code -ne 0 ]; then

.github/workflows/release_created.yaml

@@ -2,7 +2,14 @@ name: Github Release Created
 
 on:
   release:
-    types: ["published"] # Inherits all input defaults
+    types: ["released"] # Inherits all input defaults
+  workflow_dispatch:
+    inputs:
+      releaseVersion:
+        description: Release, tag, branch, or commit ID to be used for deployment
+        required: false
+        default: "main"
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,7 +34,7 @@ jobs:
           APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
         run: |
           bash .github/scripts/dispatch_internal_repo_workflow.sh \
-            --releaseVersion "${{ github.event.release.tag_name }}" \
+            --releaseVersion "${{ github.event.release.tag_name || inputs.releaseVersion }}" \
             --targetWorkflow "dispatch-deploy-static-notify-supplier-api-env.yaml" \
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-supplier-api-nonprod" \
@@ -58,5 +65,5 @@ jobs:
           environment: "main"
           apimEnv: "int"
           runId: "${{ github.run_id }}"
-          releaseVersion: "${{ github.event.release.tag_name }}"
+          releaseVersion: "${{ github.event.release.tag_name || inputs.releaseVersion }}"
           isRelease: true

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

@@ -1,5 +1,8 @@
 name: "Commit stage"
 
+permissions:
+  contents: read
+
 on:
   workflow_call:
     inputs:
@@ -166,13 +169,6 @@ jobs:
         uses: actions/checkout@v4
       - name: "Setup ASDF"
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
-      - name: "Repo setup"
-        uses: ./.github/actions/node-install
-        with:
-          node-version: ${{ inputs.nodejs_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: "Perform Setup"
-        uses: ./.github/actions/setup
       - name: "Trivy IaC Scan"
         uses: ./.github/actions/trivy-iac
   trivy-package:
@@ -188,13 +184,6 @@ jobs:
         uses: actions/checkout@v4
       - name: "Setup ASDF"
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
-      - name: "Repo setup"
-        uses: ./.github/actions/node-install
-        with:
-          node-version: ${{ inputs.nodejs_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: "Perform Setup"
-        uses: ./.github/actions/setup
       - name: "Trivy Package Scan"
         uses: ./.github/actions/trivy-package
   count-lines-of-code:

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

@@ -75,6 +75,8 @@ jobs:
     name: "Unit tests"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5
@@ -149,6 +151,8 @@ jobs:
     name: "Linting"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5
@@ -180,6 +184,8 @@ jobs:
     name: "Typecheck"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5

.gitleaksignore

@@ -22,3 +22,6 @@ e12407e09151898bfd8d049d57eee9db9977d56b:.github/copilot-instructions.md:generic
 82f6be3e657b46d8447e77cdc1894fba0b855c26:tests/component-tests/testCases/create-letter-request.spec.ts:generic-api-key:10
 debc75a97cfe551a69fd1e8694be483213322a9d:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10
 777eb4047ad06b9e939a292ee18664a0ffee4f29:tests/resources/prepared-letter.json:generic-api-key:4
+4fa1923947bbff2387218d698d766cbb7c121a0f:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:npm-access-token:9
+d005112adcfd286c3bef076214836dbb2fe8d0b5:.npmrc:github-pat:7

Makefile

@@ -103,6 +103,9 @@ config:: _install-dependencies version # Configure development environment (main
 test-component:
 	(cd tests && npm install && npm run test:component)
 
+test-performance:
+	(cd tests && npm install && npm run test:performance)
+
 version:
 	rm -f .version
 	make version-create-effective-file dir=.

VERSION

@@ -1 +1 @@
-1.0.1-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}
+1.1.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash}

docs/package.json

@@ -14,6 +14,8 @@
     "build": "JEKYLL_ENV=production bundle exec jekyll build --trace --config _config.yml,_config.version.yml",
     "debug": "JEKYLL_ENV=development BUNDLE_GEMFILE=Gemfile bundle exec jekyll serve --config _config.yml,_config.dev.yml,_config.version.yml --limit_posts 100 --trace",
     "generate-includes": "./generate-includes.sh",
+    "lint": "echo \"Documentation module has no code to lint\"",
+    "lint:fix": "echo \"Documentation module has no code to lint\"",
     "test:unit": "echo \"Documentation module has no unit tests\"",
     "typecheck": "echo \"Documentation module has no typescript to typecheck\""
   },