pr-fix: update w/ always-present entity path

arcus-azure · Sep 29, 2023 · ac98324 · ac98324
1 parent 21d3e9a
commit ac98324
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/Arcus.Messaging.Pumps.ServiceBus/Configuration/AzureServiceBusMessagePumpSettings.cs b/src/Arcus.Messaging.Pumps.ServiceBus/Configuration/AzureServiceBusMessagePumpSettings.cs
@@ -182,13 +182,13 @@ public async Task<string> GetEntityPathAsync()
             if (_tokenCredential is null)
             {
                 string connectionString = await GetConnectionStringAsync();
-                string entityPath = DetermineEntityPath(connectionString);
+                string entityPath = await DetermineEntityPathAsync(connectionString);
 
                 return entityPath;
             }
             else
             {
-                string entityPath = DetermineEntityPath();
+                string entityPath = await DetermineEntityPathAsync();
                 return entityPath;
             }
         }
@@ -206,7 +206,7 @@ internal async Task<ServiceBusProcessor> CreateMessageProcessorAsync()
             }
             else
             {
-                ServiceBusProcessor processor = CreateServiceBusProcessorWithAzureClients(factory);
+                ServiceBusProcessor processor = await CreateServiceBusProcessorWithAzureClientsAsync(factory);
                 return processor;
             }
         }
@@ -216,7 +216,7 @@ private async Task<ServiceBusProcessor> CreateServiceBusProcessorBackwardsCompat
             if (_tokenCredential is null)
             {
                 string rawConnectionString = await GetConnectionStringAsync();
-                string entityPath = DetermineEntityPath(rawConnectionString);
+                string entityPath = await DetermineEntityPathAsync(rawConnectionString);
 
                 var client = new ServiceBusClient(rawConnectionString);
                 return CreateProcessor(client, entityPath, SubscriptionName);
@@ -225,14 +225,14 @@ private async Task<ServiceBusProcessor> CreateServiceBusProcessorBackwardsCompat
             {
                 var client = new ServiceBusClient(FullyQualifiedNamespace, _tokenCredential);
 
-                string entityPath = DetermineEntityPath();
+                string entityPath = await DetermineEntityPathAsync();
                 ServiceBusProcessor processor = CreateProcessor(client, entityPath, SubscriptionName);
 
                 return processor;
             }
         }
 
-        private ServiceBusProcessor CreateServiceBusProcessorWithAzureClients(IAzureClientFactory<ServiceBusClient> factory)
+        private async Task<ServiceBusProcessor> CreateServiceBusProcessorWithAzureClientsAsync(IAzureClientFactory<ServiceBusClient> factory)
         {
             ServiceBusClient client = factory.CreateClient(Options.JobId);
             if (client is null)
@@ -244,7 +244,7 @@ private ServiceBusProcessor CreateServiceBusProcessorWithAzureClients(IAzureClie
             }
 
             ServiceBusProcessorOptions options = DetermineMessageProcessorOptions();
-            string entityPath = DetermineEntityPath();
+            string entityPath = await DetermineEntityPathAsync();
 
             if (string.IsNullOrWhiteSpace(SubscriptionName))
             {
@@ -254,8 +254,13 @@ private ServiceBusProcessor CreateServiceBusProcessorWithAzureClients(IAzureClie
             return client.CreateProcessor(entityPath, SubscriptionName, options);
         }
 
-        private string DetermineEntityPath(string connectionString = null)
+        private async Task<string> DetermineEntityPathAsync(string connectionString = null)
         {
+            if (string.IsNullOrWhiteSpace(connectionString) && string.IsNullOrWhiteSpace(EntityName))
+            {
+                connectionString = await GetConnectionStringAsync();
+            }
+
             if (_tokenCredential is null && !string.IsNullOrWhiteSpace(connectionString))
             {
                 var properties = ServiceBusConnectionStringProperties.Parse(connectionString);