Upgrade Pivotal.Discovery.Client to Pivotal.Discovery.ClientCore (#369)

src/Ocelot/DependencyInjection/OcelotBuilder.cs

@@ -45,8 +45,9 @@ namespace Ocelot.DependencyInjection
     using Ocelot.Infrastructure.Consul;
     using Butterfly.Client.Tracing;
     using Ocelot.Middleware.Multiplexer;
-    using Pivotal.Discovery.Client;
     using ServiceDiscovery.Providers;
+    using Steeltoe.Common.Discovery;
+    using Pivotal.Discovery.Client;
 
     public class OcelotBuilder : IOcelotBuilder
     {

src/Ocelot/Ocelot.csproj

@@ -54,8 +54,8 @@
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Consul" Version="0.7.2.4" />
     <PackageReference Include="Polly" Version="6.0.1" />
-    <PackageReference Include="Pivotal.Discovery.Client" Version="1.1.0" />
     <PackageReference Include="IdentityServer4" Version="2.2.0" />
     <PackageReference Include="Rafty" Version="0.4.3" />
+    <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
   </ItemGroup>
 </Project>

src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs

@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
     using Values;
 
     public class EurekaServiceDiscoveryProvider : IServiceDiscoveryProvider

src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs

@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class FakeEurekaDiscoveryClient : IDiscoveryClient
     {

src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs

@@ -8,7 +8,7 @@ using Ocelot.Values;
 
 namespace Ocelot.ServiceDiscovery
 {    
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class ServiceDiscoveryProviderFactory : IServiceDiscoveryProviderFactory
     {

test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs

@@ -14,7 +14,7 @@ namespace Ocelot.AcceptanceTests
     using TestStack.BDDfy;
     using Xunit;
     using Newtonsoft.Json;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class ServiceDiscoveryTests : IDisposable
     {

test/Ocelot.UnitTests/Middleware/OcelotPipelineExtensionsTests.cs

@@ -7,6 +7,8 @@ namespace Ocelot.UnitTests.Middleware
     using Ocelot.Middleware.Pipeline;
     using Pivotal.Discovery.Client;
     using Shouldly;
+    using Steeltoe.Common.Discovery;
+    using Steeltoe.Discovery.Eureka;
     using TestStack.BDDfy;
     using Xunit;
 
@@ -40,7 +42,16 @@ namespace Ocelot.UnitTests.Middleware
             var root = test.Build();
             var services = new ServiceCollection();
             services.AddSingleton<IConfiguration>(root);
-            services.AddDiscoveryClient(new DiscoveryOptions {ClientType = DiscoveryClientType.EUREKA});
+            services.AddDiscoveryClient(new DiscoveryOptions 
+            {
+                ClientType = DiscoveryClientType.EUREKA,
+                //options can not be null
+                ClientOptions = new EurekaClientOptions()
+                {
+                    ShouldFetchRegistry = false,
+                    ShouldRegisterWithEureka = false
+                }
+            });
             services.AddOcelot();
             var provider = services.BuildServiceProvider();
             _builder = new OcelotPipelineBuilder(provider);

test/Ocelot.UnitTests/ServiceDiscovery/EurekaServiceDiscoveryProviderTests.cs

@@ -7,6 +7,7 @@
     using Ocelot.ServiceDiscovery.Providers;
     using Pivotal.Discovery.Client;
     using Shouldly;
+    using Steeltoe.Common.Discovery;
     using TestStack.BDDfy;
     using Values;
     using Xunit;

test/Ocelot.UnitTests/ServiceDiscovery/ServiceProviderFactoryTests.cs

@@ -14,6 +14,7 @@ using Xunit;
 namespace Ocelot.UnitTests.ServiceDiscovery
 {
     using Pivotal.Discovery.Client;
+    using Steeltoe.Common.Discovery;
 
     public class ServiceProviderFactoryTests
     {