Add ability to skip certificate verification during service checks (#312)

* Add ability to skip certificate verification during service checks

Fixes gh-261

* Update to randomized port and class name based on feedback

* Move properties to @SpringBootTest

* Format code using Spring Cloud Build formatter

* Remove unused imports

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

@@ -153,6 +153,12 @@ public class ConsulDiscoveryProperties {
 	 */
 	private boolean failFast = true;
 
+	/**
+	 * Skips certificate verification during service checks if true, otherwise
+	 * runs certificate verification.
+	 */
+	private Boolean healthCheckTlsSkipVerify;
+
 	@SuppressWarnings("unused")
 	private ConsulDiscoveryProperties() {}
 

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

@@ -215,6 +215,7 @@ public class ConsulAutoRegistration extends ConsulRegistration {
 		if (StringUtils.hasText(properties.getHealthCheckCriticalTimeout())) {
 			check.setDeregisterCriticalServiceAfter(properties.getHealthCheckCriticalTimeout());
 		}
+		check.setTlsSkipVerify(properties.getHealthCheckTlsSkipVerify());
 		return check;
 	}
 

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013-2017 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
+ *
+ *      http://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.serviceregistry;
+
+import com.ecwid.consul.v1.agent.model.NewService;
+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.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
+import org.springframework.cloud.consul.ConsulAutoConfiguration;
+import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author Patrick Hi
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests.TestConfig.class, properties = {
+		"spring.application.name=myTestService-DiscoveryHealthCheckTlsSkipVerify",
+		"spring.cloud.consul.discovery.health-check-tls-skip-verify=true" }, webEnvironment = RANDOM_PORT)
+public class ConsulAutoRegistrationHealthCheckTlsSkipVerifyTests {
+
+	@Autowired
+	private ConsulAutoRegistration registration;
+
+	@Autowired
+	private ConsulDiscoveryProperties properties;
+
+	@Test
+	public void contextLoads() {
+		NewService service = this.registration.getService();
+		assertThat(service).as("service was null").isNotNull();
+
+		NewService.Check check = service.getCheck();
+		assertThat(check).as("check was null").isNotNull();
+		assertThat(check.getTlsSkipVerify()).as("tls_skip_verify was wrong")
+				.isEqualTo(Boolean.TRUE);
+
+		// unable to call consul api to get health check details
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
+			ConsulAutoConfiguration.class,
+			ConsulAutoServiceRegistrationAutoConfiguration.class })
+	public static class TestConfig {
+	}
+}