819 Commits

Author SHA1 Message Date
Tom Gardham-Pallister
17a515c4c0 sticking send messages toself in to make this testable 2018-05-05 10:38:47 +01:00
Tom Gardham-Pallister
4c405f0f29 revert 2018-05-03 23:00:40 +01:00
Tom Gardham-Pallister
da0dd68502 another quick hack to work this out 2018-05-03 22:49:44 +01:00
Tom Gardham-Pallister
334d4bf368 another quick hack to work this out 2018-05-03 22:32:07 +01:00
Tom Gardham-Pallister
e57b72173e changes to make test more stable 2018-05-03 22:06:08 +01:00
Tom Gardham-Pallister
2f8d857731 pass expiry period into cookie thing to make this more testable 2018-05-03 21:34:22 +01:00
Tom Gardham-Pallister
003fff8b24 #245 hacked these tests around and they are now passing 5 runs in a row on my mac, lets see on build server 2018-05-01 22:07:56 +01:00
geffzhang
03abfca543
Merge pull request #44 from ThreeMammals/develop
merge newest code
2018-05-01 08:34:50 +08:00
Tom Pallister
6793278597
Feature/sticky sessions (#336)
* started messing around with sticky sessions idea

* more tests for sticky session thing

* more faffing cant make up my mind how to do this

* +semver: breaking added sticky session load balancer and changed way load balancer configuration is set by user

* #336 made tests BDDFy
2018-04-30 18:55:11 +01:00
Joel Dean
97e7d32d14 Changed the word worth to work (#337)
Minor typo fix.
2018-04-30 10:30:16 +01:00
Dilsy99
d2432cf7f7 Develop (#338)
* #330 Fix and issue with the httpclient being cached on the url but not taking the http verb into accont. This caused an issue because if the same url but different verbs had handlers, the incorrect handler would be called

* Amend so that UnableToCompleteRequestError returns 500 rather than 404. This error occur when a delegate handler throws an exception

* Fix test that broke because of the change from 404 to 500 when delegate changes
2018-04-30 10:23:02 +01:00
Tom Pallister
e9106c30ee
finally got around to writing some tests for consul file config repo! Should have done these before I wrote it sigh.. 2018-04-26 21:01:51 +01:00
Tom Pallister
5b63f333f7
#262 added working eureka sample (#333) 2018-04-26 09:38:36 +01:00
Dilsy99
027bf6867a #330 Fix and issue with the httpclient being cached on the url but not taking the http verb into accont. This caused an issue because if the same url but different verbs had handlers, the incorrect handler would be called (#331) 2018-04-25 16:46:41 +01:00
geffzhang
2d01e96369
Merge pull request #43 from ThreeMammals/develop
merge newest code
2018-04-25 21:30:14 +08:00
Tom Pallister
fad190fcae
Feature/extra request id test (#329)
* messing around with benchmark.net.seems Ocelot adds about 2ms to a request..lets make this less? :)

* #326 store json indented so it looks nice :P

* #327 show another test how request id works
2018-04-24 08:30:45 +01:00
Tom Pallister
77211e9f16
Feature/store configuraton json idented (#328)
* messing around with benchmark.net.seems Ocelot adds about 2ms to a request..lets make this less? :)

* #326 store json indented so it looks nice :P
2018-04-24 08:30:17 +01:00
Tom Pallister
636d116491
#309 allow users to ignore ssl warnings, not sure this is advisable (#325)
* #309 allow users to ignore ssl warnings, not sure this is advisable

* #309 docs for ssl ignore
2018-04-22 12:05:49 +01:00
Tom Pallister
4f061f2b74
Feature/steeltoe (#324)
* #262 - Integrated Steeltoe Service Discovery with Ocelot for review.

* messing around

* seems to be working with eureka

* acceptance test passing with external lib references

* #262 support for netflix eureka service discovery thanks to pivotal

* #262 fixed warnings
2018-04-20 21:28:49 +01:00
Joseph Bales
a5f3e0fa75 Fixing documentation typo (#321) 2018-04-18 20:36:35 +01:00
Tom Pallister
5e1605882b
Feature/timeout for http client (#319)
* #318 http client obeys Qos timeout or defaults to 90 seconds, which is think is default for http client anyway but zero docs....

* #318 updated docs to specify default timeout and make it clear how to set it on a ReRoute basis

* #318 missed this

* #318 missed this
2018-04-18 15:24:16 +01:00
Tom Pallister
f9dc8659c0 forgot to update docs 2018-04-18 08:48:21 +01:00
Tom Pallister
2791cef0e0 merged develop 2018-04-18 08:32:15 +01:00
Tom Pallister
2b8c905a26 #296 remembered how to regex 2018-04-18 08:27:23 +01:00
Tom Pallister
aa55fe34cb
Feature/merge configuration files (#316)
* #296 renamed configuration.json to ocelot.json in preparation

* removed things we dont need for tests

* another file we dont need

* removed some async we dont need

* refactoring to consolidate configuration code

* removed another pointless abstraction

* #296 started writing merge code

* #296 coming up with ideas for this config merging

* #296 still hacking this idea around

* #296 will now do a crappy merge on the configuration

* #296 change so tests pass on windows
2018-04-17 22:06:41 +01:00
Tom Pallister
e94df4749c #296 change so tests pass on windows 2018-04-17 21:51:41 +01:00
Tom Gardham-Pallister
b7ff73729f #296 merged develop into this branch 2018-04-17 19:45:27 +01:00
Louis B
3607c0867e Update middlewareinjection.rst (#317)
Class name "OcelotMiddlewareConfiguration" does not exist and "UseOcelot" extension method expects a "OcelotPipelineConfiguration" so i think this documentaiton is outdated.
2018-04-17 19:27:16 +01:00
Tom Gardham-Pallister
2ed37cbc83 #296 will now do a crappy merge on the configuration 2018-04-16 20:28:15 +01:00
Tom Gardham-Pallister
c5aa11f7fb #296 still hacking this idea around 2018-04-15 18:06:03 +01:00
Tom Pallister
3ae2b286ab #296 coming up with ideas for this config merging 2018-04-15 09:20:52 +01:00
Tom Pallister
7ca828836a #296 started writing merge code 2018-04-14 07:02:17 +01:00
Felix Boers
fa09e4cf7a Support adding custom plaintext headers to downstream requests (#314) 2018-04-14 06:41:12 +01:00
Tom Pallister
fe9bca7b77 removed another pointless abstraction 2018-04-14 06:32:00 +01:00
Tom Pallister
fe5662f954 refactoring to consolidate configuration code 2018-04-13 22:47:50 +01:00
Tom Pallister
f88e1f65ef removed some async we dont need 2018-04-13 17:16:43 +01:00
Tom Pallister
060dd1dc78 another file we dont need 2018-04-13 12:36:43 +01:00
Tom Pallister
698541eb69 removed things we dont need for tests 2018-04-13 12:34:34 +01:00
Tom Pallister
cbaa2c3096 #296 renamed configuration.json to ocelot.json in preparation 2018-04-13 11:23:44 +01:00
Tom Pallister
b46ef1945d
Feature/graphql (#312)
* #298 initial hacking around better aggregation

* #298 bit more hacking around

* #298 abstraction over httpresponsemessage

* #298 tidying up

* #298 docs

* #298 missed this

* #306 example of how to do GraphQL
2018-04-12 17:48:43 +01:00
Tom Pallister
a15f75dda8
#298 initial hacking around better aggregation (#310)
* #298 initial hacking around better aggregation

* #298 bit more hacking around

* #298 abstraction over httpresponsemessage

* #298 tidying up

* #298 docs

* #298 missed this
2018-04-12 17:35:04 +01:00
Tom Pallister
982eebfc74
Feature/#295 consul acl (#307)
* removed file

* updated package

* updated package

* updated package

* updated package

* updated package

* updated package

* updated package

* all packages updated

* #295 can add token to service provider config and this will be used by consul clients to get services and configuration

* #295 wait longer for this test
2018-04-08 15:54:58 +01:00
Tom Gardham-Pallister
d7ef956935 fixed weird error 2018-04-07 21:55:54 +01:00
Tom Gardham-Pallister
035f8f1123 Merge branch 'release-5.4.0' 2018-04-07 21:36:29 +01:00
Tom Gardham-Pallister
1a4f16353a #287 removed some comments 2018-04-07 21:26:07 +01:00
Tom Pallister
0073a6f550 Merge branch 'release/5.5.0' 2018-04-07 12:08:35 +01:00
Tom Pallister
efbb950ea2
Feature/another look at logging (#303)
* #212 - hacked websockets proxy together

* faffing around

* #212 hacking away :(

* #212 websockets proxy middleware working

* #212 map when for webockets working

* #212 some test refactor

* #212 temp commit

* #212 websockets proxy working, tests passing...need to do some tidying and write docs

* #212 more code coverage

* #212 docs for websockets

* #212 updated readme

* #212 tidying up after websockets refactoring

* #212 tidying up after websockets refactoring

* #212 tidying up after websockets refactoring

* changing logging levels and logging like ms reccomends with structured data rather than strings

* more faffing

* more fafin

* #287 ocelot logger now only takes strings as it did take params then just turned them to strings, misleading, unit tests for logger and diagnosticlogger

* #287 errors now logged as they happen

* #287 more detail for logs requested in issue

* #287 tidy up

* #287 renamed

* #287 always log context id

* #287 fixed me being an idiot

* #287 removed crap websockets unit test that isnt a unit test

* #287 removed crap websockets unit test that isnt a unit test
2018-04-07 12:03:24 +01:00
Felix Boers
0c380239a9 Override ToString() in DownstreamRequest (#301)
When executing the downstreamUrlCreatorMittleware the downstream request
url shoud be written to the log. But instead of the url the type name
gets written because the ToString() method wasn't overriden.

Now ToString() internally calls the ToUri() method in order to provide
the url instead of the type name.
2018-04-05 19:07:45 +01:00
Felix Boers
ff3e7c6665 Log downstream templates in DownstreamRouteFinderMiddleware (#302)
Concatenate all downstream templates separated by , (colon) in order to write
them to the log.
2018-04-05 19:07:23 +01:00
Tom Gardham-Pallister
6817943b0a Merged into master 2018-04-02 18:15:08 +01:00