#281 Access to underlying service collection in builder

Author: EtherZa

.autover/changes/55b720e8-c5d2-41e0-abda-658b2f39f77e.json

@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Messaging",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Add builder overload to modify underlying service collection on build"
+      ]
+    }
+  ]
+}

src/AWS.Messaging/Configuration/MessageBusBuilder.cs

@@ -29,7 +29,7 @@ public class MessageBusBuilder : IMessageBusBuilder
 {
     private static readonly ConcurrentDictionary<IServiceCollection, MessageConfiguration> _messageConfigurations = new();
     private readonly MessageConfiguration _messageConfiguration;
-    private readonly IList<ServiceDescriptor> _additionalServices = new List<ServiceDescriptor>();
+    private readonly IList<Action<IMessageConfiguration, IServiceCollection>> _additionalServices = new List<Action<IMessageConfiguration, IServiceCollection>>();
     private readonly IServiceCollection _serviceCollection;
 
     /// <summary>
@@ -301,7 +301,14 @@ MessageEnvelope envelopeFactory()
     /// <inheritdoc/>
     public IMessageBusBuilder AddAdditionalService(ServiceDescriptor serviceDescriptor)
     {
-        _additionalServices.Add(serviceDescriptor);
+        _additionalServices.Add((_, services) => services.TryAdd(serviceDescriptor));
+        return this;
+    }
+
+    /// <inheritdoc/>
+    public IMessageBusBuilder AddAdditionalService(Action<IMessageConfiguration, IServiceCollection> action)
+    {
+        _additionalServices.Add(action);
         return this;
     }
 
@@ -410,9 +417,9 @@ internal void Build()
             }
         }
 
-        foreach (var service in _additionalServices)
+        foreach (var action in _additionalServices)
         {
-            _serviceCollection.TryAdd(service);
+            action.Invoke(_messageConfiguration, _serviceCollection);
         }
     }
 

test/AWS.Messaging.IntegrationTests/LambdaTests.cs

@@ -66,8 +66,13 @@ public class LambdaIntegrationTestFixture : IAsyncLifetime, IDisposable
 
     public LambdaIntegrationTestFixture()
     {
+        var config = new AmazonS3Config
+        {
+            ForcePathStyle = bool.TryParse(Environment.GetEnvironmentVariable("AWS_S3_FORCE_PATH_STYLE"), out var force) && force
+        };
+
         _iamClient = new AmazonIdentityManagementServiceClient();
-        _s3Client = new AmazonS3Client();
+        _s3Client = new AmazonS3Client(config);
     }
 
     public async Task InitializeAsync()

test/AWS.Messaging.Tests.Common/AWSUtilities.cs

@@ -118,7 +118,7 @@ public async static Task CreateBucketWithDeploymentZipAsync(IAmazonS3 s3Client,
     {
         // Create bucket if it doesn't exist
         var listBucketsResponse = await s3Client.ListBucketsAsync();
-        if (listBucketsResponse.Buckets.Find((bucket) => bucket.BucketName == bucketName) == null)
+        if (listBucketsResponse.Buckets?.Find((bucket) => bucket.BucketName == bucketName) == null)
         {
             var putBucketRequest = new PutBucketRequest
             {