From 2ffbb3906293ab315498adfcaae68c104263c71a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 9 Oct 2020 20:29:40 -0400 Subject: [PATCH 1/5] Unignores test --- .../cloud/consul/config/ConsulPropertySourceLocatorTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java index 07f87275..8636fe41 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorTests.java @@ -112,7 +112,6 @@ public class ConsulPropertySourceLocatorTests { } @Test - @Ignore // FIXME broken tests with boot 2.0.0 public void propertyLoadedAndUpdated() throws Exception { String testProp = this.environment.getProperty(TEST_PROP_CANONICAL); assertThat(testProp).as("testProp was wrong").isEqualTo(VALUE1); @@ -147,7 +146,7 @@ public class ConsulPropertySourceLocatorTests { .isEqualTo("testPropValInsert"); } - @Configuration(proxyBeanMethods = false) + @Configuration @EnableAutoConfiguration static class Config { From 6c6e4e3d631e08e944bd7ac34548d6504e387740 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:43:04 +0000 Subject: [PATCH 2/5] Update SNAPSHOT to 2.2.5.RELEASE --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 6 +++--- pom.xml | 16 ++++++++-------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 044aaa2a..4940c938 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 67f77d5c..58b353ba 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -33,8 +33,8 @@ |spring.cloud.consul.discovery.health-check-url | | Custom health check url to override default. |spring.cloud.consul.discovery.heartbeat.enabled | false | |spring.cloud.consul.discovery.heartbeat.interval-ratio | | -|spring.cloud.consul.discovery.heartbeat.ttl-unit | s | -|spring.cloud.consul.discovery.heartbeat.ttl-value | 30 | +|spring.cloud.consul.discovery.heartbeat.ttl-unit | s | +|spring.cloud.consul.discovery.heartbeat.ttl-value | 30 | |spring.cloud.consul.discovery.hostname | | Hostname to use when accessing server. |spring.cloud.consul.discovery.include-hostname-in-instance-id | false | Whether hostname is included into the default instance id when registering service. |spring.cloud.consul.discovery.instance-group | | Service instance group. @@ -77,4 +77,4 @@ |spring.cloud.consul.tls.key-store-password | | Password to an external keystore. |spring.cloud.consul.tls.key-store-path | | Path to an external keystore. -|=== +|=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index abefb8f2..26498fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom Spring Cloud Consul Spring Cloud Consul @@ -14,20 +14,20 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE 2.10.5 - 2.2.4.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.6.RELEASE + 2.2.6.RELEASE + 2.2.6.RELEASE 1.0.3.RELEASE - 2.2.5.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.6.RELEASE + Horsham.SR9 1.14.3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 265a5baf..395032b0 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 49db4642..6b0fb617 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index e7a9a627..965864e1 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index ae33054c..b47e411c 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-consul-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 47ccea3c..4b228910 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 96b9b460..c8ab55c5 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 58a39950..fb70187a 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index e8d2bf29..038ce882 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 6e93ed00..3d8efe39 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 447e12c5..4ded390e 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 59acc46b..1660e4e1 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-consul From 10c09a64ac1cb6ac91d559732b63c07797dc40ce Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:44:30 +0000 Subject: [PATCH 3/5] Going back to snapshots --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 6 +++--- pom.xml | 16 ++++++++-------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4940c938..044aaa2a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 58b353ba..67f77d5c 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -33,8 +33,8 @@ |spring.cloud.consul.discovery.health-check-url | | Custom health check url to override default. |spring.cloud.consul.discovery.heartbeat.enabled | false | |spring.cloud.consul.discovery.heartbeat.interval-ratio | | -|spring.cloud.consul.discovery.heartbeat.ttl-unit | s | -|spring.cloud.consul.discovery.heartbeat.ttl-value | 30 | +|spring.cloud.consul.discovery.heartbeat.ttl-unit | s | +|spring.cloud.consul.discovery.heartbeat.ttl-value | 30 | |spring.cloud.consul.discovery.hostname | | Hostname to use when accessing server. |spring.cloud.consul.discovery.include-hostname-in-instance-id | false | Whether hostname is included into the default instance id when registering service. |spring.cloud.consul.discovery.instance-group | | Service instance group. @@ -77,4 +77,4 @@ |spring.cloud.consul.tls.key-store-password | | Password to an external keystore. |spring.cloud.consul.tls.key-store-path | | Path to an external keystore. -|=== \ No newline at end of file +|=== diff --git a/pom.xml b/pom.xml index 26498fe8..abefb8f2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,20 +14,20 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT 2.10.5 - 2.2.3.RELEASE - 2.2.6.RELEASE - 2.2.6.RELEASE - 2.2.6.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT 1.0.3.RELEASE - 2.2.6.RELEASE - Horsham.SR9 + 2.2.5.BUILD-SNAPSHOT + Horsham.SR7 1.14.3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 395032b0..265a5baf 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 6b0fb617..49db4642 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 965864e1..e7a9a627 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index b47e411c..ae33054c 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 4b228910..47ccea3c 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index c8ab55c5..96b9b460 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index fb70187a..58a39950 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 038ce882..e8d2bf29 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 3d8efe39..6e93ed00 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 4ded390e..447e12c5 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 1660e4e1..59acc46b 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul From 58fdb0af98ad385006f567dabb3c12cb4aa99a35 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:44:30 +0000 Subject: [PATCH 4/5] Bumping versions to 2.2.6.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 16 ++++++++-------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 2 +- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 044aaa2a..d0d9faa1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index abefb8f2..56210f4b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,20 +14,20 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE 2.10.5 - 2.2.4.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.3.RELEASE + 2.2.7.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT 1.0.3.RELEASE - 2.2.5.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.7.BUILD-SNAPSHOT + Horsham.SR9 1.14.3 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 265a5baf..84784264 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 49db4642..18262291 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index e7a9a627..0a3f5b6d 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index ae33054c..8755762d 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-consul-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 47ccea3c..fad53288 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 96b9b460..bf9124f8 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 58a39950..dbc2c434 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index e8d2bf29..3c6bee9e 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 6e93ed00..282c8999 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 447e12c5..0d3fa72b 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 59acc46b..f425fce5 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-consul From 782ad89aab71c9cea624763ce97b2674066aa355 Mon Sep 17 00:00:00 2001 From: bono007 Date: Thu, 26 Nov 2020 09:53:44 -0600 Subject: [PATCH 5/5] Respect the 'spring.cloud.consul.discovery.server-list-query-tags' property during service instance lookup (#685) Fixes gh-680 --- .../discovery/ConsulDiscoveryClient.java | 12 +- ...iscoveryClientServerListQueryTagTests.java | 112 ++++++++++++++++++ 2 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientServerListQueryTagTests.java diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java index bfd542ee..c0b1fa9e 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java @@ -40,6 +40,7 @@ import static org.springframework.cloud.consul.discovery.ConsulServerUtils.getMe * @author Spencer Gibb * @author Joe Athman * @author Tim Ysewyn + * @author Chris Bono */ public class ConsulDiscoveryClient implements DiscoveryClient { @@ -77,11 +78,14 @@ public class ConsulDiscoveryClient implements DiscoveryClient { private void addInstancesToList(List instances, String serviceId, QueryParams queryParams) { - - HealthServicesRequest request = HealthServicesRequest.newBuilder() - .setTag(this.properties.getDefaultQueryTag()) + HealthServicesRequest.Builder requestBuilder = HealthServicesRequest.newBuilder() .setPassing(this.properties.isQueryPassing()).setQueryParams(queryParams) - .setToken(this.properties.getAclToken()).build(); + .setToken(this.properties.getAclToken()); + String queryTag = this.properties.getQueryTagForService(serviceId); + if (queryTag != null) { + requestBuilder.setTag(queryTag); + } + HealthServicesRequest request = requestBuilder.build(); Response> services = this.client.getHealthServices(serviceId, request); diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientServerListQueryTagTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientServerListQueryTagTests.java new file mode 100644 index 00000000..4cc9f6cd --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientServerListQueryTagTests.java @@ -0,0 +1,112 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.consul.discovery; + +import java.util.Collections; +import java.util.List; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.agent.model.NewService; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.consul.test.ConsulTestcontainers; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.MOCK; +import static org.springframework.cloud.consul.discovery.ConsulDiscoveryClientServerListQueryTagTests.NAME; + +/** + * Integration test to verify the + * {@link ConsulDiscoveryProperties#getServerListQueryTags()} is respected. + * + * @author Chris Bono + */ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = MOCK, + classes = ConsulDiscoveryClientServerListQueryTagTests.TestConfig.class, + properties = { "spring.application.name=" + NAME, + "spring.cloud.consul.discovery.catalogServicesWatch.enabled=false", + "spring.cloud.consul.discovery.server-list-query-tags[" + NAME + "]=uat", + "spring.cloud.consul.discovery.defaultQueryTag=intg" }) +@DirtiesContext +@ContextConfiguration(initializers = ConsulTestcontainers.class) +public class ConsulDiscoveryClientServerListQueryTagTests { + + public static final String NAME = "consulServiceServerListQueryTags"; + + @Autowired + private ConsulDiscoveryClient discoveryClient; + + @Autowired + private ConsulClient consulClient; + + private NewService intgService = serviceForEnvironment("intg", 9081); + + private NewService uatService = serviceForEnvironment("uat", 9080); + + @Before + public void setUp() { + consulClient.agentServiceRegister(intgService); + consulClient.agentServiceRegister(uatService); + } + + @After + public void tearDown() { + consulClient.agentServiceDeregister(intgService.getId()); + consulClient.agentServiceDeregister(uatService.getId()); + } + + @Test + public void shouldReturnInstanceWithMatchingServerListQueryTags() { + List instances = discoveryClient.getInstances(NAME); + assertThat(instances).as("instances was wrong size").hasSize(1); + ServiceInstance serviceInstance = instances.get(0); + assertThat(serviceInstance.getPort()).isEqualTo(uatService.getPort()); + assertThat(serviceInstance.getServiceId()).isEqualTo(uatService.getName()); + assertThat(serviceInstance.getInstanceId()).isEqualTo(uatService.getId()); + } + + private NewService serviceForEnvironment(String env, int port) { + NewService service = new NewService(); + service.setAddress("localhost"); + service.setId(NAME + env); + service.setName(NAME); + service.setPort(port); + service.setTags(Collections.singletonList(env)); + return service; + } + + @Configuration(proxyBeanMethods = false) + @EnableAutoConfiguration + @Import({ ConsulDiscoveryClientConfiguration.class }) + protected static class TestConfig { + + } + +}