Commit Graph

27 Commits

Author SHA1 Message Date
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
c61dc9fd11 Fix brace line spacing and remove multiple concurrent whitespace characters
SA1025, SA1505, SA1508, SA-1509, SA1513
2018-03-03 13:14:24 +00:00
28a41b21a4 Merge remote-tracking branch 'upstream/develop' into feature/AddStyleCopAnalyzers
# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
#	test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
2018-03-03 12:33:04 +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
df86052a31 Add stylecop analyzers with default ruleset 2018-02-25 14:36:33 +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
1c98dcbca3 updated packages and project versions...12 errors! 2017-09-25 11:53:56 +01:00
c06b492b46 upgraded to netcoreapp2.0 2017-09-21 23:00:22 +01:00
c09cec67c6 didnt need to add this 2017-03-12 22:39:36 +00:00
d80b73a0d2 change to get appveyor to pick up all tests from http://stackoverflow.com/questions/42747868/vs-2017-not-discovering-tests-if-net-core 2017-03-12 22:35:32 +00:00
c49a1c9004 removed a bunch of orig files checked in by accident 2017-03-09 17:00:51 +00:00
6f65d9bab0 upgraded to vs2017 2017-03-09 17:00:15 +00:00
d33e0c6f3b merged develop and stolen binarymash dont publish unstable build script code 2017-02-25 18:27:20 +00:00
2dfdf0bb86 after much hacking unit tests passing 2017-02-21 07:34:47 +00:00
3c9ad87b73 Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue. 2017-02-19 15:03:11 +00:00
7900aa3f49 got sidetracked and downgraded to .net core app 1.1 that actually exists no idea why i had 1.4 :( 2017-02-04 12:06:33 +00:00
2cd69d1908 #20 - added cake build to do same functionality as batch scripts. Also does semver versioning of assemblies, if running in AppVeyor, generates release notes and publishes packages to appveyor. 2017-01-24 21:11:15 +00:00
8c213f133c test passing on mac and windows 2017-01-17 10:33:55 +00:00
a8878b4a19 test passing on mac and windows 2017-01-17 10:20:49 +00:00
b2d33f0ec5 Updated packages and fixed build errors and tests..now need to update nuspec 2017-01-11 17:23:34 +00:00
f4acb4f041 changed to json configuration to get rid of yaml imports 2016-11-02 21:50:53 +00:00
c31a1ba598 Updated benchmark project 2016-10-30 18:59:23 +00:00
6be3c1cf73 Updated all packages and upgraded to 1.0.1 for asp.net 2016-10-26 21:49:07 +01:00
d50f06fc3e Added benchmarks project back in..tho its pointless 2016-10-24 19:01:20 +01:00
6ac9954770 remove results 2016-08-19 21:46:14 +01:00
c41dd950e0 merged develop 2016-08-19 20:20:10 +01:00
0421dba1e2 Added some benchmarke benchmark stuff 2016-08-17 19:24:23 +01:00