dont use dynamic routing unless service discovery provider explictly set and log that we are going to use dynamic info (#437)

* #428 dont use dynamic routing unless service discovery provider explictly set and log that we are going to use dynamic info

* #428 fixed tests that were failing due to not maintaining backwards compat with config for service discovery

docs/features/servicediscovery.rst

@@ -18,7 +18,8 @@ will be used.
 
     "ServiceDiscoveryProvider": {
         "Host": "localhost",
-        "Port": 8500
+        "Port": 8500,
+        "Type": "Consul"
     }
 
 In the future we can add a feature that allows ReRoute specfic configuration. 
@@ -136,8 +137,8 @@ The config might look something like
             "RequestIdKey": null,
             "ServiceDiscoveryProvider": {
                 "Host": "localhost",
-                "Port": 8510,
+                "Port": 8500,
-                "Type": null,
+                "Type": "Consul",
                 "Token": null,
                 "ConfigurationKey": null
             },

src/Ocelot/Configuration/Creator/ServiceProviderConfigurationCreator.cs

@@ -8,13 +8,16 @@ namespace Ocelot.Configuration.Creator
         public ServiceProviderConfiguration Create(FileGlobalConfiguration globalConfiguration)
         {
             var port = globalConfiguration?.ServiceDiscoveryProvider?.Port ?? 0;
-            var host = globalConfiguration?.ServiceDiscoveryProvider?.Host ?? "consul";
+            var host = globalConfiguration?.ServiceDiscoveryProvider?.Host ?? "localhost";
+            var type = !string.IsNullOrEmpty(globalConfiguration?.ServiceDiscoveryProvider?.Type) 
+                ? globalConfiguration?.ServiceDiscoveryProvider?.Type 
+                : "consul";
             var pollingInterval = globalConfiguration?.ServiceDiscoveryProvider?.PollingInterval ?? 0;
 
             return new ServiceProviderConfigurationBuilder()
                 .WithHost(host)
                 .WithPort(port)
-                .WithType(globalConfiguration?.ServiceDiscoveryProvider?.Type)
+                .WithType(type)
                 .WithToken(globalConfiguration?.ServiceDiscoveryProvider?.Token)
                 .WithConfigurationKey(globalConfiguration?.ServiceDiscoveryProvider?.ConfigurationKey)
                 .WithPollingInterval(pollingInterval)

src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteProviderFactory.cs

@@ -5,13 +5,16 @@
     using System.Linq;
     using Configuration;
     using Microsoft.Extensions.DependencyInjection;
+    using Ocelot.Logging;
 
     public class DownstreamRouteProviderFactory : IDownstreamRouteProviderFactory
     {
         private readonly Dictionary<string, IDownstreamRouteProvider> _providers;
+        private IOcelotLogger _logger;
         
-        public DownstreamRouteProviderFactory(IServiceProvider provider)
+        public DownstreamRouteProviderFactory(IServiceProvider provider, IOcelotLoggerFactory factory)
         {
+            _logger = factory.CreateLogger<DownstreamRouteProviderFactory>();
             _providers = provider.GetServices<IDownstreamRouteProvider>().ToDictionary(x => x.GetType().Name);
         }
 
@@ -19,6 +22,7 @@
         {
             if(!config.ReRoutes.Any() && IsServiceDiscovery(config.ServiceProviderConfiguration))
             {
+                _logger.LogInformation($"Selected {nameof(DownstreamRouteCreator)} as DownstreamRouteProvider for this request");
                 return _providers[nameof(DownstreamRouteCreator)];
             }
                 
@@ -27,7 +31,7 @@
 
         private bool IsServiceDiscovery(ServiceProviderConfiguration config)
         {
-            if(!string.IsNullOrEmpty(config?.Host) || config?.Port > 0)
+            if(!string.IsNullOrEmpty(config?.Host) && config?.Port > 0 && !string.IsNullOrEmpty(config.Type))
             {
                 return true;
             }

test/Ocelot.ManualTest/Program.cs

@@ -7,6 +7,8 @@
     using Microsoft.Extensions.DependencyInjection;
     using Ocelot.DependencyInjection;
     using Ocelot.Middleware;
+    using System;
+    using IdentityServer4.AccessTokenValidation;
 
     public class Program
     {

test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteProviderFactoryTests.cs

@@ -1,26 +1,28 @@
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
-using Moq;
-using Ocelot.Configuration;
-using Ocelot.Configuration.Builder;
-using Ocelot.DownstreamRouteFinder;
-using Ocelot.DownstreamRouteFinder.Finder;
-using Ocelot.DownstreamRouteFinder.UrlMatcher;
-using Ocelot.Responses;
-using Ocelot.Values;
-using Shouldly;
-using TestStack.BDDfy;
-using Xunit;
-
 namespace Ocelot.UnitTests.DownstreamRouteFinder
 {
+    using System.Collections.Generic;
+    using Microsoft.Extensions.DependencyInjection;
+    using Moq;
+    using Ocelot.Configuration;
+    using Ocelot.Configuration.Builder;
+    using Ocelot.DownstreamRouteFinder;
+    using Ocelot.DownstreamRouteFinder.Finder;
+    using Ocelot.DownstreamRouteFinder.UrlMatcher;
+    using Ocelot.Responses;
+    using Ocelot.Values;
+    using Shouldly;
+    using TestStack.BDDfy;
+    using Xunit;
     using Ocelot.Configuration.Creator;
+    using Ocelot.Logging;
 
     public class DownstreamRouteProviderFactoryTests
     {
         private readonly DownstreamRouteProviderFactory _factory;
         private IInternalConfiguration _config;
         private IDownstreamRouteProvider _result;
+        private Mock<IOcelotLogger> _logger;
+        private Mock<IOcelotLoggerFactory> _loggerFactory;
 
         public DownstreamRouteProviderFactoryTests()
         {
@@ -31,7 +33,10 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
             services.AddSingleton<IDownstreamRouteProvider, Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteFinder>();
             services.AddSingleton<IDownstreamRouteProvider, Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteCreator>();
             var provider = services.BuildServiceProvider();
-            _factory = new DownstreamRouteProviderFactory(provider);
+            _logger = new Mock<IOcelotLogger>();
+            _loggerFactory = new Mock<IOcelotLoggerFactory>();
+            _loggerFactory.Setup(x => x.CreateLogger<DownstreamRouteProviderFactory>()).Returns(_logger.Object);
+            _factory = new DownstreamRouteProviderFactory(provider, _loggerFactory.Object);
         }
 
         [Fact]
@@ -49,12 +54,34 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
         }
 
         [Fact]
-        public void should_return_downstream_route_finder_as_no_service_discovery()
+        public void should_return_downstream_route_finder_as_no_service_discovery_given_no_host()
         {
-            var spConfig = new ServiceProviderConfigurationBuilder().Build();
+            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("").WithPort(50).Build();
-            var reRoutes = new List<ReRoute>
+            var reRoutes = new List<ReRoute>();
+
+            this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
+                .When(_ => WhenIGet())
+                .Then(_ => ThenTheResultShouldBe<Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteFinder>())
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_return_downstream_route_finder_given_no_service_discovery_port()
         {
-            };
+            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("localhost").WithPort(0).Build();
+            var reRoutes = new List<ReRoute>();
+
+            this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
+                .When(_ => WhenIGet())
+                .Then(_ => ThenTheResultShouldBe<Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteFinder>())
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_return_downstream_route_finder_given_no_service_discovery_type()
+        {
+            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("localhost").WithPort(50).WithType("").Build();
+            var reRoutes = new List<ReRoute>();
 
             this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
                 .When(_ => WhenIGet())
@@ -65,10 +92,9 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
         [Fact]
         public void should_return_downstream_route_creator()
         {
-            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).Build();
+            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).WithType("test").Build();
-            var reRoutes = new List<ReRoute>
+            var reRoutes = new List<ReRoute>();
-            {
+
-            };
             this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
                 .When(_ => WhenIGet())
                 .Then(_ => ThenTheResultShouldBe<Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteCreator>())