Commit Graph

268 Commits

Author SHA1 Message Date
Spencer Gibb
bcad4ca683 Merge pull request #164 from jjathman/allow-passing-query-params
* allow-passing-query-params:
  Add the ability to pass along query parameters to Consul when discovering services. One potential use is for passing a different data center value than the default value.
2016-04-06 12:36:49 -06:00
Joseph Athman
4023dfbd30 Add the ability to pass along query parameters to Consul when discovering services. One potential use is for passing a different data center value than the default value. 2016-04-06 12:35:29 -06:00
Spencer Gibb
8d43d78959 Make dealing with catalog watch errors easier.
Uses logger to log errors. Adds ability to disable watch.

see gh-169
2016-04-06 11:58:13 -06:00
Spencer Gibb
ab8e25f5a7 Added RestTemplate to sample 2016-04-06 11:52:47 -06:00
Spencer Gibb
a78a567cce Implement ServiceInstance.getMetadata
Consul does not yet support metadata on services. Spring Cloud's `ServiceInstance` has a `Map<String, String> metadata` field. Spring Cloud Consul uses Consul tags to approximate metadata until Consul officially supports metadata. Tags with the form `key=value` will be split and used as a `Map` key and value respectively. Tags without the equal `=` sign, will be used as both the key and value.

fixes gh-162
2016-04-04 21:06:58 -06:00
Spencer Gibb
02d740fdf9 Prepare consul discovery to lookup configserver.
fixes gh-167
2016-04-04 10:57:02 -06:00
Spencer Gibb
e767c4e64f Fix broken test 2016-04-01 17:54:51 -06:00
Spencer Gibb
79c50f0fc5 Fix NPE if spring.application.name is not set. 2016-04-01 17:52:01 -06:00
Spencer Gibb
314b159a84 Revert "Update SNAPSHOT to milestone 1.0.0.RC1"
This reverts commit e4c066b0b7.
2016-03-23 10:24:27 -06:00
Spencer Gibb
e4c066b0b7 Update SNAPSHOT to milestone 1.0.0.RC1 2016-03-23 10:15:42 -06:00
Spencer Gibb
87e2ae8a44 Update mvnw to determine profile on mac and linux 2016-03-22 12:45:16 -06:00
Spencer Gibb
e4fb366009 Allow to not register a healthcheck.
Useful for development.
2016-03-21 15:05:06 -06:00
Spencer Gibb
a6803340c2 prove s.c.c.discovery.{hostname|ipAddress} work 2016-03-21 11:47:21 -06:00
Spencer Gibb
8db3c72c33 Allow s.c.c.d.register=false to disable registering.
fixes gh-155
2016-03-16 13:32:35 -06:00
Spencer Gibb
c6e7db055e Support .yaml extension for FILES format. 2016-03-11 16:16:40 -07:00
Spencer Gibb
373072182a Added FILES configuration format.
Useful for tools like git2consul that load files into individual keys in consul KV.

Fixes gh-152
2016-03-11 14:43:38 -07:00
Spencer Gibb
0f6319b88a Don't require ServerProperties for ConsulDiscoveryClient.
for apps not registering with consul (cli apps).

Fixes gh-149
2016-03-10 18:19:14 -07:00
Marcin Grzejszczak
b2e6f426d3 Added possibility to download consul without certificate check 2016-03-09 13:24:13 +01:00
Dave Syer
7d1b9c2c07 Fix mvnw script for milestones 2016-03-02 17:36:29 +00:00
Spencer Gibb
f99f61d89b Move o.s.c.util to o.s.c.commons.util 2016-03-02 10:28:31 -07:00
Spencer Gibb
1d8572d408 Only run auto config if consul and consul config is enabled. 2016-02-29 12:22:15 -07:00
Spencer Gibb
9a8ea16312 Only log ConfigWatch errors to trace if failFast=false.
fixes gh-145
2016-02-26 10:32:01 -07:00
Spencer Gibb
9ae832f643 failFast should be set in bootstrap.yml 2016-02-26 10:05:35 -07:00
Spencer Gibb
2212b9e31a If failFast=false only log warnings for config loading.
fixes gh-137
2016-02-25 10:30:34 -07:00
Spencer Gibb
3f3fccd01a Add the option to only query for services that are passing health checks. 2016-02-24 16:45:41 -07:00
Spencer Gibb
db62855c22 More efficient ServerListFilter.
Discovery now uses /v1/health/service/<serviceId> rather than /v1/catalog/service/<serviceId> which provides health checks.

