Add ability to specify scheme of ServiceProviderConfiguration

David Lievrouw · David Lievrouw · commit cd3dc00c1a91 · 2020-03-15T12:13:09.000+01:00
diff --git a/src/Ocelot.Provider.Consul/ConsulClientFactory.cs b/src/Ocelot.Provider.Consul/ConsulClientFactory.cs
@@ -9,7 +9,7 @@ public IConsulClient Get(ConsulRegistryConfiguration config)
         {
             return new ConsulClient(c =>
             {
-                c.Address = new Uri($"http://{config.Host}:{config.Port}");
+                c.Address = new Uri($"{config.Scheme}://{config.Host}:{config.Port}");
 
                 if (!string.IsNullOrEmpty(config?.Token))
                 {
diff --git a/src/Ocelot.Provider.Consul/ConsulProviderFactory.cs b/src/Ocelot.Provider.Consul/ConsulProviderFactory.cs
@@ -12,7 +12,7 @@ public static class ConsulProviderFactory
 
             var consulFactory = provider.GetService<IConsulClientFactory>();
 
-            var consulRegistryConfiguration = new ConsulRegistryConfiguration(config.Host, config.Port, reRoute.ServiceName, config.Token);
+            var consulRegistryConfiguration = new ConsulRegistryConfiguration(config.Scheme, config.Host, config.Port, reRoute.ServiceName, config.Token);
 
             var consulServiceDiscoveryProvider = new Consul(consulRegistryConfiguration, factory, consulFactory);
 
diff --git a/src/Ocelot.Provider.Consul/ConsulRegistryConfiguration.cs b/src/Ocelot.Provider.Consul/ConsulRegistryConfiguration.cs
@@ -2,15 +2,17 @@
 {
     public class ConsulRegistryConfiguration
     {
-        public ConsulRegistryConfiguration(string host, int port, string keyOfServiceInConsul, string token)
+        public ConsulRegistryConfiguration(string scheme, string host, int port, string keyOfServiceInConsul, string token)
         {
             Host = string.IsNullOrEmpty(host) ? "localhost" : host;
             Port = port > 0 ? port : 8500;
+            Scheme = string.IsNullOrEmpty(scheme) ? "http" : scheme;
             KeyOfServiceInConsul = keyOfServiceInConsul;
             Token = token;
         }
 
         public string KeyOfServiceInConsul { get; }
+        public string Scheme { get; }
         public string Host { get; }
         public int Port { get; }
         public string Token { get; }
diff --git a/src/Ocelot/Configuration/Builder/ServiceProviderConfigurationBuilder.cs b/src/Ocelot/Configuration/Builder/ServiceProviderConfigurationBuilder.cs
@@ -2,6 +2,7 @@ namespace Ocelot.Configuration.Builder
 {
     public class ServiceProviderConfigurationBuilder
     {
+        private string _serviceDiscoveryProviderScheme;
         private string _serviceDiscoveryProviderHost;
         private int _serviceDiscoveryProviderPort;
         private string _type;
@@ -10,6 +11,12 @@ public class ServiceProviderConfigurationBuilder
         private int _pollingInterval;
         private string _namespace;
 
+        public ServiceProviderConfigurationBuilder WithScheme(string serviceDiscoveryProviderScheme)
+        {
+            _serviceDiscoveryProviderScheme = serviceDiscoveryProviderScheme;
+            return this;
+        }
+
         public ServiceProviderConfigurationBuilder WithHost(string serviceDiscoveryProviderHost)
         {
             _serviceDiscoveryProviderHost = serviceDiscoveryProviderHost;
@@ -54,7 +61,7 @@ public ServiceProviderConfigurationBuilder WithNamespace(string @namespace)
 
         public ServiceProviderConfiguration Build()
         {
-            return new ServiceProviderConfiguration(_type, _serviceDiscoveryProviderHost, _serviceDiscoveryProviderPort, _token, _configurationKey, _pollingInterval, _namespace);
+            return new ServiceProviderConfiguration(_type, _serviceDiscoveryProviderScheme, _serviceDiscoveryProviderHost, _serviceDiscoveryProviderPort, _token, _configurationKey, _pollingInterval, _namespace);
         }
     }
 }
diff --git a/src/Ocelot/Configuration/Creator/ServiceProviderConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/ServiceProviderConfigurationCreator.cs
@@ -8,6 +8,7 @@ public class ServiceProviderConfigurationCreator : IServiceProviderConfiguration
         public ServiceProviderConfiguration Create(FileGlobalConfiguration globalConfiguration)
         {
             var port = globalConfiguration?.ServiceDiscoveryProvider?.Port ?? 0;
+            var scheme = globalConfiguration?.ServiceDiscoveryProvider?.Scheme ?? "http";
             var host = globalConfiguration?.ServiceDiscoveryProvider?.Host ?? "localhost";
             var type = !string.IsNullOrEmpty(globalConfiguration?.ServiceDiscoveryProvider?.Type)
                 ? globalConfiguration?.ServiceDiscoveryProvider?.Type
@@ -16,6 +17,7 @@ public ServiceProviderConfiguration Create(FileGlobalConfiguration globalConfigu
             var k8snamespace = globalConfiguration?.ServiceDiscoveryProvider?.Namespace ?? string.Empty;
 
             return new ServiceProviderConfigurationBuilder()
+                .WithScheme(scheme)
                 .WithHost(host)
                 .WithPort(port)
                 .WithType(type)
diff --git a/src/Ocelot/Configuration/File/FileServiceDiscoveryProvider.cs b/src/Ocelot/Configuration/File/FileServiceDiscoveryProvider.cs
@@ -2,6 +2,7 @@ namespace Ocelot.Configuration.File
 {
     public class FileServiceDiscoveryProvider
     {
+        public string Scheme { get; set; }
         public string Host { get; set; }
         public int Port { get; set; }
         public string Type { get; set; }
diff --git a/src/Ocelot/Configuration/ServiceProviderConfiguration.cs b/src/Ocelot/Configuration/ServiceProviderConfiguration.cs
@@ -2,9 +2,10 @@
 {
     public class ServiceProviderConfiguration
     {
-        public ServiceProviderConfiguration(string type, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace = "")
+        public ServiceProviderConfiguration(string type, string scheme, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace = "")
         {
             ConfigurationKey = configurationKey;
+            Scheme = scheme;
             Host = host;
             Port = port;
             Token = token;
@@ -13,6 +14,8 @@ public ServiceProviderConfiguration(string type, string host, int port, string t
             Namespace = @namespace;
         }
 
+        public string Scheme { get; }
+
         public string Host { get; }
 
         public int Port { get; }
diff --git a/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs b/test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
@@ -24,6 +24,7 @@ public void should_throw_exception_if_cannot_start_because_service_discovery_pro
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "https",
                         Host = "localhost",
                         Type = "consul",
                         Port = 8500
@@ -66,6 +67,7 @@ public void should_throw_exception_if_cannot_start_because_service_discovery_pro
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "https",
                         Host = "localhost",
                         Type = "consul",
                         Port = 8500
diff --git a/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
@@ -59,6 +59,7 @@ public void should_return_response_200_with_simple_url_when_using_jsonserialized
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
diff --git a/test/Ocelot.AcceptanceTests/ConsulConfigurationInConsulTests.cs b/test/Ocelot.AcceptanceTests/ConsulConfigurationInConsulTests.cs
@@ -61,6 +61,7 @@ public void should_return_response_200_with_simple_url()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -91,6 +92,7 @@ public void should_load_configuration_out_of_consul()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -123,6 +125,7 @@ public void should_load_configuration_out_of_consul()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -152,6 +155,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -184,6 +188,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -214,6 +219,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -274,6 +280,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     },
@@ -295,6 +302,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
diff --git a/test/Ocelot.AcceptanceTests/ConsulWebSocketTests.cs b/test/Ocelot.AcceptanceTests/ConsulWebSocketTests.cs
@@ -83,6 +83,7 @@ public void should_proxy_websocket_input_to_downstream_service_and_use_service_d
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort,
                         Type = "consul"
diff --git a/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs b/test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
@@ -81,6 +81,7 @@ public void should_use_consul_service_discovery_and_load_balance_request()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -137,6 +138,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -180,6 +182,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     },
@@ -243,6 +246,7 @@ public void should_use_consul_service_discovery_and_load_balance_request_no_re_r
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     },
@@ -302,6 +306,7 @@ public void should_use_token_to_make_request_to_consul()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort,
                         Token = token
@@ -372,6 +377,7 @@ public void should_send_request_to_service_after_it_becomes_available_in_consul(
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort
                     }
@@ -437,6 +443,7 @@ public void should_handle_request_to_poll_consul_for_downstream_service_and_make
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "http",
                         Host = "localhost",
                         Port = consulPort,
                         Type = "PollConsul",
diff --git a/test/Ocelot.AcceptanceTests/SslTests.cs b/test/Ocelot.AcceptanceTests/SslTests.cs
@@ -6,7 +6,7 @@ namespace Ocelot.AcceptanceTests
     using System.Collections.Generic;
     using System.Net;
     using TestStack.BDDfy;
-    using Xunit;
+    using Xunit;
 
     public class SslTests : IDisposable
     {
@@ -118,4 +118,4 @@ public void Dispose()
             _steps.Dispose();
         }
     }
-}
+}
diff --git a/test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs b/test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs
@@ -74,6 +74,7 @@ public void should_fix_issue_194()
                 {
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
                     {
+                        Scheme = "https",
                         Host = "localhost",
                         Port = consulPort
                     }
diff --git a/test/Ocelot.IntegrationTests/AdministrationTests.cs b/test/Ocelot.IntegrationTests/AdministrationTests.cs
@@ -124,6 +124,7 @@ public void should_return_file_configuration()
                     RequestIdKey = "RequestId",
                     ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                     {
+                        Scheme = "https",
                         Host = "127.0.0.1",
                     }
                 },
@@ -660,6 +661,7 @@ private void ThenTheResponseShouldBe(FileConfiguration expecteds)
             var response = JsonConvert.DeserializeObject<FileConfiguration>(_response.Content.ReadAsStringAsync().Result);
 
             response.GlobalConfiguration.RequestIdKey.ShouldBe(expecteds.GlobalConfiguration.RequestIdKey);
+            response.GlobalConfiguration.ServiceDiscoveryProvider.Scheme.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Scheme);
             response.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Host);
             response.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Port);
 
diff --git a/test/Ocelot.UnitTests/Configuration/ConfigurationCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/ConfigurationCreatorTests.cs
@@ -105,7 +105,7 @@ private void GivenTheDependenciesAreSetUp()
                 GlobalConfiguration = new FileGlobalConfiguration()
             };
             _reRoutes = new List<ReRoute>();
-            _spc = new ServiceProviderConfiguration("", "", 1, "", "", 1);
+            _spc = new ServiceProviderConfiguration("", "", "", 1, "", "", 1);
             _lbo = new LoadBalancerOptionsBuilder().Build();
             _qoso = new QoSOptions(1, 1, 1, "");
             _hho = new HttpHandlerOptionsBuilder().Build();
diff --git a/test/Ocelot.UnitTests/Configuration/DiskFileConfigurationRepositoryTests.cs b/test/Ocelot.UnitTests/Configuration/DiskFileConfigurationRepositoryTests.cs
@@ -139,6 +139,7 @@ private void WhenISetTheConfiguration()
         private void ThenTheConfigurationIsStoredAs(FileConfiguration expecteds)
         {
             _result.GlobalConfiguration.RequestIdKey.ShouldBe(expecteds.GlobalConfiguration.RequestIdKey);
+            _result.GlobalConfiguration.ServiceDiscoveryProvider.Scheme.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Scheme);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Host);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Port);
 
@@ -196,6 +197,7 @@ private void WhenIGetTheReRoutes()
         private void ThenTheFollowingIsReturned(FileConfiguration expecteds)
         {
             _result.GlobalConfiguration.RequestIdKey.ShouldBe(expecteds.GlobalConfiguration.RequestIdKey);
+            _result.GlobalConfiguration.ServiceDiscoveryProvider.Scheme.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Scheme);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Host);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expecteds.GlobalConfiguration.ServiceDiscoveryProvider.Port);
 
