Commit Graph

2838 Commits

Author SHA1 Message Date
Spencer Gibb
572220ae1f Default secureVirtualHostName to spring.application.name.
See gh-826
2016-02-22 14:04:53 -07:00
Dave Syer
48913cbb64 Add zuul.ignoredHeaders configuration hook
User can exclude headers (generally in responses is most useful)
by configuring them, or calling a setter in ZuulProperties.

If Spring Security is on the classpath we add a few headers
automatically, corresponding to the ones that would be added
by Spring Security in the remote backend anyway (so they are not
added twice). Nothing is actually removed, so if the remote
service doesn't add those headers, we don't change anything.

The X-Application-Context header is also added to the hard coded
list of ignored headers, because it isn't relevant in the
gateway (and leaks information about the remote service).

Fixes gh-819
2016-02-22 13:23:24 +00:00
Spencer Gibb
86ac0127a5 Upgrade eureka to 1.4.1
Plus polish

fixes gh-836
2016-02-19 17:01:40 -07:00
Dave Syer
104361608c Whitespace tidy up 2016-02-18 10:43:28 +00:00
Dave Syer
c291358858 Add additional null check for uri
Fixes gh-803 (again)
2016-02-18 10:42:45 +00:00
Dave Syer
86d515282e Import the autoconfig for server properties
Otherwise there can be duplicate beans with the same type and different
names, becasue the autoconfig does not (for some reason) use
@EnableConfigurationProperties to create the ServerProperties bean.

It isn't an issue until someone writes some autoconfig that itself
imports the ZuulConfiguration (i.e. regular concious users of
@EnableZuulServer do not see any problems and hence no tests fail
here or in integration projects).

Fixes gh-821
2016-02-15 15:58:50 +00:00
Nicolas Byl
67258446f9 Improved query string handling to present empty keys correctly
I.e. show empty "foo" as foo (not foo=)

