Move letter-rendering schemas from standards repo

Author: m-houston

.editorconfig

@@ -29,3 +29,6 @@ trim_trailing_whitespace = unset
 indent_style = unset
 indent_size = unset
 generated_code = true
+
+[/cloudevents/schemas/**/*.schema.json]
+insert_final_newline = unset

.github/CODEOWNERS

@@ -1,21 +1,17 @@
 # NHS Notify Code Owners
 
 # Notify default owners
-*                           @NHSDigital/nhs-notify-repository-template
+*                           @NHSDigital/nhs-notify-admins
 
-/.github/                   @NHSDigital/nhs-notify-repository-template-admins
-*.code-workspace            @NHSDigital/nhs-notify-repository-template-admins
+/.github/                   @NHSDigital/nhs-notify-admins
+*.code-workspace            @NHSDigital/nhs-notify-admins
 /infrastructure/terraform/  @NHSDigital/nhs-notify-platform
 
 # Codeowners must be final check
 /.github/CODEOWNERS         @NHSDigital/nhs-notify-code-owners
 /CODEOWNERS                 @NHSDigital/nhs-notify-code-owners
 
 
-# Each NHS Notify repository should have clear code owners set.
-# Do not use GitHub team names, instead use the GitHub usernames
-# of the people who are responsible for the code maintenance.
-
 # This is a comment.
 # Each line is a file pattern followed by one or more owners.
 

.github/scripts/dispatch_internal_repo_workflow.sh

