907 Commits

Author SHA1 Message Date
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
Tom Pallister
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
Tom Gardham-Pallister
2c4175580f Merge branch 'release-5.3.0' 2018-03-24 09:48:59 +00:00
Tom Pallister
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
Tom Pallister
4493b22d0d
Update README.md 2018-03-22 08:30:26 +00:00
tangdf
c79f1ecbf8 Middleware Invoke multi parameters (#288) 2018-03-21 06:33:22 +00:00
ChrisTorng
772c36b933 Fix typo (#292) 2018-03-21 06:29:45 +00:00
jstallm
23c2a07e3c Fix typo projct (#291) 2018-03-21 06:29:12 +00:00
Tom Gardham-Pallister
1e34ac3eec Merge branch 'release-5.2.0' 2018-03-20 20:50:43 +00:00
Tom Pallister
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
Tom Gardham-Pallister
600002dde4 Merge branch 'release-5.1.0' 2018-03-18 15:05:56 +00:00
Tom Pallister
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
Tom Gardham-Pallister
978b0a43a0 #52 remove circle ci script 2018-03-17 18:09:47 +00:00
Tom Pallister
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
Tom Pallister
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
Tom Pallister
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
Simon Jefford
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
Tom Gardham-Pallister
f7c23d3384 #271 formatting 2018-03-14 19:55:24 +00:00
Tom Gardham-Pallister
9c757e2bd8 Merge branch 'develop' of github.com:ThreeMammals/Ocelot into develop 2018-03-14 19:51:54 +00:00
Tom Gardham-Pallister
4e25f72a97 #271 Added some extra logging 2018-03-14 19:50:46 +00:00
Tom Pallister
d24df36420
#271 Added some extra logging (#276) 2018-03-14 18:49:41 +00:00
Tom Gardham-Pallister
43bac3602e Merge branch 'release-5.0.1' 2018-03-13 20:32:56 +00:00
Tom Pallister
fd2c5364fc
#270 exposed ReRoute priority (#272) 2018-03-13 20:31:22 +00:00
TomPallister
16c70e8b65 #264 missed this docs change 2018-03-10 21:24:07 +00:00
TomPallister
b8c908558e Merge branch 'release-5.0.0' 2018-03-10 21:03:38 +00:00
Tom Pallister
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
Tom Gardham-Pallister
ae5b86ef61 Merge branch 'release-4.0.0' 2018-03-09 07:38:50 +00:00
Tom Pallister
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
Philip Wood
28cc519341
Merge pull request #261 from binarymash/feature/ReduceBuildWarnings
Feature/reduce build warnings
2018-03-08 20:39:26 +00:00
Tom Pallister
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
Philip Wood
8d5c5341eb Turn some of the rules back on. 2018-03-06 11:54:56 +00:00
Philip Wood
ea95690253 Fix remaining CS0649 violations 2018-03-06 11:13:02 +00:00
Philip Wood
b8e95373a4 Fix async/await warnings 2018-03-06 10:59:01 +00:00
Tom Pallister
db05935b89
updated not supported with reasons why Ocelot doesnt support swagger (#258) 2018-03-05 20:18:58 +00:00
TomPallister
7e1f8a4604 Added service fabric to big picture in docs 2018-03-04 10:24:04 +00:00
TomPallister
254910fea3 Merge branch 'release-3.1.9' 2018-03-04 10:04:47 +00:00
TomPallister
b7e409214b #238 - updated readme 2018-03-04 10:02:53 +00:00
TomPallister
e1325568d2 Merge branch 'develop' into feature/#238-statefull 2018-03-03 17:12:41 +00:00
Philip Wood
a53338312b
Merge pull request #255 from binarymash/feature/AddStyleCopAnalyzers
Feature/add style cop analyzers
2018-03-03 17:10:44 +00:00
TomPallister
2f37acc792 #238 updated readme 2018-03-03 17:08:39 +00:00
TomPallister
4a28666a41 #238 support passing statefull service headers to service fabric naming service 2018-03-03 17:05:40 +00:00
Philip Wood
52166b4987 Merge remote-tracking branch 'upstream/release-3.1.8' into feature/AddStyleCopAnalyzers
# Conflicts:
#	src/Ocelot/Configuration/ServiceProviderConfiguration.cs
2018-03-03 16:28:19 +00:00
TomPallister
943530a1ad Merge branch 'release-3.1.8' 2018-03-03 15:25:32 +00:00
Tom Pallister
454ba3f9a0
Make Ocelot work with service fabric DNS and naming service for guest exe and stateless (#242)
* test for issue

* added service fabric sample

* working!!

* changed sample naming to Ocelot

* removed files we dont need

* removed files we dont need

* updated sample gitignore

* updated sample gitignore

* getting ocelot to work with service fabric using the reverse proxy

* #238 - added support for service fabric discovery provider, proxies requests through naming service, wont work on partioned service fabric services yet

* #238 - Manually tested service fabric using sample..all seems OK. Made some changes after testing, added docs

* #238 - added docs for servic fabric
2018-03-03 15:24:05 +00:00
Philip Wood
01fe4ef9aa Turn off a few more rules 2018-03-03 14:15:39 +00:00
Philip Wood
50980fda93 Fix various violations
SA1216, CS0105, CS0169, CS0414, CS0649
2018-03-03 14:08:52 +00:00
Philip Wood
a64e263a26 Fix file names to match class names
SA1649
2018-03-03 13:48:30 +00:00
Philip Wood
c7dbfc044f Fix else statement spacing
SA1510
2018-03-03 13:36:09 +00:00
Philip Wood
b18c8e5f2b Fix single-line comment spacing
SA1512, SA1515
2018-03-03 13:34:19 +00:00