remove nulls from constructors and dry up the service extensions

stu-mck · stu-mck · commit 406f4869527d · 2023-04-28T11:30:47.000+10:00
diff --git a/src/providers/WorkflowCore.Providers.AWS/ServiceCollectionExtensions.cs b/src/providers/WorkflowCore.Providers.AWS/ServiceCollectionExtensions.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using Amazon;
 using Amazon.DynamoDBv2;
+using Amazon.Kinesis;
 using Amazon.Runtime;
 using Amazon.SQS;
 using Microsoft.Extensions.Logging;
@@ -15,47 +16,55 @@ public static class ServiceCollectionExtensions
     {
         public static WorkflowOptions UseAwsSimpleQueueService(this WorkflowOptions options, AWSCredentials credentials, AmazonSQSConfig config, string queuesPrefix = "workflowcore")
         {
-            options.UseQueueProvider(sp => new SQSQueueProvider(credentials, config, null, sp.GetService<ILoggerFactory>(), queuesPrefix));
-            return options;
+            var sqsClient = new AmazonSQSClient(credentials, config);
+            return UseAwsSimpleQueueServiceWithProvisionedClient(options, sqsClient, queuesPrefix);
         }
 
         public static WorkflowOptions UseAwsSimpleQueueServiceWithProvisionedClient(this WorkflowOptions options, AmazonSQSClient sqsClient, string queuesPrefix = "workflowcore")
         {
-            options.UseQueueProvider(sp => new SQSQueueProvider(null, null, sqsClient, sp.GetService<ILoggerFactory>(), queuesPrefix));
+            options.UseQueueProvider(sp => new SQSQueueProvider(sqsClient, sp.GetService<ILoggerFactory>(), queuesPrefix));
             return options;
         }
 
         public static WorkflowOptions UseAwsDynamoLocking(this WorkflowOptions options, AWSCredentials credentials, AmazonDynamoDBConfig config, string tableName)
         {
-            options.UseDistributedLockManager(sp => new DynamoLockProvider(credentials, config, null, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));
-            return options;
+            var dbClient = new AmazonDynamoDBClient(credentials, config);
+            return UseAwsDynamoLockingWithProvisionedClient(options, dbClient, tableName);
         }
 
         public static WorkflowOptions UseAwsDynamoLockingWithProvisionedClient (this WorkflowOptions options, AmazonDynamoDBClient dynamoClient, string tableName)
         {
-            options.UseDistributedLockManager(sp => new DynamoLockProvider(null, null, dynamoClient, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));
+            options.UseDistributedLockManager(sp => new DynamoLockProvider(dynamoClient, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));
             return options;
         }
 
         public static WorkflowOptions UseAwsDynamoPersistence(this WorkflowOptions options, AWSCredentials credentials, AmazonDynamoDBConfig config, string tablePrefix)
         {
-            options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(credentials, config, null, tablePrefix, sp.GetService<ILoggerFactory>()));
-            options.UsePersistence(sp => new DynamoPersistenceProvider(credentials, config, null, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));
-            return options;
+            var dbClient = new AmazonDynamoDBClient(credentials, config);
+            return UseAwsDynamoPersistenceWithProvisionedClient(options, dbClient, tablePrefix);
         }
 
         public static WorkflowOptions UseAwsDynamoPersistenceWithProvisionedClient(this WorkflowOptions options, AmazonDynamoDBClient dynamoClient, string tablePrefix)
         {
-            options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(null, null, dynamoClient, tablePrefix, sp.GetService<ILoggerFactory>()));
-            options.UsePersistence(sp => new DynamoPersistenceProvider(null, null, dynamoClient, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));
+            options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(dynamoClient, tablePrefix, sp.GetService<ILoggerFactory>()));
+            options.UsePersistence(sp => new DynamoPersistenceProvider(dynamoClient, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));
             return options;
         }
 
         public static WorkflowOptions UseAwsKinesis(this WorkflowOptions options, AWSCredentials credentials, RegionEndpoint region, string appName, string streamName)
         {
-            options.Services.AddTransient<IKinesisTracker>(sp => new KinesisTracker(credentials, region, "workflowcore_kinesis", sp.GetService<ILoggerFactory>()));
-            options.Services.AddTransient<IKinesisStreamConsumer>(sp => new KinesisStreamConsumer(credentials, region, sp.GetService<IKinesisTracker>(), sp.GetService<IDistributedLockProvider>(), sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));
-            options.UseEventHub(sp => new KinesisProvider(credentials, region, appName, streamName, sp.GetService<IKinesisStreamConsumer>(), sp.GetService<ILoggerFactory>()));
+            var kinesisClient = new AmazonKinesisClient(credentials, region);
+            var dynamoClient = new AmazonDynamoDBClient(credentials, region);
+            
+            return UseAwsKinesisWithProvisionedClients(options, kinesisClient, dynamoClient,appName, streamName);
+
+        }
+
+        public static WorkflowOptions UseAwsKinesisWithProvisionedClients(this WorkflowOptions options, AmazonKinesisClient kinesisClient, AmazonDynamoDBClient dynamoDbClient, string appName, string streamName)
+        {
+            options.Services.AddTransient<IKinesisTracker>(sp => new KinesisTracker(dynamoDbClient, "workflowcore_kinesis", sp.GetService<ILoggerFactory>()));
+            options.Services.AddTransient<IKinesisStreamConsumer>(sp => new KinesisStreamConsumer(kinesisClient, sp.GetService<IKinesisTracker>(), sp.GetService<IDistributedLockProvider>(), sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));
+            options.UseEventHub(sp => new KinesisProvider(kinesisClient, appName, streamName, sp.GetService<IKinesisStreamConsumer>(), sp.GetService<ILoggerFactory>()));
             return options;
         }
     }
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/DynamoDbProvisioner.cs b/src/providers/WorkflowCore.Providers.AWS/Services/DynamoDbProvisioner.cs
@@ -15,10 +15,10 @@ public class DynamoDbProvisioner : IDynamoDbProvisioner
         private readonly IAmazonDynamoDB _client;
         private readonly string _tablePrefix;
 