@@ -243,6 +245,7 @@ private FileConfiguration FakeFileConfigurationForSet()
             {
                 ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                 {
+                    Scheme = "https",
                     Port = 198,
                     Host = "blah"
                 }
@@ -278,6 +281,7 @@ private FileConfiguration FakeFileConfigurationForGet()
             {
                 ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                 {
+                    Scheme = "https",
                     Port = 198,
                     Host = "blah"
                 }
diff --git a/test/Ocelot.UnitTests/Configuration/ServiceProviderCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/ServiceProviderCreatorTests.cs
@@ -26,6 +26,7 @@ public void should_create_service_provider_config()
             {
                 ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                 {
+                    Scheme = "https",
                     Host = "127.0.0.1",
                     Port = 1234,
                     Type = "ServiceFabric",
@@ -36,6 +37,7 @@ public void should_create_service_provider_config()
             };
 
             var expected = new ServiceProviderConfigurationBuilder()
+                .WithScheme("https")
                 .WithHost("127.0.0.1")
                 .WithPort(1234)
                 .WithType("ServiceFabric")
@@ -62,6 +64,7 @@ private void WhenICreate()
 
         private void ThenTheConfigIs(ServiceProviderConfiguration expected)
         {
+            _result.Scheme.ShouldBe(expected.Scheme);
             _result.Host.ShouldBe(expected.Host);
             _result.Port.ShouldBe(expected.Port);
             _result.Token.ShouldBe(expected.Token);
diff --git a/test/Ocelot.UnitTests/Configuration/Validation/FileConfigurationFluentValidatorTests.cs b/test/Ocelot.UnitTests/Configuration/Validation/FileConfigurationFluentValidatorTests.cs
diff --git a/test/Ocelot.UnitTests/Consul/ConsulFileConfigurationRepositoryTests.cs b/test/Ocelot.UnitTests/Consul/ConsulFileConfigurationRepositoryTests.cs
diff --git a/test/Ocelot.UnitTests/Consul/ConsulServiceDiscoveryProviderTests.cs b/test/Ocelot.UnitTests/Consul/ConsulServiceDiscoveryProviderTests.cs
diff --git a/test/Ocelot.UnitTests/Consul/ProviderFactoryTests.cs b/test/Ocelot.UnitTests/Consul/ProviderFactoryTests.cs
diff --git a/test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs b/test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteProviderFactoryTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteProviderFactoryTests.cs
diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public IConsulClient Get(ConsulRegistryConfiguration config)`
`9`	`9`	`{`
`10`	`10`	`return new ConsulClient(c =>`
`11`	`11`	`{`
`12`		`- c.Address = new Uri($"http://{config.Host}:{config.Port}");`
	`12`	`+ c.Address = new Uri($"{config.Scheme}://{config.Host}:{config.Port}");`
`13`	`13`
`14`	`14`	`if (!string.IsNullOrEmpty(config?.Token))`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,17 @@`
`2`	`2`	`{`
`3`	`3`	`public class ConsulRegistryConfiguration`
`4`	`4`	`{`
`5`		`- public ConsulRegistryConfiguration(string host, int port, string keyOfServiceInConsul, string token)`
	`5`	`+ public ConsulRegistryConfiguration(string scheme, string host, int port, string keyOfServiceInConsul, string token)`
`6`	`6`	`{`
`7`	`7`	`Host = string.IsNullOrEmpty(host) ? "localhost" : host;`
`8`	`8`	`Port = port > 0 ? port : 8500;`
	`9`	`+ Scheme = string.IsNullOrEmpty(scheme) ? "http" : scheme;`
`9`	`10`	`KeyOfServiceInConsul = keyOfServiceInConsul;`
`10`	`11`	`Token = token;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`public string KeyOfServiceInConsul { get; }`
	`15`	`+ public string Scheme { get; }`
`14`	`16`	`public string Host { get; }`
`15`	`17`	`public int Port { get; }`
`16`	`18`	`public string Token { get; }`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace Ocelot.Configuration.Builder`
`2`	`2`	`{`
`3`	`3`	`public class ServiceProviderConfigurationBuilder`
`4`	`4`	`{`
	`5`	`+ private string _serviceDiscoveryProviderScheme;`
`5`	`6`	`private string _serviceDiscoveryProviderHost;`
`6`	`7`	`private int _serviceDiscoveryProviderPort;`
`7`	`8`	`private string _type;`
`@@ -10,6 +11,12 @@ public class ServiceProviderConfigurationBuilder`
`10`	`11`	`private int _pollingInterval;`
`11`	`12`	`private string _namespace;`
`12`	`13`
	`14`	`+ public ServiceProviderConfigurationBuilder WithScheme(string serviceDiscoveryProviderScheme)`
	`15`	`+ {`
	`16`	`+ _serviceDiscoveryProviderScheme = serviceDiscoveryProviderScheme;`
	`17`	`+ return this;`
	`18`	`+ }`
	`19`	`+`
`13`	`20`	`public ServiceProviderConfigurationBuilder WithHost(string serviceDiscoveryProviderHost)`
`14`	`21`	`{`
`15`	`22`	`_serviceDiscoveryProviderHost = serviceDiscoveryProviderHost;`
`@@ -54,7 +61,7 @@ public ServiceProviderConfigurationBuilder WithNamespace(string @namespace)`
`54`	`61`
`55`	`62`	`public ServiceProviderConfiguration Build()`
`56`	`63`	`{`
`57`		`- return new ServiceProviderConfiguration(_type, _serviceDiscoveryProviderHost, _serviceDiscoveryProviderPort, _token, _configurationKey, _pollingInterval, _namespace);`
	`64`	`+ return new ServiceProviderConfiguration(_type, _serviceDiscoveryProviderScheme, _serviceDiscoveryProviderHost, _serviceDiscoveryProviderPort, _token, _configurationKey, _pollingInterval, _namespace);`
`58`	`65`	`}`
`59`	`66`	`}`
`60`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace Ocelot.Configuration.File`
`2`	`2`	`{`
`3`	`3`	`public class FileServiceDiscoveryProvider`
`4`	`4`	`{`
	`5`	`+ public string Scheme { get; set; }`
`5`	`6`	`public string Host { get; set; }`
`6`	`7`	`public int Port { get; set; }`
`7`	`8`	`public string Type { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`	`{`
`3`	`3`	`public class ServiceProviderConfiguration`
`4`	`4`	`{`
`5`		`- public ServiceProviderConfiguration(string type, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace = "")`
	`5`	`+ public ServiceProviderConfiguration(string type, string scheme, string host, int port, string token, string configurationKey, int pollingInterval, string @namespace = "")`
`6`	`6`	`{`
`7`	`7`	`ConfigurationKey = configurationKey;`
	`8`	`+ Scheme = scheme;`
`8`	`9`	`Host = host;`
`9`	`10`	`Port = port;`
`10`	`11`	`Token = token;`
`@@ -13,6 +14,8 @@ public ServiceProviderConfiguration(string type, string host, int port, string t`
`13`	`14`	`Namespace = @namespace;`
`14`	`15`	`}`
`15`	`16`
	`17`	`+ public string Scheme { get; }`
	`18`	`+`
`16`	`19`	`public string Host { get; }`
`17`	`20`
`18`	`21`	`public int Port { get; }`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public void should_throw_exception_if_cannot_start_because_service_discovery_pro`
`24`	`24`	`{`
`25`	`25`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider`
`26`	`26`	`{`
	`27`	`+ Scheme = "https",`
`27`	`28`	`Host = "localhost",`
`28`	`29`	`Type = "consul",`
`29`	`30`	`Port = 8500`
`@@ -66,6 +67,7 @@ public void should_throw_exception_if_cannot_start_because_service_discovery_pro`
`66`	`67`	`{`
`67`	`68`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider`
`68`	`69`	`{`
	`70`	`+ Scheme = "https",`
`69`	`71`	`Host = "localhost",`
`70`	`72`	`Type = "consul",`
`71`	`73`	`Port = 8500`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public void should_return_response_200_with_simple_url_when_using_jsonserialized`
`59`	`59`	`{`
`60`	`60`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`61`	`61`	`{`
	`62`	`+ Scheme = "http",`
`62`	`63`	`Host = "localhost",`
`63`	`64`	`Port = consulPort`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public void should_return_response_200_with_simple_url()`
`61`	`61`	`{`
`62`	`62`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`63`	`63`	`{`
	`64`	`+ Scheme = "http",`
`64`	`65`	`Host = "localhost",`
`65`	`66`	`Port = consulPort`
`66`	`67`	`}`
`@@ -91,6 +92,7 @@ public void should_load_configuration_out_of_consul()`
`91`	`92`	`{`
`92`	`93`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`93`	`94`	`{`
	`95`	`+ Scheme = "http",`
`94`	`96`	`Host = "localhost",`
`95`	`97`	`Port = consulPort`
`96`	`98`	`}`
`@@ -123,6 +125,7 @@ public void should_load_configuration_out_of_consul()`
`123`	`125`	`{`
`124`	`126`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`125`	`127`	`{`
	`128`	`+ Scheme = "http",`
`126`	`129`	`Host = "localhost",`
`127`	`130`	`Port = consulPort`
`128`	`131`	`}`
`@@ -152,6 +155,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()`
`152`	`155`	`{`
`153`	`156`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`154`	`157`	`{`
	`158`	`+ Scheme = "http",`
`155`	`159`	`Host = "localhost",`
`156`	`160`	`Port = consulPort`
`157`	`161`	`}`
`@@ -184,6 +188,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()`
`184`	`188`	`{`
`185`	`189`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`186`	`190`	`{`
	`191`	`+ Scheme = "http",`
`187`	`192`	`Host = "localhost",`
`188`	`193`	`Port = consulPort`
`189`	`194`	`}`
`@@ -214,6 +219,7 @@ public void should_load_configuration_out_of_consul_if_it_is_changed()`
`214`	`219`	`{`
`215`	`220`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()`
`216`	`221`	`{`
	`222`	`+ Scheme = "http",`
`217`	`223`	`Host = "localhost",`
`218`	`224`	`Port = consulPort`
`219`	`225`	`}`
`@@ -274,6 +280,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ`
`274`	`280`	`{`
`275`	`281`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider`
`276`	`282`	`{`
	`283`	`+ Scheme = "http",`
`277`	`284`	`Host = "localhost",`
`278`	`285`	`Port = consulPort`
`279`	`286`	`},`
`@@ -295,6 +302,7 @@ public void should_handle_request_to_consul_for_downstream_service_and_make_requ`
`295`	`302`	`{`
`296`	`303`	`ServiceDiscoveryProvider = new FileServiceDiscoveryProvider`
`297`	`304`	`{`
	`305`	`+ Scheme = "http",`
`298`	`306`	`Host = "localhost",`
`299`	`307`	`Port = consulPort`
`300`	`308`	`}`