ThreeMammals#529 removed consul deps and introduced delegate to find …

…service discovery provider (ThreeMammals#538)
js8080 · Aug 12, 2018 · a91235b · a91235b
1 parent afe3226
commit a91235b
Show file tree

Hide file tree

Showing 26 changed files with 99 additions and 2,383 deletions.
diff --git a/src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/ConsulFileConfigurationRepository.cs
diff --git a/src/Ocelot/DependencyInjection/IOcelotBuilder.cs b/src/Ocelot/DependencyInjection/IOcelotBuilder.cs
@@ -10,8 +10,8 @@ namespace Ocelot.DependencyInjection
     public interface IOcelotBuilder
     {
         IServiceCollection Services { get; }
+
         IConfiguration Configuration { get; }
-        IOcelotBuilder AddStoreOcelotConfigurationInConsul();
 
         IOcelotAdministrationBuilder AddAdministration(string path, string secret);
 
@@ -22,6 +22,7 @@ IOcelotBuilder AddDelegatingHandler<T>(bool global = false)
 
         IOcelotBuilder AddSingletonDefinedAggregator<T>() 
             where T : class, IDefinedAggregator;
+
         IOcelotBuilder AddTransientDefinedAggregator<T>() 
             where T : class, IDefinedAggregator;
     }

diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -40,7 +40,6 @@ namespace Ocelot.DependencyInjection
     using Microsoft.Extensions.DependencyInjection.Extensions;
     using System.Net.Http;
     using Ocelot.Infrastructure;
-    using Ocelot.Infrastructure.Consul;
     using Ocelot.Middleware.Multiplexer;
     using ServiceDiscovery.Providers;
     using Steeltoe.Common.Discovery;
@@ -148,7 +147,6 @@ public OcelotBuilder(IServiceCollection services, IConfiguration configurationRo
             Services.TryAddSingleton<IFileConfigurationPollerOptions, InMemoryFileConfigurationPollerOptions>();
             Services.TryAddSingleton<IAddHeadersToResponse, AddHeadersToResponse>();
             Services.TryAddSingleton<IPlaceholders, Placeholders>();
-            Services.TryAddSingleton<IConsulClientFactory, ConsulClientFactory>();
             Services.TryAddSingleton<IResponseAggregatorFactory, InMemoryResponseAggregatorFactory>();
             Services.TryAddSingleton<IDefinedAggregatorProvider, ServiceLocatorDefinedAggregatorProvider>();
             Services.TryAddSingleton<IDownstreamRequestCreator, DownstreamRequestCreator>();
@@ -217,13 +215,6 @@ public IOcelotBuilder AddDelegatingHandler<THandler>(bool global = false)
             return this;
         }
 
-        public IOcelotBuilder AddStoreOcelotConfigurationInConsul()
-        {
-            Services.AddHostedService<FileConfigurationPoller>();
-            Services.AddSingleton<IFileConfigurationRepository, ConsulFileConfigurationRepository>();
-            return this;
-        }
-
         private void AddIdentityServer(Action<IdentityServerAuthenticationOptions> configOptions)
         {
             Services

diff --git a/src/Ocelot/Infrastructure/Consul/ConsulClientFactory.cs b/src/Ocelot/Infrastructure/Consul/ConsulClientFactory.cs
diff --git a/src/Ocelot/Infrastructure/Consul/IConsulClientFactory.cs b/src/Ocelot/Infrastructure/Consul/IConsulClientFactory.cs
diff --git a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs
@@ -242,7 +242,8 @@ private static void ThrowToStopOcelotStarting(Response config)
 
         private static bool UsingConsul(IFileConfigurationRepository fileConfigRepo)
         {
-            return fileConfigRepo.GetType() == typeof(ConsulFileConfigurationRepository);
+            //todo - remove coupling by string
+            return fileConfigRepo.GetType().Name == "ConsulFileConfigurationRepository";
         }
 
         private static void CreateAdministrationArea(IApplicationBuilder builder, IInternalConfiguration configuration)

diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj
@@ -46,7 +46,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
-    <PackageReference Include="Consul" Version="0.7.2.5" />
     <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="IdentityServer4" Version="2.2.0" />
     <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />

diff --git a/src/Ocelot/ServiceDiscovery/Configuration/ConsulRegistryConfiguration.cs b/src/Ocelot/ServiceDiscovery/Configuration/ConsulRegistryConfiguration.cs
diff --git a/src/Ocelot/ServiceDiscovery/Providers/ConsulServiceDiscoveryProvider.cs b/src/Ocelot/ServiceDiscovery/Providers/ConsulServiceDiscoveryProvider.cs
diff --git a/src/Ocelot/ServiceDiscovery/Providers/PolingConsulServiceDiscoveryProvider.cs b/src/Ocelot/ServiceDiscovery/Providers/PolingConsulServiceDiscoveryProvider.cs