-        public DynamoDbProvisioner(AWSCredentials credentials, AmazonDynamoDBConfig config, AmazonDynamoDBClient dynamoDBClient, string tablePrefix, ILoggerFactory logFactory)
+        public DynamoDbProvisioner(AmazonDynamoDBClient dynamoDBClient, string tablePrefix, ILoggerFactory logFactory)
         {
             _logger = logFactory.CreateLogger<DynamoDbProvisioner>();
-            _client = dynamoDBClient ?? new AmazonDynamoDBClient(credentials, config);
+            _client = dynamoDBClient;
             _tablePrefix = tablePrefix;
         }
 
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/DynamoLockProvider.cs b/src/providers/WorkflowCore.Providers.AWS/Services/DynamoLockProvider.cs
@@ -25,10 +25,10 @@ public class DynamoLockProvider : IDistributedLockProvider
         private readonly AutoResetEvent _mutex = new AutoResetEvent(true);
         private readonly IDateTimeProvider _dateTimeProvider;
 
-        public DynamoLockProvider(AWSCredentials credentials, AmazonDynamoDBConfig config, AmazonDynamoDBClient dynamoDBClient, string tableName, ILoggerFactory logFactory, IDateTimeProvider dateTimeProvider)
+        public DynamoLockProvider(AmazonDynamoDBClient dynamoDBClient, string tableName, ILoggerFactory logFactory, IDateTimeProvider dateTimeProvider)
         {
             _logger = logFactory.CreateLogger<DynamoLockProvider>();
-            _client = dynamoDBClient ?? new AmazonDynamoDBClient(credentials, config);
+            _client = dynamoDBClient;
             _localLocks = new List<string>();
             _tableName = tableName;
             _nodeId = Guid.NewGuid().ToString();
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/DynamoPersistenceProvider.cs b/src/providers/WorkflowCore.Providers.AWS/Services/DynamoPersistenceProvider.cs
@@ -26,10 +26,10 @@ public class DynamoPersistenceProvider : IPersistenceProvider
 
         public bool SupportsScheduledCommands => false;
 
-        public DynamoPersistenceProvider(AWSCredentials credentials, AmazonDynamoDBConfig config, AmazonDynamoDBClient dynamoDBClient, IDynamoDbProvisioner provisioner, string tablePrefix, ILoggerFactory logFactory)
+        public DynamoPersistenceProvider(AmazonDynamoDBClient dynamoDBClient, IDynamoDbProvisioner provisioner, string tablePrefix, ILoggerFactory logFactory)
         {
             _logger = logFactory.CreateLogger<DynamoPersistenceProvider>();
-            _client = dynamoDBClient ?? new AmazonDynamoDBClient(credentials, config);
+            _client = dynamoDBClient;
             _tablePrefix = tablePrefix;
             _provisioner = provisioner;
         }
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/KinesisProvider.cs b/src/providers/WorkflowCore.Providers.AWS/Services/KinesisProvider.cs
@@ -26,15 +26,15 @@ public class KinesisProvider : ILifeCycleEventHub
         private readonly int _defaultShardCount = 1;
         private bool _started = false;
 
-        public KinesisProvider(AWSCredentials credentials, RegionEndpoint region, string appName, string streamName, IKinesisStreamConsumer consumer, ILoggerFactory logFactory)
+        public KinesisProvider(AmazonKinesisClient kinesisClient, string appName, string streamName, IKinesisStreamConsumer consumer, ILoggerFactory logFactory)
         {
             _logger = logFactory.CreateLogger(GetType());
             _appName = appName;
             _streamName = streamName;
             _consumer = consumer;
             _serializer = new JsonSerializer();            
             _serializer.TypeNameHandling = TypeNameHandling.All;
-            _client = new AmazonKinesisClient(credentials, region);
+            _client = kinesisClient;
         }
 
         public async Task PublishNotification(LifeCycleEvent evt)
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/KinesisStreamConsumer.cs b/src/providers/WorkflowCore.Providers.AWS/Services/KinesisStreamConsumer.cs
@@ -25,12 +25,12 @@ public class KinesisStreamConsumer : IKinesisStreamConsumer, IDisposable
         private ICollection<ShardSubscription> _subscribers = new HashSet<ShardSubscription>();
         private readonly IDateTimeProvider _dateTimeProvider;
         
-        public KinesisStreamConsumer(AWSCredentials credentials, RegionEndpoint region, IKinesisTracker tracker, IDistributedLockProvider lockManager, ILoggerFactory logFactory, IDateTimeProvider dateTimeProvider)
+        public KinesisStreamConsumer(AmazonKinesisClient kinesisClient, IKinesisTracker tracker, IDistributedLockProvider lockManager, ILoggerFactory logFactory, IDateTimeProvider dateTimeProvider)
         {
             _logger = logFactory.CreateLogger(GetType());
             _tracker = tracker;
             _lockManager = lockManager;
-            _client = new AmazonKinesisClient(credentials, region);
+            _client = kinesisClient;
             _processTask = new Task(Process);
             _processTask.Start();
             _dateTimeProvider = dateTimeProvider;
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/KinesisTracker.cs b/src/providers/WorkflowCore.Providers.AWS/Services/KinesisTracker.cs
@@ -17,10 +17,10 @@ public class KinesisTracker : IKinesisTracker
         private readonly string _tableName;
         private bool _tableConfirmed = false;
 
-        public KinesisTracker(AWSCredentials credentials, RegionEndpoint region, string tableName, ILoggerFactory logFactory)
+        public KinesisTracker(AmazonDynamoDBClient client, string tableName, ILoggerFactory logFactory)
         {
             _logger = logFactory.CreateLogger(GetType());
-            _client = new AmazonDynamoDBClient(credentials, region);
+            _client = client;
             _tableName = tableName;
         }
 
diff --git a/src/providers/WorkflowCore.Providers.AWS/Services/SQSQueueProvider.cs b/src/providers/WorkflowCore.Providers.AWS/Services/SQSQueueProvider.cs
@@ -21,10 +21,10 @@ public class SQSQueueProvider : IQueueProvider
 
         public bool IsDequeueBlocking => true;
 
-        public SQSQueueProvider(AWSCredentials credentials, AmazonSQSConfig config, AmazonSQSClient sqsClient, ILoggerFactory logFactory, string queuesPrefix)
+        public SQSQueueProvider(AmazonSQSClient sqsClient, ILoggerFactory logFactory, string queuesPrefix)
         {
             _logger = logFactory.CreateLogger<SQSQueueProvider>();
-            _client = sqsClient ?? new AmazonSQSClient(credentials, config);
+            _client = sqsClient;
             _queuesPrefix = queuesPrefix;
         }
 
diff --git a/test/WorkflowCore.Tests.DynamoDB/DynamoPersistenceProviderFixture.cs b/test/WorkflowCore.Tests.DynamoDB/DynamoPersistenceProviderFixture.cs
@@ -26,8 +26,9 @@ protected override IPersistenceProvider Subject
                 if (_subject == null)
                 {
                     var cfg = new AmazonDynamoDBConfig { ServiceURL = DynamoDbDockerSetup.ConnectionString };
-                    var provisioner = new DynamoDbProvisioner(DynamoDbDockerSetup.Credentials, cfg, null, "unittests", new LoggerFactory());
-                    var client = new DynamoPersistenceProvider(DynamoDbDockerSetup.Credentials, cfg, null, provisioner, "unittests", new LoggerFactory());
+                    var dbClient = new AmazonDynamoDBClient(DynamoDbDockerSetup.Credentials, cfg);
+                    var provisioner = new DynamoDbProvisioner(dbClient, "unittests", new LoggerFactory());
+                    var client = new DynamoPersistenceProvider(dbClient, provisioner, "unittests", new LoggerFactory());
                     client.EnsureStoreExists();
                     _subject = client;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Amazon;`
`3`	`3`	`using Amazon.DynamoDBv2;`
	`4`	`+using Amazon.Kinesis;`
`4`	`5`	`using Amazon.Runtime;`
`5`	`6`	`using Amazon.SQS;`
`6`	`7`	`using Microsoft.Extensions.Logging;`
`@@ -15,47 +16,55 @@ public static class ServiceCollectionExtensions`
`15`	`16`	`{`
`16`	`17`	`public static WorkflowOptions UseAwsSimpleQueueService(this WorkflowOptions options, AWSCredentials credentials, AmazonSQSConfig config, string queuesPrefix = "workflowcore")`
`17`	`18`	`{`
`18`		`- options.UseQueueProvider(sp => new SQSQueueProvider(credentials, config, null, sp.GetService<ILoggerFactory>(), queuesPrefix));`
`19`		`- return options;`
	`19`	`+ var sqsClient = new AmazonSQSClient(credentials, config);`
	`20`	`+ return UseAwsSimpleQueueServiceWithProvisionedClient(options, sqsClient, queuesPrefix);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public static WorkflowOptions UseAwsSimpleQueueServiceWithProvisionedClient(this WorkflowOptions options, AmazonSQSClient sqsClient, string queuesPrefix = "workflowcore")`
`23`	`24`	`{`
`24`		`- options.UseQueueProvider(sp => new SQSQueueProvider(null, null, sqsClient, sp.GetService<ILoggerFactory>(), queuesPrefix));`
	`25`	`+ options.UseQueueProvider(sp => new SQSQueueProvider(sqsClient, sp.GetService<ILoggerFactory>(), queuesPrefix));`
`25`	`26`	`return options;`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public static WorkflowOptions UseAwsDynamoLocking(this WorkflowOptions options, AWSCredentials credentials, AmazonDynamoDBConfig config, string tableName)`
`29`	`30`	`{`
`30`		`- options.UseDistributedLockManager(sp => new DynamoLockProvider(credentials, config, null, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));`
`31`		`- return options;`
	`31`	`+ var dbClient = new AmazonDynamoDBClient(credentials, config);`
	`32`	`+ return UseAwsDynamoLockingWithProvisionedClient(options, dbClient, tableName);`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`public static WorkflowOptions UseAwsDynamoLockingWithProvisionedClient (this WorkflowOptions options, AmazonDynamoDBClient dynamoClient, string tableName)`
`35`	`36`	`{`
`36`		`- options.UseDistributedLockManager(sp => new DynamoLockProvider(null, null, dynamoClient, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));`
	`37`	`+ options.UseDistributedLockManager(sp => new DynamoLockProvider(dynamoClient, tableName, sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));`
`37`	`38`	`return options;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public static WorkflowOptions UseAwsDynamoPersistence(this WorkflowOptions options, AWSCredentials credentials, AmazonDynamoDBConfig config, string tablePrefix)`
`41`	`42`	`{`
`42`		`- options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(credentials, config, null, tablePrefix, sp.GetService<ILoggerFactory>()));`
`43`		`- options.UsePersistence(sp => new DynamoPersistenceProvider(credentials, config, null, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));`
`44`		`- return options;`
	`43`	`+ var dbClient = new AmazonDynamoDBClient(credentials, config);`
	`44`	`+ return UseAwsDynamoPersistenceWithProvisionedClient(options, dbClient, tablePrefix);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public static WorkflowOptions UseAwsDynamoPersistenceWithProvisionedClient(this WorkflowOptions options, AmazonDynamoDBClient dynamoClient, string tablePrefix)`
`48`	`48`	`{`
`49`		`- options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(null, null, dynamoClient, tablePrefix, sp.GetService<ILoggerFactory>()));`
`50`		`- options.UsePersistence(sp => new DynamoPersistenceProvider(null, null, dynamoClient, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));`
	`49`	`+ options.Services.AddTransient<IDynamoDbProvisioner>(sp => new DynamoDbProvisioner(dynamoClient, tablePrefix, sp.GetService<ILoggerFactory>()));`
	`50`	`+ options.UsePersistence(sp => new DynamoPersistenceProvider(dynamoClient, sp.GetService<IDynamoDbProvisioner>(), tablePrefix, sp.GetService<ILoggerFactory>()));`
`51`	`51`	`return options;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public static WorkflowOptions UseAwsKinesis(this WorkflowOptions options, AWSCredentials credentials, RegionEndpoint region, string appName, string streamName)`
`55`	`55`	`{`
`56`		`- options.Services.AddTransient<IKinesisTracker>(sp => new KinesisTracker(credentials, region, "workflowcore_kinesis", sp.GetService<ILoggerFactory>()));`
`57`		`- options.Services.AddTransient<IKinesisStreamConsumer>(sp => new KinesisStreamConsumer(credentials, region, sp.GetService<IKinesisTracker>(), sp.GetService<IDistributedLockProvider>(), sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));`
`58`		`- options.UseEventHub(sp => new KinesisProvider(credentials, region, appName, streamName, sp.GetService<IKinesisStreamConsumer>(), sp.GetService<ILoggerFactory>()));`
	`56`	`+ var kinesisClient = new AmazonKinesisClient(credentials, region);`
	`57`	`+ var dynamoClient = new AmazonDynamoDBClient(credentials, region);`
	`58`	`+`
	`59`	`+ return UseAwsKinesisWithProvisionedClients(options, kinesisClient, dynamoClient,appName, streamName);`
	`60`	`+`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ public static WorkflowOptions UseAwsKinesisWithProvisionedClients(this WorkflowOptions options, AmazonKinesisClient kinesisClient, AmazonDynamoDBClient dynamoDbClient, string appName, string streamName)`
	`64`	`+ {`
	`65`	`+ options.Services.AddTransient<IKinesisTracker>(sp => new KinesisTracker(dynamoDbClient, "workflowcore_kinesis", sp.GetService<ILoggerFactory>()));`
	`66`	`+ options.Services.AddTransient<IKinesisStreamConsumer>(sp => new KinesisStreamConsumer(kinesisClient, sp.GetService<IKinesisTracker>(), sp.GetService<IDistributedLockProvider>(), sp.GetService<ILoggerFactory>(), sp.GetService<IDateTimeProvider>()));`
	`67`	`+ options.UseEventHub(sp => new KinesisProvider(kinesisClient, appName, streamName, sp.GetService<IKinesisStreamConsumer>(), sp.GetService<ILoggerFactory>()));`
`59`	`68`	`return options;`
`60`	`69`	`}`
`61`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public class DynamoDbProvisioner : IDynamoDbProvisioner`
`15`	`15`	`private readonly IAmazonDynamoDB _client;`
`16`	`16`	`private readonly string _tablePrefix;`
`17`	`17`
`18`		`- public DynamoDbProvisioner(AWSCredentials credentials, AmazonDynamoDBConfig config, AmazonDynamoDBClient dynamoDBClient, string tablePrefix, ILoggerFactory logFactory)`
	`18`	`+ public DynamoDbProvisioner(AmazonDynamoDBClient dynamoDBClient, string tablePrefix, ILoggerFactory logFactory)`
`19`	`19`	`{`
`20`	`20`	`_logger = logFactory.CreateLogger<DynamoDbProvisioner>();`
`21`		`- _client = dynamoDBClient ?? new AmazonDynamoDBClient(credentials, config);`
	`21`	`+ _client = dynamoDBClient;`
`22`	`22`	`_tablePrefix = tablePrefix;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ public class DynamoPersistenceProvider : IPersistenceProvider`
`26`	`26`
`27`	`27`	`public bool SupportsScheduledCommands => false;`
`28`	`28`
`29`		`- public DynamoPersistenceProvider(AWSCredentials credentials, AmazonDynamoDBConfig config, AmazonDynamoDBClient dynamoDBClient, IDynamoDbProvisioner provisioner, string tablePrefix, ILoggerFactory logFactory)`
	`29`	`+ public DynamoPersistenceProvider(AmazonDynamoDBClient dynamoDBClient, IDynamoDbProvisioner provisioner, string tablePrefix, ILoggerFactory logFactory)`
`30`	`30`	`{`
`31`	`31`	`_logger = logFactory.CreateLogger<DynamoPersistenceProvider>();`
`32`		`- _client = dynamoDBClient ?? new AmazonDynamoDBClient(credentials, config);`
	`32`	`+ _client = dynamoDBClient;`
`33`	`33`	`_tablePrefix = tablePrefix;`
`34`	`34`	`_provisioner = provisioner;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public class KinesisTracker : IKinesisTracker`
`17`	`17`	`private readonly string _tableName;`
`18`	`18`	`private bool _tableConfirmed = false;`
`19`	`19`
`20`		`- public KinesisTracker(AWSCredentials credentials, RegionEndpoint region, string tableName, ILoggerFactory logFactory)`
	`20`	`+ public KinesisTracker(AmazonDynamoDBClient client, string tableName, ILoggerFactory logFactory)`
`21`	`21`	`{`
`22`	`22`	`_logger = logFactory.CreateLogger(GetType());`
`23`		`- _client = new AmazonDynamoDBClient(credentials, region);`
	`23`	`+ _client = client;`
`24`	`24`	`_tableName = tableName;`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ public class SQSQueueProvider : IQueueProvider`
`21`	`21`
`22`	`22`	`public bool IsDequeueBlocking => true;`
`23`	`23`
`24`		`- public SQSQueueProvider(AWSCredentials credentials, AmazonSQSConfig config, AmazonSQSClient sqsClient, ILoggerFactory logFactory, string queuesPrefix)`
	`24`	`+ public SQSQueueProvider(AmazonSQSClient sqsClient, ILoggerFactory logFactory, string queuesPrefix)`
`25`	`25`	`{`
`26`	`26`	`_logger = logFactory.CreateLogger<SQSQueueProvider>();`
`27`		`- _client = sqsClient ?? new AmazonSQSClient(credentials, config);`
	`27`	`+ _client = sqsClient;`
`28`	`28`	`_queuesPrefix = queuesPrefix;`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ protected override IPersistenceProvider Subject`
`26`	`26`	`if (_subject == null)`
`27`	`27`	`{`
`28`	`28`	`var cfg = new AmazonDynamoDBConfig { ServiceURL = DynamoDbDockerSetup.ConnectionString };`
`29`		`- var provisioner = new DynamoDbProvisioner(DynamoDbDockerSetup.Credentials, cfg, null, "unittests", new LoggerFactory());`
`30`		`- var client = new DynamoPersistenceProvider(DynamoDbDockerSetup.Credentials, cfg, null, provisioner, "unittests", new LoggerFactory());`
	`29`	`+ var dbClient = new AmazonDynamoDBClient(DynamoDbDockerSetup.Credentials, cfg);`
	`30`	`+ var provisioner = new DynamoDbProvisioner(dbClient, "unittests", new LoggerFactory());`
	`31`	`+ var client = new DynamoPersistenceProvider(dbClient, provisioner, "unittests", new LoggerFactory());`
`31`	`32`	`client.EnsureStoreExists();`
`32`	`33`	`_subject = client;`
`33`	`34`	`}`