Skip to content

LNK-4436: Terminology service uses Azure App Config (ACA) #1232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanmcilvenna merged 4 commits into from
Nov 6, 2025
Merged

LNK-4436: Terminology service uses Azure App Config (ACA) #1232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
522c04d
* Refactored service to use a single extension for external configura…
seanmcilvenna Nov 4, 2025
958b281
Improving error message on PR Title check to ensure it outputs the PR…
seanmcilvenna Nov 4, 2025
2aad629
Merge branch 'dev' into LNK-4436
seanmcilvenna Nov 4, 2025
ca177e1
Merge branch 'dev' into LNK-4436
seanmcilvenna Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DotNet/Account/Account.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<PackageReference Include="Confluent.Kafka" Version="2.*" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
29 changes: 2 additions & 27 deletions DotNet/Account/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Compliance.Classification;
using Microsoft.Extensions.Compliance.Redaction;
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
using Microsoft.OpenApi.Models;
using Serilog;
using Serilog.Enrichers.Span;
Expand All @@ -58,32 +57,8 @@

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;
}
}
// load external configuration source (if specified)
builder.AddExternalConfiguration(AccountConstants.ServiceName);

//Initialize activity source
var assemblyVersion = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? string.Empty;
Expand Down
1 change: 0 additions & 1 deletion DotNet/Account/Settings/AccountConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ public static class AccountConstants

public static class AppSettingsSectionNames
{
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
public const string DatabaseProvider = "DatabaseProvider";
public const string UserManagement = "UserManagement";
}
Expand Down
1 change: 0 additions & 1 deletion DotNet/Admin.BFF/Admin.BFF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Compliance.Redaction" Version="8.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0-preview" />
<PackageReference Include="Microsoft.Extensions.Telemetry" Version="8.7.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Serilog" Version="4.0.1" />
Expand Down
49 changes: 0 additions & 49 deletions ...et/Admin.BFF/Infrastructure/Extensions/ExternalServices/ExternalConfigurationExtension.cs
View file
Open in desktop

This file was deleted.

13 changes: 2 additions & 11 deletions DotNet/Admin.BFF/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,8 @@
#region Register Services
static void RegisterServices(WebApplicationBuilder builder)
{
// load external configuration source if specified
var externalConfigurationSource = builder.Configuration.GetSection(LinkAdminConstants.AppSettingsSectionNames.ExternalConfigurationSource).Get<string>();
if (!string.IsNullOrEmpty(externalConfigurationSource))
{
builder.AddExternalConfiguration(options =>
{
options.ExternalConfigurationSource = externalConfigurationSource;
options.ExternalConfigurationConnectionString = builder.Configuration.GetConnectionString("AzureAppConfiguration");
options.Environment = builder.Environment;
});
}
// load external configuration source (if specified)
builder.AddExternalConfiguration(LinkAdminConstants.ServiceName);

// Logging using Serilog
builder.Logging.AddSerilog();
Expand Down
3 changes: 0 additions & 3 deletions DotNet/Admin.BFF/Settings/LinkAdminConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ public class LinkAdminConstants

public static class AppSettingsSectionNames
{
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
public const string ServiceInformation = "ServiceInformation";
public const string IdentityProvider = "IdentityProviderConfig";
public const string CORS = "CORS";
public const string Telemetry = "Telemetry";
public const string Serilog = "Serilog";
}

Expand Down
1 change: 0 additions & 1 deletion DotNet/Audit/Audit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
Expand Down
28 changes: 2 additions & 26 deletions DotNet/Audit/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,8 @@

static void RegisterServices(WebApplicationBuilder builder)
{
//load external configuration source if specified
var externalConfigurationSource = builder.Configuration.GetSection(AuditConstants.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("*", AuditConstants.ServiceName)
// Load configuration values for service name and environment
.Select("*", AuditConstants.ServiceName + ":" + builder.Environment.EnvironmentName);

options.ConfigureKeyVault(kv =>
{
kv.SetCredential(new DefaultAzureCredential());
});

});
break;
}
}
// load external configuration source (if specified)
builder.AddExternalConfiguration(AuditConstants.ServiceName);

var serviceInformation = builder.Configuration.GetRequiredSection(AuditConstants.AppSettingsSectionNames.ServiceInformation).Get<ServiceInformation>();
if (serviceInformation != null)
Expand Down
4 changes: 1 addition & 3 deletions DotNet/Audit/Settings/AuditConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ public class AuditConstants

public static class AppSettingsSectionNames
{
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
public const string ServiceInformation = "ServiceInformation";
public const string DatabaseProvider = "DatabaseProvider";
public const string IdentityProvider = "IdentityProviderConfig";
public const string DatabaseProvider = "DatabaseProvider";
public const string Serilog = "Serilog";
}

