Properly resolve services using datacenters map

yuzawa-san · yuzawa-san · commit fb17b50e2474 · 2023-08-03T17:33:38.000-04:00
Support was introduced in 7a21240 but dropped later, the docs still say this is supported, so this fixes this regression
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
@@ -54,7 +54,8 @@ public String description() {
 
 	@Override
 	public List<ServiceInstance> getInstances(final String serviceId) {
-		return getInstances(serviceId, new QueryParams(this.properties.getConsistencyMode()));
+		return getInstances(serviceId,
+				new QueryParams(this.properties.getDatacenters().get(serviceId), this.properties.getConsistencyMode()));
 	}
 
 	public List<ServiceInstance> getInstances(final String serviceId, final QueryParams queryParams) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ public String description() {`
`54`	`54`
`55`	`55`	`@Override`
`56`	`56`	`public List<ServiceInstance> getInstances(final String serviceId) {`
`57`		`- return getInstances(serviceId, new QueryParams(this.properties.getConsistencyMode()));`
	`57`	`+ return getInstances(serviceId,`
	`58`	`+ new QueryParams(this.properties.getDatacenters().get(serviceId), this.properties.getConsistencyMode()));`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`public List<ServiceInstance> getInstances(final String serviceId, final QueryParams queryParams) {`