Fixes gh-825
2016-02-15 10:35:41 +00:00
Dave Syer
5c2919074f Set -Pmilestone automatically based on pom version 2016-02-12 17:45:17 +00:00
Dave Syer
68682ce48a Make grep quiet when setting env vars 2016-02-12 15:48:42 +00:00
Dave Syer
81dd95457f Fix logic with MVN_GOAL 2016-02-12 15:06:20 +00:00
Dave Syer
90e7fd8d74 Align travis build with tools in spring-cloud/build 2016-02-12 13:23:19 +00:00
Dave Syer
d66cae9c49 Fix spelling 2016-02-11 22:13:22 +00:00
Dave Syer
2323512304 Clarification regardinff shared interfaces in server and client 2016-02-11 22:09:54 +00:00
Spencer Gibb
213df388f3 Upgrade feign to 8.14.4
fixes gh-822
2016-02-11 08:53:22 -07:00
Spencer Gibb
47747f3256 Polish and extensibility 2016-02-09 16:28:57 -07:00
Spencer Gibb
834dfe22dd Handle ClientException.SERVER_THROTTLED as 503
fixes gh-406
2016-02-09 16:02:18 -07:00
Spencer Gibb
1b190a32bd refactored zuul proxy tests 2016-02-09 15:02:31 -07:00
Spencer Gibb
57ebc6344c Upgrade eureka to 1.3.8
fixes gh-813
2016-02-05 12:52:04 -07:00
Dave Syer
443406f75f Revert to snapshots 2016-02-05 07:24:05 +00:00
Dave Syer
61ef6dd511 Update to 1.1.0.M5 2016-02-05 07:23:28 +00:00
Dave Syer
e660cbd6ee Put repository declarations back 2016-02-05 06:47:14 +00:00
Dave Syer
8fa249bab8 Remove duplicate distribution mgmt from pom 2016-02-05 06:41:36 +00:00
Spencer Gibb
3524f414ff Upgrade servo to 0.10.1
fixes gh-809
2016-02-04 14:21:55 -07:00
Marcin Grzejszczak
ad7921e32c Merge pull request #811 from spring-cloud/feign_upgrade
Upgrading feign
2016-02-04 19:07:03 +01:00
Marcin Grzejszczak
90d0725fe0 Upgrading feign 2016-02-04 11:26:34 +01:00
Dave Syer
c784ff1bc3 Add bin dir to ignores 2016-02-03 16:01:42 +00:00
Dave Syer
d5277925bc More Zuul context resets 2016-02-03 10:24:12 +00:00
Dave Syer
5b86b57771 Rename a test so it gets run in CI
Also does not rename another one because it fails (see gh-804). The
bug can be fixed in feign (https://github.com/Netflix/feign/pull/324),
and if that gets merged and released we can revert some of the recent
changes to the apache load balancer here.
2016-02-03 10:23:05 +00:00
Spencer Gibb
c2483cbe4e Upgrade feign to 8.14.2
fixes gh-807
2016-02-02 12:55:30 -07:00
Spencer Gibb
9c3010074d Update readme for code of conduct.
See https://github.com/spring-cloud/spring-cloud-build/issues/26
2016-02-01 19:59:30 -07:00
Spencer Gibb
199c740c17 Merge pull request #802 from herder/patch-1
Fix typo: zule-core -> zuul-core.
2016-02-01 15:22:13 -07:00
Spencer Gibb
63896485b0 Fix broken zuul tests. 2016-02-01 15:01:28 -07:00
Spencer Gibb
01fc27cb49 Temporarily ignore failing test so snapshots can build. 2016-02-01 12:51:35 -07:00
Spencer Gibb
3611edd1a0 Merge pull request #800 from brharrington/spectator-issue-264
* spectator-issue-264:
  fix registration bug in SpectatorMetricServices
2016-02-01 12:33:23 -07:00
Brian Harrington
63b0c8c67d fix registration bug in SpectatorMetricServices
The primary change is to fix a memory leak reported in
Netflix/spectator#264. Each time a gauge was updated it
was creating a new registration and because the map holds
a strong reference these would never get collected.
Further, the aggregate value created by the multiple
registrations was not correct.

In addition I added some test cases around the various
inputs and checked that the results were reflected as
expected in the registry. I noticed the timer values
had a unit of milliseconds, but it isn't immediately
clear if the reported value can ever less than 1.0. The
conversion to long is now delayed until after converting
to nanoseconds so duration values less than 1.0 will now
work instead of just recording 0.

For the histogram I changed to just using a cast to `long`
to avoid boxing to a `Double`. As an FYI for the future,
there is a DoubleDistributionSummary we have experimented
with in spectator-ext-sandbox that might be more appropriate
for this use-case.
2016-02-01 12:20:01 -07:00
Dave Syer
32c0f90999 Remove regex mapper properties from ZuulProperties
It is up to the user to configure a mapper if needed (one is no
longer provided automatically), so it doesn't need to take up
space in ZuulProperties
2016-01-31 16:19:51 +00:00
Dave Syer
82d8a11021 Defensive coding to avoid potential NPE
Fixes gh-803
2016-01-31 16:19:16 +00:00
Dave Syer
2e9ff4c7d7 Make eureka application manager @Lazy
So that it isn't instantated eagerly on startup by the RefreshScope.

Fixes gh-789
2016-01-29 13:13:30 +00:00
Niklas Herder
c95e2f450d Fix typo: zule-core -> zuul-core. 2016-01-29 13:27:33 +01:00
Dave Syer
cb13b9dd77 Reset Zuul state some more
Tests are very sensitive to the Zuul RequestContext which is
thread bound.
2016-01-28 17:48:42 +00:00
Marcin Grzejszczak
7747674b5c Updated e2e script 2016-01-28 13:39:02 +01:00
Dave Syer
29e691a4da Fix some zuul tests (clear request context before test) 2016-01-27 13:53:22 +00:00
Dave Syer
22b08f1a7f Fix Feign Ribbon with Apache HTTP client
The Apcahe client does not allow empty body for PATCH, nor does it
allow a request to be pre-populated with a Content-Length. Spring
Cloud tests were trying to do the former, and Feign allows the latter.
2016-01-27 13:38:48 +00:00
Dave Syer
65ec773066 Fix FeignHttpClientTests 2016-01-27 13:06:02 +00:00
Adrian Ivan
2f905b81ed Detect Zuul vs DispatcherServlet execution
Change SimpleRouteLocator to work with both Zuul and DispatcherServlet

Fixes gh-794
2016-01-27 10:51:56 +00:00
Dave Syer
1534ca41f7 Add dependency management for netty
Fixes gh-710
2016-01-26 16:02:26 +00:00
Dave Syer
7bdab0f23b Relay eureka.environment to Archaius if it is set
Apparently we already support eureka.datacenter as an alias for
archaius.deployment.datacenter and it looks like when that code
was written we intended to support eureka.environment in a similar way.
But it was never finished off, so this change adds the necessary one
line of code.

Fixes gh-791
2016-01-26 14:05:54 +00:00
Dave Syer
82991a7fc2 Make feign client bean id unique (use full classname)
Fixes gh-790
2016-01-26 10:49:21 +00:00
Dave Syer
3c5126c740 Consolidate tests and bootstrap config for config server 2016-01-25 11:43:11 +00:00
Dave Syer
dbb6059558 Simplify config server discovery with DiscoverClient metadata
Since DiscoverClient now supports metadata natively, we can use that and not rely
on Eureka interafces at all.

Fixes gh-787. Also fixes https://github.com/spring-cloud/spring-cloud-config/issues/302
2016-01-25 10:17:57 +00:00