tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 16:10:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ServiceProviderConfigurationScheme' of https://github.com/DavidLievrouw/Ocelot into DavidLievrouw-ServiceProviderConfigurationScheme

Browse Source
This commit is contained in:
TomPallister
2020-04-12 17:44:57 +01:00
parent 2f97913f41 20fd3e01ba
commit c8c3d128f6
26 changed files with 89 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Ocelot.AcceptanceTests/CannotStartOcelotTests.cs
View File

@@ -24,6 +24,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "consul",
Port = 8500
@@ -66,6 +67,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "consul",
Port = 8500

1
test/Ocelot.AcceptanceTests/ConfigurationInConsulTests.cs
View File

@@ -60,6 +60,7 @@ namespace Ocelot.AcceptanceTests
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}

8
test/Ocelot.AcceptanceTests/ConsulConfigurationInConsulTests.cs
View File

@@ -61,6 +61,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -91,6 +92,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -123,6 +125,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -152,6 +155,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -184,6 +188,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -214,6 +219,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -274,6 +280,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@@ -295,6 +302,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}

1
test/Ocelot.AcceptanceTests/ConsulWebSocketTests.cs
View File

@@ -83,6 +83,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Type = "consul"

7
test/Ocelot.AcceptanceTests/ServiceDiscoveryTests.cs
View File

@@ -81,6 +81,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -137,6 +138,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -180,6 +182,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@@ -243,6 +246,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
},
@@ -302,6 +306,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Token = token
@@ -372,6 +377,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort
}
@@ -437,6 +443,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "http",
Host = "localhost",
Port = consulPort,
Type = "PollConsul",

4
test/Ocelot.AcceptanceTests/SslTests.cs
View File

@@ -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 @@ namespace Ocelot.AcceptanceTests
_steps.Dispose();
}
}
}
}

1
test/Ocelot.AcceptanceTests/TwoDownstreamServicesTests.cs
View File

@@ -74,6 +74,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider()
{
Scheme = "https",
Host = "localhost",
Port = consulPort
}

2
test/Ocelot.IntegrationTests/AdministrationTests.cs
View File

@@ -124,6 +124,7 @@ namespace Ocelot.IntegrationTests
RequestIdKey = "RequestId",
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "127.0.0.1",
}
},
@@ -660,6 +661,7 @@ namespace Ocelot.IntegrationTests
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);

2
test/Ocelot.UnitTests/Configuration/ConfigurationCreatorTests.cs
View File

@@ -105,7 +105,7 @@ namespace Ocelot.UnitTests.Configuration
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();

4
test/Ocelot.UnitTests/Configuration/DiskFileConfigurationRepositoryTests.cs
View File

@@ -139,6 +139,7 @@ namespace Ocelot.UnitTests.Configuration
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 @@ namespace Ocelot.UnitTests.Configuration
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 @@ namespace Ocelot.UnitTests.Configuration
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Port = 198,
Host = "blah"
}
@@ -278,6 +281,7 @@ namespace Ocelot.UnitTests.Configuration
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Port = 198,
Host = "blah"
}

3
test/Ocelot.UnitTests/Configuration/ServiceProviderCreatorTests.cs
View File

@@ -26,6 +26,7 @@ namespace Ocelot.UnitTests.Configuration
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "127.0.0.1",
Port = 1234,
Type = "ServiceFabric",
@@ -36,6 +37,7 @@ namespace Ocelot.UnitTests.Configuration
};
var expected = new ServiceProviderConfigurationBuilder()
.WithScheme("https")
.WithHost("127.0.0.1")
.WithPort(1234)
.WithType("ServiceFabric")
@@ -62,6 +64,7 @@ namespace Ocelot.UnitTests.Configuration
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);

7
test/Ocelot.UnitTests/Configuration/Validation/FileConfigurationFluentValidatorTests.cs
View File