@@ -87,59 +87,6 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-if [[ -z "$APP_PEM_FILE" ]]; then
-  echo "[ERROR] PEM_FILE environment variable is not set or is empty."
-  exit 1
-fi
-
-if [[ -z "$APP_CLIENT_ID" ]]; then
-  echo "[ERROR] CLIENT_ID environment variable is not set or is empty."
-  exit 1
-fi
-
-now=$(date +%s)
-iat=$((${now} - 60)) # Issues 60 seconds in the past
-exp=$((${now} + 600)) # Expires 10 minutes in the future
-
-b64enc() { openssl base64 | tr -d '=' | tr '/+' '_-' | tr -d '\n'; }
-
-header_json='{
-    "typ":"JWT",
-    "alg":"RS256"
-}'
-# Header encode
-header=$( echo -n "${header_json}" | b64enc )
-
-payload_json="{
-    \"iat\":${iat},
-    \"exp\":${exp},
-    \"iss\":\"${APP_CLIENT_ID}\"
-}"
-# Payload encode
-payload=$( echo -n "${payload_json}" | b64enc )
-
-# Signature
-header_payload="${header}"."${payload}"
-signature=$(
-    openssl dgst -sha256 -sign <(echo -n "${APP_PEM_FILE}") \
-    <(echo -n "${header_payload}") | b64enc
-)
-
-# Create JWT
-JWT="${header_payload}"."${signature}"
-
-INSTALLATION_ID=$(curl -X GET \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: Bearer ${JWT}" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    --url "https://api.github.com/app/installations" | jq -r '.[0].id')
-
-PR_TRIGGER_PAT=$(curl --request POST \
-  --url "https://api.github.com/app/installations/${INSTALLATION_ID}/access_tokens" \
-  -H "Accept: application/vnd.github+json" \
-  -H "Authorization: Bearer ${JWT}" \
-  -H "X-GitHub-Api-Version: 2022-11-28" | jq -r '.token')
-
 # Set default values if not provided
 if [[ -z "$PR_TRIGGER_PAT" ]]; then
   echo "[ERROR] PR_TRIGGER_PAT environment variable is not set or is empty."

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

@@ -11,6 +11,14 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: false
+
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   metadata:
     name: "Set CI/CD metadata"
@@ -27,15 +35,16 @@ jobs:
       version: ${{ steps.variables.outputs.version }}
       is_version_prerelease: ${{ steps.variables.outputs.is_version_prerelease }}
       does_pull_request_exist: ${{ steps.pr_exists.outputs.does_pull_request_exist }}
+      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: |
           datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
           BUILD_DATETIME=$datetime make version-create-effective-file dir=.
-          version=$(head -n 1 .version 2> /dev/null || echo unknown)
+          version=$(jq -r '.version' package.json 2> /dev/null || echo unknown)
           echo "build_datetime_london=$(TZ=Europe/London date --date=$datetime +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
           echo "build_datetime=$datetime" >> $GITHUB_OUTPUT
           echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
@@ -53,12 +62,18 @@ jobs:
         run: |
           branch_name=${GITHUB_HEAD_REF:-$(echo $GITHUB_REF | sed 's#refs/heads/##')}
           echo "Current branch is '$branch_name'"
-          if gh pr list --head $branch_name | grep -q .; then
-            echo "Pull request exists"
+
+          pr_json=$(gh pr list --head "$branch_name" --state open --json number --limit 1)
+          pr_number=$(echo "$pr_json" | jq -r '.[0].number // empty')
+
+          if [[ -n "$pr_number" ]]; then
+            echo "Pull request exists: #$pr_number"
             echo "does_pull_request_exist=true" >> $GITHUB_OUTPUT
+            echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
           else
             echo "Pull request doesn't exist"
             echo "does_pull_request_exist=false" >> $GITHUB_OUTPUT
+            echo "pr_number=" >> $GITHUB_OUTPUT
           fi
       - name: "List variables"
         run: |

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

@@ -37,18 +37,19 @@ 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: |
           datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
+          version=$(jq -r '.version' package.json 2> /dev/null || echo unknown)
           echo "build_datetime=$datetime" >> $GITHUB_OUTPUT
           echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
           echo "build_epoch=$(date --date=$datetime -u +'%s')" >> $GITHUB_OUTPUT
           echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
+          echo "version=$(echo $version)" >> $GITHUB_OUTPUT
           # echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
       - name: "List variables"
         run: |
@@ -62,54 +63,54 @@ jobs:
           # export TAG="${{ steps.variables.outputs.tag }}"
           make list-variables
 
-  deploy-jekyll:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: metadata
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-
-      - name: "Get version"
-        id: get-asset-version
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if [[ ${{inputs.include_prereleases}} == true ]]; then
-            json=$(gh release list --json tagName --limit 1 --exclude-drafts)
-          else
-            json=$(gh release list --json tagName --limit 1 --exclude-drafts --exclude-pre-releases)
-          fi
-
-          echo $json
-
-          release_version=$(echo $json | (jq -r '.[0].tagName'))
-          if [[ $release_version == null ]]; then exit 1; else echo $release_version; fi
-
-          if [[ ${{inputs.version}} == latest ]]; then
-            echo release_version=$(echo $release_version) >> $GITHUB_OUTPUT
-          else
-            echo release_version=$(echo ${{inputs.version}}) >> $GITHUB_OUTPUT
-          fi
-
-      - name: "Get release version"
-        id: download-asset
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
-          path: artifact.tar
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
-        with:
-          artifact_name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
+#  deploy-jekyll:
+#    environment:
+#      name: github-pages
+#      url: ${{ steps.deployment.outputs.page_url }}
+#    runs-on: ubuntu-latest
+#    needs: metadata
+#    steps:
+#      - name: "Checkout code"
+#        uses: actions/checkout@v5
+#
+#      - name: "Get version"
+#        id: get-asset-version
+#        shell: bash
+#        env:
+#          GH_TOKEN: ${{ github.token }}
+#        run: |
+#          if [[ ${{inputs.include_prereleases}} == true ]]; then
+#            json=$(gh release list --json tagName --limit 1 --exclude-drafts)
+#          else
+#            json=$(gh release list --json tagName --limit 1 --exclude-drafts --exclude-pre-releases)
+#          fi
+#
+#          echo $json
+#
+#          release_version=$(echo $json | (jq -r '.[0].tagName'))
+#          if [[ $release_version == null ]]; then exit 1; else echo $release_version; fi
+#
+#          if [[ ${{inputs.version}} == latest ]]; then
+#            echo release_version=$(echo $release_version) >> $GITHUB_OUTPUT
+#          else
+#            echo release_version=$(echo ${{inputs.version}}) >> $GITHUB_OUTPUT
+#          fi
+#
+#      - name: "Get release version"
+#        id: download-asset
+#        shell: bash
+#        env:
+#          GH_TOKEN: ${{ github.token }}
+#        run: |
+#          gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar
+#
+#      - uses: actions/upload-artifact@v4
+#        with:
+#          name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
+#          path: artifact.tar
+#
+#      - name: Deploy to GitHub Pages
+#        id: deployment
+#        uses: actions/deploy-pages@v4
+#        with:
+#          artifact_name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}