From ff86f42321bb78165ad61746b2375ea8bf3ddd19 Mon Sep 17 00:00:00 2001 From: Sam Ainsworth Date: Mon, 11 Aug 2025 12:59:22 +0100 Subject: [PATCH 1/3] fix: update Service Bus connection string handling in configuration --- .../RetrievePDSDemographic/Program.cs | 2 +- .../RetrievePDSDemographicConfig.cs | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs index 89ae9a09f1..3aec6ea56d 100644 --- a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs +++ b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs @@ -25,7 +25,7 @@ }) .AddJwtTokenSigning(config.UseFakePDSServices) .AddTelemetry() - .AddServiceBusClient(config.ServiceBusConnectionString) + .AddServiceBusClient(config.EffectiveServiceBusConnectionString) .AddHttpClient(config.UseFakePDSServices) .Build(); diff --git a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs index f1a8eb9f22..2b8c5b3970 100644 --- a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs +++ b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs @@ -1,6 +1,7 @@ namespace NHS.CohortManager.DemographicServices; using System.ComponentModel.DataAnnotations; +using Microsoft.Extensions.Configuration; public class RetrievePDSDemographicConfig { @@ -28,4 +29,28 @@ public class RetrievePDSDemographicConfig public required bool UseFakePDSServices { get; set; } = false; public string ClientId { get; set; } = string.Empty; + + [ConfigurationKeyName("ServiceBusConnectionString_client_internal")] + public string? ServiceBusConnectionStringClientInternal { get; set; } + + [Required] + public string EffectiveServiceBusConnectionString + { + get + { + if (!string.IsNullOrWhiteSpace(ServiceBusConnectionString)) + { + return ServiceBusConnectionString; + } + + if (!string.IsNullOrWhiteSpace(ServiceBusConnectionStringClientInternal)) + { + return ServiceBusConnectionStringClientInternal; + } + + throw new InvalidOperationException( + "Missing Service Bus connection string. " + + "Set ServiceBusConnectionString or ServiceBusConnectionString_client_internal."); + } + } } From 15d1e910464cfb57810155a0687268c42aabd22c Mon Sep 17 00:00:00 2001 From: Sam Ainsworth Date: Mon, 11 Aug 2025 15:40:38 +0100 Subject: [PATCH 2/3] fix: update Service Bus connection string configuration in RetrievePDSDemographic - explicitly matching name without decorator --- .../RetrievePDSDemographic/Program.cs | 2 +- .../RetrievePDSDemographicConfig.cs | 30 ++----------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs index 3aec6ea56d..15be570d58 100644 --- a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs +++ b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/Program.cs @@ -25,7 +25,7 @@ }) .AddJwtTokenSigning(config.UseFakePDSServices) .AddTelemetry() - .AddServiceBusClient(config.EffectiveServiceBusConnectionString) + .AddServiceBusClient(config.ServiceBusConnectionString_client_internal) .AddHttpClient(config.UseFakePDSServices) .Build(); diff --git a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs index 2b8c5b3970..e68a1b8ee1 100644 --- a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs +++ b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs @@ -1,11 +1,9 @@ namespace NHS.CohortManager.DemographicServices; using System.ComponentModel.DataAnnotations; -using Microsoft.Extensions.Configuration; public class RetrievePDSDemographicConfig { - [Required] public required string RetrievePdsParticipantURL { get; set; } @@ -24,33 +22,9 @@ public class RetrievePDSDemographicConfig [Required] public required string ParticipantManagementTopic { get; set; } - [Required] - public required string ServiceBusConnectionString { get; set; } + public string ServiceBusConnectionString_client_internal { get; set; } public required bool UseFakePDSServices { get; set; } = false; - public string ClientId { get; set; } = string.Empty; - [ConfigurationKeyName("ServiceBusConnectionString_client_internal")] - public string? ServiceBusConnectionStringClientInternal { get; set; } - - [Required] - public string EffectiveServiceBusConnectionString - { - get - { - if (!string.IsNullOrWhiteSpace(ServiceBusConnectionString)) - { - return ServiceBusConnectionString; - } - - if (!string.IsNullOrWhiteSpace(ServiceBusConnectionStringClientInternal)) - { - return ServiceBusConnectionStringClientInternal; - } - - throw new InvalidOperationException( - "Missing Service Bus connection string. " + - "Set ServiceBusConnectionString or ServiceBusConnectionString_client_internal."); - } - } + public string ClientId { get; set; } = string.Empty; } From d20ac130e542d745ff2e585937738ebd056dd72e Mon Sep 17 00:00:00 2001 From: Sam Ainsworth Date: Mon, 11 Aug 2025 15:53:12 +0100 Subject: [PATCH 3/3] fix: revert changes from main merge, added required tag to ServiceBusConnectionString_client_internal --- .../RetrievePDSDemographicConfig.cs | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs index 570438e572..7df609c4c1 100644 --- a/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs +++ b/application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographicConfig.cs @@ -23,33 +23,10 @@ public class RetrievePDSDemographicConfig [Required] public required string ParticipantManagementTopic { get; set; } - public string ServiceBusConnectionString_client_internal { get; set; } + [Required] + public required string ServiceBusConnectionString_client_internal { get; set; } public required bool UseFakePDSServices { get; set; } = false; public string ClientId { get; set; } = string.Empty; - - [ConfigurationKeyName("ServiceBusConnectionString_client_internal")] - public string? ServiceBusConnectionStringClientInternal { get; set; } - - [Required] - public string EffectiveServiceBusConnectionString - { - get - { - if (!string.IsNullOrWhiteSpace(ServiceBusConnectionString)) - { - return ServiceBusConnectionString; - } - - if (!string.IsNullOrWhiteSpace(ServiceBusConnectionStringClientInternal)) - { - return ServiceBusConnectionStringClientInternal; - } - - throw new InvalidOperationException( - "Missing Service Bus connection string. " + - "Set ServiceBusConnectionString or ServiceBusConnectionString_client_internal."); - } - } }