mirror of
				https://github.com/nsnail/Ocelot.git
				synced 2025-11-05 00:10:49 +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:
		@@ -18,7 +18,8 @@ namespace Ocelot.UnitTests.Middleware
 | 
			
		||||
        public ResponseAggregatorFactoryTests()
 | 
			
		||||
        {
 | 
			
		||||
            _provider = new Mock<IDefinedAggregatorProvider>();
 | 
			
		||||
            _factory = new InMemoryResponseAggregatorFactory(_provider.Object);
 | 
			
		||||
            _aggregator = new SimpleJsonResponseAggregator();
 | 
			
		||||
            _factory = new InMemoryResponseAggregatorFactory(_provider.Object, _aggregator);
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
        [Fact]
 | 
			
		||||
 
 | 
			
		||||
@@ -7,11 +7,11 @@ using Castle.Components.DictionaryAdapter;
 | 
			
		||||
using Microsoft.AspNetCore.Http;
 | 
			
		||||
using Ocelot.Configuration;
 | 
			
		||||
using Ocelot.Configuration.Builder;
 | 
			
		||||
using Ocelot.Errors;
 | 
			
		||||
using Ocelot.Configuration.File;
 | 
			
		||||
using Ocelot.Middleware;
 | 
			
		||||
using Ocelot.Middleware.Multiplexer;
 | 
			
		||||
using Ocelot.Request.Middleware;
 | 
			
		||||
using Ocelot.UnitTests.Responder;
 | 
			
		||||
using Ocelot.Values;
 | 
			
		||||
using Shouldly;
 | 
			
		||||
using TestStack.BDDfy;
 | 
			
		||||
using Xunit;
 | 
			
		||||
@@ -30,6 +30,58 @@ namespace Ocelot.UnitTests.Middleware
 | 
			
		||||
            _aggregator = new SimpleJsonResponseAggregator();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Fact]
 | 
			
		||||
        public void should_aggregate_n_responses_and_set_response_content_on_upstream_context_withConfig()
 | 
			
		||||
        {
 | 
			
		||||
            var commentsDownstreamReRoute = new DownstreamReRouteBuilder().WithKey("Comments").Build();
 | 
			
		||||
 | 
			
		||||
            var userDetailsDownstreamReRoute = new DownstreamReRouteBuilder().WithKey("UserDetails")
 | 
			
		||||
                .WithUpstreamPathTemplate(new UpstreamPathTemplate("", 0, false, "/v1/users/{userId}"))
 | 
			
		||||
                .Build();
 | 
			
		||||
 | 
			
		||||
            var downstreamReRoutes = new List<DownstreamReRoute>
 | 
			
		||||
            {
 | 
			
		||||
                commentsDownstreamReRoute,
 | 
			
		||||
                userDetailsDownstreamReRoute
 | 
			
		||||
            };
 | 
			
		||||
 | 
			
		||||
            var reRoute = new ReRouteBuilder()
 | 
			
		||||
                .WithDownstreamReRoutes(downstreamReRoutes)
 | 
			
		||||
                .WithAggregateReRouteConfig(new List<AggregateReRouteConfig>()
 | 
			
		||||
                {
 | 
			
		||||
                    new AggregateReRouteConfig(){ReRouteKey = "UserDetails",JsonPath = "$[*].writerId",Parameter = "userId"}
 | 
			
		||||
                })
 | 
			
		||||
                .Build();
 | 
			
		||||
 | 
			
		||||
            var commentsResponseContent = @"[{""id"":1,""writerId"":1,""postId"":1,""text"":""text1""},{""id"":2,""writerId"":2,""postId"":2,""text"":""text2""},{""id"":3,""writerId"":2,""postId"":1,""text"":""text21""}]";
 | 
			
		||||
            var commentsDownstreamContext = new DownstreamContext(new DefaultHttpContext())
 | 
			
		||||
            {
 | 
			
		||||
                DownstreamResponse = new DownstreamResponse(new StringContent(commentsResponseContent, Encoding.UTF8, "application/json"), HttpStatusCode.OK, new EditableList<KeyValuePair<string, IEnumerable<string>>>(), "some reason"),
 | 
			
		||||
                DownstreamReRoute = commentsDownstreamReRoute
 | 
			
		||||
            };
 | 
			
		||||
 | 
			
		||||
            var userDetailsResponseContent = @"[{""id"":1,""firstName"":""abolfazl"",""lastName"":""rajabpour""},{""id"":2,""firstName"":""reza"",""lastName"":""rezaei""}]";
 | 
			
		||||
            var userDetailsDownstreamContext = new DownstreamContext(new DefaultHttpContext())
 | 
			
		||||
            {
 | 
			
		||||
                DownstreamResponse = new DownstreamResponse(new StringContent(userDetailsResponseContent, Encoding.UTF8, "application/json"), HttpStatusCode.OK, new List<KeyValuePair<string, IEnumerable<string>>>(), "some reason"),
 | 
			
		||||
                DownstreamReRoute = userDetailsDownstreamReRoute
 | 
			
		||||
            };
 | 
			
		||||
 | 
			
		||||
            var downstreamContexts = new List<DownstreamContext> { commentsDownstreamContext, userDetailsDownstreamContext };
 | 
			
		||||
 | 
			
		||||
            var expected = "{\"Comments\":" + commentsResponseContent + ",\"UserDetails\":" + userDetailsResponseContent + "}";
 | 
			
		||||
 | 
			
		||||
            this.Given(x => GivenTheUpstreamContext(new DownstreamContext(new DefaultHttpContext())))
 | 
			
		||||
                .And(x => GivenTheReRoute(reRoute))
 | 
			
		||||
                .And(x => GivenTheDownstreamContext(downstreamContexts))
 | 
			
		||||
                .When(x => WhenIAggregate())
 | 
			
		||||
                .Then(x => ThenTheContentIs(expected))
 | 
			
		||||
                .And(x => ThenTheContentTypeIs("application/json"))
 | 
			
		||||
                .And(x => ThenTheReasonPhraseIs("cannot return from aggregate..which reason phrase would you use?"))
 | 
			
		||||
                .BDDfy();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        [Fact]
 | 
			
		||||
        public void should_aggregate_n_responses_and_set_response_content_on_upstream_context()
 | 
			
		||||
        {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user