From f822b19557776609076b194f04ea7ed475d1fda3 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:59:14 -0400 Subject: [PATCH] Fixing merge --- .../KubernetesDiscoveryClientTest.java | 29 ------------------- 1 file changed, 29 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 7fb0b125..3754a264 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 @@ -549,33 +549,4 @@ 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().withNewMetadata().withName("endpoint5").withNamespace("test") - .withLabels(labels).withAnnotations(labels).endMetadata().build(); - - mockClient.services().inNamespace("test").create(service); - - final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, - KubernetesClient::services, 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); - } - }