Remove one integration test 2 (13) (#1434)

Author: wind57

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -58,7 +58,6 @@
 		<module>spring-cloud-kubernetes-discoveryclient-it</module>
 		<module>spring-cloud-kubernetes-client-loadbalancer-it</module>
 		<module>spring-cloud-kubernetes-configuration-watcher-it</module>
-		<module>spring-cloud-kubernetes-core-k8s-client-it</module>
         <module>spring-cloud-kubernetes-client-event-and-polling-reload</module>
         <module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
         <module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java

@@ -308,7 +308,7 @@ void filterMatchesBothNamespacesViaThePredicate() {
 		// patch the deployment to change what namespaces are take into account
 		KubernetesClientDiscoveryClientUtils.patchForTwoNamespacesMatchViaThePredicate(DEPLOYMENT_NAME, NAMESPACE);
 
-		new KubernetesClientDiscoveryFilterITDelegate().filterMatchesBothNamespacesViaThePredicate(util);
+		new KubernetesClientDiscoveryFilterITDelegate().filterMatchesBothNamespacesViaThePredicate();
 	}
 
 	@Test
@@ -339,7 +339,7 @@ void testDefaultConfiguration() {
 
 		KubernetesClientDiscoveryClientUtils.patchForBlockingAndReactiveHealth(DEPLOYMENT_NAME, NAMESPACE);
 
-		new KubernetesClientDiscoveryHealthITDelegate().testDefaultConfiguration(util, K3S);
+		new KubernetesClientDiscoveryHealthITDelegate().testDefaultConfiguration(K3S);
 	}
 
 	private void deleteNamespacesAndWiremock() {

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java

@@ -95,7 +95,7 @@ void filterMatchesOneNamespaceViaThePredicate(Util util) {
 	 *     As such, both services are found via 'getInstances' call.
 	 * </pre>
 	 */
-	void filterMatchesBothNamespacesViaThePredicate(Util util) {
+	void filterMatchesBothNamespacesViaThePredicate() {
 
 		// patch the deployment to change what namespaces are take into account
 		KubernetesClientDiscoveryClientUtils.patchForTwoNamespacesMatchViaThePredicate(DEPLOYMENT_NAME, NAMESPACE);

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java

@@ -29,7 +29,6 @@
 import reactor.util.retry.RetryBackoffSpec;
 
 import org.springframework.boot.test.json.BasicJsonTester;
-import org.springframework.cloud.kubernetes.integration.tests.commons.native_client.Util;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
@@ -142,7 +141,7 @@ void testReactiveConfiguration(K3sContainer container) {
 	/**
 	 * Both blocking and reactive are enabled.
 	 */
-	void testDefaultConfiguration(Util util, K3sContainer container) {
+	void testDefaultConfiguration(K3sContainer container) {
 
 		KubernetesClientDiscoveryClientUtils.patchForBlockingAndReactiveHealth(DEPLOYMENT_NAME, NAMESPACE);
 
@@ -153,9 +152,12 @@ void testDefaultConfiguration(Util util, K3sContainer container) {
 				"received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-client-discovery-it");
 
 		WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build();
+		WebClient infoClient = builder().baseUrl("http://localhost/actuator/info").build();
 
 		String healthResult = healthClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
 				.retryWhen(retrySpec()).block();
+		String infoResult = infoClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
+			.retryWhen(retrySpec()).block();
 
 		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult))
 				.extractingJsonPathStringValue("$.components.discoveryComposite.status").isEqualTo("UP");
@@ -180,6 +182,61 @@ void testDefaultConfiguration(Util util, K3sContainer container) {
 				"$.components.reactiveDiscoveryClients.components.['Kubernetes Reactive Discovery Client'].details.services")
 				.containsExactlyInAnyOrder("spring-cloud-kubernetes-client-discovery-it", "kubernetes");
 
+		// assert health/info also
+		assertHealth(healthResult);
+		assertInfo(infoResult);
+	}
+
+	private void assertHealth(String healthResult) {
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.status").isEqualTo("UP");
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.hostIp").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathBooleanValue(
+			"$.components.kubernetes.details.inside").isEqualTo(true);
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.labels.app").isEqualTo("spring-cloud-kubernetes-client-discovery-it");
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.namespace").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.nodeName").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.podIp").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.podName").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathStringValue(
+			"$.components.kubernetes.details.serviceAccount").isNotEmpty();
+	}
+
+	private void assertInfo(String infoResult) {
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.hostIp").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathBooleanValue(
+			"$.kubernetes.inside").isEqualTo(true);
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.namespace").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.nodeName").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.podIp").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.podName").isNotEmpty();
+
+		Assertions.assertThat(BASIC_JSON_TESTER.from(infoResult)).extractingJsonPathStringValue(
+			"$.kubernetes.serviceAccount").isNotEmpty();
 	}
 
 	private WebClient.Builder builder() {