From a69765bfa61d75a136a8240e77f787f78b1ec568 Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 16 Mar 2023 21:56:15 +0200 Subject: [PATCH] Fix current build from merge 2.1.x (#1264) --- .../KubernetesDiscoveryClientTest.java | 31 +++++++++++++++++++ .../KubernetesDiscoveryClientUtilsTests.java | 9 +++--- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientTest.java index 3754a264..677517d9 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientTest.java @@ -17,6 +17,7 @@ package org.springframework.cloud.kubernetes.fabric8.discovery; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -549,4 +550,34 @@ class KubernetesDiscoveryClientTest { .hasSize(1); } + @Test + public void instanceWithoutPorts() { + Map labels = new HashMap<>(); + + Endpoints endPoint1 = new EndpointsBuilder().withNewMetadata().withName("endpoint5").withNamespace("test") + .withLabels(labels).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef() + .withUid("130").endTargetRef().endAddress().endSubset().build(); + + mockClient.endpoints().inNamespace("test").create(endPoint1); + + Service service = new ServiceBuilder().withSpec(new ServiceSpecBuilder().withType("ClusterIP").build()) + .withNewMetadata().withName("endpoint5").withNamespace("test").withLabels(labels) + .withAnnotations(labels).endMetadata().build(); + + mockClient.services().inNamespace("test").create(service); + + final KubernetesDiscoveryProperties properties = KubernetesDiscoveryProperties.DEFAULT; + + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, null, new ServicePortSecureResolver(properties)); + + final List instances = discoveryClient.getInstances("endpoint5"); + + // We're returning the first discovered port to not change previous behaviour + assertThat(instances).hasSize(1).filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1) + .filteredOn(s -> s.getUri().toASCIIString().equals("http://ip1")) + .filteredOn(s -> s.getInstanceId().equals("130")).hasSize(1).filteredOn(s -> 0 == s.getPort()) + .hasSize(1); + } + } diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java index 76303e1d..ffa67e92 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientUtilsTests.java @@ -758,14 +758,13 @@ class KubernetesDiscoveryClientUtilsTests { @Test void testNoPortsServiceInstance() { - Service service = new ServiceBuilder() - .withSpec(new ServiceSpecBuilder().withType("ClusterIP").build()) - .withMetadata(new ObjectMetaBuilder().withUid("123").build()).build(); + Service service = new ServiceBuilder().withSpec(new ServiceSpecBuilder().withType("ClusterIP").build()) + .withMetadata(new ObjectMetaBuilder().withUid("123").build()).build(); EndpointAddress endpointAddress = new EndpointAddressBuilder().withIp("127.0.0.1").build(); - ServiceInstance serviceInstance = KubernetesDiscoveryClientUtils.serviceInstance(null, service, - endpointAddress, 0, "my-service", Map.of("a", "b"), "k8s", KubernetesDiscoveryProperties.DEFAULT, null); + ServiceInstance serviceInstance = KubernetesDiscoveryClientUtils.serviceInstance(null, service, endpointAddress, + 0, "my-service", Map.of("a", "b"), "k8s", KubernetesDiscoveryProperties.DEFAULT, null); Assertions.assertTrue(serviceInstance instanceof DefaultKubernetesServiceInstance); DefaultKubernetesServiceInstance defaultInstance = (DefaultKubernetesServiceInstance) serviceInstance; Assertions.assertEquals(defaultInstance.getInstanceId(), "123");