Merge branch 'dev'

awslabs · Aug 16, 2024 · 479735d · 479735d
2 parents c43c3bb + bbdb9b6
commit 479735d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Release 2024-08-15
+
+### AWS.Messaging (0.9.2)
+* Add support for AddAWSMessageBus being invoked multiple times against the same ServiceCollection. This allows different modules to register their own handlers rather than requiring a centralized registration.
+
 ## Release 2024-08-02
 
 ### AWS.Messaging.Lambda (0.10.0)

diff --git a/src/AWS.Messaging/AWS.Messaging.csproj b/src/AWS.Messaging/AWS.Messaging.csproj
@@ -17,7 +17,7 @@
     <WarningsAsErrors>CA1727</WarningsAsErrors>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>0.9.1</Version>
+    <Version>0.9.2</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/src/AWS.Messaging/Configuration/MessageBusBuilder.cs b/src/AWS.Messaging/Configuration/MessageBusBuilder.cs
@@ -25,6 +25,7 @@ namespace AWS.Messaging.Configuration;
 /// </summary>
 public class MessageBusBuilder : IMessageBusBuilder
 {
+    private static readonly Dictionary<IServiceCollection, MessageConfiguration> _messageConfigurations = new();
     private readonly MessageConfiguration _messageConfiguration;
     private readonly IList<ServiceDescriptor> _additionalServices = new List<ServiceDescriptor>();
     private readonly IServiceCollection _serviceCollection;
@@ -35,7 +36,15 @@ public class MessageBusBuilder : IMessageBusBuilder
     public MessageBusBuilder(IServiceCollection services)
     {
         _serviceCollection = services;
-        _messageConfiguration = new MessageConfiguration();
+        if (_messageConfigurations.TryGetValue(services, out var config))
+        {
+            _messageConfiguration = config;
+        }
+        else
+        {
+            _messageConfiguration = new MessageConfiguration();
+            _messageConfigurations[services] = _messageConfiguration;
+        }
     }
 
     /// <inheritdoc/>
@@ -129,7 +138,6 @@ public IMessageBusBuilder AddSQSPoller(string queueUrl, Action<SQSMessagePollerO
             VisibilityTimeoutExtensionHeartbeatInterval = sqsMessagePollerOptions.VisibilityTimeoutExtensionHeartbeatInterval,
             WaitTimeSeconds = sqsMessagePollerOptions.WaitTimeSeconds,
             IsExceptionFatal = sqsMessagePollerOptions.IsExceptionFatal
-
         };
 
         _messageConfiguration.MessagePollerConfigurations.Add(sqsMessagePollerConfiguration);
@@ -308,7 +316,7 @@ internal void Build()
         _serviceCollection.TryAdd(ServiceDescriptor.Singleton<ILoggerFactory, NullLoggerFactory>());
         _serviceCollection.TryAdd(ServiceDescriptor.Singleton(typeof(ILogger<>), typeof(NullLogger<>)));
 
-        _serviceCollection.AddSingleton<IMessageConfiguration>(_messageConfiguration);
+        _serviceCollection.TryAddSingleton<IMessageConfiguration>(_messageConfiguration);
         _serviceCollection.TryAddSingleton<IMessageSerializer, MessageSerializer>();
         _serviceCollection.TryAddSingleton<IEnvelopeSerializer, EnvelopeSerializer>();
         _serviceCollection.TryAddSingleton<IDateTimeHandler, DateTimeHandler>();
@@ -326,18 +334,20 @@ internal void Build()
 
         if (_messageConfiguration.PublisherMappings.Any())
         {
-            _serviceCollection.AddSingleton<IMessagePublisher, MessageRoutingPublisher>();
+            _serviceCollection.TryAddSingleton<IMessagePublisher, MessageRoutingPublisher>();
 
             if (_messageConfiguration.PublisherMappings.Any(x => x.PublishTargetType == PublisherTargetType.SQS_PUBLISHER))
             {
                 _serviceCollection.TryAddAWSService<Amazon.SQS.IAmazonSQS>();
                 _serviceCollection.TryAddSingleton<ISQSPublisher, SQSPublisher>();
             }
+
             if (_messageConfiguration.PublisherMappings.Any(x => x.PublishTargetType == PublisherTargetType.SNS_PUBLISHER))
             {
                 _serviceCollection.TryAddAWSService<Amazon.SimpleNotificationService.IAmazonSimpleNotificationService>();
                 _serviceCollection.TryAddSingleton<ISNSPublisher, SNSPublisher>();
             }
+
             if (_messageConfiguration.PublisherMappings.Any(x => x.PublishTargetType == PublisherTargetType.EVENTBRIDGE_PUBLISHER))
             {
                 _serviceCollection.TryAddAWSService<Amazon.EventBridge.IAmazonEventBridge>();
@@ -351,7 +361,7 @@ internal void Build()
 
             foreach (var subscriberMapping in _messageConfiguration.SubscriberMappings)
             {
-                _serviceCollection.AddScoped(subscriberMapping.HandlerType);
+                _serviceCollection.TryAddScoped(subscriberMapping.HandlerType);
             }
         }
 
@@ -387,7 +397,7 @@ internal void Build()
 
         foreach (var service in _additionalServices)
         {
-            _serviceCollection.Add(service);
+            _serviceCollection.TryAdd(service);
         }
     }
 

diff --git a/test/AWS.Messaging.UnitTests/MessageBusBuilderTests.cs b/test/AWS.Messaging.UnitTests/MessageBusBuilderTests.cs
@@ -57,6 +57,35 @@ public void BuildMessageBus()
         CheckRequiredServices(serviceProvider);
     }
 
+    [Fact]
+    public void BuildMessageBus_MultipleInvocations()
+    {
+        _serviceCollection.AddAWSMessageBus(builder =>
+        {
+            builder.AddSQSPublisher<OrderInfo>("sqsQueueUrl");
+            builder.AddMessageHandler<AddressInfoHandler, AddressInfo>();
+        });
+
+        _serviceCollection.AddAWSMessageBus(builder =>
+        {
+            builder.AddMessageHandler<ChatMessageHandler, ChatMessage>();
+        });
+
+        var serviceProvider = _serviceCollection.BuildServiceProvider();
+
+        var messagePublisher = serviceProvider.GetService<IMessagePublisher>();
+        Assert.NotNull(messagePublisher);
+
+        CheckRequiredServices(serviceProvider);
+
+        var mesageConfiguration = serviceProvider.GetRequiredService<IMessageConfiguration>();
+        Assert.Equal(2, mesageConfiguration.SubscriberMappings.Count);
+        Assert.Equal(typeof(AddressInfo), mesageConfiguration.SubscriberMappings[0].MessageType);
+        Assert.Equal(typeof(AddressInfoHandler), mesageConfiguration.SubscriberMappings[0].HandlerType);
+        Assert.Equal(typeof(ChatMessage), mesageConfiguration.SubscriberMappings[1].MessageType);
+        Assert.Equal(typeof(ChatMessageHandler), mesageConfiguration.SubscriberMappings[1].HandlerType);
+    }
+
     [Fact]
     public void MessageBus_ConfigureBackoffPolicy_Default()
     {