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

still hacking around

Browse Source
This commit is contained in:
Tom Gardham-Pallister
2017-02-17 07:27:49 +00:00
parent bc5010837e
commit 4dac8cb4fb
10 changed files with 250 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Ocelot/Controllers/FileConfigurationController.cs Normal file
View File

@@ -0,0 +1,21 @@
using Microsoft.AspNetCore.Mvc;
using Ocelot.Services;
namespace Ocelot.Controllers
{
[RouteAttribute("configuration")]
public class FileConfigurationController
{
private IGetFileConfiguration _getFileConfig;
public FileConfigurationController(IGetFileConfiguration getFileConfig)
{
_getFileConfig = getFileConfig;
}
public IActionResult Get()
{
return new OkObjectResult(_getFileConfig.Invoke().Data);
}
}
}

13
src/Ocelot/Controllers/ReRoutesController.cs
View File

@@ -1,13 +0,0 @@
using Microsoft.AspNetCore.Mvc;
namespace Ocelot.Controllers
{
[RouteAttribute("reroutes")]
public class ReRoutesController
{
public IActionResult Get()
{
return new OkObjectResult("hi from re routes controller");
}
}
}

19
src/Ocelot/Services/GetFileConfiguration.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.IO;
using Newtonsoft.Json;
using Ocelot.Configuration.File;
using Ocelot.Responses;
namespace Ocelot.Services
{
public class GetFileConfiguration : IGetFileConfiguration
{
public Response<FileConfiguration> Invoke()
{
var configFilePath = "configuration.json";
var json = File.ReadAllText(configFilePath);
var fileConfiguration = JsonConvert.DeserializeObject<FileConfiguration>(json);
return new OkResponse<FileConfiguration>(fileConfiguration);
}
}
}

10
src/Ocelot/Services/IGetFileConfiguration.cs Normal file
View File

@@ -0,0 +1,10 @@
using Ocelot.Configuration.File;
using Ocelot.Responses;
namespace Ocelot.Services
{
public interface IGetFileConfiguration
{
Response<FileConfiguration> Invoke();
}
}

31
test/Ocelot.AcceptanceTests/AdministrationTests.cs
View File

