first

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java

@@ -55,6 +55,7 @@
 import static org.springframework.cloud.kubernetes.client.discovery.KubernetesDiscoveryClientUtils.serviceMetadata;
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.endpointsPort;
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
+import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.externalNameServiceInstance;
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstanceMetadata;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
 
@@ -144,10 +145,8 @@ public List<ServiceInstance> getInstances(String serviceId) {
 						properties);
 
 				K8sInstanceIdHostPodNameSupplier supplierOne = externalName(service);
-				K8sPodLabelsAndAnnotationsSupplier supplierTwo = externalName();
-
-				ServiceInstance externalNameServiceInstance = serviceInstance(null, serviceMetadata, supplierOne,
-						supplierTwo, new ServicePortNameAndNumber(-1, null), serviceInstanceMetadata, properties);
+				ServiceInstance externalNameServiceInstance = externalNameServiceInstance(serviceMetadata,
+					supplierOne, serviceInstanceMetadata);
 				serviceInstances.add(externalNameServiceInstance);
 			}
 		}

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java

@@ -53,6 +53,7 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -570,7 +571,8 @@ void testExternalNameService() {
 
 		List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
 		assertThat(result.size()).isEqualTo(1);
-		DefaultKubernetesServiceInstance externalNameServiceInstance = (DefaultKubernetesServiceInstance) result.get(0);
+		KubernetesExternalNameServiceInstance externalNameServiceInstance =
+			(KubernetesExternalNameServiceInstance) result.get(0);
 		assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
 		assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
 		assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtils.java

@@ -159,6 +159,17 @@ public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolve
 				podMetadata);
 	}
 
+	public static ServiceInstance externalNameServiceInstance(
+		ServiceMetadata serviceMetadata, Supplier<InstanceIdHostPodName> instanceIdAndHost,
+		Map<String, String> serviceInstanceMetadata) {
+
+		InstanceIdHostPodName data = instanceIdAndHost.get();
+
+		return new KubernetesExternalNameServiceInstance(serviceMetadata.name(), data.host(),
+			data.instanceId(), serviceInstanceMetadata);
+
+	}
+
 	/**
 	 * take primary-port-name from service label "PRIMARY_PORT_NAME_LABEL_KEY" if it
 	 * exists, otherwise from KubernetesDiscoveryProperties if it exists, otherwise null.

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/configdata/KubernetesConfigDataLocationResolverTests.java

@@ -289,11 +289,6 @@ void testResolveProfileSpecificSix() {
 		Mockito.when(RESOLVER_CONTEXT.getBinder()).thenReturn(binder);
 		Mockito.when(RESOLVER_CONTEXT.getBootstrapContext()).thenReturn(new DefaultBootstrapContext());
 
-		Profiles profiles = Mockito.mock(Profiles.class);
-		ConfigDataLocation configDataLocation = ConfigDataLocation.of("kubernetes:abc");
-		List<KubernetesConfigDataResource> result = storePropertiesResolver.resolveProfileSpecific(RESOLVER_CONTEXT,
-				configDataLocation, profiles);
-
 		// on the other hand, @Default will be picked here
 		Assertions.assertThat(storePropertiesResolver.configMapConfigProperties.enabled()).isTrue();
 

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClient.java

@@ -40,6 +40,7 @@
 
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.endpointsPort;
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstance;
+import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.externalNameServiceInstance;
 import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.serviceInstanceMetadata;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
 import static org.springframework.cloud.kubernetes.fabric8.Fabric8Utils.serviceMetadata;
@@ -112,10 +113,11 @@ public List<ServiceInstance> getInstances(String serviceId) {
 						properties);
 
 				Fabric8InstanceIdHostPodNameSupplier supplierOne = externalName(service);
-				Fabric8PodLabelsAndAnnotationsSupplier supplierTwo = externalName();
 
-				ServiceInstance externalNameServiceInstance = serviceInstance(null, serviceMetadata, supplierOne,
-						supplierTwo, new ServicePortNameAndNumber(-1, null), serviceInstanceMetadata, properties);
+				ServiceInstance externalNameServiceInstance = externalNameServiceInstance(
+					serviceMetadata, supplierOne, serviceInstanceMetadata
+				);
+
 				instances.add(externalNameServiceInstance);
 			}
 		}

spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientTwoTests.java

@@ -45,6 +45,7 @@
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.KubernetesExternalNameServiceInstance;
 import org.springframework.core.env.Environment;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -552,7 +553,8 @@ void testExternalNameService() {
 		Fabric8DiscoveryClient discoveryClient = new Fabric8DiscoveryClient(client, properties, null, null, null);
 		List<ServiceInstance> result = discoveryClient.getInstances("blue-service");
 		Assertions.assertThat(result.size()).isEqualTo(1);
-		DefaultKubernetesServiceInstance externalNameServiceInstance = (DefaultKubernetesServiceInstance) result.get(0);
+		KubernetesExternalNameServiceInstance externalNameServiceInstance =
+			(KubernetesExternalNameServiceInstance) result.get(0);
 		Assertions.assertThat(externalNameServiceInstance.getServiceId()).isEqualTo("blue-service");
 		Assertions.assertThat(externalNameServiceInstance.getHost()).isEqualTo("k8s-spring-b");
 		Assertions.assertThat(externalNameServiceInstance.getPort()).isEqualTo(-1);