585 Commits

Author SHA1 Message Date
Tom Pallister
7e01caf550
#529 removed some deps ocelot doesnt need (#563) 2018-08-19 13:57:57 +01:00
Tom Pallister
6d8b18c01d
Feature/inject error mapper (#562)
* added delegate to select last handler

* #529 implemented a way we can inject the last delegating handler

* wip - moving code

* #529 removed loads of qos code and moved it into Ocelot.Provider.Polly

* #529 can now inject http client expcetions to ocelot errors mappers and updated docs
2018-08-19 12:57:43 +01:00
Tom Pallister
98ba0271be
Feature/move polly (#561)
* added delegate to select last handler

* #529 implemented a way we can inject the last delegating handler

* wip - moving code

* #529 removed loads of qos code and moved it into Ocelot.Provider.Polly
2018-08-19 10:14:15 +01:00
Sergey Borodachev
3f784d7949 Merge branch 'develop' into feature/config_grow_when_merged
# Conflicts:
#	src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
#	test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
2018-08-18 05:11:35 +04:00
Sergey Borodachev
af3c39da6a Addressing issue #559 (Infinite configuration file growth when ASPNETCORE_ENVIRONMENT is defined)
Made IHostingEnvironment optional for AddOcelot() to avoid breaking change.
2018-08-18 04:29:21 +04:00
Tom Pallister
18ded25b0e
Feature/remove id server (#551)
* removed idserver4

* some files I missed removing
2018-08-14 18:39:18 +01:00
Tom Pallister
0786614e50
removed idserver4 (#547) 2018-08-14 08:19:00 +01:00
Tom Pallister
5916cbfd94
Feature/remove rafty (#544)
* #529 removed raft

* #529 Rafty needs properties exposed
2018-08-12 22:51:11 +05:30
Tom Pallister
cbd0af6d75
#529 removed raft (#543) 2018-08-12 22:12:59 +05:30
Tom Pallister
34afefced6
Feature/remove pivotal (#541)
* #529 removed eureka client

* #529 removed some unused code
2018-08-12 19:44:08 +05:30
Tom Pallister
87348e5d1b
Feature/removed consul and its deps to other package (#539)
* #529 removed consul deps and introduced delegate to find service discovery provider

* +semver: breaking moved consul configuration to package..introduced mechanism for packages to configure Ocelot pipeline
2018-08-12 17:28:41 +05:30
Tom Pallister
a91235b405
#529 removed consul deps and introduced delegate to find service discovery provider (#538) 2018-08-12 14:46:46 +05:30
Tom Pallister
afe322693e
added nuget package url (#537) 2018-08-11 20:47:40 +05:30
Tom Pallister
d4b65198f3
#529 removed cache manager specific code (#535) 2018-08-11 18:21:07 +05:30
Marcelo Castagna
ad8025df1b Reload config on change (#527)
* Reload config on change.
Added test case.

* added testing for adding the json with reloadOnChange = false
2018-08-04 08:17:31 +01:00
JanKolk
89f0cc786a #524 Solved - Add request headers to websocket connection (#528) 2018-08-04 08:02:30 +01:00
Tom Pallister
37fb32b7f5
broke out butterfly into seperate project (#521)
* broke out butterfly into seperate project

* nearly did it...

* updated docs as I have broken the butterfly code off into a seperate dll
2018-08-03 08:11:47 +01:00
Tom Pallister
24f8a18579 make stringextensions available 2018-08-02 20:42:57 +01:00
Tom Pallister
95a7c821fd
add v1 tracer interface so we can break out tracing (#523) 2018-08-02 18:27:19 +01:00
aqa510415008
46132b6fa8 Fix configuration error, throw error message (#522)
Fix configuration error, throw error message
2018-08-01 23:54:01 +01:00
Tom Pallister
43ad065e4a
#500 validate that there is an address in consul service, also made this clear in docs (#520) 2018-07-31 21:21:46 +01:00
Tom Pallister
b854ca63ce
use a stream rather than byte array in responder (#519) 2018-07-31 19:21:12 +01:00
Tom Pallister
eb4b996c99
removed loads of stupid code (#518) 2018-07-31 18:37:59 +01:00
Tom Pallister
29ff0045fe
removed null admin path hack (#513) 2018-07-30 23:15:03 +01:00
Tom Pallister
049731b43b
removed fake service tracer (#511)
* removed fake service tracer

* removed comments
2018-07-30 22:44:07 +01:00
aqa510415008
8711b07de6 Fix extended coverage main pipeline bug (#510) 2018-07-30 07:07:12 +01:00
Tom Pallister
b0a20d13b9
Feature/more dynamic routes (#508)
* Made the file config poller use IHostedService, bit more generic, not just need to provide the correct implementations of the repo services and it will poll anything..this means we can open up redis for #458

* removed comments

* #458 allow users to set rate limits per service for dynamic re routes

* #458 added docs for rate limting on dynamic reroutes
2018-07-29 20:32:45 +01:00
Tom Pallister
0f2cf2d188
Made the file config poller use IHostedService, bit more generic, not… (#507)
* Made the file config poller use IHostedService, bit more generic, not just need to provide the correct implementations of the repo services and it will poll anything..this means we can open up redis for #458

* removed comments
2018-07-29 18:23:49 +01:00
Tom Pallister
1817564ea5
Feature/fix #463 (#506)
* #463 save both files

* #463 made it so we dont save to disk on startup unless using admin api
2018-07-27 23:13:22 +01:00
Tom Pallister
d186f0e1b6
#490 use byte content not stream (#498) 2018-07-25 08:34:58 +01:00
Tom Pallister
079ec0f365
#474 tests to show how spaces in headers work (#483) 2018-07-21 00:10:06 +01:00
Tom Pallister
7dbfc46e7b
#473 dont remove query string param (#481) 2018-07-20 23:10:59 +01:00
Tom Pallister
23c5fcbf91
#464 (#477)
* #464 added code to request mapper to not automatically add content type and content length headers, .net will automatically try and add these headers in a few circumstances but this solves the 464 issue

* #464 use seek instead of read on body check for websockets tests

* #464 ran out of inodes on linux, looks like reloadonchange causes this
2018-07-20 22:32:40 +01:00
Edwin van Wijk
12ef3bc00f Added overload of the IConfigurationBuilder.AddOcelot extension-method that accepts a specific folder (#476) 2018-07-19 17:49:47 +01:00
aqa510415008
5c940acf0e Expand other branch pipes (#416)
* Expand other branch pipes

* Expand other branch pipes

* Expand other branch pipes

* optimization Expand other branch pipes ,Add Unit test

*  I hope to add two attributes to IOcelotBuilder for easy extension.
2018-07-19 17:45:46 +01:00
Tom Pallister
8f4ae03290
Added support for query string parameters in upstream path template (#467) 2018-07-12 19:26:23 +01:00
Tom Pallister
26ef3faa11
upgraded packages to netcoreapp2.1 Ocelot is still netstandard2.0 (#455)
* upgraded packages to netcoreapp2.1 Ocelot is still netstandard2.0

* try get latest sdk travis

* try get specific sdk travis
2018-07-11 06:28:08 +01:00
Tom Pallister
75f9a8f9be
#451 started implementing querystring support in templates (#459)
* #451 started implementing querystring support in templates

* #451 ocelot.json back to normal and specified in docs query string wont work in upstream template

* Revert "#451 ocelot.json back to normal and specified in docs query string wont work in upstream template"

This reverts commit 563193f7b2f78bad6109484fe77f3c87de831005.

* #451 ocelot.json back to normal and specified in docs query string wont work in upstream template
2018-07-10 18:00:17 +01:00
Tom Pallister
c8b72f31b5
#438 removed singleton delegating handlers as you cannot have these (#456) 2018-07-09 08:08:39 +01:00
Tom Pallister
a419ed68dc
#398 refactored MemoryHttpClientCache to stop it holding onto references (#448) 2018-07-08 15:09:16 +01:00
Tom Pallister
d604badd49
test to show returning 304 works (#450) 2018-07-08 15:02:35 +01:00
Tom Pallister
a87bc92c60
Feature/test for #441 (#444)
* #441 added a test for this change

* #441 bit of tidying up and fixing of erros
2018-07-01 08:56:06 +01:00
Tom Gardham-Pallister
2832cb1bf4 Merge branch 'master' into develop 2018-06-29 19:03:55 +01:00
liuyuedeyv
ddbfd44125 Update HttpClientBuilder.cs (#442)
if get the httpclient from cache,when the save method called ,it can not to save the right httpclient;
2018-06-29 19:02:35 +01:00
Tom Pallister
0f7aaa097d
dont use dynamic routing unless service discovery provider explictly set and log that we are going to use dynamic info (#437)
* #428 dont use dynamic routing unless service discovery provider explictly set and log that we are going to use dynamic info

* #428 fixed tests that were failing due to not maintaining backwards compat with config for service discovery
2018-06-27 18:15:04 +01:00
Marco Antonio Araujo
9db4273f18 Fix catch all route on UpstreamTemplatePatternCreator regex to match everything (#407) (#411) 2018-06-22 16:35:21 +01:00
Tom Pallister
3eb9b4da89
Feature/fix admin api caching wrong re routes (#421)
* #383 added failing test for this issue

* #383 identified issue was with cached load balancer for a given upstream path template based on the key we use, have modified this to include more data, I guess this might be an issue again for other things so I will have a think about it

* #383 fixed failing tests after key change

* Seems to be an issue with coveralls new package not being on nuget...try same version as their nuget package

* bash the old manual tests json back in
2018-06-21 22:45:24 +01:00
David Nissimoff
fffc4c8d3c #419 Incorrect routing when UpstreamHost is specified and UpstreamHttpMethod is empty (#420) 2018-06-20 22:41:00 +01:00
Tom Pallister
e636cefdb1
check which version of .net framework before creating http handler (#412)
* #405 needto check which version of .net we are using but cannot use compiler directives

* #405 started puttig abstraction around static method to get frameworks so we can test this logic

* #405 added test for all methods and tidied up tests

* #405 made contains as ms docs are wrong, thanks to davidni for the heads up
2018-06-20 20:44:38 +01:00
Ni Yanwei
347303ee7b 修改查找ocelot配置文件正则表达式中的问题 (#410)
正则表达式"(?i)ocelot.([a-zA-Z0-9]*).json",“ocelot.”中的“.”能匹配除"\n"外的任意字符;".json"原因是匹配json文件,但实际能匹配任何"*.json*"文件
2018-06-17 19:25:45 +01:00