Merge pull request #5 from GodelTech/feature/improve-extension

update extension to use IConfiguration

Author: rodchenkov

src/GodelTech.Messaging.AzureServiceBus/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using Azure.Messaging.ServiceBus;
 using GodelTech.Messaging.AzureServiceBus;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Builder
@@ -15,18 +16,25 @@ public static class ServiceCollectionExtensions
         /// </summary>
         /// <param name="services">Service collection.</param>
         /// <param name="connectionString">Connection string to Azure Service Bus.</param>
-        /// <param name="optionsAction">Azure Service Bus options action.</param>
+        /// <param name="configureOptions">Azure Service Bus options.</param>
         /// <returns></returns>
         public static IServiceCollection AddAzureServiceBusSender(
             this IServiceCollection services,
-            string connectionString,
-            Action<AzureServiceBusOptions> optionsAction)
+            Func<IConfiguration, string> connectionString,
+            Action<AzureServiceBusOptions, IConfiguration> configureOptions)
         {
             // ServiceBusClient
-            services.AddTransient(provider => new ServiceBusClient(connectionString));
+            services.AddTransient(
+                provider => new ServiceBusClient(
+                    connectionString(
+                        provider.GetService<IConfiguration>()
+                    )
+                )
+            );
 
             // Options
-            services.Configure(optionsAction);
+            services.AddOptions<AzureServiceBusOptions>()
+                .Configure(configureOptions);
 
             // AzureServiceBusSender
             services.AddTransient<IAzureServiceBusSender, AzureServiceBusSender>();

src/GodelTech.Messaging.AzureServiceBus/GodelTech.Messaging.AzureServiceBus.csproj

@@ -29,6 +29,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
 

test/GodelTech.Messaging.AzureServiceBus.Tests/DependencyInjection/ServiceCollectionExtensionsTests.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 using Azure.Messaging.ServiceBus;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
@@ -14,23 +16,31 @@ public class ServiceCollectionExtensionsTests
         public void AddAzureServiceBusSender_Success()
         {
             // Arrange
-            const string connectionString = "Endpoint=sb://test.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=YourAccessKey";
-            var queues = new Dictionary<string, string>
-            {
-                {
-                    "InternalKey",
-                    "AzureServiceBusQueueName"
-                }
-            };
-            Action<AzureServiceBusOptions> optionsAction = options =>
-            {
-                options.Queues = queues;
-            };
+            Expression<Func<IConfiguration, string>> connectionStringExpression = configuration => configuration
+                .GetValue<string>("AzureServiceBusOptions:ConnectionString");
+
+            Action<AzureServiceBusOptions, IConfiguration> configureOptions = (options, configuration) => configuration
+                .GetSection("AzureServiceBusOptions")
+                .Bind(options);
 
             var services = new ServiceCollection();
 
+            services
+                .AddTransient<IConfiguration>(
+                    _ => new ConfigurationBuilder()
+                        .AddInMemoryCollection(
+                            new Dictionary<string, string>
+                            {
+                                ["AzureServiceBusOptions:ConnectionString"] = "Endpoint=sb://test.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=YourAccessKey",
+                                ["AzureServiceBusOptions:Queues:FirstInternalKey"] = "FirstAzureServiceBusQueueName",
+                                ["AzureServiceBusOptions:Queues:SecondInternalKey"] = "SecondAzureServiceBusQueueName"
+                            }
+                        )
+                        .Build()
+                );
+
             // Act
-            services.AddAzureServiceBusSender(connectionString, optionsAction);
+            services.AddAzureServiceBusSender(connectionStringExpression.Compile(), configureOptions);
 
             // Assert
             var provider = services.BuildServiceProvider();
@@ -41,7 +51,8 @@ public void AddAzureServiceBusSender_Success()
             var resultOptionsAction = provider.GetRequiredService<IOptions<AzureServiceBusOptions>>();
             Assert.NotNull(resultOptionsAction);
             Assert.NotNull(resultOptionsAction.Value);
-            Assert.Equal(queues, resultOptionsAction.Value.Queues);
+            Assert.Equal("FirstAzureServiceBusQueueName", resultOptionsAction.Value.Queues["FirstInternalKey"]);
+            Assert.Equal("SecondAzureServiceBusQueueName", resultOptionsAction.Value.Queues["SecondInternalKey"]);
 
             var resultAzureServiceBusSender = provider.GetRequiredService<IAzureServiceBusSender>();
             Assert.NotNull(resultAzureServiceBusSender);

test/GodelTech.Messaging.AzureServiceBus.Tests/GodelTech.Messaging.AzureServiceBus.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+	<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">