TomPallister
1a76c9fbd9
Merge branch 'master' into develop
2017-04-23 15:40:50 +01:00
Juan Carlos Santana Herrera
b8ee43c737
Adds the posibility of use final paths in the reroutes of configuration.json file.
...
Adds a unit test method to test the functionality.
2017-04-20 11:05:46 +01:00
Philip Wood
80e728aa00
Made changes based on PR comments. Also added lots more tests!
2017-04-19 20:12:08 +01:00
Philip Wood
878eacf1db
Remove obsolete code
2017-04-18 15:35:54 +01:00
Philip Wood
a1c6ab4ce4
Get rest of unit tests working
2017-04-18 15:16:27 +01:00
Philip Wood
7c1a277147
Fixed some unit tests
2017-04-18 14:05:15 +01:00
Philip Wood
eeb8f691c7
Very hacky proof of concept
2017-04-17 21:25:04 +01:00
TomPallister
c3cd181b90
added a new implementation that stores the ocelot config in consul kv store, had to change some major things and add cache settings as default
2017-04-16 19:35:59 +01:00
Tom Pallister
f58da434ba
Merge pull request #70 from MarcDenman/feature/updateLogging
...
Update logging
2017-03-19 15:57:28 +00:00
Marc Denman
82ecd667e0
Merged in develop
2017-03-14 21:50:03 +00:00
David Derman
a3b387aeb1
Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and
...
AdditionalScopes to Allowed Scoped in order to be more consistent with
Identity Server naming conventions.
2017-03-14 16:54:55 -04:00
Marc Denman
0ad41aa3fa
Add LogError(string) to logger
...
Added LogError(string) to interface as sometimes there isn't an exception
to be logged. Additionally, split Logger and LoggerFactory implementations
into seperate files just for tidiness.
Additonally added some very basic unit tests to the HttpDataRepository as
a bit of regression safety and to prove that Get never returns a null.
Slightly refactored the logic within AspDotNetLogger under
GetMessageWithOcelotRequestId so that the if statement is a little easier
to read. Attempted to remove the requestId == null, however this broke
numerous tests as the mocks don't set the behviour for dataReposioty
getting the requestId
2017-03-14 11:52:44 +00:00
Marc Denman
0c33323352
Change HttpStatusCodeMapper not to wrap responses
...
As part of #66 we realised that the implementation of
IErrorToHttpStatusCodeMapper would always return a wrapped StatusCode
within an OK response, in turn meaning that ResponderMiddleware would
never fall into the else branch for returning a 500.
This commit removes the wrapping of the status code and removes the unused
logic for generating the 500 status code, giving the mapper full
responsbility for generating the correct status code.
2017-03-14 09:15:19 +00:00
Marc Denman
0ec7fc44ad
Change all ctor's to use IOcelotLoggerFactory
...
As part of #35 we are we are standardising on using IOcelotLoggerFactory
over the default ILogger for DI purposes. Following a sln search, the use
of ILogger was only found in one place (FileOcelotConfigurationCreator)
and it's corresponding tests.
This commit changes them and ensures the unit tests still pass.
2017-03-13 11:44:02 +00:00
TomPallister
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
TomPallister
c49a1c9004
removed a bunch of orig files checked in by accident
2017-03-09 17:00:51 +00:00
TomPallister
6f65d9bab0
upgraded to vs2017
2017-03-09 17:00:15 +00:00
TomPallister
c787202374
I realised we can get rid of the cookie container as cookies are just sent as a header called cookie...
2017-03-05 18:05:20 +00:00
TomPallister
558a0dfdab
finished refactoring config cretor
2017-03-05 16:56:41 +00:00
Tom Gardham-Pallister
8bbd781820
updated file options
2017-03-02 09:18:53 +00:00
Tom Gardham-Pallister
b44c02510a
unit test for qos
2017-03-01 23:34:56 +00:00
Tom Gardham-Pallister
0a2d7a6922
qos options creator in own class
2017-03-01 23:28:32 +00:00
Tom Gardham-Pallister
6661cb5f32
use config tests
2017-03-01 23:15:30 +00:00
Tom Gardham-Pallister
034732ce90
added lame test for service config creator
2017-03-01 23:12:00 +00:00
Tom Gardham-Pallister
fff743ccf8
pulling out service config cretor
2017-03-01 12:42:37 +00:00
Tom Gardham-Pallister
d4119ab33d
extracted thing that creates request id key
2017-03-01 08:11:39 +00:00
Tom Gardham-Pallister
c85ea41951
refactoring ocelot config creation process
2017-03-01 07:54:07 +00:00
TomPallister
d33e0c6f3b
merged develop and stolen binarymash dont publish unstable build script code
2017-02-25 18:27:20 +00:00
TomPallister
be24f9a9ca
Added base url finder for when nothing set in Program.cs
2017-02-25 17:02:36 +00:00
Tom Gardham-Pallister
112a9c303e
hacky auth working
2017-02-24 19:52:48 +00:00
Tom Gardham-Pallister
aa0d8fe59a
all tests passing, now to do authentication config provider
2017-02-22 07:48:49 +00:00
Tom Gardham-Pallister
2dfdf0bb86
after much hacking unit tests passing
2017-02-21 07:34:47 +00:00
Philip Wood
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
TomPallister
fa47663259
changed file config stuff to just use app base directory
2017-02-19 12:58:22 +00:00
Tom Gardham-Pallister
816221c7a6
morehaking about
2017-02-19 12:33:09 +00:00
Tom Gardham-Pallister
4dac8cb4fb
still hacking around
2017-02-17 07:27:49 +00:00
geffzhang
0aad1f8fa0
Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit
...
# Conflicts:
# src/Ocelot/Configuration/Builder/ReRouteBuilder.cs
# src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
# src/Ocelot/Configuration/QoSOptions.cs
# src/Ocelot/Configuration/ReRoute.cs
# test/Ocelot.AcceptanceTests/configuration.json
2017-02-15 08:49:40 +08:00
Tom Gardham-Pallister
95fc687e93
started messing around with admin area
2017-02-13 12:13:53 +00:00
geffzhang
2fa6e66dd4
refactor code
2017-02-13 08:29:29 +08:00
geffzhang
e1f16c2be1
add ratelimit acceptance test
2017-02-12 15:49:21 +08:00
TomPallister
286c7f8488
Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service.
2017-02-11 18:56:36 +00:00
TomPallister
820673dda8
added docs but qos acceptance test not working seems circuit never opens but not sure if it is meant to with timeouts..investigating
2017-02-11 15:11:10 +00:00
TomPallister
ce8da4c92d
removed qos by accident, added back in
2017-02-11 13:14:25 +00:00
geffzhang
9b06afc781
refactor ratelimit config
2017-02-11 20:52:20 +08:00
TomPallister
e33fe4cf7d
merged develop
2017-02-11 12:07:08 +00:00
geffzhang
e1d5ef3aae
implement Request Rate limit, this feature is options
2017-02-11 16:32:30 +08:00
Tom Gardham-Pallister
f7fe7c0f49
more refactoring
2017-02-08 18:47:35 +00:00
Tom Gardham-Pallister
dbe28d38bc
tidying up configuration creation
2017-02-08 07:37:04 +00:00
geffzhang
caae826d77
Refactor qos as options
2017-02-08 09:25:32 +08:00
Tom Gardham-Pallister
7fffc9827a
auth options builders
2017-02-07 20:30:26 +00:00
