Merge pull request #39 from conductor-sdk/compatibility-fixes

Compatibility fixes
conductor-sdk · Dec 15, 2022 · 9fb1eab · 9fb1eab
2 parents 0739481 + ba125e1
commit 9fb1eab
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 54 deletions.
diff --git a/Conductor/Client/Extensions/DependencyInjectionExtensions.cs b/Conductor/Client/Extensions/DependencyInjectionExtensions.cs
@@ -9,41 +9,36 @@ namespace Conductor.Client.Extensions
 {
     public static class DependencyInjectionExtensions
     {
-        public static IServiceCollection WithConductorWorker<T>(this IServiceCollection services) where T : IWorkflowTask
+        public static IServiceCollection AddConductorWorkflowTask<T>(this IServiceCollection services) where T : IWorkflowTask
         {
             services.AddTransient(typeof(IWorkflowTask), typeof(T));
             services.AddTransient(typeof(T));
             return services;
         }
 
-        public static IServiceCollection WithOrkesApiClient(this IServiceCollection services, OrkesApiClient orkesApiClient)
+        public static IServiceCollection AddConductorWorker(this IServiceCollection services, Configuration configuration = null, Action<IServiceProvider, HttpClient> configureHttpClient = null)
         {
             services.AddHttpClient();
             services.AddOptions();
+            if (configuration == null)
+            {
+                configuration = new Configuration();
+            }
+            services.AddSingleton(configuration);
+            OrkesApiClient orkesApiClient = new OrkesApiClient(configuration);
             services.AddSingleton(orkesApiClient);
-            services.AddTransient<IConductorWorkerRestClient, ConductorWorkerRestClient>();
+            services.AddSingleton(new ConductorWorkerRestClient(orkesApiClient));
             services.AddSingleton<IWorkflowTaskCoordinator, WorkflowTaskCoordinator>();
             services.AddTransient<IWorkflowTaskExecutor, WorkflowTaskExecutor>();
-            services.AddSingleton(orkesApiClient);
-            return services;
-        }
-
-        public static IServiceCollection WithHostedService<T>(this IServiceCollection services) where T : BackgroundService
-        {
-            services.AddHostedService<T>();
-            return services;
+            return services.AddConductorClient(configureHttpClient);
         }
 
-        public static IServiceCollection WithConfiguration(this IServiceCollection services, Configuration configuration)
+        public static IServiceCollection AddConductorClient(this IServiceCollection services, Func<IServiceProvider, string> serverUrl)
         {
-            if (configuration == null)
+            services.AddHttpClient<IConductorWorkerRestClient, ConductorWorkerRestClient>((provider, client) =>
             {
-                services.AddSingleton<Configuration>();
-            }
-            else
-            {
-                services.AddSingleton(configuration);
-            }
+                client.BaseAddress = new Uri(serverUrl(provider));
+            });
             return services;
         }
 
@@ -59,5 +54,12 @@ public static IServiceCollection AddConductorClient(this IServiceCollection serv
             }
             return services;
         }
+
+        public static IServiceCollection WithHostedService<T>(this IServiceCollection services) where T : BackgroundService
+        {
+            services.AddHostedService<T>();
+            return services;
+        }
+
     }
 }
