#340 getting old routing tests to pass

ThreeMammals · May 9, 2018 · 81f920f · 81f920f
1 parent e686896
commit 81f920f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs b/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs
@@ -40,12 +40,22 @@ public DownstreamRouteFinderFactory(IServiceProvider provider)
 
         public IDownstreamRouteFinder Get(IInternalConfiguration config)
         {
-            if(!config.ReRoutes.Any())
+            if(!config.ReRoutes.Any() && IsServiceDiscovery(config.ServiceProviderConfiguration))
             {
                 return _providers[nameof(DownstreamRouteCreator)];
             }
 
             return _providers[nameof(DownstreamRouteFinder)];
         }
+
+        private bool IsServiceDiscovery(ServiceProviderConfiguration config)
+        {
+            if(!string.IsNullOrEmpty(config?.Host) || config?.Port > 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Ocelot/ServiceDiscovery/Providers/ConsulServiceDiscoveryProvider.cs b/src/Ocelot/ServiceDiscovery/Providers/ConsulServiceDiscoveryProvider.cs
@@ -22,6 +22,8 @@ public ConsulServiceDiscoveryProvider(ConsulRegistryConfiguration config, IOcelo
         {;
             _logger = factory.CreateLogger<ConsulServiceDiscoveryProvider>();
 
+            //todo - set these in the builder, not here? Is hacky now because we need to run logic in route finder factory to
+            //see if serviee discovery set
             var consulHost = string.IsNullOrEmpty(config?.Host) ? "localhost" : config.Host;
 
             var consulPort = config?.Port ?? 8500;

diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderFactoryTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderFactoryTests.cs
@@ -44,14 +44,26 @@ public void should_return_downstream_route_finder()
         }
 
         [Fact]
-        public void should_return_downstream_route_creator()
+        public void should_return_downstream_route_finder_as_no_service_discovery()
         {
             var spConfig = new ServiceProviderConfigurationBuilder().Build();
             var reRoutes = new List<ReRoute>
             {
             };
             IInternalConfiguration config = new InternalConfiguration(reRoutes, "", spConfig, "");
             var result = _factory.Get(config);
+            result.ShouldBeOfType<Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteFinder>();
+        }
+
+        [Fact]
+        public void should_return_downstream_route_creator()
+        {
+            var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).Build();
+            var reRoutes = new List<ReRoute>
+            {
+            };
+            IInternalConfiguration config = new InternalConfiguration(reRoutes, "", spConfig, "");
+            var result = _factory.Get(config);
             result.ShouldBeOfType<Ocelot.DownstreamRouteFinder.Finder.DownstreamRouteCreator>();
         }
     }