Commit Graph

902 Commits

Author SHA1 Message Date
9f1fb002c1 Feature/#246 (#252)
* failing test

* failing test but needs real butterfly server running..need to fix that...also worked out ive broken tracing...yey

* brought in butterfly source code so i can work out how to write acceptance tests for this...

* fixed the bug but still need to fix tracing

* tracing working again across services but need to make tracing hook into new Ocelot middleware as it still uses asp.net middleware

* removed butterfly libs brought in for testing
2018-03-01 12:58:36 +00:00
18c34aa998 added basic rate limiting docs (#251) 2018-02-27 09:02:58 +00:00
04555dbb39 docs for multiple environments (#250) 2018-02-27 08:41:58 +00:00
d1926268ac Feature/downstream aggregation (#248)
* started messing around with this on the train last night

* mega hacking away to change middleware into Ocelot iddleware

* scoped data repo back in

* broken commit getting tests working

* another broken commit farting around with tests

* all unit tests passing again

* mw pipeline for ocelot...still loads of hacks but getting there now to get acceptance tests working, then fix config so you can have aggregate and then imlement multiplexer, then mapping to response...loads to do

* all tests passing before aggregation feature implemented

* removed all the request middleware stuff we dont need it

* updated how errors work...tho i think there could be edge case here when aggregating because one downstream could error and this would effect another

* removed multiplexer so you dont have to send route down, this isnt very thread safe...sigh

* hacking around getting the config for aggregates in, this might change

* refactored builder and unit tests passing now

* Updated a bunch of ports for tests

* plugged in code to create reroutes that are aggregates

* made multiplexer a class

* hacked test to death

* simple aggregator done, initial validation done

* removed request id from context, it is still specific for http request

* now aggregates to json always

* docs for aggregate reroutes

* Updated docs
2018-02-27 08:22:47 +00:00
2573657ec2 #245 ignored raft tests for now as a bit unstable 2018-02-26 08:56:37 +00:00
9f458a878b Disable all but the least contentious rules 2018-02-25 15:47:13 +00:00
df86052a31 Add stylecop analyzers with default ruleset 2018-02-25 14:36:33 +00:00
3754a8ae36 Merge branch 'release-3.1.6' 2018-02-21 20:54:55 +00:00
9f7478c91f Feature/fix #240 (#243)
* testing issue on train

* check multiple claims of the same type for authorisation
2018-02-21 20:53:46 +00:00
1e48a97294 tests showing how this could work (#241)
* tests showing how this could work

* test passing

* test needs work

* skip test as doesnt really do anything
2018-02-21 18:54:11 +00:00
8811ea3736 Merge branch 'release-3.1.5' 2018-02-15 09:53:15 +00:00
bf3188020a Feature/base url in config (#234)
* started moving baseurl to config issue 233

* fixed test
2018-02-15 09:52:16 +00:00
6976ec668f Merge pull request #39 from TomPallister/develop
merge use any id server for admin area
2018-02-15 08:16:56 +08:00
6919d2b286 Merge branch 'release-3.1.4' 2018-02-14 19:03:16 +00:00
d6a86b9295 +semver: feature 2018-02-14 19:01:08 +00:00
05481f3af3 Feature/use any id server for admin area (#232)
* initial commits around using any id servers

* add your own id server for admin area

* lots of refactoring, now instead of injecting IWebHostBuilder we just set the Ocelot base url as a configuration extension method..this means people can pass it in on the command line aswell as hardcode which is OK I guess, also can now use your own IdentityServer to authenticate admin area

* updated docs for #231

* some tests that hopefully bump up coverage
2018-02-14 18:53:18 +00:00
57d7b9dfde Merge pull request #38 from TomPallister/develop
Merge Tracing
2018-02-14 09:50:29 +08:00
6f177fbf5b messing around (#230) 2018-02-13 23:00:41 +00:00
065a013433 Merge branch 'release-3.0.3' 2018-02-13 14:29:55 +00:00
947a1450d0 updated docs for tracing 2018-02-13 14:23:23 +00:00
7c62b55431 added tracing to some routes 2018-02-13 09:13:34 +00:00
98133d9473 Feature/expose http handlers (#224)
* temp commit

* trying to work out how to expose the http handlers in a decent way..

* pissing about at lunch

* changed to func so you can instanciate object or new it up each time

* docs for dele handlers

* upgraded to sdk 2.1.4

* some validation for consul services
2018-02-13 09:07:09 +00:00
ef3c4f614a Monitoring (#219)
* feat:  use Https://github.com/ButterflyAPM to monitor each API request monitoring metrics

* feat: using DiagnosticSource and Butterfly.OpenTracing

* refactor:refactor Ocelot tracing, merge code into OcelotDiagnosticListener

* refactor: move OcelotHttpTracingHandler to Requester

* fix: Requester\HttpClientBuilder.cs(10,14): error CS0234: The type or namespace name 'Tracing' does not exist in the namespace

* feat: add test should_set_up_tracing

* feat : Remove extraneous code

* feat: remove unused DiagnosticSource diagnostic

* fix : test UseTracing

* add test should_call_scoped_data_repository_QosProviderError

* add test should_return_any_errors

* add test HttpClientHttpRequesterTest

*  it should keep it can not be deleted
2018-02-12 18:33:23 +00:00
f179b7d0d0 updated cake script for windows 2018-02-08 18:03:51 +00:00
ec7b4ff8fa Merge branch 'release-3.0.2' 2018-02-05 18:34:54 +00:00
6ff8c1cac4 Merge branch 'develop' of github.com:TomPallister/Ocelot into develop 2018-02-03 11:00:46 +00:00
35fff08f48 checking what happens on app veyor 2018-02-03 11:00:36 +00:00
d3e53062a2 Update README.md 2018-02-03 10:46:18 +00:00
a4bb0dd13b fix for #214 and some tests for the class it was in but not for the error (cant be arsed to test as have to spin up IIS) (#218) 2018-02-03 09:02:01 +00:00
eca3290f71 Merge pull request #36 from TomPallister/develop
Feature/issue 209 upstream host based routing (#216)
2018-02-02 21:23:44 +08:00
deac86fb8a Merge branch 'release-3.0.1' 2018-02-02 13:07:00 +00:00
5848e12d15 Feature/issue 209 upstream host based routing (#216)
* from messing around at lunch...initial hacking seems to sort of work..need to think of all the test scenarios

* drunken train hacking

* docs for upstreamhost
2018-02-02 11:06:54 +00:00
3e2c410626 Merge pull request #35 from TomPallister/develop
Merge load balancing reroutes
2018-02-02 08:50:40 +08:00
86951d6aaa fix: LF for linux scripts (.sh) (#215) 2018-02-01 20:00:39 +00:00
f690f287cb forgot this 2018-02-01 13:51:55 +00:00
9d0a7f5961 Merge branch 'release-3.0.0' 2018-01-31 20:49:30 +00:00
f1244ff3d4 +semver: breaking 2018-01-31 20:40:59 +00:00
3ac9b3bd87 hacked together load balancing reroutes in fileconfig (#211)
* hacked together load balancing reroutes in fileconfig

* some renaming and refactoring

* more renames

* hacked away the old config json

* test for issue 213

* renamed key

* dont share ports

* oops

* updated docs

* mvoed docs around

* port being used
2018-01-31 20:34:55 +00:00
f572d1b0ca downstreambaseurl placeholder for multiple location value redirects (#207) 2018-01-27 20:03:49 +00:00
112b4b69c6 Merge pull request #34 from TomPallister/develop
merge newest code
2018-01-22 19:01:15 -06:00
a38f3cb454 Merge branch 'release-2.0.11' 2018-01-22 20:23:03 +00:00
d0eee70c46 Feature/transform headers (#204)
* New feature that lets a user do find and replace on an upstream header

* can transform downstream and upstream headers, not sure if interface is good

* can replace location header with placeholder

* added some syntax
2018-01-22 20:21:29 +00:00
9c048ba615 fix/#98 - command line build on mac (#203)
* Cake v0.25.0; git ignore .idea/ directory

* revert cake to upstream

* revert src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs

* comments
2018-01-18 21:02:30 +00:00
24870b1a83 fixed log message (#202)
* Can't set StatusCode after Response has started

* fixed log message
2018-01-18 19:28:53 +00:00
0784954971 Can't set StatusCode after Response has started (#200) 2018-01-16 07:10:52 +00:00
31f526d3cd passing test for issue (#197)
* passing test for issue

* fix test when run together
2018-01-13 06:09:21 +00:00
1824f99ae9 Merge branch 'release-2.0.10' 2018-01-10 18:50:37 +00:00
d0b07b2cc2 this isnt used 2018-01-10 18:50:02 +00:00
a9becc182b Merge branch 'release-2.0.9' 2018-01-10 18:17:51 +00:00
852f11c423 Feature/fix #194 (#196)
* added failing acceptance test

* added validation for double slash in upstream and downstream path templates
2018-01-10 18:11:56 +00:00