Feature/cdms 14 (#54)

* Expanded ASB config to support multiple subscriptions and setup a generic consumer for ALVS which routes messages based on messages. * fixed compilations issues * added install for docker compose * added compose file for asb emulator * moved docker compose files * updated path * updated path * updated to start mongo after asb emulator * changed sb connection string * updated sb connection string * check out azure-service-bus-emulator-installer * fixed typo * updates * updates * ignored asb smoke tests for the moment * added health check for both subscriptions * updated slim message bus to use the web proxy when connecting to ASB --------- Co-authored-by: Thomas Anderson <[email protected]>
DEFRA · Jan 13, 2025 · fda5e1a · fda5e1a
1 parent c454571
commit fda5e1a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/Btms.Backend/Asb/AzureServiceBusHealthCheckBuilderExtensions.cs b/Btms.Backend/Asb/AzureServiceBusHealthCheckBuilderExtensions.cs
@@ -24,13 +24,30 @@ public static IHealthChecksBuilder AddBtmsAzureServiceBusSubscription(
         this IHealthChecksBuilder builder,
         TimeSpan? timeout = default)
     {
+        builder.Add(new HealthCheckRegistration(
+            "azuresubscription_alvs",
+            sp =>
+            {
+                var sbOptions = sp.GetRequiredService<IOptions<ServiceBusOptions>>();
+                var subscription = sbOptions.Value.AlvsSubscription;
+                var options = new AzureServiceBusSubscriptionHealthCheckHealthCheckOptions(subscription.Topic, subscription.Subscription)
+                {
+                    ConnectionString = sbOptions.Value.ConnectionString,
+                    UsePeekMode = true
+                };
+                return new AzureServiceBusSubscriptionHealthCheck(options, new BtmsServiceBusClientProvider(sp.GetRequiredService<IWebProxy>()));
+            },
+            default,
+            default,
+            timeout));
+
         return builder.Add(new HealthCheckRegistration(
-            "azuresubscription",
+            "azuresubscription_notification",
             sp =>
             {
                 var sbOptions = sp.GetRequiredService<IOptions<ServiceBusOptions>>();
-                var firstSubscription = sbOptions.Value.Subscriptions.First();
-                var options = new AzureServiceBusSubscriptionHealthCheckHealthCheckOptions(firstSubscription.Value.Topic, firstSubscription.Value.Subscription)
+                var subscription = sbOptions.Value.NotificationSubscription;
+                var options = new AzureServiceBusSubscriptionHealthCheckHealthCheckOptions(subscription.Topic, subscription.Subscription)
                 {
                     ConnectionString = sbOptions.Value.ConnectionString,
                     UsePeekMode = true

diff --git a/Btms.Consumers/Extensions/ServiceCollectionExtensions.cs b/Btms.Consumers/Extensions/ServiceCollectionExtensions.cs
@@ -1,3 +1,5 @@
+using System.Net;
+using Azure.Messaging.ServiceBus;
 using Btms.Common.Extensions;
 using Btms.Consumers.Interceptors;
 using Btms.Consumers.MemoryQueue;
@@ -48,6 +50,15 @@ public static IServiceCollection AddConsumers(this IServiceCollection services,
                 {
                     cbb.WithProviderServiceBus(cfg =>
                     {
+                        cfg.ClientFactory = (sp, settings) =>
+                        {
+                            var clientOptions = new ServiceBusClientOptions()
+                            {
+                                WebProxy = sp.GetRequiredService<IWebProxy>(),
+                                TransportType = ServiceBusTransportType.AmqpWebSockets,
+                            };
+                            return new ServiceBusClient(settings.ConnectionString, clientOptions);
+                        };
                         cfg.ConnectionString = serviceBusOptions?.ConnectionString;
                     });
                     cbb.AddJsonSerializer();