Merge branch 'main' into LNK-2159-Shared-Add-SQL-Persistence

.github/workflows/autocomment-on-pr-shared.yaml

@@ -19,8 +19,8 @@ jobs:
       run: |
         # Use GitHub API to create a comment on the PR
         PR_NUMBER=${{ github.event.pull_request.number }}
-        COMMENT="****THERE IS A NEW VERSIONING APPROACH TO VERSIONING OF THE SHARED PROJECT*****\nPlease refere here for guidance: https://lantana.atlassian.net/wiki/spaces/LSD/pages/493322243/Shared+NuGet+Project+Versioning+and+Releases"
+        COMMENT="****THERE IS A NEW APPROACH TO VERSIONING OF THE SHARED PROJECT*****\nPlease refer here for guidance: https://lantana.atlassian.net/wiki/spaces/LSD/pages/493322243/Shared+NuGet+Project+Versioning+and+Releases"
         GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
         COMMENT_URL="https://api.github.com/repos/${{ github.repository }}/issues/${PR_NUMBER}/comments"
 
-        curl -s -H "Authorization: token ${GITHUB_TOKEN}" -X POST $COMMENT_URL -d "{\"body\":\"$COMMENT\"}"
+        curl -s -H "Authorization: token ${GITHUB_TOKEN}" -X POST $COMMENT_URL -d "{\"body\":\"$COMMENT\"}"

Account/Account.csproj

@@ -21,13 +21,15 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.*" />
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="com.lantanagroup.link.Shared" Version="2024.3.14.3" />
+    <PackageReference Include="Azure.Identity" Version="1.10.4" />
+    <PackageReference Include="com.lantanagroup.link.Shared" Version="2.*" />
     <PackageReference Include="Confluent.Kafka" Version="2.*" />
     <PackageReference Include="Confluent.Kafka.Extensions.OpenTelemetry" Version="0.*" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.*" />
     <PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.*" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="8.*" />
     <PackageReference Include="Microsoft.AspNetCore.Grpc.Swagger" Version="0.*" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.*" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.*" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />

Account/Program.cs

@@ -1,3 +1,4 @@
+using Azure.Identity;
 using Confluent.Kafka.Extensions.OpenTelemetry;
 using HealthChecks.UI.Client;
 using LantanaGroup.Link.Account.Domain.Entities;
@@ -8,6 +9,7 @@
 using LantanaGroup.Link.Shared.Application.Models.Configs;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.Configuration.AzureAppConfiguration;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
