Merge branch 'dev' into snyk-upgrade-991dbd867a9fd94e65072e848f59980e

Author: seanmcilvenna

.env

@@ -12,4 +12,6 @@ ISSUER_URI=https://oauth.nhsnlink.org/realms/NHSNLink
 
 KafkaConnection__SaslUsername=${KAFKA_SASL_CLIENT_USER}
 KafkaConnection__SaslPassword=${KAFKA_SASL_CLIENT_PASSWORD}
-Redis__Password=${REDIS_PASS}
+Redis__Password=${REDIS_PASS}
+InternalBlobStorage__BlobContainerName=${INTERNAL_BLOB_CONTAINER_NAME}
+ExternalBlobStorage__BlobContainerName=${EXTERNAL_BLOB_CONTAINER_NAME}

.github/dependabot.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)|(^SNYK:\s)/g
-          const prTitleMismatchError = 'Invalid PR title "' + prTitle + '"! Must begin with LNK-nnnn:<space> or TECH_DEBT:<space> or DOCS:<space> or SNYK:<space>, e.g. LNK-1234: My PR title, or TECH_DEBT: My PR title or DOCS: My PR title or [Snyk] 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)

…orkflows/snyk_pull_request_template.yaml .github/snyk_pull_request_template.yaml.github/workflows/snyk_pull_request_template.yaml renamed to .github/snyk_pull_request_template.yaml .github/workflows/snyk_pull_request_template.yaml renamed to .github/snyk_pull_request_template.yaml

@@ -7,6 +7,8 @@ on:
     branches:
       - dev
       - workflow/**
+      - release/**
+      - hotfix/**
 
 permissions:
   contents: read
@@ -197,28 +199,6 @@ 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']

.github/workflows/deploy-eventcatalog.yml

@@ -52,7 +52,7 @@ public async Task<bool> Execute(AuditEventMessage model, CancellationToken cance
             catch (Exception ex)
             {
                 Activity.Current?.SetStatus(ActivityStatusCode.Error);
-                Activity.Current?.RecordException(ex);
+                Activity.Current?.AddException(ex);
                 _logger.LogAuditEventCreationException(ex.Message, model);
                 throw;
             }              

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

@@ -92,7 +92,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid userId, Cancell
             catch (Exception ex)
             {
                 Activity.Current?.SetStatus(ActivityStatusCode.Error);
-                Activity.Current?.RecordException(ex);
+                Activity.Current?.AddException(ex);
                 _logger.LogDeactivateUserException(userId.ToString(), ex.Message);
                 throw;
             }                  

.github/workflows/tests.yaml

@@ -1,7 +1,7 @@
 using LantanaGroup.Link.Account.Application.Interfaces.Factories.Role;
 using LantanaGroup.Link.Account.Application.Interfaces.Persistence;
 using LantanaGroup.Link.Account.Application.Models.Role;
-using LantanaGroup.Link.Account.Infrastructure;
+using LantanaGroup.Link.Shared.Application.Models;
 using System.Diagnostics;
 
 namespace LantanaGroup.Link.Account.Application.Queries.Role

DotNet/Account/Application/Commands/AuditEvent/CreateAuditEvent.cs

@@ -1,7 +1,7 @@
 using LantanaGroup.Link.Account.Application.Interfaces.Factories.Role;
 using LantanaGroup.Link.Account.Application.Interfaces.Persistence;
 using LantanaGroup.Link.Account.Application.Models.Role;
-using LantanaGroup.Link.Account.Infrastructure;
+using LantanaGroup.Link.Shared.Application.Models;
 using System.Diagnostics;
 
 namespace LantanaGroup.Link.Account.Application.Queries.Role