Feature/remove pivotal (#541)

* #529 removed eureka client * #529 removed some unused code
ThreeMammals · Aug 12, 2018 · 34afefc · 34afefc
1 parent 87348e5
commit 34afefc
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 568 deletions.
diff --git a/.../Repository/IConsulPollerConfiguration.cs → ...sitory/IFileConfigurationPollerOptions.cs b/.../Repository/IConsulPollerConfiguration.cs → ...sitory/IFileConfigurationPollerOptions.cs
diff --git a/src/Ocelot/DependencyInjection/OcelotBuilder.cs b/src/Ocelot/DependencyInjection/OcelotBuilder.cs
@@ -42,8 +42,6 @@ namespace Ocelot.DependencyInjection
     using Ocelot.Infrastructure;
     using Ocelot.Middleware.Multiplexer;
     using ServiceDiscovery.Providers;
-    using Steeltoe.Common.Discovery;
-    using Pivotal.Discovery.Client;
     using Ocelot.Request.Creator;
 
     public class OcelotBuilder : IOcelotBuilder
@@ -109,16 +107,6 @@ public OcelotBuilder(IServiceCollection services, IConfiguration configurationRo
             Services.TryAddSingleton<IHttpHandlerOptionsCreator, HttpHandlerOptionsCreator>();
             Services.TryAddSingleton<IDownstreamAddressesCreator, DownstreamAddressesCreator>();
             Services.TryAddSingleton<IDelegatingHandlerHandlerFactory, DelegatingHandlerHandlerFactory>();
-
-            if (UsingEurekaServiceDiscoveryProvider(configurationRoot))
-            {
-                Services.AddDiscoveryClient(configurationRoot);
-            }
-            else
-            {
-                Services.TryAddSingleton<IDiscoveryClient, FakeEurekaDiscoveryClient>();
-            }
-
             Services.TryAddSingleton<IHttpRequester, HttpClientHttpRequester>();
 
             // see this for why we register this as singleton http://stackoverflow.com/questions/37371264/invalidoperationexception-unable-to-resolve-service-for-type-microsoft-aspnetc

diff --git a/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs
@@ -18,7 +18,6 @@
     using Rafty.Concensus;
     using Rafty.Infrastructure;
     using Ocelot.Middleware.Pipeline;
-    using Pivotal.Discovery.Client;
     using Rafty.Concensus.Node;
     using Microsoft.Extensions.DependencyInjection;
 
@@ -48,15 +47,9 @@ public static async Task<IApplicationBuilder> UseOcelot(this IApplicationBuilder
                 SetUpRafty(builder);
             }
 
-            if (UsingEurekaServiceDiscoveryProvider(configuration))
-            {
-                builder.UseDiscoveryClient();
-            }
-
             ConfigureDiagnosticListener(builder);
 
             return CreateOcelotPipeline(builder, pipelineConfiguration);
-
         }
 
         private static IApplicationBuilder CreateOcelotPipeline(IApplicationBuilder builder, OcelotPipelineConfiguration pipelineConfiguration)
@@ -84,11 +77,6 @@ rest of asp.net..
             return builder;
         }
 
-        private static bool UsingEurekaServiceDiscoveryProvider(IInternalConfiguration configuration)
-        {
-            return configuration?.ServiceProviderConfiguration != null && configuration.ServiceProviderConfiguration.Type?.ToLower() == "eureka";
-        }
-
         private static bool UsingRafty(IApplicationBuilder builder)
         {
             var node = builder.ApplicationServices.GetService<INode>();

diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj
@@ -48,7 +48,6 @@
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
     <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="IdentityServer4" Version="2.2.0" />
-    <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
     <PackageReference Include="Rafty" Version="0.4.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs b/src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs
diff --git a/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs b/src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs
diff --git a/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs b/src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs
@@ -9,19 +9,16 @@ namespace Ocelot.ServiceDiscovery
     using System;
     using System.Linq;
     using Microsoft.Extensions.DependencyInjection;
-    using Steeltoe.Common.Discovery;
 
     public class ServiceDiscoveryProviderFactory : IServiceDiscoveryProviderFactory
     {
         private readonly IOcelotLoggerFactory _factory;
-        private readonly IDiscoveryClient _eurekaClient;
         private readonly List<ServiceDiscoveryFinderDelegate> _delegates;
         private readonly IServiceProvider _provider;
 
-        public ServiceDiscoveryProviderFactory(IOcelotLoggerFactory factory, IDiscoveryClient eurekaClient, IServiceProvider provider)
+        public ServiceDiscoveryProviderFactory(IOcelotLoggerFactory factory, IServiceProvider provider)
         {
             _factory = factory;
-            _eurekaClient = eurekaClient;
             _provider = provider;
             _delegates = provider
                 .GetServices<ServiceDiscoveryFinderDelegate>()
@@ -55,11 +52,6 @@ private IServiceDiscoveryProvider GetServiceDiscoveryProvider(ServiceProviderCon
                 return new ServiceFabricServiceDiscoveryProvider(sfConfig);
             }
 
-            if (config.Type?.ToLower() == "eureka")
-            {
-                return new EurekaServiceDiscoveryProvider(key, _eurekaClient);
-            }
-
             foreach (var serviceDiscoveryFinderDelegate in _delegates)
             {
                 var provider = serviceDiscoveryFinderDelegate?.Invoke(_provider, config, key);