tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 18:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,190 Commits 1 Branch 0 Tags
Commit Graph

430 Commits

Author SHA1 Message Date
TomPallister
c8c3d128f6 Merge branch 'ServiceProviderConfigurationScheme' of https://github.com/DavidLievrouw/Ocelot into DavidLievrouw-ServiceProviderConfigurationScheme 2020-04-12 17:44:57 +01:00
TomPallister
cdbd8e85d3 http error code tests and docs 2020-04-11 18:46:19 +01:00
TomPallister
3dfcff822b Merge branch 'feature/603-bad-gateway' of https://github.com/jlukawska/Ocelot into jlukawska-feature/603-bad-gateway 2020-04-11 18:01:05 +01:00
TomPallister
6e5471a714 Refactored k8s endpoints PR +semver: major 2020-04-11 11:48:47 +01:00
Pedram Rezaei
84821c6c8d
Updated packages (#1133) 
* Upgrading nugets

* doc changes

* more changes to remove warnings

* one more fix

* one more fix

* forcing the build
 2020-04-11 10:00:58 +01:00
David Lievrouw
20fd3e01ba Fix issue and test after cherry-pick. 2020-03-15 12:18:44 +01:00
David Lievrouw
bc42f041e4 Fix tests that are failing on AppVeyor. 2020-03-15 12:13:19 +01:00
David Lievrouw
cd3dc00c1a Add ability to specify scheme of ServiceProviderConfiguration 2020-03-15 12:13:09 +01:00
jlukawska
f922f0c078
Merge pull request #3 from ThreeMammals/master 
Master merge
 2020-03-11 21:51:47 +01:00
WebMed
84907bd4ce Update KubeServiceDiscoveryProviderTests 2020-02-22 22:39:06 +01:00
TomPallister
ec8a5b6ddf finished tests around http2 2020-02-21 16:49:26 +00:00
TomPallister
2772ce406d all acceptance tests passing 2020-02-19 09:18:01 +00:00
TomPallister
e969e9ff0b unit tests passing 2020-02-18 20:45:28 +00:00
TomPallister
b8922cef5f tests for version creator 2020-02-17 08:03:11 +00:00
TomPallister
42a1395a84 tests for downstream http version validation 2020-02-17 07:45:44 +00:00
TomPallister
d879721978 Merge branch 'master' into pitming-feature/MethodTransformer 2020-02-09 16:55:14 +00:00
TomPallister
0c5e09d18f moved logic to request mapper and public setter gone 2020-02-09 15:51:22 +00:00
TomPallister
6bd903bc87 tests passing 2020-02-09 15:37:27 +00:00
Tom Pallister
86e8d66daf
Activate ChangeToken when Ocelot's configuration changes #1037 
* Add configuration change token (#1036)

* Add IOptionsMonitor<IInternalConfiguration>

* Activate change token from *ConfigurationRepository instead of FileAndInternalConfigurationSetter; add acceptance & integration tests

* Update documentation

* Use IWebHostEnvironment as IHostingEnvironment deprecated

Co-authored-by: Chris Swinchatt <chrisswinchatt@gmail.com>
 2020-02-04 20:50:40 +00:00
jlukawska
8985495f38 Merge remote-tracking branch 'origin/develop' into feature/603-bad-gateway 2020-01-22 14:58:04 +01:00
jlukawska
68e3ae8cdd #603 return 502 on HttpRequestException 2020-01-22 14:55:41 +01:00
Tom Pallister
ebe662abe6
make rate limiting whitelist a function so users can override with dynamic behaviour 
* Make rate-limiting client whitelist dynamic
* Refactor `RateLimitOptions.ClientWhiteList`
* Fix typo in variable `enbleRateLimiting`
* Fix case in variable `clientIdheader`
author Taiwo Otubamowo <totubamowo@deloitte.co.uk>

* fix 1045

* #492 log 500 with error log level, acceptance test, unit test

* #492 minor changes

* initial commit for new feature #1077

allow to limit the number of concurrent tcp connection to a downstream service

* protect code against value not in accurate range

add unit test

* Do not crash host on Dispose

* Add test

* Pin GitVersion.CommandLine package version

* #683 validate if there are duplicated placeholders in UpstreamPathTemplate

* Use registered scheme from Eureka (#1087)

* extra test

* very brief mention MaxConnectionsPerServer in docs

* build develop like a PR

* more docs

* test

Co-authored-by: Taiwo O. <44668623+totubamowo@users.noreply.github.com>
Co-authored-by: Catcher Wong <catcher_hwq@outlook.com>
Co-authored-by: jlukawska <56401969+jlukawska@users.noreply.github.com>
Co-authored-by: buretjph <58700930+buretjph@users.noreply.github.com>
Co-authored-by: Jonathan Mezach <jonathanmezach@gmail.com>
Co-authored-by: 彭伟 <pengweiqhca@sina.com>
 2020-01-19 17:47:57 +00:00
TomPallister
02c9711369 Merge branch 'feature/dynamic-rate-limit-client-whitelist' of https://github.com/totubamowo/Ocelot into totubamowo-feature/dynamic-rate-limit-client-whitelist 2020-01-19 17:33:50 +00:00
TomPallister
1723076874 test 2020-01-19 17:20:36 +00:00
TomPallister
9da55ea037 small changes to log all responses either information or warning 2020-01-19 16:27:08 +00:00
Tom Pallister
65710f4a94
+semver: breaking PRs merged from Develop, Eureka honour scheme, don't crash on dispose and validate duplicate placeholders in UpstreamPathTemplate 
* initial commit for new feature #1077

allow to limit the number of concurrent tcp connection to a downstream service

* protect code against value not in accurate range

add unit test

* Do not crash host on Dispose

* Add test

* Pin GitVersion.CommandLine package version

* #683 validate if there are duplicated placeholders in UpstreamPathTemplate

* Use registered scheme from Eureka (#1087)

* extra test

* very brief mention MaxConnectionsPerServer in docs

* build develop like a PR

* more docs

Co-authored-by: jlukawska <56401969+jlukawska@users.noreply.github.com>
Co-authored-by: buretjph <58700930+buretjph@users.noreply.github.com>
Co-authored-by: Jonathan Mezach <jonathanmezach@gmail.com>
Co-authored-by: 彭伟 <pengweiqhca@sina.com>
 2020-01-19 15:00:21 +00:00
TomPallister
e4f5a71939 extra test 2020-01-19 11:10:21 +00:00
TomPallister
19881d51ff Merge branch 'feature/httphandler-maxconnectionperserver' of https://github.com/buretjph/Ocelot into buretjph-feature/httphandler-maxconnectionperserver 2020-01-19 10:58:31 +00:00
TomPallister
48f871088c Merge branch 'feature/683-validate-two-same-placeholders-in-upstream-template' of https://github.com/jlukawska/Ocelot into jlukawska-feature/683-validate-two-same-placeholders-in-upstream-template 2020-01-19 10:50:55 +00:00
TomPallister
96707a5055 Merge branch 'bugfix/fcp-dispose' of https://github.com/jmezach/Ocelot into jmezach-bugfix/fcp-dispose 2020-01-19 10:46:11 +00:00
彭伟
b28ced4ec5 Use registered scheme from Eureka (#1087) 2020-01-19 10:42:11 +00:00
Tom Pallister
664c6ef626
Updated to netcoreapp3.1 
* added basic sample

* updated docs
 2020-01-18 22:17:22 +00:00
jlukawska
caf5cf80fa #683 validate if there are duplicated placeholders in UpstreamPathTemplate 2019-12-16 21:19:31 +01:00
Jonathan Mezach
ac7d0d0af3 Add test 2019-12-12 08:35:22 +01:00
Jean-Philippe BURET
dbb61834d9 protect code against value not in accurate range 
add unit test
 2019-12-10 14:23:54 +01:00
Jean-Philippe BURET
3942c329ab initial commit for new feature #1077 
allow to limit the number of concurrent tcp connection to a downstream service
 2019-12-10 13:50:15 +01:00
jlukawska
f35a07a3da #603 return 502 when request cannot be completed 2019-11-22 08:01:02 +01:00
jlukawska
c82a613c16 Merge remote-tracking branch 'origin/develop' into feature/492-log-500-status-code-as-error 
# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
 2019-11-11 22:23:19 +01:00
jlukawska
90c5676887 #492 minor changes 2019-11-11 21:47:31 +01:00
jlukawska
f0667471dd #492 log 500 with error log level, acceptance test, unit test 2019-11-07 09:18:05 +01:00
totubamowo
21be46e680 Make rate-limiting client whitelist dynamic 
* Refactor `RateLimitOptions.ClientWhiteList`
* Fix typo in variable `enbleRateLimiting`
* Fix case in variable `clientIdheader`
author Taiwo Otubamowo <totubamowo@deloitte.co.uk>
 2019-10-30 18:53:37 +00:00
TomPallister
fbd9c01a42 Merge branch 'release/13.8.0' 2019-10-28 07:34:56 +00:00
geffzhang
903b380a5b update .net core 3.0 RTM (#1025) 
* feat: update to asp.net core 3.0 preview 9

* fix :  AspDotNetLogger unittest

* feat:  update generic host  and  useMvc

1、Using 'UseMvc' to configure MVC is not supported while using Endpoint Routing https://github.com/aspnet/AspNetCore/issues/9542
2、 use IHost and IHostBuilder

* feat : update .net core 3.0 rc1

* eureka extension

* fixed logger formatter error

* fixed synchronous operations are disallowed of ReadToEnd method

* fix log tests

* Flush method of FakeStream should do nothing

* Update ContentTests.cs

* Fixed ws tests

* feat： delelte comment code

* feat： update .net core 3.0 RTM

* Update OcelotBuilderTests.cs

* Update .travis.yml

mono 6.0.0 and dotnet 3.0.100

* Update Ocelot.IntegrationTests.csproj

update Microsoft.Data.SQLite 3.0.0

* Update .travis.yml

* feat： remove FrameworkReference

1、 remove FrameworkReference
2、 update package

* add appveyor configuration to use version of VS2019 with dotnet core 3 sdk support

* update obsoleted SetCollectionValidator method

* Swap out OpenCover for Coverlet

* Bump Cake to 0.35.0

* Downgrade coveralls.net to 0.7.0
Fix disposing of PollConsul instance

* Remove environment specific path separator

* Do not return ReportGenerator on Mac/Linux

* Remove direct dependency on IInternalConfiguration

* Fix ordering of variable assignment

* Fix broken tests

* Fix acceptance tests for Consul
 2019-10-28 07:24:30 +00:00
donaldgray
bef40041ba Add ConfigAwarePlaceholders class (#997) 
* Add ConfigAwarePlaceholders class

This allows placeholder values to be sourced from IConfiguration in
addition to set values.

* Rework how IPlaceholders is decorated in container
 2019-09-12 23:09:38 +08:00
Víctor Martos
8117366313 [New feature] Support claims to path transformation (#968) 
* Add the option to change DownstreamPath based on Claims

* Add tests for Claims to downstream path
 2019-08-13 01:03:20 +08:00
Marcelo Castagna
176a7bb960
allow to add delegating handlers by type (#943) 2019-07-01 08:23:06 -03:00
Jason Morton
e1d7f28951 Fix issue #936: Kubernetes service discovery provider doesn't allow cross-namespace discovery (#938) 
* Allow default k8s namespace to be overridden

* Add ServiceNamespace to ReRoute configuration

* Remove debug comments

* Update unit tests

* Unit tests (Eureka)

* Update docs

* Re-run build
 2019-06-25 11:08:18 +08:00
Thiago Loureiro
60655c4056 Fixed Merge Conflicts 2019-06-01 19:52:34 +08:00
Thiago Loureiro
5d82e68534
Removed unused usings, removed empty spaces, removed tons os warnings (#903) 2019-05-28 11:00:54 +08:00
liweihan
4476f8273e [WIP] use HttpContext.RequestAborted to support cancel a request (#902) 
* use HttpContext.RequestAborted to support cancel a request

* register context.HttpContext.RequestAborted.ThrowIfCancellationRequested() in ExceptionHandlerMiddleware

* add LangVersion

* add default number to OcelotErrorCode
fix unit test

* revert back to one line
 2019-05-27 16:23:30 +08:00