HealthServiceServerListFilter now uses the health check to return only PASSING servers.

This eliminates extra calls to consul.

fixes gh-116
2016-02-24 16:36:58 -07:00
Dave Syer
abc1bcea66 Set -Pmilestone automatically based on pom version 2016-02-12 17:45:17 +00:00
Dave Syer
262ae1741f Make grep quiet when setting env vars 2016-02-12 15:48:42 +00:00
Dave Syer
e4d5eeb144 Fix logic with MVN_GOAL 2016-02-12 15:06:20 +00:00
Dave Syer
74681eb77a Align travis build with tools in spring-cloud/build 2016-02-12 13:21:15 +00:00
Spencer Gibb
a58311f1a0 Always pass acl token (even if null). Add consul.token shortcut. 2016-02-10 18:50:44 -07:00
Spencer Gibb
7c0a801986 Merge pull request #139 from bpgray/fix-config-tests
* fix-config-tests:
  add anonymous acl with kv store and discovery permissions
2016-02-10 14:15:48 -07:00
Bill Gray
b62c7f41dc add anonymous acl with kv store and discovery permissions 2016-02-10 14:14:29 -07:00
Spencer Gibb
c2dc040199 fix service name 2016-02-09 21:17:24 -07:00
Spencer Gibb
2072d6d57b fix problem with travis_run_consul.sh 2016-02-09 19:48:43 -07:00
Spencer Gibb
bcabc372d6 try and fix build 2016-02-09 19:45:06 -07:00
Spencer Gibb
caf663edca try and fix build 2016-02-09 19:42:22 -07:00
Spencer Gibb
a92eb572d7 disable acl tests 2016-02-09 19:17:55 -07:00
Spencer Gibb
12af0f532e Merge pull request #82 from bpgray/test-discovery-acl-for-pr
* test-discovery-acl-for-pr:
  add acl tests and setup test instance of consul to support acl testing
2016-02-09 18:04:35 -07:00
Bill Gray
1e1d3c7864 add acl tests and setup test instance of consul to support acl testing 2016-02-09 18:03:56 -07:00
Spencer Gibb
c678035e58 Ignore test failing on travis 2016-02-09 17:22:00 -07:00
Spencer Gibb
68a851a879 Update timeout for travis 2016-02-09 17:15:06 -07:00
Spencer Gibb
bb7cd15b11 move to container builds 2016-02-09 17:09:57 -07:00
Spencer Gibb
21fe4b9ad3 Merge pull request #138 from split3/feature/address-source
* feature/address-source:
  Added support for customizing address for service via addressSource (agent of lookup)
2016-02-09 16:49:28 -07:00
Daniel Hopper
b8f4453c1f Added support for customizing address for service via addressSource (agent of lookup) 2016-02-09 16:48:05 -07:00
Spencer Gibb
304b913e18 Comment out hanging test 2016-02-08 18:16:47 -07:00
Spencer Gibb
3e875bca82 Use RefreshEvent/Listener from s-c-commons 2016-02-08 17:11:50 -07:00
Spencer Gibb
fd0befb196 renamed bean 2016-02-08 16:37:40 -07:00
Spencer Gibb
7ed138644e Update timeouts in tests 2016-02-08 16:05:33 -07:00
Spencer Gibb
c03ac421da Update consul ui 2016-02-08 15:54:18 -07:00