Commit Graph

1082 Commits

Author SHA1 Message Date
698541eb69 removed things we dont need for tests 2018-04-13 12:34:34 +01:00
cbaa2c3096 #296 renamed configuration.json to ocelot.json in preparation 2018-04-13 11:23:44 +01:00
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
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
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
d7ef956935 fixed weird error 2018-04-07 21:55:54 +01:00
035f8f1123 Merge branch 'release-5.4.0' 2018-04-07 21:36:29 +01:00
1a4f16353a #287 removed some comments 2018-04-07 21:26:07 +01:00
0073a6f550 Merge branch 'release/5.5.0' 2018-04-07 12:08:35 +01:00
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
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
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
6817943b0a Merged into master 2018-04-02 18:15:08 +01:00
ec545fadae Feature/fix tracing (#297)
* hacked together tracing fix by wrapping middleware delegate in another delegate

* #227 have re-implemented tracing, cleaned up trace names, probably still need some refactoring and tests as this was a bit of a hack job

* #227 bit of checking for when we dont want to use tracing, also removed a unit test for websockets that wasnt a unit test, i stuck it there because i wanted the code coverage and now im paying the price, will have to work out a better way to do it

* #227 a bit of refactoring to make this work better, still a bit hacky...would like to revisit the whole thing one day

* #227 dont need this

* #227 or this

* #227 small refactor
2018-04-02 18:12:35 +01:00
2c4175580f Merge branch 'release-5.3.0' 2018-03-24 09:48:59 +00:00
463a7bdab4 Feature/websockets (#273)
* #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

* stuck a warning in about logging levels into docs!
2018-03-23 18:01:02 +00:00
4493b22d0d Update README.md 2018-03-22 08:30:26 +00:00
c79f1ecbf8 Middleware Invoke multi parameters (#288) 2018-03-21 06:33:22 +00:00
772c36b933 Fix typo (#292) 2018-03-21 06:29:45 +00:00
23c2a07e3c Fix typo projct (#291) 2018-03-21 06:29:12 +00:00
1e34ac3eec Merge branch 'release-5.2.0' 2018-03-20 20:50:43 +00:00
7e43af0126 #289 fix for issue where I was not preserving original query string when more than one query with same name (#290) 2018-03-20 20:48:30 +00:00
600002dde4 Merge branch 'release-5.1.0' 2018-03-18 15:05:56 +00:00
b51df71d7b #280 Add headers to response (#286)
* #280 can now add response headers inc trace id, now need to consolidate the header place holder stuff

* #280 changed port for linux tests

* #280 lots of hacking around to handle errors and consolidate placeholders into one class
2018-03-18 14:58:39 +00:00
978b0a43a0 #52 remove circle ci script 2018-03-17 18:09:47 +00:00
0ab670a143 Feature/#52 (#283)
* #52 test circle ci

* #52 nicked some lads cake script

* #52 put the mac build script back

* #52 trying another lads circle CI thing doesnt use cake

* #52 added test steps

* #52 ports for linux build

* #52 try travis mac build

* #52 dont use build script

* #52 dont use build script

* #52 acceptance and int tests dont really work on mac...v strange?

* #52 unique port for linux tests

* #52 increase code coverage

* #52 try using cake on linux for travis

* #52 try using cake for mac and linux on travis

* #52 dont run the acceptance and int tests on mac

* #52 build.sh has lf line endings

* #52 turns out crlf is OK for cake file..sigh

* #52 not sure what return does in cake so wrapped in if just to see

* #52 try use travis to work not run on mac

* #52 dont need these references

* #52 wrong property

* #52 remove circle ci for linux and just use travis for all
2018-03-17 18:07:27 +00:00
8a2f76d0c5 #268 fix flakey acceptance test (#282)
* #268 added waiter to test, altho i wasn't able to replicate flakeyness with wait anyway! Hopefully this will be solid now!

* #268 fixed a warning

* #268 more code coverage
2018-03-17 12:54:17 +00:00
ed11f3024c Feature/#274 (#281)
* #274 added acceptance tests, need to work out failing unit tests but probably going to be a redesign where we hold a reference to the cookie container and empty it if needed

* #274 updated code coverage value

* #274 offloaded cache logic to builder in preparation for adding state

* #274 hacked something together but this is not right approach

* #274 updated defaults and docs

* #274 updated code coverage
2018-03-17 11:35:16 +00:00
c1b315173f Squash some warnings (#278)
* squash SA1649 warnings (file/type name mismatch)

* squash SA1127 warnings (generic constraint on own line)

* squash SA1507 warnings (multiple blank lines)

* squash package analysis warnings re: summary text

It's not actually possible to provide a summary right now as per
https://github.com/NuGet/Home/issues/4587

* squash missing castle.core reference warning

* squash obsolete method warnings re: AddOcelotBaseUrl
2018-03-16 17:48:11 +00:00
f7c23d3384 #271 formatting 2018-03-14 19:55:24 +00:00
9c757e2bd8 Merge branch 'develop' of github.com:ThreeMammals/Ocelot into develop 2018-03-14 19:51:54 +00:00
4e25f72a97 #271 Added some extra logging 2018-03-14 19:50:46 +00:00
d24df36420 #271 Added some extra logging (#276) 2018-03-14 18:49:41 +00:00
43bac3602e Merge branch 'release-5.0.1' 2018-03-13 20:32:56 +00:00
fd2c5364fc #270 exposed ReRoute priority (#272) 2018-03-13 20:31:22 +00:00
1a5687aca2 Merge pull request #42 from ThreeMammals/develop
merge newest code
2018-03-12 21:55:44 +08:00
16c70e8b65 #264 missed this docs change 2018-03-10 21:24:07 +00:00
b8c908558e Merge branch 'release-5.0.0' 2018-03-10 21:03:38 +00:00
4c840d40a6 Feature/re route specific handlers (#269)
* #264 added handlers to config

* #264 added global handlers object and defaut param for method, not sure this is correct api for users yet

* #264 Can now add all sorts of delegating handlers in all sorts of ways

* +semver: breaking #264
2018-03-10 21:02:59 +00:00
ae5b86ef61 Merge branch 'release-4.0.0' 2018-03-09 07:38:50 +00:00
a31a3ae0fc Delegating Handlers from container (#266)
* #259 quickly hacked poc for this together, needs tidying up maybe

* #266 +semver: breaking removed adding delegating handler funcs directly...i feel from container is enough
2018-03-09 07:37:37 +00:00
28cc519341 Merge pull request #261 from binarymash/feature/ReduceBuildWarnings
Feature/reduce build warnings
2018-03-08 20:39:26 +00:00
5e9ee1f2ed #263 map all content specific headers to downstream request content property, make sure we dont map them to request specific headers, added a gzip encoding acceptance test (#267) 2018-03-08 07:32:06 +00:00
8d5c5341eb Turn some of the rules back on. 2018-03-06 11:54:56 +00:00
ea95690253 Fix remaining CS0649 violations 2018-03-06 11:13:02 +00:00
b8e95373a4 Fix async/await warnings 2018-03-06 10:59:01 +00:00
db05935b89 updated not supported with reasons why Ocelot doesnt support swagger (#258) 2018-03-05 20:18:58 +00:00
681f0551cd Merge pull request #41 from ThreeMammals/develop
support_service_fabric
2018-03-05 08:36:58 +08:00
7e1f8a4604 Added service fabric to big picture in docs 2018-03-04 10:24:04 +00:00
254910fea3 Merge branch 'release-3.1.9' 2018-03-04 10:04:47 +00:00