@@ -57,6 +57,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "ServiceFabric",
Port = 8500
@@ -90,6 +91,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "FakeServiceDiscoveryProvider",
Port = 8500
@@ -113,6 +115,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "FakeServiceDiscoveryProvider",
Port = 8500
@@ -147,6 +150,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "FakeServiceDiscoveryProvider",
Port = 8500
@@ -171,6 +175,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "FakeServiceDiscoveryProvider",
Port = 8500
@@ -206,6 +211,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "localhost",
Type = "consul",
Port = 8500
@@ -1197,6 +1203,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Type = "servicefabric",
Host = "localhost",
Port = 1234

1
test/Ocelot.UnitTests/Consul/ConsulFileConfigurationRepositoryTests.cs
View File

@@ -244,6 +244,7 @@
{
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Port = 198,
Host = "blah"
}

8
test/Ocelot.UnitTests/Consul/ConsulServiceDiscoveryProviderTests.cs
View File

@@ -25,6 +25,7 @@
private readonly string _serviceName;
private readonly int _port;
private readonly string _consulHost;
private readonly string _consulScheme;
private readonly string _fakeConsulServiceDiscoveryUrl;
private List<Service> _services;
private readonly Mock<IOcelotLoggerFactory> _factory;
@@ -37,14 +38,15 @@
_serviceName = "test";
_port = 8500;
_consulHost = "localhost";
_fakeConsulServiceDiscoveryUrl = $"http://{_consulHost}:{_port}";
_consulScheme = "http";
_fakeConsulServiceDiscoveryUrl = $"{_consulScheme}://{_consulHost}:{_port}";
_serviceEntries = new List<ServiceEntry>();
_factory = new Mock<IOcelotLoggerFactory>();
_clientFactory = new ConsulClientFactory();
_logger = new Mock<IOcelotLogger>();
_factory.Setup(x => x.CreateLogger<Consul>()).Returns(_logger.Object);
_factory.Setup(x => x.CreateLogger<PollConsul>()).Returns(_logger.Object);
var config = new ConsulRegistryConfiguration(_consulHost, _port, _serviceName, null);
var config = new ConsulRegistryConfiguration(_consulScheme, _consulHost, _port, _serviceName, null);
_provider = new Consul(config, _factory.Object, _clientFactory);
}
@@ -74,7 +76,7 @@
public void should_use_token()
{
var token = "test token";
var config = new ConsulRegistryConfiguration(_consulHost, _port, _serviceName, token);
var config = new ConsulRegistryConfiguration(_consulScheme, _consulHost, _port, _serviceName, token);
_provider = new Consul(config, _factory.Object, _clientFactory);
var serviceEntryOne = new ServiceEntry()

4
test/Ocelot.UnitTests/Consul/ProviderFactoryTests.cs
View File

@@ -35,7 +35,7 @@ namespace Ocelot.UnitTests.Consul
.WithServiceName("")
.Build();
var provider = ConsulProviderFactory.Get(_provider, new ServiceProviderConfiguration("", "", 1, "", "", 1), reRoute);
var provider = ConsulProviderFactory.Get(_provider, new ServiceProviderConfiguration("", "", "", 1, "", "", 1), reRoute);
provider.ShouldBeOfType<Consul>();
}
@@ -48,7 +48,7 @@ namespace Ocelot.UnitTests.Consul
.WithServiceName("")
.Build();
var provider = ConsulProviderFactory.Get(_provider, new ServiceProviderConfiguration("pollconsul", "", 1, "", "", stopsPollerFromPolling), reRoute);
var provider = ConsulProviderFactory.Get(_provider, new ServiceProviderConfiguration("pollconsul", "http", "", 1, "", "", stopsPollerFromPolling), reRoute);
var pollProvider = provider as PollConsul;
pollProvider.ShouldNotBeNull();
pollProvider.Dispose();

2
test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
View File