@@ -34,12 +34,41 @@ namespace Ocelot.AcceptanceTests
this.Given(x => _steps.GivenThereIsAConfiguration(configuration))
.And(x => _steps.GivenOcelotIsRunning())
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/administration/reroutes"))
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/administration/configuration"))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
.And(x => _steps.ThenTheResponseBodyShouldBe("hi from re routes controller"))
.BDDfy();
}
[Fact]
public void should_return_file_configuration()
{
var configuration = new FileConfiguration
{
GlobalConfiguration = new FileGlobalConfiguration
{
AdministrationPath = "/administration"
},
ReRoutes = new List<FileReRoute>()
{
new FileReRoute()
{
DownstreamHost = "localhost",
DownstreamPort = 80,
DownstreamScheme = "https",
DownstreamPathTemplate = "/"
}
}
};
this.Given(x => _steps.GivenThereIsAConfiguration(configuration))
.And(x => _steps.GivenOcelotIsRunning())
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/administration/configuration"))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
.And(x => _steps.ThenTheResponseShouldBe(configuration))
.BDDfy();
}
private void GivenThereIsAServiceRunningOn(string url, int statusCode, string responseBody)
{
_builder = new WebHostBuilder()

20
test/Ocelot.AcceptanceTests/Steps.cs
View File

@@ -75,6 +75,25 @@ namespace Ocelot.AcceptanceTests
_ocelotClient = _ocelotServer.CreateClient();
}
internal void ThenTheResponseShouldBe(FileConfiguration expected)
{
var response = JsonConvert.DeserializeObject<FileConfiguration>(_response.Content.ReadAsStringAsync().Result);
response.GlobalConfiguration.AdministrationPath.ShouldBe(expected.GlobalConfiguration.AdministrationPath);
response.GlobalConfiguration.RequestIdKey.ShouldBe(expected.GlobalConfiguration.RequestIdKey);
response.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Host);
response.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Port);
response.GlobalConfiguration.ServiceDiscoveryProvider.Provider.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Provider);
for(var i = 0; i < response.ReRoutes.Count; i++)
{
response.ReRoutes[i].DownstreamHost.ShouldBe(expected.ReRoutes[i].DownstreamHost);
response.ReRoutes[i].DownstreamPathTemplate.ShouldBe(expected.ReRoutes[i].DownstreamPathTemplate);
response.ReRoutes[i].DownstreamPort.ShouldBe(expected.ReRoutes[i].DownstreamPort);
response.ReRoutes[i].DownstreamScheme.ShouldBe(expected.ReRoutes[i].DownstreamScheme);
}
}
/// <summary>
/// This is annoying cos it should be in the constructor but we need to set up the file before calling startup so its a step.
/// </summary>
@@ -155,7 +174,6 @@ namespace Ocelot.AcceptanceTests
}
}
public void WhenIGetUrlOnTheApiGateway(string url)
{
_response = _ocelotClient.GetAsync(url).Result;

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

@@ -28,7 +28,7 @@
{
var runTime = $"{oSDescription}-{osArchitecture}".ToLower();
var configPath = $"./bin/Debug/netcoreapp{Version}/{runTime}/configuration.json";
var configPath = $"./test/Ocelot.AcceptanceTests/bin/Debug/netcoreapp{Version}/{runTime}/configuration.json";
return configPath;
}

53
test/Ocelot.UnitTests/Controllers/FileConfigurationControllerTests.cs Normal file
View File

@@ -0,0 +1,53 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Moq;
using Ocelot.Configuration;
using Ocelot.Configuration.File;
using Ocelot.Controllers;
using Ocelot.Responses;
using Ocelot.Services;
using TestStack.BDDfy;
using Xunit;
namespace Ocelot.UnitTests.Controllers
{
public class FileConfigurationControllerTests
{
private FileConfigurationController _controller;
private Mock<IGetFileConfiguration> _getFileConfig;
private IActionResult _result;
public FileConfigurationControllerTests()
{
_getFileConfig = new Mock<IGetFileConfiguration>();
_controller = new FileConfigurationController(_getFileConfig.Object);
}
[Fact]
public void should_return_file_configuration()
{
var expected = new OkResponse<FileConfiguration>(new FileConfiguration());
this.Given(x => x.GivenTheGetConfigurationReturns(expected))
.When(x => x.WhenIGetTheFileConfiguration())
.Then(x => x.ThenTheFileConfigurationIsReturned(expected.Data))
.BDDfy();
}
private void GivenTheGetConfigurationReturns(Response<FileConfiguration> fileConfiguration)
{
_getFileConfig
.Setup(x => x.Invoke())
.Returns(fileConfiguration);
}
private void WhenIGetTheFileConfiguration()
{
_result = _controller.Get();
}
private void ThenTheFileConfigurationIsReturned(FileConfiguration expected)
{
}
}
}

96
test/Ocelot.UnitTests/Services/GetFileConfigurationTests.cs Normal file
View File

@@ -0,0 +1,96 @@
using System.Collections.Generic;
using Moq;
using Ocelot.Configuration;
using Ocelot.Configuration.File;
using Ocelot.Responses;
using Shouldly;
using TestStack.BDDfy;
using Xunit;
using Ocelot.Services;
using Newtonsoft.Json;
using System.IO;
namespace Ocelot.UnitTests.Services
{
public class GetFileConfigurationTests
{
private IGetFileConfiguration _getReRoutes;
private FileConfiguration _result;
public GetFileConfigurationTests()
{
_getReRoutes = new GetFileConfiguration();
}
[Fact]
public void should_return_file_configuration()
{
var reRoutes = new List<FileReRoute>
{
new FileReRoute
{
DownstreamHost = "localhost",
DownstreamPort = 80,
DownstreamScheme = "https",
DownstreamPathTemplate = "/test/test/{test}"
}
};
var globalConfiguration = new FileGlobalConfiguration
{
AdministrationPath = "testy",
ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
{
Provider = "consul",
Port = 198,
Host = "blah"
}
};
var config = new FileConfiguration();
config.GlobalConfiguration = globalConfiguration;
config.ReRoutes.AddRange(reRoutes);
this.Given(x => x.GivenTheConfigurationIs(config))
.When(x => x.WhenIGetTheReRoutes())
.Then(x => x.ThenTheFollowingIsReturned(config))
.BDDfy();
}
private void GivenTheConfigurationIs(FileConfiguration fileConfiguration)
{
var configurationPath = "configuration.json";
var jsonConfiguration = JsonConvert.SerializeObject(fileConfiguration);
if (File.Exists(configurationPath))
{
File.Delete(configurationPath);
}
File.WriteAllText(configurationPath, jsonConfiguration);
}
private void WhenIGetTheReRoutes()
{
_result = _getReRoutes.Invoke().Data;
}
private void ThenTheFollowingIsReturned(FileConfiguration expected)
{
_result.GlobalConfiguration.AdministrationPath.ShouldBe(expected.GlobalConfiguration.AdministrationPath);
_result.GlobalConfiguration.RequestIdKey.ShouldBe(expected.GlobalConfiguration.RequestIdKey);
_result.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Host);
_result.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Port);
_result.GlobalConfiguration.ServiceDiscoveryProvider.Provider.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Provider);
for(var i = 0; i < _result.ReRoutes.Count; i++)
{
_result.ReRoutes[i].DownstreamHost.ShouldBe(expected.ReRoutes[i].DownstreamHost);
_result.ReRoutes[i].DownstreamPathTemplate.ShouldBe(expected.ReRoutes[i].DownstreamPathTemplate);
_result.ReRoutes[i].DownstreamPort.ShouldBe(expected.ReRoutes[i].DownstreamPort);
_result.ReRoutes[i].DownstreamScheme.ShouldBe(expected.ReRoutes[i].DownstreamScheme);
//todo -- add more!
}
}
}
}

1
test/Ocelot.UnitTests/configuration.json Executable file
View File

@@ -0,0 +1 @@
{"ReRoutes":[{"DownstreamPathTemplate":"/test/test/{test}","UpstreamPathTemplate":null,"UpstreamHttpMethod":null,"AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"https","DownstreamHost":"localhost","DownstreamPort":80,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":"consul","Host":"blah","Port":198},"AdministrationPath":"testy"}}