Merge branch '3.0.x'

Author: ryanjbaxter

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

@@ -20,14 +20,19 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.util.StringUtils;
 
 import static org.springframework.cloud.kubernetes.commons.config.ConfigUtils.keysWithPrefix;
+import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTP;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.HTTPS;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.NAMESPACE_METADATA_KEY;
@@ -130,6 +135,32 @@ public static ServicePortNameAndNumber endpointsPort(LinkedHashMap<String, Integ
 		}
 	}
 
+	public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolver servicePortSecureResolver,
+			ServiceMetadataForServiceInstance serviceMetadataForServiceInstance,
+			Supplier<InstanceIdHostPodName> instanceIdAndHost,
+			Function<String, PodLabelsAndAnnotations> podLabelsAndMetadata, ServicePortNameAndNumber portData,
+			String serviceId, Map<String, String> serviceMetadata, String namespace,
+			KubernetesDiscoveryProperties properties) {
+
+		InstanceIdHostPodName data = instanceIdAndHost.get();
+
+		boolean secured;
+		if (servicePortSecureResolver == null) {
+			secured = false;
+		}
+		else {
+			secured = servicePortSecureResolver.resolve(new ServicePortSecureResolver.Input(portData,
+					serviceMetadataForServiceInstance.name(), serviceMetadataForServiceInstance.labels(),
+					serviceMetadataForServiceInstance.annotations()));
+		}
+
+		Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceMetadata, properties,
+				podLabelsAndMetadata);
+
+		return new DefaultKubernetesServiceInstance(data.instanceId(), serviceId, data.host(), portData.portNumber(),
+				serviceMetadata, secured, namespace, null, podMetadata);
+	}
+
 	/**
 	 * take primary-port-name from service label "PRIMARY_PORT_NAME_LABEL_KEY" if it
 	 * exists, otherwise from KubernetesDiscoveryProperties if it exists, otherwise null.
@@ -154,6 +185,32 @@ static String primaryPortName(KubernetesDiscoveryProperties properties, Map<Stri
 		return primaryPortName;
 	}
 
+	static Map<String, Map<String, String>> podMetadata(String podName, Map<String, String> serviceMetadata,
+			KubernetesDiscoveryProperties properties, Function<String, PodLabelsAndAnnotations> podLabelsAndMetadata) {
+		if (!EXTERNAL_NAME.equals(serviceMetadata.get(SERVICE_TYPE))) {
+			if (properties.metadata().addPodLabels() || properties.metadata().addPodAnnotations()) {
+
+				if (podName != null) {
+					PodLabelsAndAnnotations both = podLabelsAndMetadata.apply(podName);
+					Map<String, Map<String, String>> result = new HashMap<>();
+					if (properties.metadata().addPodLabels() && !both.labels().isEmpty()) {
+						result.put("labels", both.labels());
+					}
+
+					if (properties.metadata().addPodAnnotations() && !both.annotations().isEmpty()) {
+						result.put("annotations", both.annotations());
+					}
+
+					LOG.debug(() -> "adding podMetadata : " + result + " from pod : " + podName);
+					return result;
+				}
+
+			}
+		}
+
+		return Map.of();
+	}
+
 	private static Optional<ServicePortNameAndNumber> fromMap(Map<String, Integer> existingPorts, String key,
 			String message) {
 		Integer fromPrimaryPortName = existingPorts.get(key);

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.commons.discovery;
+
+/**
+ * computes instanceId, host and podName. All needed when calculating ServiceInstance.
+ * @author wind57
+ */
+public record InstanceIdHostPodName(String instanceId, String host, String podName) {
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.commons.discovery;
+
+import java.util.Map;
+
+/**
+ * Holds pod labels and annotations.
+ * @author wind57
+ */
+public record PodLabelsAndAnnotations(Map<String, String> labels, Map<String, String> annotations) {
+}

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.commons.discovery;
+
+import java.util.Map;
+
+/**
+ * Holds service name, labels and annotations.
+ *
+ * @author wind57
+ *
+ */
+public record ServiceMetadataForServiceInstance(String name, Map<String, String> labels,
+		Map<String, String> annotations) {
+}