Update client service bus options

Energinet-DataHub · Nov 19, 2024 · 898cded · 898cded
1 parent aeb6d12
commit 898cded
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 47 deletions.
diff --git a/source/ProcessManager.Client/Extensions/DependencyInjection/ClientExtensions.cs b/source/ProcessManager.Client/Extensions/DependencyInjection/ClientExtensions.cs
@@ -61,26 +61,29 @@ public static IServiceCollection AddProcessManagerHttpClients(this IServiceColle
 
     /// <summary>
     /// Register Process Manager RequestCalculatedData client for use in applications.
-    /// <remarks>The application must register the <see cref="ServiceBusClient"/> by calling </remarks>
+    /// <remarks>The application must register the <see cref="ServiceBusClient"/> and contain configuration for <see cref="ProcessManagerServiceBusClientsOptions"/></remarks>
     /// </summary>
     public static IServiceCollection AddProcessManagerRequestCalculatedDataClient(this IServiceCollection services)
     {
-        services.AddProcessManagerServiceBusOptions();
+        services
+            .AddOptions<ProcessManagerServiceBusClientsOptions>()
+            .BindConfiguration(ProcessManagerServiceBusClientsOptions.SectionName)
+            .ValidateDataAnnotations();
 
         services.AddAzureClients(
             builder =>
             {
                 builder.AddClient<ServiceBusSender, ServiceBusClientOptions>(
                     (_, _, provider) =>
                     {
-                        var serviceBusOptions = provider.GetRequiredProcessManagerServiceBusOptions();
+                        var serviceBusOptions = provider.GetRequiredService<IOptions<ProcessManagerServiceBusClientsOptions>>().Value;
                         var serviceBusSender = provider
                             .GetRequiredService<ServiceBusClient>()
                             .CreateSender(serviceBusOptions.ProcessManagerTopic);
 
                         return serviceBusSender;
                     })
-                    .WithName(nameof(ProcessManagerServiceBusOptions.ProcessManagerTopic));
+                    .WithName(nameof(ProcessManagerServiceBusClientsOptions.ProcessManagerTopic));
             });
 
         services.AddScoped<IRequestCalculatedDataClientV1, RequestCalculatedDataClientV1>();

diff --git a/...ptions/ProcessManagerServiceBusOptions.cs → ...ProcessManagerServiceBusClientsOptions.cs b/...ptions/ProcessManagerServiceBusOptions.cs → ...ProcessManagerServiceBusClientsOptions.cs
@@ -20,9 +20,9 @@ namespace Energinet.DataHub.ProcessManager.Client.Extensions.Options;
 /// <summary>
 /// Options for configuration of Process Manager Service Bus clients using the Process Manager.
 /// </summary>
-public class ProcessManagerServiceBusOptions
+public class ProcessManagerServiceBusClientsOptions
 {
-    public const string SectionName = "ProcessManagerServiceBus";
+    public const string SectionName = "ProcessManagerServiceBusClients";
 
     /// <summary>
     /// Name of the topic which the Process Manager receives service bus messages on

diff --git a/source/ProcessManager.Client/Extensions/Options/ProcessManagerServiceBusOptionsExtensions.cs b/source/ProcessManager.Client/Extensions/Options/ProcessManagerServiceBusOptionsExtensions.cs
diff --git a/source/ProcessManager.Client/Processes/BRS_026_028/V1/RequestCalculatedDataClientV1.cs b/source/ProcessManager.Client/Processes/BRS_026_028/V1/RequestCalculatedDataClientV1.cs
@@ -27,7 +27,7 @@ namespace Energinet.DataHub.ProcessManager.Client.Processes.BRS_026_028.V1;
 public class RequestCalculatedDataClientV1(
     IAzureClientFactory<ServiceBusSender> serviceBusFactory) : IRequestCalculatedDataClientV1
 {
-    private readonly ServiceBusSender _serviceBusSender = serviceBusFactory.CreateClient(nameof(ProcessManagerServiceBusOptions.ProcessManagerTopic));
+    private readonly ServiceBusSender _serviceBusSender = serviceBusFactory.CreateClient(nameof(ProcessManagerServiceBusClientsOptions.ProcessManagerTopic));
 
     public async Task RequestCalculatedEnergyTimeSeriesAsync(RequestCalculatedDataInputV1<RequestCalculatedEnergyTimeSeriesInputV1> input, CancellationToken cancellationToken)
     {