Merge branch 'dev' into clinical-reasoning-dep-update

Author: seanmcilvenna

.docker/create-dbs.sql

@@ -6,4 +6,5 @@ IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-notification') CRE
 IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-tenant') CREATE DATABASE [link-tenant];
 IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-validation') CREATE DATABASE [link-validation];
 IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-querydispatch') CREATE DATABASE [link-querydispatch];
-IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-account') CREATE DATABASE [link-account];
+IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-account') CREATE DATABASE [link-account];
+IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'link-submission') CREATE DATABASE [link-submission];

.env

@@ -8,3 +8,8 @@ KAFKA_INTER_BROKER_PASSWORD=controller_password
 AZURITE_CONNECTION_STRING=DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1
 INTERNAL_BLOB_CONTAINER_NAME=internal
 EXTERNAL_BLOB_CONTAINER_NAME=external
+ISSUER_URI=https://oauth.nhsnlink.org/realms/NHSNLink
+
+KafkaConnection__SaslUsername=${KAFKA_SASL_CLIENT_USER}
+KafkaConnection__SaslPassword=${KAFKA_SASL_CLIENT_PASSWORD}
+Redis__Password=${REDIS_PASS}

.github/workflows/deploy-eventcatalog.yml

@@ -3,6 +3,7 @@
 on:
   push:
     branches:
+      - dev
       - tech_debt/ec-docs
 
 permissions:

.github/workflows/pr-title-check.yml

@@ -30,8 +30,8 @@ jobs:
           } else {
             core.setFailed('Cannot determine PR title for validation.')
           }
