dirty

Author: wind57

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

@@ -16,31 +16,23 @@
 
 package org.springframework.cloud.kubernetes.fabric8.client.discovery.it;
 
-import java.util.List;
-import java.util.Map;
-
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryApp;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
 
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.builder;
-import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.retrySpec;
 import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.Fabric8DiscoveryPodMetadataIT.TestConfig;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.assertPodMetadata;
 
 /**
  * @author wind57
@@ -49,8 +41,8 @@
 	webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class Fabric8DiscoveryPodMetadataIT extends Fabric8DiscoveryBase {
 
-	@LocalServerPort
-	private int port;
+	@Autowired
+	private DiscoveryClient discoveryClient;
 
 	@BeforeEach
 	void beforeEach() {
@@ -81,6 +73,8 @@ void test() throws Exception {
 
 		K3S.execInContainer("sh", "-c", "kubectl label pods " + podOne + " my-label=my-value");
 		K3S.execInContainer("sh", "-c", "kubectl annotate pods " + podTwo + " my-annotation=my-value");
+
+		assertPodMetadata(discoveryClient);
 	}
 
 	@TestConfiguration

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

@@ -16,32 +16,60 @@
 
 package org.springframework.cloud.kubernetes.fabric8.client.discovery.it;
 
-import java.time.Duration;
-import java.util.Objects;
+import java.util.List;
+import java.util.Map;
 
+import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import reactor.netty.http.client.HttpClient;
-import reactor.util.retry.Retry;
-import reactor.util.retry.RetryBackoffSpec;
+import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.web.reactive.function.client.WebClient;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author wind57
  */
-class TestAssertions {
+final class TestAssertions {
 
-	static void assertPodMetadata(DiscoveryClient discoveryClient) {
+	private TestAssertions() {
 
 	}
 
-	static WebClient.Builder builder() {
-		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
-	}
+	static void assertPodMetadata(DiscoveryClient discoveryClient) {
+
+		List<ServiceInstance> serviceInstances = discoveryClient.getInstances("busybox-service");
+
+		DefaultKubernetesServiceInstance withCustomLabel = serviceInstances.stream()
+			.map(instance -> (DefaultKubernetesServiceInstance) instance)
+			.filter(x -> x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
+			.toList()
+			.get(0);
+
+		Assertions.assertEquals(withCustomLabel.getServiceId(), "busybox-service");
+		Assertions.assertNotNull(withCustomLabel.getInstanceId());
+		Assertions.assertNotNull(withCustomLabel.getHost());
+		Assertions.assertEquals(withCustomLabel.getMetadata(),
+			Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
+		Assertions.assertTrue(withCustomLabel.podMetadata()
+			.get("labels")
+			.entrySet()
+			.stream()
+			.anyMatch(x -> x.getKey().equals("custom-label") && x.getValue().equals("custom-label-value")));
 
-	static RetryBackoffSpec retrySpec() {
-		return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
+		DefaultKubernetesServiceInstance withCustomAnnotation = serviceInstances.stream()
+			.map(instance -> (DefaultKubernetesServiceInstance) instance)
+			.filter(x -> !x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
+			.toList()
+			.get(0);
+		Assertions.assertEquals(withCustomAnnotation.getServiceId(), "busybox-service");
+		Assertions.assertNotNull(withCustomAnnotation.getInstanceId());
+		Assertions.assertNotNull(withCustomAnnotation.getHost());
+		Assertions.assertEquals(withCustomAnnotation.getMetadata(),
+			Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
+		Assertions.assertTrue(withCustomAnnotation.podMetadata()
+			.get("annotations")
+			.entrySet()
+			.stream()
+			.anyMatch(x -> x.getKey().equals("custom-annotation") && x.getValue().equals("custom-annotation-value")));
 	}
 
 }