Merge branch '3.0.x'

Author: ryanjbaxter

…discovery/ServicePortSecureResolver.java …discovery/ServicePortSecureResolver.javaspring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/ServicePortSecureResolver.java renamed to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolver.java spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/ServicePortSecureResolver.java renamed to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolver.java

@@ -14,29 +14,27 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.discovery;
+package org.springframework.cloud.kubernetes.commons.discovery;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.cloud.kubernetes.commons.discovery.ServicePortNameAndNumber;
 import org.springframework.core.log.LogAccessor;
 
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.SECURED;
 
-class ServicePortSecureResolver {
+public final class ServicePortSecureResolver {
 
 	private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(ServicePortSecureResolver.class));
 
 	private static final Set<String> TRUTHY_STRINGS = Set.of("true", "on", "yes", "1");
 
 	private final KubernetesDiscoveryProperties properties;
 
-	ServicePortSecureResolver(KubernetesDiscoveryProperties properties) {
+	public ServicePortSecureResolver(KubernetesDiscoveryProperties properties) {
 		this.properties = properties;
 	}
 
@@ -51,7 +49,7 @@ class ServicePortSecureResolver {
 	 * </ul>
 	 *
 	 */
-	boolean resolve(Input input) {
+	public boolean resolve(Input input) {
 
 		String serviceName = input.serviceName();
 		ServicePortNameAndNumber portData = input.portData();
@@ -90,10 +88,10 @@ private static void logEntry(String serviceName, Integer port, String reason) {
 	/**
 	 * @author wind57
 	 */
-	record Input(ServicePortNameAndNumber portData, String serviceName, Map<String, String> serviceLabels,
+	public record Input(ServicePortNameAndNumber portData, String serviceName, Map<String, String> serviceLabels,
 			Map<String, String> serviceAnnotations) {
 
-		Input(ServicePortNameAndNumber portData, String serviceName, Map<String, String> serviceLabels,
+		public Input(ServicePortNameAndNumber portData, String serviceName, Map<String, String> serviceLabels,
 				Map<String, String> serviceAnnotations) {
 			this.portData = portData;
 			this.serviceName = serviceName;

…overy/ServicePortSecureResolverTest.java …overy/ServicePortSecureResolverTest.javaspring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/ServicePortSecureResolverTest.java renamed to spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/ServicePortSecureResolverTest.java renamed to spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/discovery/ServicePortSecureResolverTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.kubernetes.fabric8.discovery;
+package org.springframework.cloud.kubernetes.commons.discovery;
 
 import java.util.Collections;
 import java.util.Map;
@@ -25,11 +25,9 @@
 
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.cloud.kubernetes.commons.discovery.ServicePortNameAndNumber;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.cloud.kubernetes.fabric8.discovery.ServicePortSecureResolver.Input;
+import static org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver.Input;
 
 @ExtendWith(OutputCaptureExtension.class)
 class ServicePortSecureResolverTest {

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

@@ -33,6 +33,7 @@
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerBootstrapper;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerInstanceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration;
 import org.springframework.util.ClassUtils;
 

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

@@ -49,6 +49,7 @@
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.ServicePortNameAndNumber;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 import org.springframework.cloud.kubernetes.fabric8.Fabric8Utils;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.util.CollectionUtils;
@@ -57,7 +58,6 @@
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.EXTERNAL_NAME;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.PRIMARY_PORT_NAME_LABEL_KEY;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.SERVICE_TYPE;
-import static org.springframework.cloud.kubernetes.fabric8.discovery.ServicePortSecureResolver.Input;
 
 /**
  * @author wind57
@@ -208,8 +208,9 @@ static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolver servi
 			secured = false;
 		}
 		else {
-			secured = servicePortSecureResolver.resolve(new Input(portData, service.getMetadata().getName(),
-					service.getMetadata().getLabels(), service.getMetadata().getAnnotations()));
+			secured = servicePortSecureResolver
+					.resolve(new ServicePortSecureResolver.Input(portData, service.getMetadata().getName(),
+							service.getMetadata().getLabels(), service.getMetadata().getAnnotations()));
 		}
 
 		String host = Optional.ofNullable(endpointAddress).map(EndpointAddress::getIp)
@@ -294,8 +295,7 @@ static LinkedHashMap<String, Integer> endpointSubsetPortsData(EndpointSubset end
 
 		// this is most probably not a needed if statement, but it preserves the
 		// previous logic before I refactored the code. In particular, this takes care of
-		// the fact
-		// that an EndpointsPort name could be missing.
+		// the fact that an EndpointsPort name could be missing.
 		if (endpointPorts.size() == 1) {
 			result.put(endpointPorts.get(0).getName(), endpointPorts.get(0).getPort());
 			return result;

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

@@ -36,6 +36,7 @@
 import org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.ServicePortNameAndNumber;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 import org.springframework.core.log.LogAccessor;

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

@@ -36,6 +36,7 @@
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthIndicatorInitializer;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;

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

@@ -40,6 +40,7 @@
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesServiceInstance;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties.Metadata;

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

@@ -41,6 +41,7 @@
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.ServicePortNameAndNumber;
+import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
 
 /**
  * @author wind57