diff --git a/Conductor/Client/OrkesApiClient.cs b/Conductor/Client/OrkesApiClient.cs
@@ -10,22 +10,24 @@ public class OrkesApiClient
     {
         private Configuration _configuration;
         private MemoryCache _memoryCache;
-
-        private OrkesAuthenticationSettings _authenticationSettings;
         private TokenResourceApi _tokenClient;
+        private OrkesAuthenticationSettings _authenticationSettings;
 
         private OrkesApiClient()
         {
             _memoryCache = new MemoryCache(new MemoryCacheOptions());
             _configuration = null;
-            _authenticationSettings = null;
             _tokenClient = null;
+            _authenticationSettings = null;
         }
 
-        public OrkesApiClient(Configuration configuration = null, OrkesAuthenticationSettings authenticationSettings = null) : this()
+        public OrkesApiClient(Configuration configuration = null) : this()
         {
-            _authenticationSettings = authenticationSettings;
             _configuration = configuration;
+            if (_configuration != null && !string.IsNullOrEmpty(_configuration.keyId) && !string.IsNullOrEmpty(_configuration.keySecret))
+            {
+                _authenticationSettings = new OrkesAuthenticationSettings(_configuration.keyId, _configuration.keySecret);
+            }
             RefreshAuthenticationHeader();
         }
 

diff --git a/Conductor/Client/Worker/ConductorWorkerRestClient.cs b/Conductor/Client/Worker/ConductorWorkerRestClient.cs
@@ -1,7 +1,7 @@
+using Conductor.Api;
 using Conductor.Client.Interfaces;
 using Conductor.Client.Models;
 using System.Threading.Tasks;
-using Conductor.Api;
 
 namespace Conductor.Client
 {

diff --git a/Conductor/Client/Worker/WorkflowTaskCoordinator.cs b/Conductor/Client/Worker/WorkflowTaskCoordinator.cs
@@ -11,14 +11,13 @@ namespace Conductor.Client.Worker
     internal class WorkflowTaskCoordinator : IWorkflowTaskCoordinator
     {
         private int _concurrentWorkers;
-        private IServiceProvider _serviceProvider;
         private ILogger<WorkflowTaskCoordinator> _logger;
+        private IWorkflowTaskExecutor _workflowTaskExecutor;
         private HashSet<Type> _workerDefinitions;
         private TaskResourceApi _client;
 
         public WorkflowTaskCoordinator(IServiceProvider serviceProvider, ILogger<WorkflowTaskCoordinator> logger, OrkesApiClient orkesApiClient, int? concurrentWorkers = null)
         {
-            _serviceProvider = serviceProvider;
             _logger = logger;
             _workerDefinitions = new HashSet<Type>();
             if (concurrentWorkers == null)
@@ -27,6 +26,7 @@ public WorkflowTaskCoordinator(IServiceProvider serviceProvider, ILogger<Workflo
             }
             _concurrentWorkers = concurrentWorkers.Value;
             _client = orkesApiClient.GetClient<TaskResourceApi>();
+            _workflowTaskExecutor = serviceProvider.GetService(typeof(IWorkflowTaskExecutor)) as IWorkflowTaskExecutor;
         }
 
         public async Task Start()
@@ -35,8 +35,7 @@ public async Task Start()
             var pollers = new List<Task>();
             for (var i = 0; i < _concurrentWorkers; i++)
             {
-                var executor = _serviceProvider.GetService(typeof(IWorkflowTaskExecutor)) as IWorkflowTaskExecutor;
-                pollers.Add(executor.StartPoller(_workerDefinitions.ToList()));
+                pollers.Add(_workflowTaskExecutor.StartPoller(_workerDefinitions.ToList()));
             }
             await Task.WhenAll(pollers);
         }

diff --git a/Conductor/Client/Worker/WorkflowTaskExecutor.cs b/Conductor/Client/Worker/WorkflowTaskExecutor.cs
@@ -13,6 +13,7 @@ namespace Conductor.Client.Worker
 {
     internal class WorkflowTaskExecutor : IWorkflowTaskExecutor
     {
+        private IServiceProvider _serviceProvider;
         private List<Type> workers;
         private ILogger<WorkflowTaskExecutor> logger;
         private readonly Configuration configuration;
@@ -24,12 +25,11 @@ internal class WorkflowTaskExecutor : IWorkflowTaskExecutor
         private readonly string workerId = Environment.MachineName + "_" + new Random(epoch).Next();
 
         public WorkflowTaskExecutor(
-            IConductorWorkerRestClient taskClient,
             IServiceProvider serviceProvider,
             ILogger<WorkflowTaskExecutor> logger,
             IOptions<Configuration> configuration)
         {
-            this.taskClient = taskClient;
+            this.taskClient = serviceProvider.GetService(typeof(ConductorWorkerRestClient)) as ConductorWorkerRestClient;
             this.serviceProvider = serviceProvider;
             this.logger = logger;
             this.configuration = configuration.Value;

diff --git a/Conductor/conductor-csharp.csproj b/Conductor/conductor-csharp.csproj
@@ -15,5 +15,6 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
     <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="106.13.0" />
+    <None Include="README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 </Project>
diff --git a/Tests/Util/ApiUtil.cs b/Tests/Util/ApiUtil.cs
@@ -1,6 +1,5 @@
 using Conductor.Api;
 using Conductor.Client;
-using Conductor.Client.Authentication;
 using Conductor.Executor;
 using System;
 using System.Diagnostics;
@@ -34,30 +33,17 @@ public static WorkflowExecutor GetWorkflowExecutor()
 
         public static T GetClient<T>() where T : IApiAccessor, new()
         {
-            OrkesApiClient apiClient = GetApiClient();
+            OrkesApiClient apiClient = new OrkesApiClient(GetConfiguration());
             return apiClient.GetClient<T>();
         }
 
-        public static OrkesApiClient GetApiClient()
+        public static Configuration GetConfiguration()
         {
-            return GetApiClient(
-                basePath: _basePath,
-                keyId: _keyId,
-                keySecret: _keySecret
-            );
-        }
-
-        private static OrkesApiClient GetApiClient(string basePath, string keyId, string keySecret)
-        {
-            return new OrkesApiClient(
-                configuration: new Configuration()
-                {
-                    BasePath = basePath
-                },
-                authenticationSettings: new OrkesAuthenticationSettings(
-                    keyId, keySecret
-                )
-            );
+            Configuration configuration = new Configuration();
+            configuration.keyId = _keyId;
+            configuration.keySecret = _keySecret;
+            configuration.BasePath = _basePath;
+            return configuration;
         }
 
         private static string GetEnvironmentVariable(string variable)

diff --git a/Tests/Worker/WorkerTests.cs b/Tests/Worker/WorkerTests.cs
@@ -1,8 +1,11 @@
 using Conductor.Api;
+using Conductor.Client;
 using Conductor.Client.Extensions;
+using Conductor.Client.Interfaces;
 using Conductor.Definition;
 using Conductor.Definition.TaskType;
 using Conductor.Executor;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System;
@@ -83,8 +86,8 @@ private IHost GetWorkerHost()
                 .ConfigureServices(
                     (ctx, services) =>
                         {
-                            services.WithOrkesApiClient(ApiUtil.GetApiClient());
-                            services.WithConductorWorker<SimpleWorker>();
+                            services.AddConductorWorker(ApiUtil.GetConfiguration());
+                            services.AddConductorWorkflowTask<SimpleWorker>();
                             services.WithHostedService<WorkerService>();
                         }
                 ).ConfigureLogging(