Expand Down
1 change: 0 additions & 1 deletion DotNet/Census/Application/Settings/CensusConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ public static class AppSettings
{
public const string ServiceInformation = "ServiceInformation";
public const string DatabaseProvider = "DatabaseProvider";
public const string ExternalConfigurationSource = "ExternalConfigurationSource";
}

public static class Scheduler
Expand Down
1 change: 0 additions & 1 deletion DotNet/Census/Census.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<PackageReference Include="Confluent.Kafka" Version="2.*" />
<PackageReference Include="Grpc.AspNetCore" Version="2.*" />
<PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.*" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.3" />
Expand Down
25 changes: 2 additions & 23 deletions DotNet/Census/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,8 @@

static void RegisterServices(WebApplicationBuilder builder)
{
// Load external configuration source if specified
var externalConfigurationSource = builder.Configuration.GetSection(CensusConstants.AppSettings.ExternalConfigurationSource).Get<string>();

if (!string.IsNullOrEmpty(externalConfigurationSource))
{
switch (externalConfigurationSource)
{
case "AzureAppConfiguration":
builder.Configuration.AddAzureAppConfiguration(options =>
{
options.Connect(builder.Configuration.GetConnectionString("AzureAppConfiguration"))
.Select("*", LabelFilter.Null)
.Select("*", CensusConstants.ServiceName)
.Select("*", CensusConstants.ServiceName + ":" + builder.Environment.EnvironmentName);

options.ConfigureKeyVault(kv =>
{
kv.SetCredential(new DefaultAzureCredential());
});
});
break;
}
}
// load external configuration source (if specified)
builder.AddExternalConfiguration(CensusConstants.ServiceName);

var serviceInformation = builder.Configuration.GetRequiredSection(CensusConstants.AppSettings.ServiceInformation).Get<ServiceInformation>();
if (serviceInformation != null)
Expand Down
1 change: 0 additions & 1 deletion DotNet/DataAcquisition.Domain/DataAcquisition.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
<PackageReference Include="PemUtils" Version="3.*" />
<PackageReference Include="Portable.BouncyCastle" Version="1.*" />
<PackageReference Include="Serilog.AspNetCore" Version="8.*" />
Expand Down
51 changes: 3 additions & 48 deletions DotNet/DataAcquisition.Domain/Extensions/GeneralStartupExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,12 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using OpenTelemetry.Trace;
using Serilog;
using Serilog.Enrichers.Span;
using Serilog.Settings.Configuration;
using System.Diagnostics;
using System.Net;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Interfaces;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Services.Auth;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Models.Kafka;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Services.FhirApi;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Validators;
using FluentValidation;
using Microsoft.Extensions.Hosting;
using LantanaGroup.Link.Shared.Domain.Repositories.Interceptors;
using LantanaGroup.Link.Shared.Domain.Repositories.Interfaces;
using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Entities;
using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure;
using LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Context;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Queries;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Managers;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Models.Domain;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Services.FhirApi.Commands;
using LantanaGroup.Link.DataAcquisition.Domain.Application.Serializers;

namespace LantanaGroup.Link.DataAcquisition.Domain.Extensions;
Expand All @@ -68,7 +52,9 @@ public static void RegisterAll(
string serviceName,
bool? configureRedis = false)
{
builder.Configuration.RegisterAzureConfigService(builder.Environment, serviceName);
// load external configuration source (if specified)
builder.AddExternalConfiguration(serviceName);

builder.Configuration.RegisterMonitoring(builder.Logging, builder.Services);
builder.Services.RegisterConfigs(builder.Configuration);
builder.RegisterEntityFramework();
Expand All @@ -90,37 +76,6 @@ public static void RegisterAll(
builder.Services.RegisterProblemDetails((Microsoft.Extensions.Hosting.IHostingEnvironment)builder.Environment);
}

public static void RegisterAzureConfigService(this IConfigurationManager configuration, IWebHostEnvironment environment, string serviceName)
{
//load external configuration source if specified
var externalConfigurationSource = configuration.GetSection(DataAcquisitionConstants.AppSettingsSectionNames.ExternalConfigurationSource).Get<string>();

if (!string.IsNullOrEmpty(externalConfigurationSource))
{
switch (externalConfigurationSource)
{
case ("AzureAppConfiguration"):
configuration.AddAzureAppConfiguration(options =>
{
options.Connect(configuration.GetConnectionString("AzureAppConfiguration"))
// Load configuration values with no label
.Select("*", LabelFilter.Null)
// Load configuration values for service name
.Select("*", serviceName)
// Load configuration values for service name and environment
.Select("*", serviceName + ":" + environment.EnvironmentName);

options.ConfigureKeyVault(kv =>
{
kv.SetCredential(new DefaultAzureCredential());
});

});
break;
}
}
}

public static void RegisterMonitoring(this IConfigurationManager configuration, ILoggingBuilder logging, IServiceCollection services)
{
// Logging using Serilog
Expand Down
Loading
Loading