@@ -98,6 +98,7 @@
},
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Scheme = "https",
Host = "Host",
Port = 80,
Type = "Type"
@@ -277,6 +278,7 @@
fc.GlobalConfiguration.RateLimitOptions.QuotaExceededMessage.ShouldBe(_globalConfig.GlobalConfiguration.RateLimitOptions.QuotaExceededMessage);
fc.GlobalConfiguration.RateLimitOptions.RateLimitCounterPrefix.ShouldBe(_globalConfig.GlobalConfiguration.RateLimitOptions.RateLimitCounterPrefix);
fc.GlobalConfiguration.RequestIdKey.ShouldBe(_globalConfig.GlobalConfiguration.RequestIdKey);
fc.GlobalConfiguration.ServiceDiscoveryProvider.Scheme.ShouldBe(_globalConfig.GlobalConfiguration.ServiceDiscoveryProvider.Scheme);
fc.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(_globalConfig.GlobalConfiguration.ServiceDiscoveryProvider.Host);
fc.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(_globalConfig.GlobalConfiguration.ServiceDiscoveryProvider.Port);
fc.GlobalConfiguration.ServiceDiscoveryProvider.Type.ShouldBe(_globalConfig.GlobalConfiguration.ServiceDiscoveryProvider.Type);

24
test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteProviderFactoryTests.cs
View File

@@ -54,7 +54,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
[Fact]
public void should_return_downstream_route_finder_when_not_dynamic_re_route_and_service_discovery_on()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).WithType("test").Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("test").WithPort(50).WithType("test").Build();
var reRoutes = new List<ReRoute>
{
new ReRouteBuilder().WithUpstreamPathTemplate(new UpstreamPathTemplateBuilder().WithOriginalValue("woot").Build()).Build()
@@ -66,10 +66,22 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
.BDDfy();
}
[Fact]
public void should_return_downstream_route_finder_as_no_service_discovery_given_no_scheme()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("").WithHost("test").WithPort(50).Build();
var reRoutes = new List<ReRoute>();
this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
.When(_ => WhenIGet())
.Then(_ => ThenTheResultShouldBe<DownstreamRouteFinder>())
.BDDfy();
}
[Fact]
public void should_return_downstream_route_finder_as_no_service_discovery_given_no_host()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("").WithPort(50).Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("").WithPort(50).Build();
var reRoutes = new List<ReRoute>();
this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
@@ -81,7 +93,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
[Fact]
public void should_return_downstream_route_finder_given_no_service_discovery_port()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("localhost").WithPort(0).Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("localhost").WithPort(0).Build();
var reRoutes = new List<ReRoute>();
this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
@@ -93,7 +105,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
[Fact]
public void should_return_downstream_route_finder_given_no_service_discovery_type()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("localhost").WithPort(50).WithType("").Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("localhost").WithPort(50).WithType("").Build();
var reRoutes = new List<ReRoute>();
this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
@@ -105,7 +117,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
[Fact]
public void should_return_downstream_route_creator()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).WithType("test").Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("test").WithPort(50).WithType("test").Build();
var reRoutes = new List<ReRoute>();
this.Given(_ => GivenTheReRoutes(reRoutes, spConfig))
@@ -117,7 +129,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
[Fact]
public void should_return_downstream_route_creator_with_dynamic_re_route()
{
var spConfig = new ServiceProviderConfigurationBuilder().WithHost("test").WithPort(50).WithType("test").Build();
var spConfig = new ServiceProviderConfigurationBuilder().WithScheme("http").WithHost("test").WithPort(50).WithType("test").Build();
var reRoutes = new List<ReRoute>
{
new ReRouteBuilder().Build()

2
test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs
View File

@@ -26,7 +26,7 @@ namespace Ocelot.UnitTests.LoadBalancer
{
_factory = new Mock<ILoadBalancerFactory>();
_loadBalancerHouse = new LoadBalancerHouse(_factory.Object);
_serviceProviderConfig = new ServiceProviderConfiguration("myType", "myHost", 123, string.Empty, "configKey", 0);
_serviceProviderConfig = new ServiceProviderConfiguration("myType", "myScheme", "myHost", 123, string.Empty, "configKey", 0);
}
[Fact]