mirror of
https://github.com/nsnail/Ocelot.git
synced 2025-06-20 03:38:15 +08:00
Release/13.2.0 (#834)
* Fix formatting in getting started page (#752)
* updated release docs (#745)
* Update README.md (#756)
Fixed typo "Ocleot"
* Fixed typo there => their (#763)
* Some Typo fixes (#765)
* Typo algorythm => algorithm (#764)
* Typo querystring => query string (#766)
* Typo usual => usually (#767)
* Typos (#768)
* kubernetes provider (#772)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* fix issue #661 for Advanced aggregations (#704)
* Add Advanced Aggregation Feature
* fix overwrite error
* distinct data for better performance
* remove constructor parameter
* fix tests issue
* fix tests
* fix tests issue
* Add UnitTest and AcceptanceTest
* fix responseKeys typo
* Update SimpleJsonResponseAggregator.cs
* change port
* Fix code example for SSL Errors (#780)
DangerousAcceptAnyServerCertificateValidator has to be set to "true" to disable certification validation, not "false".
* Changed wording for ease of reading (#776)
Just some wording changes for clarification.
* Ignore response content if null (fix #785) (#786)
* fix bug #791 (#795)
* Update loadbalancer.rst (#796)
* UriBuilder - remove leading question mark #747 (#794)
* Update qualityofservice.rst (#801)
Tiny typo
* K8s package (#804)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* feat： publish package Ocelot.Provider.Kubernetes
* Okta integration (#807)
Okta integration
* update cliamsParser (#798)
* update cliamsParser
* update using
* IOcelotBuilder opens the IMvcCoreBuilder property for easy customization (#790)
* IOcelotBuilder opens the IMvcCoreBuilder property for easy customization
* Adjustment code
* nuget package (#809)
* feat: Kubernetes ServiceDiscoveryProvider
* 编写k8s测试例子
* feat：fix kube config
* feat： remove port
* feat ： complete the k8s test
* feat : add kubeserviceDiscovery test
* feat : add kube provider unittest
* feat :add kubetnetes docs
how to use ocelot with kubetnetes docs
* keep the configuration as simple as possible, no qos, no cache
* fix: use http
* add PollingKubeServiceDiscovery
* feat : refactor logger
* feat : add pollkube docs
* feat：Remove unnecessary code
* feat ： code-block json
* feat： publish package Ocelot.Provider.Kubernetes
* feat : nuget package
* fix： Namesapce Spelling wrong
* fix：Namesapce Spelling Wrong
* Fix: errors when using rate limiting (#811)
* Fix: errors when using rate limiting
Add: QuotaExceededError class for requesting too much
Add: QuotaExceededError error code
Add: Add an error when limit is reached
Reflact: Extract GetResponseMessage method for getting default or configured response message for requ
* Fix: modify check_we_have_considered_all_errors_in_these_tests for adding a new OcelotErrorCode
* added missing COPY csproj files (#821)
* Add note on In-Process hosting (#816)
When using ASP.NET Core 2.2 with In-Process hosting in IIS it's important to use .UseIIS() instead of .UseIISIntegration().
* Fix bug： (#810)
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* Fixed Dockerfile (missing Kubernetes)
* Revert "Fix bug： (#810)" (#823)
This reverts commit 19c80afb05.
* remove duplicate `IHttpRequester` register (#819)
* remove duplicate `IHttpRequester` register
* reserve the first
* fix HttpRequesterMiddleware does not call next bug (#830)
call next so that we can do something with the response, such as add some custom header etc...
* Removed Packing to fix issues, will be sorted out after create a nuget package on Nuget.Org (#831)
* Allows access to unpass node (#825)
* Fix bug：
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* fix bug：
If the registered Consul node is unexpectedly down and not restarted immediately, other services should continue to find the registered service.
* Updated FluentValidations Nuget Package (#833)
This commit is contained in:
Thiago Loureiro
@ -141,6 +141,100 @@ namespace Ocelot.AcceptanceTests
|
||||
.BDDfy();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void should_return_response_200_with_advanced_aggregate_configs()
|
||||
{
|
||||
var configuration = new FileConfiguration
|
||||
{
|
||||
ReRoutes = new List<FileReRoute>
|
||||
{
|
||||
new FileReRoute
|
||||
{
|
||||
DownstreamPathTemplate = "/",
|
||||
DownstreamScheme = "http",
|
||||
DownstreamHostAndPorts = new List<FileHostAndPort>
|
||||
{
|
||||
new FileHostAndPort
|
||||
{
|
||||
Host = "localhost",
|
||||
Port = 51889,
|
||||
}
|
||||
},
|
||||
UpstreamPathTemplate = "/Comments",
|
||||
UpstreamHttpMethod = new List<string> { "Get" },
|
||||
Key = "Comments"
|
||||
},
|
||||
new FileReRoute
|
||||
{
|
||||
DownstreamPathTemplate = "/users/{userId}",
|
||||
DownstreamScheme = "http",
|
||||
DownstreamHostAndPorts = new List<FileHostAndPort>
|
||||
{
|
||||
new FileHostAndPort
|
||||
{
|
||||
Host = "localhost",
|
||||
Port = 51890,
|
||||
}
|
||||
},
|
||||
UpstreamPathTemplate = "/UserDetails",
|
||||
UpstreamHttpMethod = new List<string> { "Get" },
|
||||
Key = "UserDetails"
|
||||
},
|
||||
new FileReRoute
|
||||
{
|
||||
DownstreamPathTemplate = "/posts/{postId}",
|
||||
DownstreamScheme = "http",
|
||||
DownstreamHostAndPorts = new List<FileHostAndPort>
|
||||
{
|
||||
new FileHostAndPort
|
||||
{
|
||||
Host = "localhost",
|
||||
Port = 51887,
|
||||
}
|
||||
},
|
||||
UpstreamPathTemplate = "/PostDetails",
|
||||
UpstreamHttpMethod = new List<string> { "Get" },
|
||||
Key = "PostDetails"
|
||||
}
|
||||
},
|
||||
Aggregates = new List<FileAggregateReRoute>
|
||||
{
|
||||
new FileAggregateReRoute
|
||||
{
|
||||
UpstreamPathTemplate = "/",
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Comments",
|
||||
"UserDetails",
|
||||
"PostDetails"
|
||||
},
|
||||
ReRouteKeysConfig = new List<AggregateReRouteConfig>()
|
||||
{
|
||||
new AggregateReRouteConfig(){ReRouteKey = "UserDetails",JsonPath = "$[*].writerId",Parameter = "userId"},
|
||||
new AggregateReRouteConfig(){ReRouteKey = "PostDetails",JsonPath = "$[*].postId",Parameter = "postId"}
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var userDetailsResponseContent = @"{""id"":1,""firstName"":""abolfazl"",""lastName"":""rajabpour""}";
|
||||
var postDetailsResponseContent = @"{""id"":1,""title"":""post1""}";
|
||||
var commentsResponseContent = @"[{""id"":1,""writerId"":1,""postId"":2,""text"":""text1""},{""id"":2,""writerId"":1,""postId"":2,""text"":""text2""}]";
|
||||
|
||||
var expected = "{\"Comments\":" + commentsResponseContent + ",\"UserDetails\":" + userDetailsResponseContent + ",\"PostDetails\":" + postDetailsResponseContent + "}";
|
||||
|
||||
this.Given(x => x.GivenServiceOneIsRunning("http://localhost:51889", "/", 200, commentsResponseContent))
|
||||
.Given(x => x.GivenServiceTwoIsRunning("http://localhost:51890", "/users/1", 200, userDetailsResponseContent))
|
||||
.Given(x => x.GivenServiceTwoIsRunning("http://localhost:51887", "/posts/2", 200, postDetailsResponseContent))
|
||||
.And(x => _steps.GivenThereIsAConfiguration(configuration))
|
||||
.And(x => _steps.GivenOcelotIsRunning())
|
||||
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
|
||||
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
|
||||
.And(x => _steps.ThenTheResponseBodyShouldBe(expected))
|
||||
.BDDfy();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void should_return_response_200_with_simple_url_user_defined_aggregate()
|
||||
{
|
||||
@ -189,8 +283,8 @@ namespace Ocelot.AcceptanceTests
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Tom",
|
||||
"Laura"
|
||||
"Laura",
|
||||
"Tom"
|
||||
},
|
||||
Aggregator = "FakeDefinedAggregator"
|
||||
}
|
||||
@ -258,8 +352,8 @@ namespace Ocelot.AcceptanceTests
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Tom",
|
||||
"Laura"
|
||||
"Laura",
|
||||
"Tom"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -326,8 +420,9 @@ namespace Ocelot.AcceptanceTests
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Tom",
|
||||
"Laura"
|
||||
"Laura",
|
||||
"Tom"
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -394,8 +489,8 @@ namespace Ocelot.AcceptanceTests
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Tom",
|
||||
"Laura"
|
||||
"Laura",
|
||||
"Tom"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -462,8 +557,8 @@ namespace Ocelot.AcceptanceTests
|
||||
UpstreamHost = "localhost",
|
||||
ReRouteKeys = new List<string>
|
||||
{
|
||||
"Tom",
|
||||
"Laura"
|
||||
"Laura",
|
||||
"Tom"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -434,7 +434,8 @@
|
||||
Host = "localhost",
|
||||
Port = consulPort,
|
||||
Type = "PollConsul",
|
||||
PollingInterval = 0
|
||||
PollingInterval = 0,
|
||||
Namespace = string.Empty
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user