Polish "Enable masking ACL token in the logs"

Adds test, also mask ConsulDiscoveryProperties.aclToken in toString()

Fixes gh-889

Author: spencergibb

spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulConfigPropertiesTests.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013-present 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.config;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ConsulConfigPropertiesTests {
+
+	@Test
+	public void aclTokenToStringMasked() {
+		ConsulConfigProperties properties = new ConsulConfigProperties();
+		properties.setAclToken("myAclToken");
+		assertThat(properties.toString()).doesNotContain("myAclToken").contains("******");
+	}
+
+}

spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java

@@ -619,7 +619,7 @@ public void setManagementEnableTagOverride(Boolean managementEnableTagOverride)
 
 	@Override
 	public String toString() {
-		return new ToStringCreator(this).append("aclToken", this.aclToken)
+		return new ToStringCreator(this).append("aclToken", this.aclToken != null ? "******" : null)
 			.append("catalogServicesWatchDelay", this.catalogServicesWatchDelay)
 			.append("catalogServicesWatchTimeout", this.catalogServicesWatchTimeout)
 			.append("consistencyMode", this.consistencyMode)

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/reactive/ConsulReactiveDiscoveryClientTests.java

@@ -33,6 +33,7 @@
 import reactor.test.StepVerifier;
 
 import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
 
 import static java.util.Collections.emptyList;
@@ -88,9 +89,18 @@ public void shouldReturnFluxOfServices() {
 		verify(consulClient).getCatalogServices(any(CatalogServicesRequest.class));
 	}
 
+	@Test
+	public void aclTokenToStringMasked() {
+		InetUtils inetUtils = mock(InetUtils.class);
+		when(inetUtils.findFirstNonLoopbackHostInfo()).thenReturn(mock(InetUtils.HostInfo.class));
+		ConsulDiscoveryProperties consulDiscoveryProperties = new ConsulDiscoveryProperties(inetUtils);
+		consulDiscoveryProperties.setAclToken("myAclToken");
+		assertThat(consulDiscoveryProperties.toString()).doesNotContain("myAclToken").contains("******");
+	}
+
 	@Test
 	public void shouldReturnFluxOfServicesWithAclToken() {
-		when(properties.getAclToken()).thenReturn("aclToken");
+		when(properties.getAclToken()).thenReturn("myAclToken");
 		when(consulClient.getCatalogServices(any(CatalogServicesRequest.class))).thenReturn(consulServicesResponse());
 		Flux<String> services = client.getServices();
 		StepVerifier.create(services).expectNext("my-service").expectComplete().verify();