Commit Graph

219 Commits

Author SHA1 Message Date
Dave Syer
2cdcd767ac Move some of the routing logic into the route locator
We now support prefix stripping per service, e.g.

zuul:
  routes:
    customers:
      path: /customers/**
      stripPrefix: true

Will route /customers/101 -> /101 (on the customers service)

See gh-77
2014-12-03 10:51:17 +00:00
Dave Syer
34f277b816 Add ZuulRoute as values object in zuul.routes
User can now specify zuul.routes.*.{path,url,serviceId} (with
"url" and "serviceId" mutually exclusive (and "location" is a
synonym) separately, or can use a one-one short form, like the
old style.

See gh-77
2014-12-03 10:31:09 +00:00
Dave Syer
7e91b9ea21 Rename some Zuul config keys
zuul.route -> zuul.routes
zuul.mapping -> zuul.prefix
2014-12-03 10:31:09 +00:00
Spencer Gibb
e272f8d660 change caches to ConcurrentHashMap 2014-12-02 16:41:18 -07:00
Spencer Gibb
acfecc38ff renamed Hystrix and Eureka configurations 2014-12-02 15:32:53 -07:00
Spencer Gibb
3a06632301 added @EnableCircuitBreaker deprecated @EnableHystrix.
removed classes now in spring-cloud-commons
2014-12-02 15:28:45 -07:00
Spencer Gibb
61ea784300 added @EnableDiscoveryClient, deprecated @EnableEurekaClient 2014-12-02 13:47:55 -07:00
Spencer Gibb
79ceebb1d0 Merge branch 'vanroy-feign-ribbon' 2014-12-01 13:15:48 -07:00
Spencer Gibb
a7c6c88ff0 renamed RibbonLoadBalancerClient to FeignRibbonClient 2014-12-01 13:14:14 -07:00
Spencer Gibb
3d7cc70757 Merge branch 'feign-ribbon' of github.com:VanRoy/spring-cloud-netflix into vanroy-feign-ribbon 2014-12-01 11:52:33 -07:00
Julien Roy
943d1b9bbe Connect Feign to resilient Ribbon client 2014-12-01 14:31:51 +01:00
Dave Syer
70c3d9e784 Ensure user-suppplied ZuulFilters are added properly
Bean instantiation ordering was causing external (user-supplied)
filter beans to replace the defaults, not append to them. Separating
out the autowired map of beans into a spearate class was enough to
fix it.

Fixes gh-78
2014-11-29 09:29:24 +00:00
Spencer Gibb
9add6f1edf don't send an entity on DELETE's through RibbonRoutingFilter
fixes gh-73
2014-11-26 13:38:26 -07:00
Spencer Gibb
c28b3252fb added a get to the same path as a delete 2014-11-26 11:38:51 -07:00
Spencer Gibb
f79166cb8e fixed test broken by change in functionality in ZuulHandlerMapping.reset 2014-11-26 11:28:00 -07:00
Spencer Gibb
c0903c5a22 add pkg protected resetRoutes so new mappings can be created via post to /routes 2014-11-26 11:00:55 -07:00
Dave Syer
8e16789ee3 /route -> /routes 2014-11-26 17:42:28 +00:00
Dave Syer
ddf7edebf9 /proxy/routes -> /routes 2014-11-26 17:17:12 +00:00
Dave Syer
de4822e801 Add test for DELETE on zuul proxy route
Also adds support for context paths in physical URL mappings, e.g.

zuul.route.http\://localhost\:8081/app=/stores/**

will result in a proxy forward of /stores/foo to
http://localhost:8081/app/stores/foo

Fixes gh-73
2014-11-26 13:50:27 +00:00
Dave Syer
9c6566bc9b Explicitly allow all HTTP methods in ZuulController 2014-11-26 13:14:40 +00:00
Dave Syer
45420b9618 Remove debug logging (use /trace instead) 2014-11-26 13:14:10 +00:00
Dave Syer
065d91fdbe Allow user to map physical routes in zuul.route
E.g.

zuul:
  route:
    testclient: /testing123/**         # service mapping
    http://localhost:8081: /stores/**  # physical mapping
2014-11-26 11:58:06 +00:00
Dave Syer
ce1fcb1552 Remove ugly depednency on Environment
You can bind to a Map<String,String> with application.yml, so there's
no need to work so hard to extract the zuul routes.
2014-11-26 11:05:49 +00:00
Dave Syer
243e163de4 Add JMX and MVC endpoints to ZuulHandlerMapping
User can now list routes with /zuul/routes and reset with a
POST.

Fixes gh-75
2014-11-26 10:50:23 +00:00
Dave Syer
05fe175223 Move field injection into @Configuration 2014-11-26 09:58:05 +00:00
Dave Syer
cee619d4ff Fix travis build script 2014-11-26 09:26:26 +00:00
Spencer Gibb
9bc8a5039d Fire InstanceRegisterEvent after eureka registration, then components can listen for that event and safely access DiscoveryClient. 2014-11-25 17:19:02 -07:00
Spencer Gibb
a3ce593bf6 ignore test till fixed 2014-11-25 17:02:43 -07:00
Spencer Gibb
760429b64f ignore test till fixed 2014-11-25 16:56:22 -07:00
Spencer Gibb
98f37d36d8 added simple python http server as a test non-jvm app 2014-11-25 16:46:10 -07:00
Spencer Gibb
198cb5997b updated sidecar so the health and info urls go to sidecar, but homepage and non-secure-port go to local app 2014-11-25 16:44:28 -07:00
Spencer Gibb
dc12c23596 Merge branch 'sidecar'
Conflicts:
	pom.xml
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/discovery/DiscoveryClient.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java
2014-11-25 15:51:51 -07:00
Spencer Gibb
75addf04d3 change zuul implementation to be controller/handler mapping based.
This allows mappings to be at the root and not have to be prefixed.  It also allows mappings to fall through to other handler mappings.  Patterns are now Ant-style via AntPathMatcher.

fixes gh-72
2014-11-25 15:48:30 -07:00
Dave Syer
7c4e3100ca Fix pull request builds 2014-11-25 09:48:32 +00:00
Spencer Gibb
f14297ceb2 initial sidecar implementation 2014-11-25 01:06:47 -07:00
Spencer Gibb
c8c8b6d0f6 Merge pull request #71 from spring-cloud/netflix-versions
update versions of netflix libs
2014-11-24 23:50:52 -07:00
Spencer Gibb
dfaad78ddb update versions of netflix libs 2014-11-24 23:42:59 -07:00
Spencer Gibb
e51f0cae37 add zuul-server to dep mgmt 2014-11-24 23:26:29 -07:00
Spencer Gibb
79db27226f added documentation for zuul options.
fixes gh-68
2014-11-24 11:26:37 -07:00
Dave Syer
230efab8d9 Exclude groovy-all from zuul 2014-11-24 11:51:07 +00:00
Dave Syer
d2cfcb0c2d Fix formatting 2014-11-22 17:01:21 +00:00
Spencer Gibb
162eb1a2e2 allow ipAddress to be used based on ribbon.UseIPAddrForServer.
fixes gh-67
2014-11-21 15:24:38 -07:00
Spencer Gibb
b6426e1bb4 Merge pull request #66 from scottfrederick/docs
Fixed formatting in docs.
2014-11-21 11:10:13 -07:00
Dave Syer
dde3055b6c Exclude event-bus (optional dependency) 2014-11-21 11:56:11 +00:00
Dave Syer
7b325044c1 Update wro4j to run in Eclipse 2014-11-21 09:32:12 +00:00
Scott Frederick
151ae8e6e1 Fixed formatting in docs. 2014-11-20 12:56:25 -06:00
Spencer Gibb
acaf2d2047 Only set ribbon properties if they are not already set.
fixes gh-45
2014-11-19 13:10:00 -07:00
Dave Syer
d2988b2179 Add metadata to Eureka entry for config server
If the prefix is set we also set configPath=<prefix> in the
instance metadata, so config clients can pick it up and add it
to the home page URL.

Fixes gh-64, fixes gh-65
2014-11-17 14:46:56 +00:00
Dave Syer
ed053e9b9b Add contributing section to README 2014-11-17 10:29:14 +00:00
Spencer Gibb
eba0cc0b7a Use Ribbon LoadBalancerContext to record statistics of an execution.
Added LoadBalancerClient.reconstructURI to take an URI with the service as hostname and inject a real host and port.
Added tests for RibbonInterceptor and RibbonLoadBalancerClient.

fixes gh-37
2014-11-13 18:11:17 -07:00