@@ -32,6 +34,34 @@
 
 static void RegisterServices(WebApplicationBuilder builder)
 {
+    //load external configuration source if specified
+    var externalConfigurationSource = builder.Configuration.GetSection(AccountConstants.AppSettingsSectionNames.ExternalConfigurationSource).Get<string>();
+
+    if (!string.IsNullOrEmpty(externalConfigurationSource))
+    {
+        switch (externalConfigurationSource)
+        {
+            case ("AzureAppConfiguration"):
+                builder.Configuration.AddAzureAppConfiguration(options =>
+                {
+                    options.Connect(builder.Configuration.GetConnectionString("AzureAppConfiguration"))
+                            // Load configuration values with no label
+                            .Select("*", LabelFilter.Null)
+                            // Load configuration values for service name
+                            .Select("*", AccountConstants.ServiceName)
+                            // Load configuration values for service name and environment
+                            .Select("*", AccountConstants.ServiceName + ":" + builder.Environment.EnvironmentName);
+
+                    options.ConfigureKeyVault(kv =>
+                    {
+                        kv.SetCredential(new DefaultAzureCredential());
+                    });
+
+                });
+                break;
+        }
+    }
+
     var serviceInformation = builder.Configuration.GetRequiredSection(AccountConstants.AppSettingsSectionNames.ServiceInformation).Get<ServiceInformation>();
     if (serviceInformation != null)
     {

Account/Settings/AccountConstants.cs

@@ -2,7 +2,7 @@
 {
     public static class AccountConstants
     {
-        public const string ServiceName = "Account Service";
+        public const string ServiceName = "Account";
 
         public static class AppSettingsSectionNames
         {
@@ -11,6 +11,7 @@ public static class AppSettingsSectionNames
             public const string Postgres = "Postgres";
             public const string Telemetry = "TelemetryConfig";
             public const string TenantApiSettings = "TenantApiSettings";
+            public const string ExternalConfigurationSource = "ExternalConfigurationSource";
         }
     }
 }

Account/appsettings.Development.json

@@ -13,6 +13,20 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
+  "Kestrel": {
+    "Endpoints": {
+      "http": {
+        "Url": "http://localhost:7221"
+      },
+      "https": {
+        "Url": "https://localhost:7222"
+      },
+      "Grpc": {
+        "Url": "http://localhost:7223",
+        "Protocols": "Http2"
+      }
+    }
+  },
   "TenantApiSettings": {
     "TenantServiceBaseEndpoint": "https://localhost:7332/api/",
     "CheckIfTenantExists": true,

Account/appsettings.json

@@ -25,20 +25,6 @@
     "TelemetryCollectorEndpoint": "http://localhost:4317"
   },
   "AllowedHosts": "*",
-  "Kestrel": {
-    "Endpoints": {
-      "http": {
-        "Url": "http://localhost:7221"
-      },
-      "https": {
-        "Url": "https://localhost:7222"
-      },
-      "Grpc": {
-        "Url": "http://localhost:7223",
-        "Protocols": "Http2"
-      }
-    }
-  },
   "Serilog": {
     "Using": [
       "Serilog.Sinks.Grafana.Loki"

Audit/Audit.csproj

@@ -23,7 +23,7 @@
 
   <ItemGroup>
 	<PackageReference Include="Azure.Identity" Version="1.10.4" />
-	<PackageReference Include="com.lantanagroup.link.Shared" Version="2024.3.14.3" />
+	<PackageReference Include="com.lantanagroup.link.Shared" Version="2.*" />
 	<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
 	<PackageReference Include="Confluent.Kafka.Extensions.OpenTelemetry" Version="0.3.0" />
 	<PackageReference Include="Grpc.AspNetCore" Version="2.61.0" />

Azure_Pipelines/azure-pipelines.account.cd.yaml

@@ -18,6 +18,8 @@ variables:
   value: 'AccountUnitTests/AccountUnitTests.csproj'
 - name: nugetPath
   value: 'Account/nuget.config'
+- name: serviceName
+  value: 'Account'
 - name: tags1
   value: 'latest'
 - name: tags2
@@ -26,6 +28,9 @@ variables:
   value: 'link-account'
 - name: dockerPath
   value: '**/Account/Dockerfile'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
+
 steps:
   - template: ../azure-nuget-package-source.yml
   - task: DotNetCoreCLI@2
@@ -53,7 +58,7 @@ steps:
     displayName: "Build & Push Account Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.audit.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/Audit/Dockerfile'
 - name: serviceName
   value: 'Audit'  
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Audit Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.census.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/Census/Dockerfile'
 - name: serviceName
   value: 'Census'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Census Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/DataAcquisition/Dockerfile'
 - name: serviceName
   value: 'DataAcquisition'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push DataAcquisition Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.gateway.cd.yaml

@@ -17,6 +17,7 @@ variables:
     $(Build.BuildId)
   registry-repo-Name: 'link-api-gw'
   dockerPath: '**/DemoApiGateway/Dockerfile'
+  containerRegistry: 'NHSNLink ACR Premium'
 
 steps:
   - task: PowerShell@2
@@ -73,7 +74,7 @@ steps:
     displayName: "Build & Push DemoApiGateway Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.measureeval.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/MeasureEval/Dockerfile'
 - name: serviceName
   value: 'MeasureEval'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push MeasureEval Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.normalization.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/Normalization/Dockerfile'
 - name: serviceName
   value: 'Normalization'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Normalization Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)

Azure_Pipelines/azure-pipelines.notification.cd.yaml

@@ -28,6 +28,8 @@ variables:
   value: '**/Notification/Dockerfile'
 - name: serviceName
   value: 'Notification'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Notification Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)