-          const prTitleExpectedPattern = /(^LNK-\d+:\s)|(^TECH_DEBT:\s)|(^DOCS:\s)/g
-          const prTitleMismatchError = 'Invalid PR title! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title'
+          const prTitleExpectedPattern = /(^LNK-\d+:\s)|(^TECH_DEBT:\s)|(^DOCS:\s)|(^SNYK:\s)|(^Bump\s)/g
+          const prTitleMismatchError = 'Invalid PR title "' + prTitle + '"! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space> or SNYK:<space> or Bump<space>, e.g. LNK-1234: My PR title, or TECH_DEBT or DOCS or SNYK or Bump: My PR title or DOCS: My PR title or [Snyk] My PR title'
           if (!prTitleExpectedPattern.test(prTitle)) {
             // Fail the workflow
             console.log(prTitleMismatchError)

.github/workflows/snyk_pull_request_template.yaml

@@ -0,0 +1,13 @@
+title: "SNYK: {{ snyk_pull_request_type }} for {{ package_name }}"
+description: |
+  {{ #is_upgrade_pr }}
+  This PR has been opened by Snyk to make sure our repositories are kept up-to-date.
+  It updates **{{ package_name }}** from version {{ package_from }} to version {{ package_to }}.
+  Review relevant docs for possible breaking changes.
+  {{ /is_upgrade_pr }}
+  
+  {{ #is_fix_pr }}
+  This PR applies a fix for a vulnerability in **{{ package_name }}**.
+  {{ /is_fix_pr }}
+
+  **Issues Fixed:** {{ issue_count }}

.github/workflows/tests.yaml

@@ -197,6 +197,28 @@ jobs:
           path: ./TestResults/dotnet-unit-test-results.trx
           reporter: dotnet-trx
 
+  docs-build:
+    name: Build Documentation
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ./docs
+
+      - name: Build documentation
+        run: npm run build
+        working-directory: ./docs
+
   java-unit-tests:
     name: Unit Tests for Java
     runs-on: ['ubuntu-latest']

Azure_Pipelines/_deploy_all_services.yml

@@ -26,6 +26,13 @@ variables:
   value: 'nhsnlink-aks'
 - name: nhsn_resourcegroup
   value: 'nhsnlink-rg'
+- name: env
+  ${{ if eq(parameters.environment, 'dev-scale') }}:
+    value:  'dev'
+  ${{ if eq(parameters.environment, 'scale-test') }}:
+    value:  'test'
+  ${{ if eq(parameters.environment, 'scale-qa') }}:
+    value:  'qa'
 
 jobs:
 
@@ -82,58 +89,77 @@ jobs:
         serviceName: account
         repoName: account
         containerName: account
+        healthUrl: https://$(env)-account.nhsnlink.org/health
       admin:
         serviceName: admin
         repoName: admin
         containerName: admin
+        healthUrl: https://$(env)-admin.nhsnlink.org/api/health
       admin-ui:
         serviceName: admin-ui
         repoName: admin-ui
         containerName: admin-ui
+        healthUrl: https://$(env)-admin.nhsnlink.org/
       audit:
         serviceName: audit
         repoName: audit
         containerName: audit
+        healthUrl: https://$(env)-audit.nhsnlink.org/health
       census:
         serviceName: census
         repoName: census
         containerName: census
+        healthUrl: https://$(env)-census.nhsnlink.org/health
       data-acquisition:
         serviceName: data-acquisition
         repoName: dataacquisition
         containerName: data
+        healthUrl: https://$(env)-data.nhsnlink.org/health
       data-acquisition-worker:
         serviceName: data-acquisition-worker
         repoName: dataacquisition-worker
         containerName: data-worker
+        healthUrl: https://$(env)-data.nhsnlink.org/health
       measure-eval:
         serviceName: measure
         repoName: measureeval
         containerName: measure
+        healthUrl: https://$(env)-measure.nhsnlink.org/health
       normalization:
         serviceName: normalization
         repoName: normalization
         containerName: normalization
+        healthUrl: https://$(env)-normalization.nhsnlink.org/health
       query-dispatch:
         serviceName: query-dispatch
         repoName: querydispatch
         containerName: query-dispatch
+        healthUrl: https://$(env)-querydispatch.nhsnlink.org/health
       report:
         serviceName: report
         repoName: report
         containerName: report
+        healthUrl: https://$(env)-report.nhsnlink.org/health
       submission:
         serviceName: submission
         repoName: submission
         containerName: submission
+        healthUrl: https://$(env)-submission.nhsnlink.org/health
       tenant:
         serviceName: tenant
         repoName: tenant
         containerName: tenant
+        healthUrl: https://$(env)-tenant.nhsnlink.org/health
+      terminology:
+        serviceName: terminology
+        repoName: terminology
+        containerName: terminology
+        healthUrl: https://$(env)-terminology.nhsnlink.org/health
       validation:
         serviceName: validation
         repoName: validation
         containerName: validation
+        healthUrl: https://$(env)-validation.nhsnlink.org/health
 
   steps:
     - task: KubeloginInstaller@0
@@ -156,4 +182,25 @@ jobs:
         kubernetesCluster: '$(kube_clustername)'
         namespace: '$(kube_namespace)'
         command: set
-        arguments: 'image -n $(kube_namespace) deployment $(serviceName)-deploy $(containerName)=$(containerRegistry)/link-$(repoName):$(Build.SourceBranchName)-$(GIT_COMMIT)'
+        arguments: 'image -n $(kube_namespace) deployment $(serviceName)-deploy $(containerName)=$(containerRegistry)/link-$(repoName):$(Build.SourceBranchName)-$(GIT_COMMIT)'
+
+    - task: Bash@3
+      displayName: 'Site Validation for $(serviceName)'
+      inputs:
+        targetType: 'inline'
+        script: |
+          echo "Starting health check for app..."
+          URL="$(healthUrl)"
+          
+          for i in {1..20}; do
+            STATUS=$(curl -s -o /dev/null -w "%{http_code}" $URL)
+            if [ "$STATUS" == "200" ]; then
+              echo "Health check succeeded with HTTP $STATUS"
+              exit 0
+            fi
+            echo "Attempt $i: App not healthy yet (HTTP $STATUS)"
+            sleep 10
+          done
+          
+          echo "Application failed health check after 10 attempts."
+          exit 1

Azure_Pipelines/_summarize_delta.yaml

@@ -1,4 +1,4 @@
-name: Deploy_All_Services
+name: Summarize Delta
 
 trigger: none
 

Azure_Pipelines/azure-pipelines.admin-ui.cd.yaml

@@ -35,11 +35,11 @@ variables:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '18.x'
+      versionSpec: '20.x'
     displayName: 'Install Node.js'
 
   - task: Npm@1  
-    displayName: 'Angular CLI 13.2.5'  
+    displayName: 'Angular CLI 20.3.7'  
     inputs:  
       command: custom  
       verbose: false  

Azure_Pipelines/azure-pipelines.census.cd.yaml

@@ -97,28 +97,6 @@ steps:
         $(MyTag)
       buildContext: '$(Build.Repository.LocalPath)'
 
-  - task: DotNetCoreCLI@2
-    displayName: Install dotnet-ef
-    inputs:
-      command: 'custom'
-      custom: 'tool'
-      arguments: 'install --global dotnet-ef'
-
-  # - script: |
-  #    dotnet ef migrations script \
-  #    --idempotent \
-  #    --verbose \
-  #    -c CensusContext \
-  #    -s $(build.sourcesdirectory)/$(project) \
-  #    -p $(build.sourcesdirectory)/$(project) \
-  #    -o $(build.artifactstagingdirectory)/DotNet/Census/Scripts/censusDb.sql
-  #   displayName: Generate SQL Script
-
-  # - task: PublishPipelineArtifact@1
-  #   inputs:
-  #     targetPath: '$(Build.ArtifactStagingDirectory)'
-  #     artifact: 'manifest'
-
   - task: PublishBuildArtifacts@1
     inputs:
       PathtoPublish: '$(Build.ArtifactStagingDirectory)'