From 0e3846a504026b68ea9e1c69039d6fb5467c783a Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 31 Aug 2017 15:52:43 -0600 Subject: [PATCH 1/2] Upgrade to latest consul docker image. fixes gh-354 --- docker-compose.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ff2e9712..d464815d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,8 @@ # Work in Progress consul: - image: progrium/consul - volumes: - - /data - - /config - - ./src/test/resources/consul_ui:/ui + image: library/consul ports: - "8300:8300" - "8400:8400" - "8500:8500" - "8600:8600" - command: -server -bootstrap -data-dir /data -ui-dir /ui From 7971265acf68089c9f4c1c2b54ca926c56d0b45b Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 25 Sep 2017 13:17:40 -0400 Subject: [PATCH 2/2] Remove optional @EnableDiscoveryClient (#355) * Remove optional @EnableDiscoveryClient. Fixes #353. --- docs/src/main/asciidoc/spring-cloud-consul.adoc | 4 +--- .../src/main/resources/META-INF/spring.factories | 5 +---- .../consul/discovery/ConsulDiscoveryClientAclTests.java | 1 - .../discovery/ConsulDiscoveryClientCustomizedTests.java | 1 - .../discovery/ConsulDiscoveryClientDefaultQueryTagTests.java | 1 - .../ConsulDiscoveryClientLocalServiceInstanceTests.java | 1 - .../cloud/consul/discovery/ConsulDiscoveryClientTests.java | 1 - .../consul/discovery/ConsulLifecycleCustomizedTests.java | 1 - .../cloud/consul/discovery/ConsulServerListAclTests.java | 1 - .../cloud/consul/sample/SampleConsulApplication.java | 1 - 10 files changed, 2 insertions(+), 15 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-consul.adoc b/docs/src/main/asciidoc/spring-cloud-consul.adoc index 531148e7..89ed1d5e 100644 --- a/docs/src/main/asciidoc/spring-cloud-consul.adoc +++ b/docs/src/main/asciidoc/spring-cloud-consul.adoc @@ -42,7 +42,6 @@ Example Consul client: [source,java,indent=0] ---- @SpringBootApplication -@EnableDiscoveryClient @RestController public class Application { @@ -73,7 +72,7 @@ CAUTION: If you use <>, t The default service name, instance id and port, taken from the `Environment`, are `${spring.application.name}`, the Spring Context ID and `${server.port}` respectively. -`@EnableDiscoveryClient` make the app into both a Consul "service" (i.e. it registers itself) and a "client" (i.e. it can query Consul to locate other services). +To disable the Consul Discovery Client you can set `spring.cloud.consul.discovery.enabled` to `false`. === HTTP Health Check @@ -322,7 +321,6 @@ The `clusterConfig` and `appConfig` sections must match, so it's useful to put t .Turbine.java ---- @EnableTurbine -@EnableDiscoveryClient @SpringBootApplication public class Turbine { public static void main(String[] args) { diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories index b746e722..d1d8101c 100644 --- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories @@ -2,10 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.cloud.consul.discovery.RibbonConsulAutoConfiguration,\ org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerAutoConfiguration,\ org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration,\ -org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration - -# Discovery Client Configuration -org.springframework.cloud.client.discovery.EnableDiscoveryClient=\ +org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration,\ org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java index 33d1f91e..ebf0abfb 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientAclTests.java @@ -72,7 +72,6 @@ public class ConsulDiscoveryClientAclTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration @Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class }) public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java index d9fe8fef..a43e550f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientCustomizedTests.java @@ -101,7 +101,6 @@ public class ConsulDiscoveryClientCustomizedTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration @Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class }) public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java index 515b9804..32f1a34a 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientDefaultQueryTagTests.java @@ -94,7 +94,6 @@ public class ConsulDiscoveryClientDefaultQueryTagTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration @Import({ ConsulDiscoveryClientConfiguration.class }) protected static class TestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientLocalServiceInstanceTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientLocalServiceInstanceTests.java index c9def5ca..076f74cc 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientLocalServiceInstanceTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientLocalServiceInstanceTests.java @@ -148,7 +148,6 @@ public class ConsulDiscoveryClientLocalServiceInstanceTests { } @Configuration - @EnableDiscoveryClient @ImportAutoConfiguration({ ConsulDiscoveryClientConfiguration.class }) protected static class LocalServiceTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java index c2204584..b778ff62 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientTests.java @@ -114,7 +114,6 @@ public class ConsulDiscoveryClientTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration @Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class }) public static class MyTestConfig { diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java index f83ac6b6..a19695ed 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedTests.java @@ -77,7 +77,6 @@ public class ConsulLifecycleCustomizedTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration public static class MyTestConfig { @Bean diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java index 99e6bb47..018cfda1 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulServerListAclTests.java @@ -64,7 +64,6 @@ public class ConsulServerListAclTests { } @Configuration - @EnableDiscoveryClient @EnableAutoConfiguration @Import({ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class}) public static class TestConfig { diff --git a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java index a49dc6eb..fe03c4b3 100644 --- a/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java +++ b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleConsulApplication.java @@ -46,7 +46,6 @@ import org.springframework.web.client.RestTemplate; */ @Configuration @EnableAutoConfiguration -@EnableDiscoveryClient @RestController @EnableConfigurationProperties @EnableFeignClients