diff --git a/README.adoc b/README.adoc index a2e5a348..7d534f18 100644 --- a/README.adoc +++ b/README.adoc @@ -437,6 +437,10 @@ You can specify multiple (exact) file paths in `spring.cloud.kubernetes.config.p NOTE: You have to provide the full exact path to each property file, because directories are not being recursively parsed. +NOTE: If you use `spring.cloud.kubernetes.config.paths` or `spring.cloud.kubernetes.secrets.path` the automatic reload +functionality will not work. You will need to make a `POST` request to the `/actuator/refresh` endpoint or +restart/redeploy the application. + .Properties: [options="header,footer"] |=== diff --git a/docs/src/main/asciidoc/property-source-config.adoc b/docs/src/main/asciidoc/property-source-config.adoc index 9e2f3184..ec0ac32e 100644 --- a/docs/src/main/asciidoc/property-source-config.adoc +++ b/docs/src/main/asciidoc/property-source-config.adoc @@ -279,6 +279,10 @@ You can specify multiple (exact) file paths in `spring.cloud.kubernetes.config.p NOTE: You have to provide the full exact path to each property file, because directories are not being recursively parsed. +NOTE: If you use `spring.cloud.kubernetes.config.paths` or `spring.cloud.kubernetes.secrets.path` the automatic reload +functionality will not work. You will need to make a `POST` request to the `/actuator/refresh` endpoint or +restart/redeploy the application. + .Properties: [options="header,footer"] |=== diff --git a/spring-cloud-kubernetes-config/pom.xml b/spring-cloud-kubernetes-config/pom.xml index c6fc4afd..3038062e 100644 --- a/spring-cloud-kubernetes-config/pom.xml +++ b/spring-cloud-kubernetes-config/pom.xml @@ -120,6 +120,7 @@ + io.fabric8 kubernetes-client @@ -136,6 +137,7 @@ + io.fabric8 mockwebserver diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java index 9b6d72c6..4754fecf 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/BootstrapConfiguration.java @@ -41,26 +41,21 @@ public class BootstrapConfiguration { @Configuration(proxyBeanMethods = false) @Import(KubernetesAutoConfiguration.class) - @EnableConfigurationProperties({ ConfigMapConfigProperties.class, - SecretsConfigProperties.class }) + @EnableConfigurationProperties({ ConfigMapConfigProperties.class, SecretsConfigProperties.class }) protected static class KubernetesPropertySourceConfiguration { @Autowired private KubernetesClient client; @Bean - @ConditionalOnProperty(name = "spring.cloud.kubernetes.config.enabled", - matchIfMissing = true) - public ConfigMapPropertySourceLocator configMapPropertySourceLocator( - ConfigMapConfigProperties properties) { + @ConditionalOnProperty(name = "spring.cloud.kubernetes.config.enabled", matchIfMissing = true) + public ConfigMapPropertySourceLocator configMapPropertySourceLocator(ConfigMapConfigProperties properties) { return new ConfigMapPropertySourceLocator(this.client, properties); } @Bean - @ConditionalOnProperty(name = "spring.cloud.kubernetes.secrets.enabled", - matchIfMissing = true) - public SecretsPropertySourceLocator secretsPropertySourceLocator( - SecretsConfigProperties properties) { + @ConditionalOnProperty(name = "spring.cloud.kubernetes.secrets.enabled", matchIfMissing = true) + public SecretsPropertySourceLocator secretsPropertySourceLocator(SecretsConfigProperties properties) { return new SecretsPropertySourceLocator(this.client, properties); } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java index 2256ac19..cb287f40 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapConfigProperties.java @@ -16,8 +16,7 @@ package org.springframework.cloud.kubernetes.config; -import java.util.ArrayList; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -36,9 +35,9 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { private boolean enableApi = true; - private List paths = new LinkedList<>(); + private List paths = Collections.emptyList(); - private List sources = new LinkedList<>(); + private List sources = Collections.emptyList(); public boolean isEnableApi() { return this.enableApi; @@ -74,16 +73,11 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { */ public List determineSources() { if (this.sources.isEmpty()) { - return new ArrayList() { - { - add(new NormalizedSource(ConfigMapConfigProperties.this.name, - ConfigMapConfigProperties.this.namespace)); - } - }; + return Collections.singletonList(new NormalizedSource(ConfigMapConfigProperties.this.name, + ConfigMapConfigProperties.this.namespace)); } - return this.sources.stream().map(s -> s.normalize(this.name, this.namespace)) - .collect(Collectors.toList()); + return this.sources.stream().map(s -> s.normalize(this.name, this.namespace)).collect(Collectors.toList()); } @Override @@ -135,10 +129,8 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { } public NormalizedSource normalize(String defaultName, String defaultNamespace) { - final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName - : this.name; - final String normalizedNamespace = StringUtils.isEmpty(this.namespace) - ? defaultNamespace : this.namespace; + final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName : this.name; + final String normalizedNamespace = StringUtils.isEmpty(this.namespace) ? defaultNamespace : this.namespace; return new NormalizedSource(normalizedName, normalizedNamespace); } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java index 4d561dbd..41cac15f 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java @@ -60,40 +60,31 @@ public class ConfigMapPropertySource extends MapPropertySource { this(client, name, null, (Environment) null); } - public ConfigMapPropertySource(KubernetesClient client, String name, String namespace, - String[] profiles) { + public ConfigMapPropertySource(KubernetesClient client, String name, String namespace, String[] profiles) { this(client, name, namespace, createEnvironmentWithActiveProfiles(profiles)); } - private static Environment createEnvironmentWithActiveProfiles( - String[] activeProfiles) { + private static Environment createEnvironmentWithActiveProfiles(String[] activeProfiles) { StandardEnvironment environment = new StandardEnvironment(); environment.setActiveProfiles(activeProfiles); return environment; } - public ConfigMapPropertySource(KubernetesClient client, String name, String namespace, - Environment environment) { - super(getName(client, name, namespace), - asObjectMap(getData(client, name, namespace, environment))); + public ConfigMapPropertySource(KubernetesClient client, String name, String namespace, Environment environment) { + super(getName(client, name, namespace), asObjectMap(getData(client, name, namespace, environment))); } - private static String getName(KubernetesClient client, String name, - String namespace) { - return new StringBuilder().append(PREFIX) - .append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name) + private static String getName(KubernetesClient client, String name, String namespace) { + return new StringBuilder().append(PREFIX).append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name) .append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR) - .append(namespace == null || namespace.isEmpty() ? client.getNamespace() - : namespace) - .toString(); + .append(namespace == null || namespace.isEmpty() ? client.getNamespace() : namespace).toString(); } - private static Map getData(KubernetesClient client, String name, - String namespace, Environment environment) { + private static Map getData(KubernetesClient client, String name, String namespace, + Environment environment) { try { Map result = new LinkedHashMap<>(); - ConfigMap map = StringUtils.isEmpty(namespace) - ? client.configMaps().withName(name).get() + ConfigMap map = StringUtils.isEmpty(namespace) ? client.configMaps().withName(name).get() : client.configMaps().inNamespace(namespace).withName(name).get(); if (map != null) { @@ -107,12 +98,10 @@ public class ConfigMapPropertySource extends MapPropertySource { ConfigMap mapWithProfile = StringUtils.isEmpty(namespace) ? client.configMaps().withName(mapNameWithProfile).get() - : client.configMaps().inNamespace(namespace) - .withName(mapNameWithProfile).get(); + : client.configMaps().inNamespace(namespace).withName(mapNameWithProfile).get(); if (mapWithProfile != null) { - result.putAll( - processAllEntries(mapWithProfile.getData(), environment)); + result.putAll(processAllEntries(mapWithProfile.getData(), environment)); } } @@ -122,15 +111,13 @@ public class ConfigMapPropertySource extends MapPropertySource { } catch (Exception e) { - LOG.warn("Can't read configMap with name: [" + name + "] in namespace:[" - + namespace + "]. Ignoring.", e); + LOG.warn("Can't read configMap with name: [" + name + "] in namespace:[" + namespace + "]. Ignoring.", e); } return new LinkedHashMap<>(); } - private static Map processAllEntries(Map input, - Environment environment) { + private static Map processAllEntries(Map input, Environment environment) { Set> entrySet = input.entrySet(); if (entrySet.size() == 1) { @@ -141,12 +128,10 @@ public class ConfigMapPropertySource extends MapPropertySource { String propertyValue = singleEntry.getValue(); if (propertyName.endsWith(".yml") || propertyName.endsWith(".yaml")) { if (LOG.isDebugEnabled()) { - LOG.debug("The single property with name: [" + propertyName - + "] will be treated as a yaml file"); + LOG.debug("The single property with name: [" + propertyName + "] will be treated as a yaml file"); } - return yamlParserGenerator(environment).andThen(PROPERTIES_TO_MAP) - .apply(propertyValue); + return yamlParserGenerator(environment).andThen(PROPERTIES_TO_MAP).apply(propertyValue); } else if (propertyName.endsWith(".properties")) { if (LOG.isDebugEnabled()) { @@ -154,8 +139,7 @@ public class ConfigMapPropertySource extends MapPropertySource { + "] will be treated as a properties file"); } - return KEY_VALUE_TO_PROPERTIES.andThen(PROPERTIES_TO_MAP) - .apply(propertyValue); + return KEY_VALUE_TO_PROPERTIES.andThen(PROPERTIES_TO_MAP).apply(propertyValue); } else { return defaultProcessAllEntries(input, environment); @@ -165,23 +149,17 @@ public class ConfigMapPropertySource extends MapPropertySource { return defaultProcessAllEntries(input, environment); } - private static Map defaultProcessAllEntries(Map input, - Environment environment) { + private static Map defaultProcessAllEntries(Map input, Environment environment) { - return input.entrySet().stream() - .map(e -> extractProperties(e.getKey(), e.getValue(), environment)) + return input.entrySet().stream().map(e -> extractProperties(e.getKey(), e.getValue(), environment)) .filter(m -> !m.isEmpty()).flatMap(m -> m.entrySet().stream()) - .collect(Collectors.toMap(Entry::getKey, Entry::getValue, - throwingMerger(), LinkedHashMap::new)); + .collect(Collectors.toMap(Entry::getKey, Entry::getValue, throwingMerger(), LinkedHashMap::new)); } - private static Map extractProperties(String resourceName, - String content, Environment environment) { + private static Map extractProperties(String resourceName, String content, Environment environment) { - if (resourceName.equals(APPLICATION_YAML) - || resourceName.equals(APPLICATION_YML)) { - return yamlParserGenerator(environment).andThen(PROPERTIES_TO_MAP) - .apply(content); + if (resourceName.equals(APPLICATION_YAML) || resourceName.equals(APPLICATION_YML)) { + return yamlParserGenerator(environment).andThen(PROPERTIES_TO_MAP).apply(content); } else if (resourceName.equals(APPLICATION_PROPERTIES)) { return KEY_VALUE_TO_PROPERTIES.andThen(PROPERTIES_TO_MAP).apply(content); @@ -195,8 +173,8 @@ public class ConfigMapPropertySource extends MapPropertySource { } private static Map asObjectMap(Map source) { - return source.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, - Map.Entry::getValue, throwingMerger(), LinkedHashMap::new)); + return source.entrySet().stream().collect( + Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, throwingMerger(), LinkedHashMap::new)); } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java index 39116614..748385d9 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySourceLocator.java @@ -52,15 +52,13 @@ import static org.springframework.cloud.kubernetes.config.PropertySourceUtils.ya @Order(0) public class ConfigMapPropertySourceLocator implements PropertySourceLocator { - private static final Log LOG = LogFactory - .getLog(ConfigMapPropertySourceLocator.class); + private static final Log LOG = LogFactory.getLog(ConfigMapPropertySourceLocator.class); private final KubernetesClient client; private final ConfigMapConfigProperties properties; - public ConfigMapPropertySourceLocator(KubernetesClient client, - ConfigMapConfigProperties properties) { + public ConfigMapPropertySourceLocator(KubernetesClient client, ConfigMapConfigProperties properties) { this.client = client; this.properties = properties; } @@ -70,13 +68,10 @@ public class ConfigMapPropertySourceLocator implements PropertySourceLocator { if (environment instanceof ConfigurableEnvironment) { ConfigurableEnvironment env = (ConfigurableEnvironment) environment; - List sources = this.properties - .determineSources(); - CompositePropertySource composite = new CompositePropertySource( - "composite-configmap"); + List sources = this.properties.determineSources(); + CompositePropertySource composite = new CompositePropertySource("composite-configmap"); if (this.properties.isEnableApi()) { - sources.forEach(s -> composite.addFirstPropertySource( - getMapPropertySourceForSingleConfigMap(env, s))); + sources.forEach(s -> composite.addFirstPropertySource(getMapPropertySourceForSingleConfigMap(env, s))); } addPropertySourcesFromPaths(environment, composite); @@ -86,20 +81,17 @@ public class ConfigMapPropertySourceLocator implements PropertySourceLocator { return null; } - private MapPropertySource getMapPropertySourceForSingleConfigMap( - ConfigurableEnvironment environment, NormalizedSource normalizedSource) { + private MapPropertySource getMapPropertySourceForSingleConfigMap(ConfigurableEnvironment environment, + NormalizedSource normalizedSource) { String configurationTarget = this.properties.getConfigurationTarget(); return new ConfigMapPropertySource(this.client, - getApplicationName(environment, normalizedSource.getName(), - configurationTarget), - getApplicationNamespace(this.client, normalizedSource.getNamespace(), - configurationTarget), + getApplicationName(environment, normalizedSource.getName(), configurationTarget), + getApplicationNamespace(this.client, normalizedSource.getNamespace(), configurationTarget), environment); } - private void addPropertySourcesFromPaths(Environment environment, - CompositePropertySource composite) { + private void addPropertySourcesFromPaths(Environment environment, CompositePropertySource composite) { this.properties.getPaths().stream().map(Paths::get).peek(p -> { if (!Files.exists(p)) { LOG.warn("Configured input path: " + p @@ -107,23 +99,18 @@ public class ConfigMapPropertySourceLocator implements PropertySourceLocator { } }).filter(Files::exists).peek(p -> { if (!Files.isRegularFile(p)) { - LOG.warn("Configured input path: " + p - + " will be ignored because it is not a regular file"); + LOG.warn("Configured input path: " + p + " will be ignored because it is not a regular file"); } }).filter(Files::isRegularFile).forEach(p -> { try { String content = new String(Files.readAllBytes(p)).trim(); String filename = p.getFileName().toString().toLowerCase(); if (filename.endsWith(".properties")) { - addPropertySourceIfNeeded( - c -> PROPERTIES_TO_MAP - .apply(KEY_VALUE_TO_PROPERTIES.apply(c)), - content, filename, composite); + addPropertySourceIfNeeded(c -> PROPERTIES_TO_MAP.apply(KEY_VALUE_TO_PROPERTIES.apply(c)), content, + filename, composite); } else if (filename.endsWith(".yml") || filename.endsWith(".yaml")) { - addPropertySourceIfNeeded( - c -> PROPERTIES_TO_MAP - .apply(yamlParserGenerator(environment).apply(c)), + addPropertySourceIfNeeded(c -> PROPERTIES_TO_MAP.apply(yamlParserGenerator(environment).apply(c)), content, filename, composite); } } @@ -133,15 +120,13 @@ public class ConfigMapPropertySourceLocator implements PropertySourceLocator { }); } - private void addPropertySourceIfNeeded( - Function> contentToMapFunction, String content, + private void addPropertySourceIfNeeded(Function> contentToMapFunction, String content, String name, CompositePropertySource composite) { Map map = new HashMap<>(); map.putAll(contentToMapFunction.apply(content)); if (map.isEmpty()) { - LOG.warn("Property source: " + name - + "will be ignored because no properties could be found"); + LOG.warn("Property source: " + name + "will be ignored because no properties could be found"); } else { composite.addFirstPropertySource(new MapPropertySource(name, map)); diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java index b186cf93..d06e33ab 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigUtils.java @@ -39,38 +39,26 @@ public final class ConfigUtils { throw new IllegalStateException("Can't instantiate a utility class"); } - public static String getApplicationName( - Environment env, String configName, String configurationTarget) { - String name = configName; - if (StringUtils.isEmpty(name)) { + public static String getApplicationName(Environment env, String configName, String configurationTarget) { + if (StringUtils.isEmpty(configName)) { // TODO: use relaxed binding - if (LOG.isDebugEnabled()) { - LOG.debug(configurationTarget - + " name has not been set, taking it from property/env " - + SPRING_APPLICATION_NAME + " (default=" - + FALLBACK_APPLICATION_NAME + ")"); - } - - name = env.getProperty(SPRING_APPLICATION_NAME, FALLBACK_APPLICATION_NAME); + LOG.debug(configurationTarget + " name has not been set, taking it from property/env " + + SPRING_APPLICATION_NAME + " (default=" + FALLBACK_APPLICATION_NAME + ")"); + configName = env.getProperty(SPRING_APPLICATION_NAME, FALLBACK_APPLICATION_NAME); } - return name; + return configName; } - public static String getApplicationNamespace( - KubernetesClient client, String configNamespace, String configurationTarget) { - String namespace = configNamespace; - if (StringUtils.isEmpty(namespace)) { - if (LOG.isDebugEnabled()) { - LOG.debug(configurationTarget - + " namespace has not been set, taking it from client (ns=" - + client.getNamespace() + ")"); - } - - namespace = client.getNamespace(); + public static String getApplicationNamespace(KubernetesClient client, String configNamespace, + String configurationTarget) { + if (StringUtils.isEmpty(configNamespace)) { + LOG.debug(configurationTarget + " namespace has not been set, taking it from client (ns=" + + client.getNamespace() + ")"); + configNamespace = client.getNamespace(); } - return namespace; + return configNamespace; } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/PropertySourceUtils.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/PropertySourceUtils.java index b89294dd..ad9641fd 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/PropertySourceUtils.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/PropertySourceUtils.java @@ -52,9 +52,9 @@ public final class PropertySourceUtils { throw new IllegalArgumentException(); } }; - static final Function> PROPERTIES_TO_MAP = p -> p - .entrySet().stream().collect(Collectors.toMap(e -> String.valueOf(e.getKey()), - Map.Entry::getValue, throwingMerger(), java.util.LinkedHashMap::new)); + static final Function> PROPERTIES_TO_MAP = p -> p.entrySet().stream() + .collect(Collectors.toMap(e -> String.valueOf(e.getKey()), Map.Entry::getValue, throwingMerger(), + java.util.LinkedHashMap::new)); private PropertySourceUtils() { throw new IllegalStateException("Can't instantiate a utility class"); @@ -66,8 +66,7 @@ public final class PropertySourceUtils { yamlFactory.setDocumentMatchers(properties -> { String profiles = properties.getProperty("spring.profiles"); if (environment != null && StringUtils.hasText(profiles)) { - return environment.acceptsProfiles(Profiles.of(profiles)) ? FOUND - : NOT_FOUND; + return environment.acceptsProfiles(Profiles.of(profiles)) ? FOUND : NOT_FOUND; } else { return ABSTAIN; diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java index 93edcebb..2a1c23c3 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsConfigProperties.java @@ -94,16 +94,13 @@ public class SecretsConfigProperties extends AbstractConfigProperties { if (this.sources.isEmpty()) { return new ArrayList() { { - add(new SecretsConfigProperties.NormalizedSource( - SecretsConfigProperties.this.name, - SecretsConfigProperties.this.namespace, - SecretsConfigProperties.this.labels)); + add(new SecretsConfigProperties.NormalizedSource(SecretsConfigProperties.this.name, + SecretsConfigProperties.this.namespace, SecretsConfigProperties.this.labels)); } }; } - return this.sources.stream() - .map(s -> s.normalize(this.name, this.namespace, this.labels)) + return this.sources.stream().map(s -> s.normalize(this.name, this.namespace, this.labels)) .collect(Collectors.toList()); } @@ -161,17 +158,13 @@ public class SecretsConfigProperties extends AbstractConfigProperties { return StringUtils.isEmpty(this.name) && StringUtils.isEmpty(this.namespace); } - public SecretsConfigProperties.NormalizedSource normalize(String defaultName, - String defaultNamespace, Map defaultLabels) { - final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName - : this.name; - final String normalizedNamespace = StringUtils.isEmpty(this.namespace) - ? defaultNamespace : this.namespace; - final Map normalizedLabels = this.labels.isEmpty() - ? defaultLabels : this.labels; + public SecretsConfigProperties.NormalizedSource normalize(String defaultName, String defaultNamespace, + Map defaultLabels) { + final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName : this.name; + final String normalizedNamespace = StringUtils.isEmpty(this.namespace) ? defaultNamespace : this.namespace; + final Map normalizedLabels = this.labels.isEmpty() ? defaultLabels : this.labels; - return new SecretsConfigProperties.NormalizedSource(normalizedName, - normalizedNamespace, normalizedLabels); + return new SecretsConfigProperties.NormalizedSource(normalizedName, normalizedNamespace, normalizedLabels); } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java index 5168ad4a..7c96c1db 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySource.java @@ -41,22 +41,18 @@ public class SecretsPropertySource extends MapPropertySource { private static final String PREFIX = "secrets"; - public SecretsPropertySource(KubernetesClient client, Environment env, String name, + public SecretsPropertySource(KubernetesClient client, Environment env, String name, String namespace, + Map labels) { + super(getSourceName(client, env, name, namespace), getSourceData(client, env, name, namespace, labels)); + } + + private static String getSourceName(KubernetesClient client, Environment env, String name, String namespace) { + return new StringBuilder().append(PREFIX).append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name) + .append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(namespace).toString(); + } + + private static Map getSourceData(KubernetesClient client, Environment env, String name, String namespace, Map labels) { - super(getSourceName(client, env, name, namespace), - getSourceData(client, env, name, namespace, labels)); - } - - private static String getSourceName(KubernetesClient client, Environment env, - String name, String namespace) { - return new StringBuilder().append(PREFIX) - .append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name) - .append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(namespace) - .toString(); - } - - private static Map getSourceData(KubernetesClient client, - Environment env, String name, String namespace, Map labels) { Map result = new HashMap<>(); try { @@ -73,19 +69,17 @@ public class SecretsPropertySource extends MapPropertySource { // Read for secrets api (label) if (!labels.isEmpty()) { if (StringUtils.isEmpty(namespace)) { - client.secrets().withLabels(labels).list().getItems() - .forEach(s -> putAll(s, result)); + client.secrets().withLabels(labels).list().getItems().forEach(s -> putAll(s, result)); } else { - client.secrets().inNamespace(namespace).withLabels(labels).list() - .getItems().forEach(s -> putAll(s, result)); + client.secrets().inNamespace(namespace).withLabels(labels).list().getItems() + .forEach(s -> putAll(s, result)); } } } catch (Exception e) { - LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels - + "] in namespace:[" + namespace + "] (cause: " + e.getMessage() - + "). Ignoring"); + LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels + "] in namespace:[" + namespace + + "] (cause: " + e.getMessage() + "). Ignoring"); } return result; @@ -96,8 +90,7 @@ public class SecretsPropertySource extends MapPropertySource { // ***************************** private static void putAll(Secret secret, Map result) { if (secret != null && secret.getData() != null) { - secret.getData().forEach((k, v) -> result.put(k, - new String(Base64.getDecoder().decode(v)).trim())); + secret.getData().forEach((k, v) -> result.put(k, new String(Base64.getDecoder().decode(v)).trim())); } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java index 35aefa16..f092a8e5 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceLocator.java @@ -63,8 +63,7 @@ public class SecretsPropertySourceLocator implements PropertySourceLocator { private final SecretsConfigProperties properties; - public SecretsPropertySourceLocator(KubernetesClient client, - SecretsConfigProperties properties) { + public SecretsPropertySourceLocator(KubernetesClient client, SecretsConfigProperties properties) { this.client = client; this.properties = properties; } @@ -78,7 +77,6 @@ public class SecretsPropertySourceLocator implements PropertySourceLocator { .determineSources(); CompositePropertySource composite = new CompositePropertySource( "composite-secrets"); - // read for secrets mount putPathConfig(composite); @@ -92,16 +90,13 @@ public class SecretsPropertySourceLocator implements PropertySourceLocator { return null; } - private MapPropertySource getKubernetesPropertySourceForSingleSecret( - ConfigurableEnvironment environment, + private MapPropertySource getKubernetesPropertySourceForSingleSecret(ConfigurableEnvironment environment, SecretsConfigProperties.NormalizedSource normalizedSource) { String configurationTarget = this.properties.getConfigurationTarget(); return new SecretsPropertySource(this.client, environment, - getApplicationName(environment, normalizedSource.getName(), - configurationTarget), - getApplicationNamespace(this.client, normalizedSource.getNamespace(), - configurationTarget), + getApplicationName(environment, normalizedSource.getName(), configurationTarget), + getApplicationNamespace(this.client, normalizedSource.getNamespace(), configurationTarget), normalizedSource.getLabels()); } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java index 8b0d33e6..a78e265b 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java @@ -24,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -36,6 +38,7 @@ import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocato import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.AbstractEnvironment; import org.springframework.scheduling.annotation.EnableAsync; @@ -50,8 +53,8 @@ import org.springframework.util.Assert; @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.cloud.kubernetes.enabled", matchIfMissing = true) @ConditionalOnClass(EndpointAutoConfiguration.class) -@AutoConfigureAfter({ InfoEndpointAutoConfiguration.class, - RefreshEndpointAutoConfiguration.class, RefreshAutoConfiguration.class }) +@AutoConfigureAfter({ InfoEndpointAutoConfiguration.class, RefreshEndpointAutoConfiguration.class, + RefreshAutoConfiguration.class }) @EnableConfigurationProperties(ConfigReloadProperties.class) public class ConfigReloadAutoConfiguration { @@ -71,35 +74,26 @@ public class ConfigReloadAutoConfiguration { @Autowired private KubernetesClient kubernetesClient; - @Autowired - private ConfigMapPropertySourceLocator configMapPropertySourceLocator; - - @Autowired - private SecretsPropertySourceLocator secretsPropertySourceLocator; - /** * @param properties config reload properties * @param strategy configuration update strategy * @return a bean that listen to configuration changes and fire a reload. */ @Bean - @ConditionalOnMissingBean - public ConfigurationChangeDetector propertyChangeWatcher( - ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy) { + @Conditional(OnConfigEnabledOrSecretsEnabled.class) + public ConfigurationChangeDetector propertyChangeWatcher(ConfigReloadProperties properties, + ConfigurationUpdateStrategy strategy, + @Autowired(required = false) ConfigMapPropertySourceLocator configMapPropertySourceLocator, + @Autowired(required = false) SecretsPropertySourceLocator secretsPropertySourceLocator) { switch (properties.getMode()) { case POLLING: - return new PollingConfigurationChangeDetector(this.environment, - properties, this.kubernetesClient, strategy, - this.configMapPropertySourceLocator, - this.secretsPropertySourceLocator); + return new PollingConfigurationChangeDetector(this.environment, properties, this.kubernetesClient, + strategy, configMapPropertySourceLocator, secretsPropertySourceLocator); case EVENT: - return new EventBasedConfigurationChangeDetector(this.environment, - properties, this.kubernetesClient, strategy, - this.configMapPropertySourceLocator, - this.secretsPropertySourceLocator); + return new EventBasedConfigurationChangeDetector(this.environment, properties, this.kubernetesClient, + strategy, configMapPropertySourceLocator, secretsPropertySourceLocator); } - throw new IllegalStateException( - "Unsupported configuration reload mode: " + properties.getMode()); + throw new IllegalStateException("Unsupported configuration reload mode: " + properties.getMode()); } /** @@ -111,35 +105,29 @@ public class ConfigReloadAutoConfiguration { */ @Bean @ConditionalOnMissingBean - public ConfigurationUpdateStrategy configurationUpdateStrategy( - ConfigReloadProperties properties, ConfigurableApplicationContext ctx, - @Autowired(required = false) RestartEndpoint restarter, + public ConfigurationUpdateStrategy configurationUpdateStrategy(ConfigReloadProperties properties, + ConfigurableApplicationContext ctx, @Autowired(required = false) RestartEndpoint restarter, ContextRefresher refresher) { switch (properties.getStrategy()) { case RESTART_CONTEXT: Assert.notNull(restarter, "Restart endpoint is not enabled"); - return new ConfigurationUpdateStrategy(properties.getStrategy().name(), - () -> { - wait(properties); - restarter.restart(); - }); + return new ConfigurationUpdateStrategy(properties.getStrategy().name(), () -> { + wait(properties); + restarter.restart(); + }); case REFRESH: - return new ConfigurationUpdateStrategy(properties.getStrategy().name(), - refresher::refresh); + return new ConfigurationUpdateStrategy(properties.getStrategy().name(), refresher::refresh); case SHUTDOWN: - return new ConfigurationUpdateStrategy(properties.getStrategy().name(), - () -> { - wait(properties); - ctx.close(); - }); + return new ConfigurationUpdateStrategy(properties.getStrategy().name(), () -> { + wait(properties); + ctx.close(); + }); } - throw new IllegalStateException("Unsupported configuration update strategy: " - + properties.getStrategy()); + throw new IllegalStateException("Unsupported configuration update strategy: " + properties.getStrategy()); } private static void wait(ConfigReloadProperties properties) { - final long waitMillis = ThreadLocalRandom.current() - .nextLong(properties.getMaxWaitForRestart().toMillis()); + final long waitMillis = ThreadLocalRandom.current().nextLong(properties.getMaxWaitForRestart().toMillis()); try { Thread.sleep(waitMillis); } @@ -147,6 +135,24 @@ public class ConfigReloadAutoConfiguration { } } + private static class OnConfigEnabledOrSecretsEnabled extends AnyNestedCondition { + + OnConfigEnabledOrSecretsEnabled() { + super(ConfigurationPhase.REGISTER_BEAN); + } + + @ConditionalOnBean(ConfigMapPropertySourceLocator.class) + static class configEnabled { + + } + + @ConditionalOnBean(SecretsPropertySourceLocator.class) + static class secretsEnabled { + + } + + } + } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadDefaultAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadDefaultAutoConfiguration.java index d4097f97..66f3200e 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadDefaultAutoConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadDefaultAutoConfiguration.java @@ -69,22 +69,17 @@ public class ConfigReloadDefaultAutoConfiguration { */ @Bean @ConditionalOnMissingBean - public ConfigurationChangeDetector propertyChangeWatcher( - ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy) { + public ConfigurationChangeDetector propertyChangeWatcher(ConfigReloadProperties properties, + ConfigurationUpdateStrategy strategy) { switch (properties.getMode()) { case POLLING: - return new PollingConfigurationChangeDetector(this.environment, - properties, this.kubernetesClient, strategy, - this.configMapPropertySourceLocator, - this.secretsPropertySourceLocator); + return new PollingConfigurationChangeDetector(this.environment, properties, this.kubernetesClient, + strategy, this.configMapPropertySourceLocator, this.secretsPropertySourceLocator); case EVENT: - return new EventBasedConfigurationChangeDetector(this.environment, - properties, this.kubernetesClient, strategy, - this.configMapPropertySourceLocator, - this.secretsPropertySourceLocator); + return new EventBasedConfigurationChangeDetector(this.environment, properties, this.kubernetesClient, + strategy, this.configMapPropertySourceLocator, this.secretsPropertySourceLocator); } - throw new IllegalStateException( - "Unsupported configuration reload mode: " + properties.getMode()); + throw new IllegalStateException("Unsupported configuration reload mode: " + properties.getMode()); } /** @@ -96,23 +91,20 @@ public class ConfigReloadDefaultAutoConfiguration { */ @Bean @ConditionalOnMissingBean - public ConfigurationUpdateStrategy configurationUpdateStrategy( - ConfigReloadProperties properties, ConfigurableApplicationContext ctx) { + public ConfigurationUpdateStrategy configurationUpdateStrategy(ConfigReloadProperties properties, + ConfigurableApplicationContext ctx) { switch (properties.getStrategy()) { case SHUTDOWN: - return new ConfigurationUpdateStrategy(properties.getStrategy().name(), - () -> { - wait(properties); - ctx.close(); - }); + return new ConfigurationUpdateStrategy(properties.getStrategy().name(), () -> { + wait(properties); + ctx.close(); + }); } - throw new IllegalStateException("Unsupported configuration update strategy: " - + properties.getStrategy()); + throw new IllegalStateException("Unsupported configuration update strategy: " + properties.getStrategy()); } private static void wait(ConfigReloadProperties properties) { - final long waitMillis = ThreadLocalRandom.current() - .nextLong(properties.getMaxWaitForRestart().toMillis()); + final long waitMillis = ThreadLocalRandom.current().nextLong(properties.getMaxWaitForRestart().toMillis()); try { Thread.sleep(waitMillis); } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java index 12034a49..4df0a4ea 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetector.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.PreDestroy; @@ -54,9 +55,8 @@ public abstract class ConfigurationChangeDetector { protected ConfigurationUpdateStrategy strategy; - public ConfigurationChangeDetector(ConfigurableEnvironment environment, - ConfigReloadProperties properties, KubernetesClient kubernetesClient, - ConfigurationUpdateStrategy strategy) { + public ConfigurationChangeDetector(ConfigurableEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy) { this.environment = environment; this.properties = properties; this.kubernetesClient = kubernetesClient; @@ -77,36 +77,32 @@ public abstract class ConfigurationChangeDetector { /** * Determines if two property sources are different. - * @param mp1 map property sources 1 - * @param mp2 map property sources 2 + * @param left left map property sources + * @param right right map property sources * @return {@code true} if source has changed */ - protected boolean changed(MapPropertySource mp1, MapPropertySource mp2) { - if (mp1 == mp2) { + protected boolean changed(MapPropertySource left, MapPropertySource right) { + if (left == right) { return false; } - if (mp1 == null && mp2 != null || mp1 != null && mp2 == null) { + if (left == null || right == null) { return true; } - - Map s1 = mp1.getSource(); - Map s2 = mp2.getSource(); - - return s1 == null ? s2 != null : !s1.equals(s2); + Map leftMap = left.getSource(); + Map rightMap = right.getSource(); + return !Objects.equals(leftMap, rightMap); } - protected boolean changed(List l1, - List l2) { + protected boolean changed(List left, List right) { - if (l1.size() != l2.size()) { - this.log.warn( - "The current number of ConfigMap PropertySources does not match " - + "the ones loaded from the Kubernetes - No reload will take place"); + if (left.size() != right.size()) { + this.log.warn("The current number of ConfigMap PropertySources does not match " + + "the ones loaded from the Kubernetes - No reload will take place"); return false; } - for (int i = 0; i < l1.size(); i++) { - if (changed(l1.get(i), l2.get(i))) { + for (int i = 0; i < left.size(); i++) { + if (changed(left.get(i), right.get(i))) { return true; } } @@ -136,12 +132,10 @@ public abstract class ConfigurationChangeDetector { * @param sourceClass class for which property sources will be found * @return finds all registered property sources of the given type */ - protected > List findPropertySources( - Class sourceClass) { + protected > List findPropertySources(Class sourceClass) { List managedSources = new LinkedList<>(); - LinkedList> sources = toLinkedList( - this.environment.getPropertySources()); + LinkedList> sources = toLinkedList(this.environment.getPropertySources()); while (!sources.isEmpty()) { PropertySource source = sources.pop(); if (source instanceof CompositePropertySource) { @@ -151,9 +145,8 @@ public abstract class ConfigurationChangeDetector { else if (sourceClass.isInstance(source)) { managedSources.add(sourceClass.cast(source)); } - else if (BootstrapPropertySource.class.isInstance(source)) { - PropertySource propertySource = ((BootstrapPropertySource) source) - .getDelegate(); + else if (source instanceof BootstrapPropertySource) { + PropertySource propertySource = ((BootstrapPropertySource) source).getDelegate(); if (sourceClass.isInstance(propertySource)) { sources.add(propertySource); } @@ -164,7 +157,7 @@ public abstract class ConfigurationChangeDetector { } private LinkedList toLinkedList(Iterable it) { - LinkedList list = new LinkedList(); + LinkedList list = new LinkedList<>(); for (E e : it) { list.add(e); } @@ -179,22 +172,21 @@ public abstract class ConfigurationChangeDetector { * @return a list of MapPropertySource that correspond to the current state of the * system */ - protected List locateMapPropertySources( - PropertySourceLocator propertySourceLocator, Environment environment) { + protected List locateMapPropertySources(PropertySourceLocator propertySourceLocator, + Environment environment) { List result = new ArrayList<>(); - PropertySource propertySource = propertySourceLocator.locate(environment); + PropertySource propertySource = propertySourceLocator.locate(environment); if (propertySource instanceof MapPropertySource) { result.add((MapPropertySource) propertySource); } else if (propertySource instanceof CompositePropertySource) { - result.addAll(((CompositePropertySource) propertySource).getPropertySources() - .stream().filter(p -> p instanceof MapPropertySource) - .map(p -> (MapPropertySource) p).collect(Collectors.toList())); + result.addAll(((CompositePropertySource) propertySource).getPropertySources().stream() + .filter(p -> p instanceof MapPropertySource).map(p -> (MapPropertySource) p) + .collect(Collectors.toList())); } else { - this.log.debug("Found property source that cannot be handled: " - + propertySource.getClass()); + this.log.debug("Found property source that cannot be handled: " + propertySource.getClass()); } return result; diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java index b394a15d..1b6b7506 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationUpdateStrategy.java @@ -26,15 +26,13 @@ import java.util.Objects; */ public class ConfigurationUpdateStrategy { - private String name; + private final String name; - private Runnable reloadProcedure; + private final Runnable reloadProcedure; public ConfigurationUpdateStrategy(String name, Runnable reloadProcedure) { - Objects.requireNonNull(name, "name cannot be null"); - Objects.requireNonNull(reloadProcedure, "reloadProcedure cannot be null"); - this.name = name; - this.reloadProcedure = reloadProcedure; + this.name = Objects.requireNonNull(name, "name cannot be null"); + this.reloadProcedure = Objects.requireNonNull(reloadProcedure, "reloadProcedure cannot be null"); } public String getName() { @@ -47,10 +45,7 @@ public class ConfigurationUpdateStrategy { @Override public String toString() { - final StringBuilder sb = new StringBuilder("ConfigurationUpdateStrategy{"); - sb.append("name='").append(this.name).append('\''); - sb.append('}'); - return sb.toString(); + return "ConfigurationUpdateStrategy{name='" + this.name + "'}"; } } diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java index 43b675f6..af712dbb 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetector.java @@ -44,15 +44,14 @@ import org.springframework.core.env.AbstractEnvironment; */ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDetector { - private ConfigMapPropertySourceLocator configMapPropertySourceLocator; + private final ConfigMapPropertySourceLocator configMapPropertySourceLocator; - private SecretsPropertySourceLocator secretsPropertySourceLocator; + private final SecretsPropertySourceLocator secretsPropertySourceLocator; - private Map watches; + private final Map watches; - public EventBasedConfigurationChangeDetector(AbstractEnvironment environment, - ConfigReloadProperties properties, KubernetesClient kubernetesClient, - ConfigurationUpdateStrategy strategy, + public EventBasedConfigurationChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, ConfigMapPropertySourceLocator configMapPropertySourceLocator, SecretsPropertySourceLocator secretsPropertySourceLocator) { super(environment, properties, kubernetesClient, strategy); @@ -66,25 +65,22 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe public void watch() { boolean activated = false; - if (this.properties.isMonitoringConfigMaps()) { + if (this.properties.isMonitoringConfigMaps() && this.configMapPropertySourceLocator != null) { try { String name = "config-maps-watch"; - this.watches.put(name, this.kubernetesClient.configMaps() - .watch(new Watcher() { - @Override - public void eventReceived(Action action, - ConfigMap configMap) { - if (log.isDebugEnabled()) { - log.debug(name + " received event for ConfigMap " - + configMap.getMetadata().getName()); - } - onEvent(configMap); - } + this.watches.put(name, this.kubernetesClient.configMaps().watch(new Watcher() { + @Override + public void eventReceived(Action action, ConfigMap configMap) { + if (log.isDebugEnabled()) { + log.debug(name + " received event for ConfigMap " + configMap.getMetadata().getName()); + } + onEvent(configMap); + } - @Override - public void onClose(KubernetesClientException e) { - } - })); + @Override + public void onClose(KubernetesClientException e) { + } + })); activated = true; this.log.info("Added new Kubernetes watch: " + name); } @@ -95,38 +91,34 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe } } - if (this.properties.isMonitoringSecrets()) { + if (this.properties.isMonitoringSecrets() && this.secretsPropertySourceLocator != null) { try { activated = false; String name = "secrets-watch"; - this.watches.put(name, - this.kubernetesClient.secrets().watch(new Watcher() { - @Override - public void eventReceived(Action action, Secret secret) { - if (log.isDebugEnabled()) { - log.debug(name + " received and event for Secret " - + secret.getMetadata().getName()); - } - onEvent(secret); - } + this.watches.put(name, this.kubernetesClient.secrets().watch(new Watcher() { + @Override + public void eventReceived(Action action, Secret secret) { + if (log.isDebugEnabled()) { + log.debug(name + " received and event for Secret " + secret.getMetadata().getName()); + } + onEvent(secret); + } - @Override - public void onClose(KubernetesClientException e) { - } - })); + @Override + public void onClose(KubernetesClientException e) { + } + })); activated = true; this.log.info("Added new Kubernetes watch: " + name); } catch (Exception e) { - this.log.error( - "Error while establishing a connection to watch secrets: configuration may remain stale", + this.log.error("Error while establishing a connection to watch secrets: configuration may remain stale", e); } } if (activated) { - this.log.info( - "Kubernetes event-based configuration change detector activated"); + this.log.info("Kubernetes event-based configuration change detector activated"); } } @@ -147,9 +139,7 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe } protected void onEvent(ConfigMap configMap) { - boolean changed = changed( - locateMapPropertySources(this.configMapPropertySourceLocator, - this.environment), + boolean changed = changed(locateMapPropertySources(this.configMapPropertySourceLocator, this.environment), findPropertySources(ConfigMapPropertySource.class)); if (changed) { this.log.info("Detected change in config maps"); @@ -158,9 +148,7 @@ public class EventBasedConfigurationChangeDetector extends ConfigurationChangeDe } protected void onEvent(Secret secret) { - boolean changed = changed( - locateMapPropertySources(this.secretsPropertySourceLocator, - this.environment), + boolean changed = changed(locateMapPropertySources(this.secretsPropertySourceLocator, this.environment), findPropertySources(SecretsPropertySource.class)); if (changed) { this.log.info("Detected change in secrets"); diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java index d315ef4c..941ad47e 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/PollingConfigurationChangeDetector.java @@ -43,13 +43,12 @@ public class PollingConfigurationChangeDetector extends ConfigurationChangeDetec protected Log log = LogFactory.getLog(getClass()); - private ConfigMapPropertySourceLocator configMapPropertySourceLocator; + private final ConfigMapPropertySourceLocator configMapPropertySourceLocator; - private SecretsPropertySourceLocator secretsPropertySourceLocator; + private final SecretsPropertySourceLocator secretsPropertySourceLocator; - public PollingConfigurationChangeDetector(AbstractEnvironment environment, - ConfigReloadProperties properties, KubernetesClient kubernetesClient, - ConfigurationUpdateStrategy strategy, + public PollingConfigurationChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, ConfigMapPropertySourceLocator configMapPropertySourceLocator, SecretsPropertySourceLocator secretsPropertySourceLocator) { super(environment, properties, kubernetesClient, strategy); @@ -68,25 +67,23 @@ public class PollingConfigurationChangeDetector extends ConfigurationChangeDetec public void executeCycle() { boolean changedConfigMap = false; - if (this.properties.isMonitoringConfigMaps()) { + if (this.properties.isMonitoringConfigMaps() && this.configMapPropertySourceLocator != null) { List currentConfigMapSources = findPropertySources( ConfigMapPropertySource.class); if (!currentConfigMapSources.isEmpty()) { changedConfigMap = changed( - locateMapPropertySources(this.configMapPropertySourceLocator, - this.environment), + locateMapPropertySources(this.configMapPropertySourceLocator, this.environment), currentConfigMapSources); } } boolean changedSecrets = false; if (this.properties.isMonitoringSecrets()) { - List currentSecretSources = locateMapPropertySources( - this.secretsPropertySourceLocator, this.environment); + List currentSecretSources = locateMapPropertySources(this.secretsPropertySourceLocator, + this.environment); if (currentSecretSources != null && !currentSecretSources.isEmpty()) { - List propertySources = findPropertySources( - SecretsPropertySource.class); + List propertySources = findPropertySources(SecretsPropertySource.class); changedSecrets = changed(currentSecretSources, propertySources); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapTestUtil.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapTestUtil.java index fdafb7e0..5cb55d99 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapTestUtil.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapTestUtil.java @@ -31,8 +31,7 @@ final class ConfigMapTestUtil { static String readResourceFile(String file) { String resource; try { - resource = IOHelpers.readFully( - ConfigMapTestUtil.class.getClassLoader().getResourceAsStream(file)); + resource = IOHelpers.readFully(ConfigMapTestUtil.class.getClassLoader().getResourceAsStream(file)); } catch (IOException e) { resource = ""; diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java index 363e6425..a3d33be0 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java @@ -39,12 +39,10 @@ import static org.assertj.core.util.Lists.newArrayList; import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.createFileWithContent; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=configmap-path-example", "spring.cloud.kubernetes.config.enableApi=false", - "spring.cloud.kubernetes.config.paths=" - + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + "," + "spring.cloud.kubernetes.config.paths=" + ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + "," + ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH }) public class ConfigMapsFromFilePathsTests { @@ -56,14 +54,11 @@ public class ConfigMapsFromFilePathsTests { protected static final String UNUSED_FILE_NAME = "unused.properties"; - protected static final String FIRST_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" - + FIRST_FILE_NAME; + protected static final String FIRST_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" + FIRST_FILE_NAME; - protected static final String SECOND_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" - + SECOND_FILE_NAME; + protected static final String SECOND_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" + SECOND_FILE_NAME; - protected static final String UNUSED_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" - + UNUSED_FILE_NAME; + protected static final String UNUSED_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/" + UNUSED_FILE_NAME; @ClassRule public static KubernetesServer server = new KubernetesServer(); @@ -78,27 +73,23 @@ public class ConfigMapsFromFilePathsTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); Files.createDirectories(Paths.get(FILES_ROOT_PATH)); - createFileWithContent(FIRST_FILE_NAME_FULL_PATH, - "bean.greeting=Hello from path!"); + createFileWithContent(FIRST_FILE_NAME_FULL_PATH, "bean.greeting=Hello from path!"); createFileWithContent(SECOND_FILE_NAME_FULL_PATH, "bean.farewell=Bye from path!"); - createFileWithContent(UNUSED_FILE_NAME_FULL_PATH, - "bean.morning=Morning from path!"); + createFileWithContent(UNUSED_FILE_NAME_FULL_PATH, "bean.morning=Morning from path!"); } @AfterClass public static void teardownAfterClass() { - newArrayList(FIRST_FILE_NAME_FULL_PATH, SECOND_FILE_NAME_FULL_PATH, - SECOND_FILE_NAME_FULL_PATH, FILES_ROOT_PATH).forEach(fn -> { + newArrayList(FIRST_FILE_NAME_FULL_PATH, SECOND_FILE_NAME_FULL_PATH, SECOND_FILE_NAME_FULL_PATH, FILES_ROOT_PATH) + .forEach(fn -> { try { Files.delete(Paths.get(fn)); } @@ -109,20 +100,20 @@ public class ConfigMapsFromFilePathsTests { @Test public void greetingInputShouldReturnPropertyFromFirstFile() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Hello from path!"); + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Hello from path!"); } @Test public void farewellInputShouldReturnPropertyFromSecondFile() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Bye from path!"); + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Bye from path!"); } @Test public void morningInputShouldReturnDefaultValue() { - this.webClient.get().uri("/api/morning").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Good morning, World!"); + this.webClient.get().uri("/api/morning").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Good morning, World!"); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java index 1f4ea258..08b42808 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsMixedTests.java @@ -41,12 +41,10 @@ import static org.assertj.core.util.Lists.newArrayList; import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.readResourceFile; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.application.name=" + ConfigMapsMixedTests.APPLICATION_NAME, "spring.cloud.kubernetes.config.enableApi=true", - "spring.cloud.kubernetes.config.paths=" - + ConfigMapsMixedTests.FILE_NAME_FULL_PATH }) + "spring.cloud.kubernetes.config.paths=" + ConfigMapsMixedTests.FILE_NAME_FULL_PATH }) public class ConfigMapsMixedTests { protected static final String FILES_ROOT_PATH = "/tmp/scktests"; @@ -70,24 +68,21 @@ public class ConfigMapsMixedTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); Files.createDirectories(Paths.get(FILES_ROOT_PATH)); - ConfigMapTestUtil.createFileWithContent(FILE_NAME_FULL_PATH, - readResourceFile("application-path.yaml")); + ConfigMapTestUtil.createFileWithContent(FILE_NAME_FULL_PATH, readResourceFile("application-path.yaml")); HashMap data = new HashMap<>(); data.put("bean.morning", "Buenos Dias ConfigMap, %s"); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @@ -104,22 +99,19 @@ public class ConfigMapsMixedTests { @Test public void greetingInputShouldReturnPropertyFromFile() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Hello ConfigMap, World from path"); } @Test public void farewellInputShouldReturnPropertyFromFile() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Bye ConfigMap, World from path"); } @Test public void morningInputShouldReturnPropertyFromApi() { - this.webClient.get().uri("/api/morning").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/morning").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Buenos Dias ConfigMap, World"); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java index c77f5784..0997152e 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTest.java @@ -51,11 +51,9 @@ public class ConfigMapsTest { @Test public void testConfigMapGet() { - this.server.expect().withPath("/api/v1/namespaces/ns2/configmaps") - .andReturn(200, - new ConfigMapBuilder().withNewMetadata() - .withName("reload-example").endMetadata() - .addToData("KEY", "123").build()) + this.server + .expect().withPath("/api/v1/namespaces/ns2/configmaps").andReturn(200, new ConfigMapBuilder() + .withNewMetadata().withName("reload-example").endMetadata().addToData("KEY", "123").build()) .once(); KubernetesClient client = this.server.getClient(); @@ -63,8 +61,7 @@ public class ConfigMapsTest { assertThat(configMapList).isNotNull(); assertThat(configMapList.getAdditionalProperties()).containsKey("data"); @SuppressWarnings("unchecked") - Map data = (Map) configMapList - .getAdditionalProperties().get("data"); + Map data = (Map) configMapList.getAdditionalProperties().get("data"); assertThat(data.get("KEY")).isEqualTo("123"); } @@ -72,18 +69,13 @@ public class ConfigMapsTest { public void testConfigMapFromSingleApplicationProperties() { String configMapName = "app-properties-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(configMapName).endMetadata() - .addToData("application.properties", - readResourceFile("application.properties")) - .build()) + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData("application.properties", readResourceFile("application.properties")).build()) .once(); - ConfigMapPropertySource cmps = new ConfigMapPropertySource( - this.server.getClient().inNamespace(namespace), configMapName); + ConfigMapPropertySource cmps = new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), + configMapName); assertThat(cmps.getProperty("dummy.property.string1")).isEqualTo("a"); assertThat(cmps.getProperty("dummy.property.int1")).isEqualTo("1"); @@ -94,19 +86,13 @@ public class ConfigMapsTest { public void testConfigMapFromSingleApplicationYaml() { String configMapName = "app-yaml-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, - new ConfigMapBuilder().withNewMetadata().withName(configMapName) - .endMetadata() - .addToData("application.yaml", - readResourceFile("application.yaml")) - .build()) + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData("application.yaml", readResourceFile("application.yaml")).build()) .once(); - ConfigMapPropertySource cmps = new ConfigMapPropertySource( - this.server.getClient().inNamespace(namespace), configMapName); + ConfigMapPropertySource cmps = new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), + configMapName); assertThat(cmps.getProperty("dummy.property.string2")).isEqualTo("a"); assertThat(cmps.getProperty("dummy.property.int2")).isEqualTo(1); @@ -117,16 +103,13 @@ public class ConfigMapsTest { public void testConfigMapFromSingleNonStandardFileName() { String configMapName = "single-non-standard-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(configMapName).endMetadata() + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() .addToData("adhoc.yml", readResourceFile("adhoc.yml")).build()) .once(); - ConfigMapPropertySource cmps = new ConfigMapPropertySource( - this.server.getClient().inNamespace(namespace), configMapName); + ConfigMapPropertySource cmps = new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), + configMapName); assertThat(cmps.getProperty("dummy.property.string3")).isEqualTo("a"); assertThat(cmps.getProperty("dummy.property.int3")).isEqualTo(1); @@ -137,17 +120,12 @@ public class ConfigMapsTest { public void testConfigMapFromSingleInvalidPropertiesContent() { String configMapName = "single-unparseable-properties-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, - new ConfigMapBuilder().withNewMetadata().withName(configMapName) - .endMetadata() - .addToData("application.properties", "somevalue").build()) + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData("application.properties", "somevalue").build()) .once(); - new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), - configMapName); + new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), configMapName); // no exception is thrown for unparseable content } @@ -156,17 +134,12 @@ public class ConfigMapsTest { public void testConfigMapFromSingleInvalidYamlContent() { String configMapName = "single-unparseable-yaml-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, - new ConfigMapBuilder().withNewMetadata().withName(configMapName) - .endMetadata().addToData("application.yaml", "somevalue") - .build()) + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData("application.yaml", "somevalue").build()) .once(); - new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), - configMapName); + new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), configMapName); // no exception is thrown for unparseable content } @@ -175,21 +148,15 @@ public class ConfigMapsTest { public void testConfigMapFromMultipleApplicationProperties() { String configMapName = "app-multiple-properties-test"; String namespace = "app-props"; - this.server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) + this.server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) .andReturn(200, - new ConfigMapBuilder().withNewMetadata().withName(configMapName) - .endMetadata() - .addToData("application.properties", - readResourceFile("application.properties")) - .addToData("adhoc.properties", - readResourceFile("adhoc.properties")) - .build()) + new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData("application.properties", readResourceFile("application.properties")) + .addToData("adhoc.properties", readResourceFile("adhoc.properties")).build()) .once(); - ConfigMapPropertySource cmps = new ConfigMapPropertySource( - this.server.getClient().inNamespace(namespace), configMapName); + ConfigMapPropertySource cmps = new ConfigMapPropertySource(this.server.getClient().inNamespace(namespace), + configMapName); // application.properties should be read correctly assertThat(cmps.getProperty("dummy.property.string1")).isEqualTo("a"); diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java index 4237a749..dbdbb2eb 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsTests.java @@ -41,9 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Charles Moulliard */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, properties = { "spring.application.name=configmap-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, + properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient public class ConfigMapsTests { @@ -65,42 +64,38 @@ public class ConfigMapsTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("bean.greeting", "Hello ConfigMap, %s!"); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void testConfig() { - assertThat(mockClient.getConfiguration().getMasterUrl()) - .isEqualTo(this.config.getMasterUrl()); + assertThat(mockClient.getConfiguration().getMasterUrl()).isEqualTo(this.config.getMasterUrl()); assertThat(mockClient.getNamespace()).isEqualTo(this.config.getNamespace()); } @Test public void testConfigMap() { - ConfigMap configmap = mockClient.configMaps().inNamespace("test") - .withName(APPLICATION_NAME).get(); + ConfigMap configmap = mockClient.configMaps().inNamespace("test").withName(APPLICATION_NAME).get(); HashMap keys = (HashMap) configmap.getData(); assertThat("Hello ConfigMap, %s!").isEqualTo(keys.get("bean.greeting")); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Hello ConfigMap, World!"); + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Hello ConfigMap, World!"); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java index c9066574..6d57e29a 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithActiveProfilesNameTests.java @@ -43,8 +43,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT, classes = App.class, - properties = { - "spring.application.name=configmap-with-active-profile-name-example", + properties = { "spring.application.name=configmap-with-active-profile-name-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient @@ -68,46 +67,37 @@ public class ConfigMapsWithActiveProfilesNameTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); HashMap dataWithName = new HashMap<>(); - dataWithName.put("application.yml", - readResourceFile("application-with-active-profiles-name.yaml")); - server.expect() - .withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME - + "-development") - .andReturn(200, - new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME + "-development").endMetadata() - .addToData(dataWithName).build()) + dataWithName.put("application.yml", readResourceFile("application-with-active-profiles-name.yaml")); + server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME + "-development") + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME + "-development") + .endMetadata().addToData(dataWithName).build()) .always(); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Hello ConfigMap Active Profile Name, World!"); } @Test public void testFarewellEndpoint() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Goodbye ConfigMap default, World!"); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java index 490b5e00..ebe1be2e 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfileExpressionTests.java @@ -41,10 +41,8 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read * Tests reading property from YAML document specified by profile expression. */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, - properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles({ "production", "us-east" }) @AutoConfigureWebTestClient public class ConfigMapsWithProfileExpressionTests { @@ -62,27 +60,24 @@ public class ConfigMapsWithProfileExpressionTests { KubernetesClient mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Hello ConfigMap production and us-east, World!"); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java index 7a68d2ac..a0082bc2 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesNoActiveProfileTests.java @@ -40,10 +40,8 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read * @author Charles Moulliard */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, - properties = { - "spring.application.name=configmap-with-profile-no-active-profiles-example", +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, + properties = { "spring.application.name=configmap-with-profile-no-active-profiles-example", "spring.cloud.kubernetes.reload.enabled=false" }) @AutoConfigureWebTestClient public class ConfigMapsWithProfilesNoActiveProfileTests { @@ -63,34 +61,30 @@ public class ConfigMapsWithProfilesNoActiveProfileTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Hello ConfigMap default, World!"); } @Test public void testFarewellEndpoint() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Goodbye ConfigMap default, World!"); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java index fe7ce92f..fe26523f 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithProfilesTests.java @@ -41,10 +41,8 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.read * @author Charles Moulliard */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, - properties = { "spring.application.name=configmap-with-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient public class ConfigMapsWithProfilesTests { @@ -67,34 +65,30 @@ public class ConfigMapsWithProfilesTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); data.put("application.yml", readResourceFile("application-with-profiles.yaml")); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Hello ConfigMap dev, World!"); } @Test public void testFarewellEndpoint() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content") + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") .isEqualTo("Goodbye ConfigMap default, World!"); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java index 96390475..2f0bc98c 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsWithoutProfilesTests.java @@ -38,10 +38,8 @@ import org.springframework.test.web.reactive.server.WebTestClient; import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.readResourceFile; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, - properties = { "spring.application.name=configmap-without-profile-example", - "spring.cloud.kubernetes.reload.enabled=false" }) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { + "spring.application.name=configmap-without-profile-example", "spring.cloud.kubernetes.reload.enabled=false" }) @ActiveProfiles("development") @AutoConfigureWebTestClient public class ConfigMapsWithoutProfilesTests { @@ -61,34 +59,31 @@ public class ConfigMapsWithoutProfilesTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); HashMap data = new HashMap<>(); - data.put("application.yml", - readResourceFile("application-without-profiles.yaml")); + data.put("application.yml", readResourceFile("application-without-profiles.yaml")); server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(APPLICATION_NAME).endMetadata().addToData(data).build()) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(APPLICATION_NAME).endMetadata() + .addToData(data).build()) .always(); } @Test public void testGreetingEndpoint() { - this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Hello ConfigMap, World!"); + this.webClient.get().uri("/api/greeting").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Hello ConfigMap, World!"); } @Test public void testFarewellEndpoint() { - this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk() - .expectBody().jsonPath("content").isEqualTo("Goodbye ConfigMap, World!"); + this.webClient.get().uri("/api/farewell").exchange().expectStatus().isOk().expectBody().jsonPath("content") + .isEqualTo("Goodbye ConfigMap, World!"); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/CoreTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/CoreTest.java index 26192423..e94d87ed 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/CoreTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/CoreTest.java @@ -37,10 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @SpringBootTest(classes = TestApplication.class, - properties = { "spring.application.name=testapp", - "spring.cloud.kubernetes.client.namespace=testns", - "spring.cloud.kubernetes.client.trustCerts=true", - "spring.cloud.kubernetes.config.namespace=testns", + properties = { "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns", + "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns", "spring.cloud.kubernetes.secrets.enableApi=true" }) public class CoreTest { @@ -63,39 +61,32 @@ public class CoreTest { mockClient = mockServer.getClient(); mockServer.expect().get().withPath("/api/v1/namespaces/testns/configmaps/testapp") - .andReturn(200, - new ConfigMapBuilder().withData(new HashMap() { - { - put("spring.kubernetes.test.value", "value1"); - } - }).build()) - .always(); + .andReturn(200, new ConfigMapBuilder().withData(new HashMap() { + { + put("spring.kubernetes.test.value", "value1"); + } + }).build()).always(); mockServer.expect().get().withPath("/api/v1/namespaces/testns/secrets/testapp") - .andReturn(200, - new SecretBuilder().withData(new HashMap() { - { - put("amq.user", "YWRtaW4K"); - put("amq.pwd", "MWYyZDFlMmU2N2Rm"); - } - }).build()) - .always(); + .andReturn(200, new SecretBuilder().withData(new HashMap() { + { + put("amq.user", "YWRtaW4K"); + put("amq.pwd", "MWYyZDFlMmU2N2Rm"); + } + }).build()).always(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @Test public void kubernetesClientConfigBeanShouldBeConfigurableViaSystemProperties() { assertThat(config).isNotNull(); - assertThat(config.getMasterUrl()) - .isEqualTo(mockClient.getConfiguration().getMasterUrl()); + assertThat(config.getMasterUrl()).isEqualTo(mockClient.getConfiguration().getMasterUrl()); assertThat(config.getNamespace()).isEqualTo("testns"); assertThat(config.isTrustCerts()).isTrue(); } @@ -103,14 +94,12 @@ public class CoreTest { @Test public void kubernetesClientBeanShouldBeConfigurableViaSystemProperties() { assertThat(client).isNotNull(); - assertThat(client.getConfiguration().getMasterUrl()) - .isEqualTo(mockClient.getConfiguration().getMasterUrl()); + assertThat(client.getConfiguration().getMasterUrl()).isEqualTo(mockClient.getConfiguration().getMasterUrl()); } @Test public void propertiesShouldBeReadFromConfigMap() { - assertThat(environment.getProperty("spring.kubernetes.test.value")) - .isEqualTo("value1"); + assertThat(environment.getProperty("spring.kubernetes.test.value")).isEqualTo("value1"); } @Test diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/HealthIndicatorTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/HealthIndicatorTest.java index b022bd85..6384df25 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/HealthIndicatorTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/HealthIndicatorTest.java @@ -35,8 +35,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; import static org.hamcrest.Matchers.containsString; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "management.endpoint.health.show-details=always" }) public class HealthIndicatorTest { @@ -56,12 +55,10 @@ public class HealthIndicatorTest { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @@ -69,8 +66,8 @@ public class HealthIndicatorTest { @Test public void healthEndpointShouldContainKubernetes() { this.webClient.get().uri("http://localhost:{port}/actuator/health", this.port) - .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk() - .expectBody(String.class).value(containsString("kubernetes")); + .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody(String.class) + .value(containsString("kubernetes")); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java index c3c36f36..3491a629 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigConfigurationTest.java @@ -22,6 +22,8 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration; +import org.springframework.cloud.kubernetes.config.reload.ConfigReloadAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,12 +54,25 @@ public class KubernetesConfigConfigurationTest { @Test public void kubernetesWhenKubernetesConfigDisabled() throws Exception { - setup("spring.cloud.kubernetes.config.enabled=false", - "spring.cloud.kubernetes.secrets.enabled=false"); + setup("spring.cloud.kubernetes.config.enabled=false", "spring.cloud.kubernetes.secrets.enabled=false"); assertThat(this.context.containsBean("configMapPropertySourceLocator")).isFalse(); assertThat(this.context.containsBean("secretsPropertySourceLocator")).isFalse(); } + @Test + public void kubernetesWhenKubernetesConfigEnabledButSecretDisabled() throws Exception { + setup("spring.cloud.kubernetes.config.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false"); + assertThat(this.context.containsBean("configMapPropertySourceLocator")).isTrue(); + assertThat(this.context.containsBean("secretsPropertySourceLocator")).isFalse(); + } + + @Test + public void kubernetesWhenKubernetesConfigDisabledButSecretEnabled() throws Exception { + setup("spring.cloud.kubernetes.config.enabled=false", "spring.cloud.kubernetes.secrets.enabled=true"); + assertThat(this.context.containsBean("configMapPropertySourceLocator")).isFalse(); + assertThat(this.context.containsBean("secretsPropertySourceLocator")).isTrue(); + } + @Test public void kubernetesDefaultEnabled() throws Exception { setup("spring.cloud.kubernetes.enabled=true"); @@ -65,12 +80,37 @@ public class KubernetesConfigConfigurationTest { assertThat(this.context.containsBean("secretsPropertySourceLocator")).isTrue(); } + @Test + public void kubernetesReloadEnabled() throws Exception { + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.context.containsBean("configMapPropertySourceLocator")).isTrue(); + assertThat(this.context.containsBean("secretsPropertySourceLocator")).isTrue(); + assertThat(this.context.containsBean("propertyChangeWatcher")).isTrue(); + } + + @Test + public void kubernetesReloadEnabledButSecretDisabled() throws Exception { + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=true", + "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.context.containsBean("configMapPropertySourceLocator")).isTrue(); + assertThat(this.context.containsBean("secretsPropertySourceLocator")).isFalse(); + assertThat(this.context.containsBean("propertyChangeWatcher")).isTrue(); + } + + @Test + public void kubernetesReloadEnabledButSecretAndConfigDisabled() throws Exception { + setup("spring.cloud.kubernetes.enabled=true", "spring.cloud.kubernetes.config.enabled=false", + "spring.cloud.kubernetes.secrets.enabled=false", "spring.cloud.kubernetes.reload.enabled=true"); + assertThat(this.context.containsBean("configMapPropertySourceLocator")).isFalse(); + assertThat(this.context.containsBean("secretsPropertySourceLocator")).isFalse(); + assertThat(this.context.containsBean("propertyChangeWatcher")).isFalse(); + } + private void setup(String... env) { - this.context = new SpringApplicationBuilder( - PropertyPlaceholderAutoConfiguration.class, - KubernetesClientTestConfiguration.class, BootstrapConfiguration.class) - .web(org.springframework.boot.WebApplicationType.NONE) - .properties(env).run(); + this.context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class, + KubernetesClientTestConfiguration.class, BootstrapConfiguration.class, + ConfigReloadAutoConfiguration.class, RefreshAutoConfiguration.class) + .web(org.springframework.boot.WebApplicationType.NONE).properties(env).run(); } @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java index 250602d5..e0c6c606 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MissingActuatorTest.java @@ -34,26 +34,23 @@ import static org.assertj.core.api.Assertions.assertThat; // inspired by spring-cloud-commons: RefreshAutoConfigurationMoreClassPathTests @RunWith(ModifiedClassPathRunner.class) -@ClassPathExclusions({ "spring-boot-actuator-autoconfigure-*.jar", - "spring-boot-starter-actuator-*.jar" }) +@ClassPathExclusions({ "spring-boot-actuator-autoconfigure-*.jar", "spring-boot-starter-actuator-*.jar" }) public class MissingActuatorTest { @Rule public OutputCaptureRule outputCapture = new OutputCaptureRule(); - private static ConfigurableApplicationContext getApplicationContext( - Class configuration, String... properties) { - return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE) - .properties(properties).run(); + private static ConfigurableApplicationContext getApplicationContext(Class configuration, String... properties) { + return new SpringApplicationBuilder(configuration).web(WebApplicationType.NONE).properties(properties).run(); } @Test public void unknownClassProtected() { - try (ConfigurableApplicationContext context = getApplicationContext(Config.class, - "debug=true")) { + try (ConfigurableApplicationContext context = getApplicationContext(Config.class, "debug=true")) { String output = this.outputCapture.toString(); - assertThat(output).doesNotContain("Failed to introspect annotations on" - + " [class org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration") + assertThat(output) + .doesNotContain("Failed to introspect annotations on" + + " [class org.springframework.cloud.autoconfigure.RefreshEndpointAutoConfiguration") .doesNotContain("TypeNotPresentExceptionProxy"); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java index bb6ad831..9e452242 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleConfigMapsTests.java @@ -39,8 +39,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; * @author Charles Moulliard */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = ExampleApp.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ExampleApp.class, properties = { "spring.cloud.bootstrap.name=multiplecms" }) @AutoConfigureWebTestClient public class MultipleConfigMapsTests { @@ -58,46 +57,38 @@ public class MultipleConfigMapsTests { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); - createConfigmap(server, "s1", "defnamespace", new HashMap() { - { - put("bean.common-message", "c1"); - put("bean.message1", "m1"); - } - }); + Map one = new HashMap<>(); + one.put("bean.common-message", "c1"); + one.put("bean.message1", "m1"); - createConfigmap(server, "defname", "s2", new HashMap() { - { - put("bean.common-message", "c2"); - put("bean.message2", "m2"); - } - }); + createConfigmap(server, "s1", "defnamespace", one); - createConfigmap(server, "othername", "othernamespace", - new HashMap() { - { - put("bean.common-message", "c3"); - put("bean.message3", "m3"); - } - }); + Map two = new HashMap<>(); + two.put("bean.common-message", "c2"); + two.put("bean.message2", "m2"); + + createConfigmap(server, "defname", "s2", two); + + Map three = new HashMap<>(); + three.put("bean.common-message", "c3"); + three.put("bean.message3", "m3"); + + createConfigmap(server, "othername", "othernamespace", three); } - private static void createConfigmap(KubernetesServer server, String configMapName, - String namespace, Map data) { + private static void createConfigmap(KubernetesServer server, String configMapName, String namespace, + Map data) { - server.expect() - .withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, - configMapName)) - .andReturn(200, new ConfigMapBuilder().withNewMetadata() - .withName(configMapName).endMetadata().addToData(data).build()) + server.expect().withPath(String.format("/api/v1/namespaces/%s/configmaps/%s", namespace, configMapName)) + .andReturn(200, new ConfigMapBuilder().withNewMetadata().withName(configMapName).endMetadata() + .addToData(data).build()) .always(); } @@ -124,8 +115,8 @@ public class MultipleConfigMapsTests { } private void assertResponse(String path, String expectedMessage) { - this.webClient.get().uri(path).exchange().expectStatus().isOk().expectBody() - .jsonPath("message").isEqualTo(expectedMessage); + this.webClient.get().uri(path).exchange().expectStatus().isOk().expectBody().jsonPath("message") + .isEqualTo(expectedMessage); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleSecretsTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleSecretsTests.java index f06f8c3c..676129cc 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleSecretsTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/MultipleSecretsTests.java @@ -41,8 +41,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; * @author Haytham Mohamed */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = MultiSecretsApp.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MultiSecretsApp.class, properties = { "spring.cloud.bootstrap.name=multiple-secrets" }) @AutoConfigureWebTestClient public class MultipleSecretsTests { @@ -68,14 +67,11 @@ public class MultipleSecretsTests { KubernetesClient mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); - System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, - DEFAULT_NAMESPACE); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); + System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, DEFAULT_NAMESPACE); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); Map metadata1 = new HashMap() { @@ -85,11 +81,8 @@ public class MultipleSecretsTests { } }; - Secret secret1 = new SecretBuilder().withNewMetadata().withName("name1") - .withLabels(metadata1).endMetadata() - .addToData("secrets.secret1", - Base64.getEncoder().encodeToString(SECRET_VALUE_1.getBytes())) - .build(); + Secret secret1 = new SecretBuilder().withNewMetadata().withName("name1").withLabels(metadata1).endMetadata() + .addToData("secrets.secret1", Base64.getEncoder().encodeToString(SECRET_VALUE_1.getBytes())).build(); mockClient.secrets().inNamespace(DEFAULT_NAMESPACE).create(secret1); @@ -100,11 +93,8 @@ public class MultipleSecretsTests { } }; - Secret secret2 = new SecretBuilder().withNewMetadata().withName("name2") - .withLabels(metadata2).endMetadata() - .addToData("secrets.secret2", - Base64.getEncoder().encodeToString(SECRET_VALUE_2.getBytes())) - .build(); + Secret secret2 = new SecretBuilder().withNewMetadata().withName("name2").withLabels(metadata2).endMetadata() + .addToData("secrets.secret2", Base64.getEncoder().encodeToString(SECRET_VALUE_2.getBytes())).build(); mockClient.secrets().inNamespace(ANOTHER_NAMESPACE).create(secret2); } @@ -120,8 +110,8 @@ public class MultipleSecretsTests { } private void assertResponse(String path, String expectedMessage) { - this.webClient.get().uri(path).exchange().expectStatus().isOk().expectBody() - .jsonPath("secret").isEqualTo(expectedMessage); + this.webClient.get().uri(path).exchange().expectStatus().isOk().expectBody().jsonPath("secret") + .isEqualTo(expectedMessage); } } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceTest.java index b6b5d719..9e00777b 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceTest.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/SecretsPropertySourceTest.java @@ -39,8 +39,7 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class) @TestPropertySource("classpath:/application-secrets.properties") public class SecretsPropertySourceTest { @@ -62,20 +61,15 @@ public class SecretsPropertySourceTest { KubernetesClient mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, NAMESPACE); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); - Secret secret = new SecretBuilder().withNewMetadata() - .withLabels(singletonMap("foo", "bar")).endMetadata() - .addToData("secretName", - Base64.getEncoder().encodeToString(SECRET_VALUE.getBytes())) - .build(); + Secret secret = new SecretBuilder().withNewMetadata().withLabels(singletonMap("foo", "bar")).endMetadata() + .addToData("secretName", Base64.getEncoder().encodeToString(SECRET_VALUE.getBytes())).build(); mockClient.secrets().inNamespace(NAMESPACE).create(secret); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example/GreetingController.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example/GreetingController.java index d3410409..7574e283 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example/GreetingController.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example/GreetingController.java @@ -35,20 +35,17 @@ public class GreetingController { } @RequestMapping("/api/greeting") - public ResponseMessage greeting( - @RequestParam(value = "name", defaultValue = "World") String name) { + public ResponseMessage greeting(@RequestParam(value = "name", defaultValue = "World") String name) { return new ResponseMessage(String.format(this.properties.getGreeting(), name)); } @RequestMapping("/api/farewell") - public ResponseMessage farewell( - @RequestParam(value = "name", defaultValue = "World") String name) { + public ResponseMessage farewell(@RequestParam(value = "name", defaultValue = "World") String name) { return new ResponseMessage(String.format(this.properties.getFarewell(), name)); } @RequestMapping("/api/morning") - public ResponseMessage morning( - @RequestParam(value = "name", defaultValue = "World") String name) { + public ResponseMessage morning(@RequestParam(value = "name", defaultValue = "World") String name) { return new ResponseMessage(String.format(this.properties.getMorning(), name)); } diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example2/ExampleApp.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example2/ExampleApp.java index 8909fee0..b8932fba 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example2/ExampleApp.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example2/ExampleApp.java @@ -27,8 +27,7 @@ import org.springframework.web.bind.annotation.RestController; public class ExampleApp { public static void main(String[] args) { - SpringApplication - .run(org.springframework.cloud.kubernetes.config.example.App.class, args); + SpringApplication.run(org.springframework.cloud.kubernetes.config.example.App.class, args); } @RestController diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetectorTest.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetectorTest.java new file mode 100644 index 00000000..a68d2f4e --- /dev/null +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/ConfigurationChangeDetectorTest.java @@ -0,0 +1,131 @@ +/* + * Copyright 2013-2020 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.config.reload; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import io.fabric8.kubernetes.client.KubernetesClient; +import org.junit.Assert; +import org.junit.Test; + +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.MapPropertySource; + +/** + * @author wind57 + */ +public class ConfigurationChangeDetectorTest { + + private final ConfigurationChangeDetectorStub stub = new ConfigurationChangeDetectorStub(null, null, null, null); + + @Test + public void testChangedTwoNulls() { + boolean changed = stub.changed(null, (MapPropertySource) null); + Assert.assertFalse(changed); + } + + @Test + public void testChangedLeftNullRightNonNull() { + MapPropertySource right = new MapPropertySource("rightNonNull", Collections.emptyMap()); + boolean changed = stub.changed(null, right); + Assert.assertTrue(changed); + } + + @Test + public void testChangedLeftNonNullRightNull() { + MapPropertySource left = new MapPropertySource("leftNonNull", Collections.emptyMap()); + boolean changed = stub.changed(left, null); + Assert.assertTrue(changed); + } + + @Test + public void testChangedEqualMaps() { + Object value = new Object(); + Map leftMap = new HashMap<>(); + leftMap.put("key", value); + Map rightMap = new HashMap<>(); + rightMap.put("key", value); + MapPropertySource left = new MapPropertySource("left", leftMap); + MapPropertySource right = new MapPropertySource("right", rightMap); + boolean changed = stub.changed(left, right); + Assert.assertFalse(changed); + } + + @Test + public void testChangedNonEqualMaps() { + Object value = new Object(); + Map leftMap = new HashMap<>(); + leftMap.put("key", value); + leftMap.put("anotherKey", value); + Map rightMap = new HashMap<>(); + rightMap.put("key", value); + MapPropertySource left = new MapPropertySource("left", leftMap); + MapPropertySource right = new MapPropertySource("right", rightMap); + boolean changed = stub.changed(left, right); + Assert.assertTrue(changed); + } + + @Test + public void testChangedListsDifferentSizes() { + List left = Collections.singletonList(new MapPropertySource("one", Collections.emptyMap())); + List right = Collections.emptyList(); + boolean changed = stub.changed(left, right); + Assert.assertFalse(changed); + } + + @Test + public void testChangedListSameSizesButNotEqual() { + Object value = new Object(); + Map leftMap = new HashMap<>(); + leftMap.put("key", value); + Map rightMap = new HashMap<>(); + leftMap.put("anotherKey", value); + List left = Collections.singletonList(new MapPropertySource("one", leftMap)); + List right = Collections.singletonList(new MapPropertySource("two", rightMap)); + boolean changed = stub.changed(left, right); + Assert.assertTrue(changed); + } + + @Test + public void testChangedListSameSizesEqual() { + Object value = new Object(); + Map leftMap = new HashMap<>(); + leftMap.put("key", value); + Map rightMap = new HashMap<>(); + leftMap.put("key", value); + List left = Collections.singletonList(new MapPropertySource("one", leftMap)); + List right = Collections.singletonList(new MapPropertySource("two", rightMap)); + boolean changed = stub.changed(left, right); + Assert.assertTrue(changed); + } + + /** + * only needed to test some protected methods it defines + */ + private static final class ConfigurationChangeDetectorStub extends ConfigurationChangeDetector { + + private ConfigurationChangeDetectorStub(ConfigurableEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy) { + super(environment, properties, kubernetesClient, strategy); + } + + } + +} diff --git a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetectorTests.java b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetectorTests.java index d96962ba..49f56c76 100644 --- a/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetectorTests.java +++ b/spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/EventBasedConfigurationChangeDetectorTests.java @@ -60,22 +60,15 @@ public class EventBasedConfigurationChangeDetectorTests { when(mixedOperation.withName(eq("myconfigmap"))).thenReturn(resource); when(k8sClient.configMaps()).thenReturn(mixedOperation); - ConfigMapPropertySource configMapPropertySource = new ConfigMapPropertySource( - k8sClient, "myconfigmap"); - env.getPropertySources() - .addFirst(new BootstrapPropertySource(configMapPropertySource)); + ConfigMapPropertySource configMapPropertySource = new ConfigMapPropertySource(k8sClient, "myconfigmap"); + env.getPropertySources().addFirst(new BootstrapPropertySource(configMapPropertySource)); - ConfigurationUpdateStrategy configurationUpdateStrategy = mock( - ConfigurationUpdateStrategy.class); - ConfigMapPropertySourceLocator configMapLocator = mock( - ConfigMapPropertySourceLocator.class); - SecretsPropertySourceLocator secretsLocator = mock( - SecretsPropertySourceLocator.class); - EventBasedConfigurationChangeDetector detector = new EventBasedConfigurationChangeDetector( - env, configReloadProperties, k8sClient, configurationUpdateStrategy, - configMapLocator, secretsLocator); - List sources = detector - .findPropertySources(ConfigMapPropertySource.class); + ConfigurationUpdateStrategy configurationUpdateStrategy = mock(ConfigurationUpdateStrategy.class); + ConfigMapPropertySourceLocator configMapLocator = mock(ConfigMapPropertySourceLocator.class); + SecretsPropertySourceLocator secretsLocator = mock(SecretsPropertySourceLocator.class); + EventBasedConfigurationChangeDetector detector = new EventBasedConfigurationChangeDetector(env, + configReloadProperties, k8sClient, configurationUpdateStrategy, configMapLocator, secretsLocator); + List sources = detector.findPropertySources(ConfigMapPropertySource.class); assertThat(sources.size()).isEqualTo(1); assertThat(sources.get(0).getProperty("foo")).isEqualTo("bar"); } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetector.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetector.java index 9a0485d1..afeb17b6 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetector.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetector.java @@ -35,45 +35,41 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; /** * @author Ryan Baxter */ -public class BusEventBasedConfigurationWatcherChangeDetector extends - ConfigurationWatcherChangeDetector implements ApplicationEventPublisherAware { +public class BusEventBasedConfigurationWatcherChangeDetector extends ConfigurationWatcherChangeDetector + implements ApplicationEventPublisherAware { private ApplicationEventPublisher applicationEventPublisher; private BusProperties busProperties; - public BusEventBasedConfigurationWatcherChangeDetector( - AbstractEnvironment environment, ConfigReloadProperties properties, - KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, + public BusEventBasedConfigurationWatcherChangeDetector(AbstractEnvironment environment, + ConfigReloadProperties properties, KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, ConfigMapPropertySourceLocator configMapPropertySourceLocator, - SecretsPropertySourceLocator secretsPropertySourceLocator, - BusProperties busProperties, + SecretsPropertySourceLocator secretsPropertySourceLocator, BusProperties busProperties, ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, ThreadPoolTaskExecutor threadPoolTaskExecutor) { - super(environment, properties, kubernetesClient, strategy, - configMapPropertySourceLocator, secretsPropertySourceLocator, - k8SConfigurationProperties, threadPoolTaskExecutor); + super(environment, properties, kubernetesClient, strategy, configMapPropertySourceLocator, + secretsPropertySourceLocator, k8SConfigurationProperties, threadPoolTaskExecutor); this.busProperties = busProperties; } @Override protected Mono triggerRefresh(Secret secret) { - this.applicationEventPublisher.publishEvent(new RefreshRemoteApplicationEvent( - secret, busProperties.getId(), secret.getMetadata().getName())); + this.applicationEventPublisher.publishEvent( + new RefreshRemoteApplicationEvent(secret, busProperties.getId(), secret.getMetadata().getName())); return Mono.empty(); } @Override protected Mono triggerRefresh(ConfigMap configMap) { - this.applicationEventPublisher.publishEvent(new RefreshRemoteApplicationEvent( - configMap, busProperties.getId(), configMap.getMetadata().getName())); + this.applicationEventPublisher.publishEvent( + new RefreshRemoteApplicationEvent(configMap, busProperties.getId(), configMap.getMetadata().getName())); return Mono.empty(); } @Override - public void setApplicationEventPublisher( - ApplicationEventPublisher applicationEventPublisher) { + public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { this.applicationEventPublisher = applicationEventPublisher; } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherApplication.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherApplication.java index e58da7e5..98523c7f 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherApplication.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherApplication.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.Configuration; * @author Ryan Baxter */ @Configuration(proxyBeanMethods = false) -@SpringBootApplication(exclude = { ContextFunctionCatalogAutoConfiguration.class, - RabbitHealthContributorAutoConfiguration.class }) +@SpringBootApplication( + exclude = { ContextFunctionCatalogAutoConfiguration.class, RabbitHealthContributorAutoConfiguration.class }) public class ConfigurationWatcherApplication { public static void main(String[] args) { diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java index e94429fa..0c8084d7 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java @@ -55,40 +55,35 @@ public class ConfigurationWatcherAutoConfiguration { @Bean @ConditionalOnMissingBean(ConfigurationWatcherChangeDetector.class) - public ConfigurationWatcherChangeDetector httpBasedConfigurationWatchChangeDetector( - AbstractEnvironment environment, KubernetesClient kubernetesClient, - ConfigMapPropertySourceLocator configMapPropertySourceLocator, - SecretsPropertySourceLocator secretsPropertySourceLocator, - ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy, + public ConfigurationWatcherChangeDetector httpBasedConfigurationWatchChangeDetector(AbstractEnvironment environment, + KubernetesClient kubernetesClient, ConfigMapPropertySourceLocator configMapPropertySourceLocator, + SecretsPropertySourceLocator secretsPropertySourceLocator, ConfigReloadProperties properties, + ConfigurationUpdateStrategy strategy, ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, ThreadPoolTaskExecutor threadFactory, WebClient webClient, KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient) { - return new HttpBasedConfigurationWatchChangeDetector(environment, properties, - kubernetesClient, strategy, configMapPropertySourceLocator, - secretsPropertySourceLocator, k8SConfigurationProperties, threadFactory, + return new HttpBasedConfigurationWatchChangeDetector(environment, properties, kubernetesClient, strategy, + configMapPropertySourceLocator, secretsPropertySourceLocator, k8SConfigurationProperties, threadFactory, webClient, kubernetesReactiveDiscoveryClient); } @Configuration @Profile("bus") - @Import({ ContextFunctionCatalogAutoConfiguration.class, - RabbitHealthContributorAutoConfiguration.class }) + @Import({ ContextFunctionCatalogAutoConfiguration.class, RabbitHealthContributorAutoConfiguration.class }) static class BusConfiguration { @Bean @ConditionalOnMissingBean(ConfigurationWatcherChangeDetector.class) - public ConfigurationWatcherChangeDetector busPropertyChangeWatcher( - BusProperties busProperties, AbstractEnvironment environment, - KubernetesClient kubernetesClient, + public ConfigurationWatcherChangeDetector busPropertyChangeWatcher(BusProperties busProperties, + AbstractEnvironment environment, KubernetesClient kubernetesClient, ConfigMapPropertySourceLocator configMapPropertySourceLocator, - SecretsPropertySourceLocator secretsPropertySourceLocator, - ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy, + SecretsPropertySourceLocator secretsPropertySourceLocator, ConfigReloadProperties properties, + ConfigurationUpdateStrategy strategy, ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, ThreadPoolTaskExecutor threadFactory) { - return new BusEventBasedConfigurationWatcherChangeDetector(environment, - properties, kubernetesClient, strategy, - configMapPropertySourceLocator, secretsPropertySourceLocator, - busProperties, k8SConfigurationProperties, threadFactory); + return new BusEventBasedConfigurationWatcherChangeDetector(environment, properties, kubernetesClient, + strategy, configMapPropertySourceLocator, secretsPropertySourceLocator, busProperties, + k8SConfigurationProperties, threadFactory); } } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherChangeDetector.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherChangeDetector.java index 2551848e..5b8ed735 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherChangeDetector.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherChangeDetector.java @@ -36,24 +36,22 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; /** * @author Ryan Baxter */ -public abstract class ConfigurationWatcherChangeDetector - extends EventBasedConfigurationChangeDetector { +public abstract class ConfigurationWatcherChangeDetector extends EventBasedConfigurationChangeDetector { private ScheduledExecutorService executorService; protected ConfigurationWatcherConfigurationProperties k8SConfigurationProperties; - public ConfigurationWatcherChangeDetector(AbstractEnvironment environment, - ConfigReloadProperties properties, KubernetesClient kubernetesClient, - ConfigurationUpdateStrategy strategy, + public ConfigurationWatcherChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, ConfigMapPropertySourceLocator configMapPropertySourceLocator, SecretsPropertySourceLocator secretsPropertySourceLocator, ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, ThreadPoolTaskExecutor threadPoolTaskExecutor) { - super(environment, properties, kubernetesClient, strategy, - configMapPropertySourceLocator, secretsPropertySourceLocator); - this.executorService = Executors.newScheduledThreadPool( - k8SConfigurationProperties.getThreadPoolSize(), threadPoolTaskExecutor); + super(environment, properties, kubernetesClient, strategy, configMapPropertySourceLocator, + secretsPropertySourceLocator); + this.executorService = Executors.newScheduledThreadPool(k8SConfigurationProperties.getThreadPoolSize(), + threadPoolTaskExecutor); this.k8SConfigurationProperties = k8SConfigurationProperties; } @@ -63,38 +61,33 @@ public abstract class ConfigurationWatcherChangeDetector if (log.isDebugEnabled()) { log.debug("Scheduling remote refresh event to be published for ConfigMap " + configMap.getMetadata().getName() + " to be published in " - + k8SConfigurationProperties.getRefreshDelay().toMillis() - + " milliseconds"); + + k8SConfigurationProperties.getRefreshDelay().toMillis() + " milliseconds"); } executorService.schedule(() -> triggerRefresh(configMap).subscribe(), - k8SConfigurationProperties.getRefreshDelay().toMillis(), - TimeUnit.MILLISECONDS); + k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); } else { if (log.isDebugEnabled()) { - log.debug("Not publishing event. ConfigMap " - + configMap.getMetadata().getName() - + " does not contain the label " - + k8SConfigurationProperties.getConfigLabel()); + log.debug("Not publishing event. ConfigMap " + configMap.getMetadata().getName() + + " does not contain the label " + k8SConfigurationProperties.getConfigLabel()); } } } protected boolean isSpringCloudKubernetesConfig(ConfigMap configMap) { - if (configMap.getMetadata() == null - || configMap.getMetadata().getLabels() == null) { + if (configMap.getMetadata() == null || configMap.getMetadata().getLabels() == null) { return false; } - return Boolean.parseBoolean(configMap.getMetadata().getLabels() - .getOrDefault(k8SConfigurationProperties.getConfigLabel(), "false")); + return Boolean.parseBoolean( + configMap.getMetadata().getLabels().getOrDefault(k8SConfigurationProperties.getConfigLabel(), "false")); } protected boolean isSpringCloudKubernetesSecret(Secret secret) { if (secret.getMetadata() == null || secret.getMetadata().getLabels() == null) { return false; } - return Boolean.parseBoolean(secret.getMetadata().getLabels() - .getOrDefault(k8SConfigurationProperties.getSecretLabel(), "false")); + return Boolean.parseBoolean( + secret.getMetadata().getLabels().getOrDefault(k8SConfigurationProperties.getSecretLabel(), "false")); } protected abstract Mono triggerRefresh(Secret secret); @@ -105,20 +98,17 @@ public abstract class ConfigurationWatcherChangeDetector protected void onEvent(Secret secret) { if (isSpringCloudKubernetesSecret(secret)) { if (log.isDebugEnabled()) { - log.debug("Scheduling remote refresh event to be published for Secret " - + secret.getMetadata().getName() + " to be published in " - + k8SConfigurationProperties.getRefreshDelay().toMillis() + log.debug("Scheduling remote refresh event to be published for Secret " + secret.getMetadata().getName() + + " to be published in " + k8SConfigurationProperties.getRefreshDelay().toMillis() + " milliseconds"); } executorService.schedule(() -> triggerRefresh(secret).subscribe(), - k8SConfigurationProperties.getRefreshDelay().toMillis(), - TimeUnit.MILLISECONDS); + k8SConfigurationProperties.getRefreshDelay().toMillis(), TimeUnit.MILLISECONDS); } else { if (log.isDebugEnabled()) { log.debug("Not publishing event. Secret " + secret.getMetadata().getName() - + " does not contain the label " - + k8SConfigurationProperties.getSecretLabel()); + + " does not contain the label " + k8SConfigurationProperties.getSecretLabel()); } } } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetector.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetector.java index 671d36f7..75c92428 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetector.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetector.java @@ -41,8 +41,7 @@ import org.springframework.web.util.UriComponentsBuilder; /** * @author Ryan Baxter */ -public class HttpBasedConfigurationWatchChangeDetector - extends ConfigurationWatcherChangeDetector { +public class HttpBasedConfigurationWatchChangeDetector extends ConfigurationWatcherChangeDetector { /** * Annotation key for actuator port and path. @@ -53,17 +52,15 @@ public class HttpBasedConfigurationWatchChangeDetector private KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient; - public HttpBasedConfigurationWatchChangeDetector(AbstractEnvironment environment, - ConfigReloadProperties properties, KubernetesClient kubernetesClient, - ConfigurationUpdateStrategy strategy, + public HttpBasedConfigurationWatchChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties, + KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy, ConfigMapPropertySourceLocator configMapPropertySourceLocator, SecretsPropertySourceLocator secretsPropertySourceLocator, ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, ThreadPoolTaskExecutor threadPoolTaskExecutor, WebClient webClient, KubernetesReactiveDiscoveryClient k8sReactiveDiscoveryClient) { - super(environment, properties, kubernetesClient, strategy, - configMapPropertySourceLocator, secretsPropertySourceLocator, - k8SConfigurationProperties, threadPoolTaskExecutor); + super(environment, properties, kubernetesClient, strategy, configMapPropertySourceLocator, + secretsPropertySourceLocator, k8SConfigurationProperties, threadPoolTaskExecutor); this.webClient = webClient; this.kubernetesReactiveDiscoveryClient = k8sReactiveDiscoveryClient; } @@ -73,8 +70,7 @@ public class HttpBasedConfigurationWatchChangeDetector return refresh(secret.getMetadata()).then(); } - private void setActuatorUriFromAnnotation(UriComponentsBuilder actuatorUriBuilder, - String metadataUri) { + private void setActuatorUriFromAnnotation(UriComponentsBuilder actuatorUriBuilder, String metadataUri) { URI annotationUri = URI.create(metadataUri); actuatorUriBuilder.path(annotationUri.getPath() + "/refresh"); @@ -84,8 +80,7 @@ public class HttpBasedConfigurationWatchChangeDetector // 9090 in this case if (annotationUri.getPort() < 0) { if (annotationUri.getAuthority() != null) { - actuatorUriBuilder - .port(annotationUri.getAuthority().replaceFirst(":", "")); + actuatorUriBuilder.port(annotationUri.getAuthority().replaceFirst(":", "")); } } else { @@ -99,8 +94,8 @@ public class HttpBasedConfigurationWatchChangeDetector log.debug("Metadata actuator uri is: " + metadataUri); } - UriComponentsBuilder actuatorUriBuilder = UriComponentsBuilder.newInstance() - .scheme(si.getScheme()).host(si.getHost()); + UriComponentsBuilder actuatorUriBuilder = UriComponentsBuilder.newInstance().scheme(si.getScheme()) + .host(si.getHost()); if (!StringUtils.isEmpty(metadataUri)) { if (log.isDebugEnabled()) { @@ -111,8 +106,7 @@ public class HttpBasedConfigurationWatchChangeDetector else { Integer port = k8SConfigurationProperties.getActuatorPort() < 0 ? si.getPort() : k8SConfigurationProperties.getActuatorPort(); - actuatorUriBuilder = actuatorUriBuilder - .path(k8SConfigurationProperties.getActuatorPath() + "/refresh") + actuatorUriBuilder = actuatorUriBuilder.path(k8SConfigurationProperties.getActuatorPath() + "/refresh") .port(port); } @@ -121,28 +115,22 @@ public class HttpBasedConfigurationWatchChangeDetector protected Flux> refresh(ObjectMeta objectMeta) { - return kubernetesReactiveDiscoveryClient.getInstances(objectMeta.getName()) - .flatMap(si -> { - URI actuatorUri = getActuatorUri(si); - if (log.isDebugEnabled()) { - log.debug("Sending refresh request for " + objectMeta.getName() - + " to URI " + actuatorUri.toString()); - } - Mono> response = webClient.post() - .uri(actuatorUri).retrieve().toBodilessEntity() - .doOnSuccess(re -> { - if (log.isDebugEnabled()) { - log.debug("Refresh sent to " + objectMeta.getName() - + " at URI address " + actuatorUri - + " returned a " - + re.getStatusCode().toString()); - } - }).doOnError(t -> { - log.warn("Refresh sent to " + objectMeta.getName() - + " failed", t); - }); - return response; - }); + return kubernetesReactiveDiscoveryClient.getInstances(objectMeta.getName()).flatMap(si -> { + URI actuatorUri = getActuatorUri(si); + if (log.isDebugEnabled()) { + log.debug("Sending refresh request for " + objectMeta.getName() + " to URI " + actuatorUri.toString()); + } + Mono> response = webClient.post().uri(actuatorUri).retrieve().toBodilessEntity() + .doOnSuccess(re -> { + if (log.isDebugEnabled()) { + log.debug("Refresh sent to " + objectMeta.getName() + " at URI address " + actuatorUri + + " returned a " + re.getStatusCode().toString()); + } + }).doOnError(t -> { + log.warn("Refresh sent to " + objectMeta.getName() + " failed", t); + }); + return response; + }); } @Override diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetectorTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetectorTests.java index be8c3c46..5a38e2b0 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetectorTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigurationWatcherChangeDetectorTests.java @@ -76,11 +76,9 @@ public class BusEventBasedConfigurationWatcherChangeDetectorTests { ConfigReloadProperties configReloadProperties = new ConfigReloadProperties(); configurationWatcherConfigurationProperties = new ConfigurationWatcherConfigurationProperties(); busProperties = new BusProperties(); - changeDetector = new BusEventBasedConfigurationWatcherChangeDetector( - mockEnvironment, configReloadProperties, client, updateStrategy, - configMapPropertySourceLocator, secretsPropertySourceLocator, - busProperties, configurationWatcherConfigurationProperties, - threadPoolTaskExecutor); + changeDetector = new BusEventBasedConfigurationWatcherChangeDetector(mockEnvironment, configReloadProperties, + client, updateStrategy, configMapPropertySourceLocator, secretsPropertySourceLocator, busProperties, + configurationWatcherConfigurationProperties, threadPoolTaskExecutor); changeDetector.setApplicationEventPublisher(applicationEventPublisher); } @@ -95,8 +93,7 @@ public class BusEventBasedConfigurationWatcherChangeDetectorTests { .forClass(RefreshRemoteApplicationEvent.class); verify(applicationEventPublisher).publishEvent(argumentCaptor.capture()); assertThat(argumentCaptor.getValue().getSource()).isEqualTo(configMap); - assertThat(argumentCaptor.getValue().getOriginService()) - .isEqualTo(busProperties.getId()); + assertThat(argumentCaptor.getValue().getOriginService()).isEqualTo(busProperties.getId()); assertThat(argumentCaptor.getValue().getDestinationService()).isEqualTo("foo:**"); } @@ -111,8 +108,7 @@ public class BusEventBasedConfigurationWatcherChangeDetectorTests { .forClass(RefreshRemoteApplicationEvent.class); verify(applicationEventPublisher).publishEvent(argumentCaptor.capture()); assertThat(argumentCaptor.getValue().getSource()).isEqualTo(secret); - assertThat(argumentCaptor.getValue().getOriginService()) - .isEqualTo(busProperties.getId()); + assertThat(argumentCaptor.getValue().getOriginService()).isEqualTo(busProperties.getId()); assertThat(argumentCaptor.getValue().getDestinationService()).isEqualTo("foo:**"); } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetectorTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetectorTests.java index fc6bbb39..79857387 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetectorTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/HttpBasedConfigurationWatchChangeDetectorTests.java @@ -98,21 +98,18 @@ public class HttpBasedConfigurationWatchChangeDetectorTests { EndpointPort fooEndpointPort = new EndpointPort(); fooEndpointPort.setPort(wireMockRule.port()); List instances = new ArrayList<>(); - KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance( - "foo", "foo", fooEndpointAddress.getIp(), fooEndpointPort.getPort(), - new HashMap<>(), false); + KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance("foo", "foo", + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), new HashMap<>(), false); instances.add(fooServiceInstance); - when(reactiveDiscoveryClient.getInstances(eq("foo"))) - .thenReturn(Flux.fromIterable(instances)); + when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); MockEnvironment mockEnvironment = new MockEnvironment(); ConfigReloadProperties configReloadProperties = new ConfigReloadProperties(); configurationWatcherConfigurationProperties = new ConfigurationWatcherConfigurationProperties(); WebClient webClient = WebClient.builder().build(); - changeDetector = new HttpBasedConfigurationWatchChangeDetector(mockEnvironment, - configReloadProperties, client, updateStrategy, - configMapPropertySourceLocator, secretsPropertySourceLocator, - configurationWatcherConfigurationProperties, threadPoolTaskExecutor, - webClient, reactiveDiscoveryClient); + changeDetector = new HttpBasedConfigurationWatchChangeDetector(mockEnvironment, configReloadProperties, client, + updateStrategy, configMapPropertySourceLocator, secretsPropertySourceLocator, + configurationWatcherConfigurationProperties, threadPoolTaskExecutor, webClient, + reactiveDiscoveryClient); } @Test @@ -122,8 +119,7 @@ public class HttpBasedConfigurationWatchChangeDetectorTests { objectMeta.setName("foo"); configMap.setMetadata(objectMeta); WireMock.configureFor("localhost", wireMockRule.port()); - stubFor(post(WireMock.urlEqualTo("/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(configMap)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/actuator/refresh"))); } @@ -135,40 +131,33 @@ public class HttpBasedConfigurationWatchChangeDetectorTests { objectMeta.setName("foo"); secret.setMetadata(objectMeta); WireMock.configureFor("localhost", wireMockRule.port()); - stubFor(post(WireMock.urlEqualTo("/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(secret)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/actuator/refresh"))); } @Test - public void triggerConfigMapRefreshWithPropertiesBasedActuatorPath() - throws InterruptedException { - configurationWatcherConfigurationProperties - .setActuatorPath("/my/custom/actuator"); + public void triggerConfigMapRefreshWithPropertiesBasedActuatorPath() throws InterruptedException { + configurationWatcherConfigurationProperties.setActuatorPath("/my/custom/actuator"); ConfigMap configMap = new ConfigMap(); ObjectMeta objectMeta = new ObjectMeta(); objectMeta.setName("foo"); configMap.setMetadata(objectMeta); WireMock.configureFor("localhost", wireMockRule.port()); - stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(configMap)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/my/custom/actuator/refresh"))); } @Test - public void triggerSecretRefreshWithPropertiesBasedActuatorPath() - throws InterruptedException { - configurationWatcherConfigurationProperties - .setActuatorPath("/my/custom/actuator"); + public void triggerSecretRefreshWithPropertiesBasedActuatorPath() throws InterruptedException { + configurationWatcherConfigurationProperties.setActuatorPath("/my/custom/actuator"); Secret secret = new Secret(); ObjectMeta objectMeta = new ObjectMeta(); objectMeta.setName("foo"); secret.setMetadata(objectMeta); WireMock.configureFor("localhost", wireMockRule.port()); - stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(secret)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/my/custom/actuator/refresh"))); } @@ -176,26 +165,22 @@ public class HttpBasedConfigurationWatchChangeDetectorTests { @Test public void triggerConfigMapRefreshWithAnnotationActuatorPath() { Map metadata = new HashMap<>(); - metadata.put(ANNOTATION_KEY, - "http://:" + wireMockRule.port() + "/my/custom/actuator"); + metadata.put(ANNOTATION_KEY, "http://:" + wireMockRule.port() + "/my/custom/actuator"); EndpointAddress fooEndpointAddress = new EndpointAddress(); fooEndpointAddress.setIp("127.0.0.1"); fooEndpointAddress.setHostname("localhost"); EndpointPort fooEndpointPort = new EndpointPort(); fooEndpointPort.setPort(wireMockRule.port()); List instances = new ArrayList<>(); - KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance( - "foo", "foo", fooEndpointAddress.getIp(), fooEndpointPort.getPort(), - metadata, false); + KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance("foo", "foo", + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false); instances.add(fooServiceInstance); - when(reactiveDiscoveryClient.getInstances(eq("foo"))) - .thenReturn(Flux.fromIterable(instances)); + when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); ConfigMap configMap = new ConfigMap(); ObjectMeta objectMeta = new ObjectMeta(); objectMeta.setName("foo"); configMap.setMetadata(objectMeta); - stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(configMap)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/my/custom/actuator/refresh"))); } @@ -203,26 +188,22 @@ public class HttpBasedConfigurationWatchChangeDetectorTests { @Test public void triggerSecretRefreshWithAnnotationActuatorPath() { Map metadata = new HashMap<>(); - metadata.put(ANNOTATION_KEY, - "http://:" + wireMockRule.port() + "/my/custom/actuator"); + metadata.put(ANNOTATION_KEY, "http://:" + wireMockRule.port() + "/my/custom/actuator"); EndpointAddress fooEndpointAddress = new EndpointAddress(); fooEndpointAddress.setIp("127.0.0.1"); fooEndpointAddress.setHostname("localhost"); EndpointPort fooEndpointPort = new EndpointPort(); fooEndpointPort.setPort(wireMockRule.port()); List instances = new ArrayList<>(); - KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance( - "foo", "foo", fooEndpointAddress.getIp(), fooEndpointPort.getPort(), - metadata, false); + KubernetesServiceInstance fooServiceInstance = new KubernetesServiceInstance("foo", "foo", + fooEndpointAddress.getIp(), fooEndpointPort.getPort(), metadata, false); instances.add(fooServiceInstance); - when(reactiveDiscoveryClient.getInstances(eq("foo"))) - .thenReturn(Flux.fromIterable(instances)); + when(reactiveDiscoveryClient.getInstances(eq("foo"))).thenReturn(Flux.fromIterable(instances)); Secret secret = new Secret(); ObjectMeta objectMeta = new ObjectMeta(); objectMeta.setName("foo"); secret.setMetadata(objectMeta); - stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")) - .willReturn(aResponse().withStatus(200))); + stubFor(post(WireMock.urlEqualTo("/my/custom/actuator/refresh")).willReturn(aResponse().withStatus(200))); StepVerifier.create(changeDetector.triggerRefresh(secret)).verifyComplete(); verify(postRequestedFor(urlEqualTo("/my/custom/actuator/refresh"))); } diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java index 9ccdacd1..425e6b0f 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java @@ -76,65 +76,41 @@ public class KubernetesAutoConfiguration { @Bean @ConditionalOnMissingBean(Config.class) - public Config kubernetesClientConfig( - KubernetesClientProperties kubernetesClientProperties) { + public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClientProperties) { Config base = Config.autoConfigure(null); Config properties = new ConfigBuilder(base) // Only set values that have been explicitly specified - .withMasterUrl(or(kubernetesClientProperties.getMasterUrl(), - base.getMasterUrl())) - .withApiVersion(or(kubernetesClientProperties.getApiVersion(), - base.getApiVersion())) - .withNamespace(or(kubernetesClientProperties.getNamespace(), - base.getNamespace())) - .withUsername( - or(kubernetesClientProperties.getUsername(), base.getUsername())) - .withPassword( - or(kubernetesClientProperties.getPassword(), base.getPassword())) + .withMasterUrl(or(kubernetesClientProperties.getMasterUrl(), base.getMasterUrl())) + .withApiVersion(or(kubernetesClientProperties.getApiVersion(), base.getApiVersion())) + .withNamespace(or(kubernetesClientProperties.getNamespace(), base.getNamespace())) + .withUsername(or(kubernetesClientProperties.getUsername(), base.getUsername())) + .withPassword(or(kubernetesClientProperties.getPassword(), base.getPassword())) - .withCaCertFile(or(kubernetesClientProperties.getCaCertFile(), - base.getCaCertFile())) - .withCaCertData(or(kubernetesClientProperties.getCaCertData(), - base.getCaCertData())) + .withCaCertFile(or(kubernetesClientProperties.getCaCertFile(), base.getCaCertFile())) + .withCaCertData(or(kubernetesClientProperties.getCaCertData(), base.getCaCertData())) - .withClientKeyFile(or(kubernetesClientProperties.getClientKeyFile(), - base.getClientKeyFile())) - .withClientKeyData(or(kubernetesClientProperties.getClientKeyData(), - base.getClientKeyData())) + .withClientKeyFile(or(kubernetesClientProperties.getClientKeyFile(), base.getClientKeyFile())) + .withClientKeyData(or(kubernetesClientProperties.getClientKeyData(), base.getClientKeyData())) - .withClientCertFile(or(kubernetesClientProperties.getClientCertFile(), - base.getClientCertFile())) - .withClientCertData(or(kubernetesClientProperties.getClientCertData(), - base.getClientCertData())) + .withClientCertFile(or(kubernetesClientProperties.getClientCertFile(), base.getClientCertFile())) + .withClientCertData(or(kubernetesClientProperties.getClientCertData(), base.getClientCertData())) // No magic is done for the properties below so we leave them as is. - .withClientKeyAlgo(or(kubernetesClientProperties.getClientKeyAlgo(), - base.getClientKeyAlgo())) + .withClientKeyAlgo(or(kubernetesClientProperties.getClientKeyAlgo(), base.getClientKeyAlgo())) .withClientKeyPassphrase( - or(kubernetesClientProperties.getClientKeyPassphrase(), - base.getClientKeyPassphrase())) + or(kubernetesClientProperties.getClientKeyPassphrase(), base.getClientKeyPassphrase())) .withConnectionTimeout( - orDurationInt(kubernetesClientProperties.getConnectionTimeout(), - base.getConnectionTimeout())) + orDurationInt(kubernetesClientProperties.getConnectionTimeout(), base.getConnectionTimeout())) .withRequestTimeout( - orDurationInt(kubernetesClientProperties.getRequestTimeout(), - base.getRequestTimeout())) + orDurationInt(kubernetesClientProperties.getRequestTimeout(), base.getRequestTimeout())) .withRollingTimeout( - orDurationLong(kubernetesClientProperties.getRollingTimeout(), - base.getRollingTimeout())) - .withTrustCerts(or(kubernetesClientProperties.isTrustCerts(), - base.isTrustCerts())) - .withHttpProxy(or(kubernetesClientProperties.getHttpProxy(), - base.getHttpProxy())) - .withHttpsProxy(or(kubernetesClientProperties.getHttpsProxy(), - base.getHttpsProxy())) - .withProxyUsername(or(kubernetesClientProperties.getProxyUsername(), - base.getProxyUsername())) - .withProxyPassword(or(kubernetesClientProperties.getProxyPassword(), - base.getProxyPassword())) - .withNoProxy( - or(kubernetesClientProperties.getNoProxy(), base.getNoProxy())) - .build(); + orDurationLong(kubernetesClientProperties.getRollingTimeout(), base.getRollingTimeout())) + .withTrustCerts(or(kubernetesClientProperties.isTrustCerts(), base.isTrustCerts())) + .withHttpProxy(or(kubernetesClientProperties.getHttpProxy(), base.getHttpProxy())) + .withHttpsProxy(or(kubernetesClientProperties.getHttpsProxy(), base.getHttpsProxy())) + .withProxyUsername(or(kubernetesClientProperties.getProxyUsername(), base.getProxyUsername())) + .withProxyPassword(or(kubernetesClientProperties.getProxyPassword(), base.getProxyPassword())) + .withNoProxy(or(kubernetesClientProperties.getNoProxy(), base.getNoProxy())).build(); if (properties.getNamespace() == null || properties.getNamespace().isEmpty()) { LOG.warn("No namespace has been detected. Please specify " diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java index 85da8fae..8aef880e 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesHealthIndicator.java @@ -40,12 +40,10 @@ public class KubernetesHealthIndicator extends AbstractHealthIndicator { try { Pod current = this.utils.currentPod().get(); if (current != null) { - builder.up().withDetail("inside", true) - .withDetail("namespace", current.getMetadata().getNamespace()) + builder.up().withDetail("inside", true).withDetail("namespace", current.getMetadata().getNamespace()) .withDetail("podName", current.getMetadata().getName()) .withDetail("podIp", current.getStatus().getPodIP()) - .withDetail("serviceAccount", - current.getSpec().getServiceAccountName()) + .withDetail("serviceAccount", current.getSpec().getServiceAccountName()) .withDetail("nodeName", current.getSpec().getNodeName()) .withDetail("hostIp", current.getStatus().getHostIP()) .withDetail("labels", current.getMetadata().getLabels()); diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java index 1e68fc35..404283c0 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/StandardPodUtils.java @@ -47,8 +47,7 @@ public class StandardPodUtils implements PodUtils { public StandardPodUtils(KubernetesClient client) { if (client == null) { - throw new IllegalArgumentException( - "Must provide an instance of KubernetesClient"); + throw new IllegalArgumentException("Must provide an instance of KubernetesClient"); } this.client = client; @@ -76,10 +75,8 @@ public class StandardPodUtils implements PodUtils { } } catch (Throwable t) { - LOG.warn("Failed to get pod with name:[" + this.hostName - + "]. You should look into this if things aren't" - + " working as you expect. Are you missing serviceaccount permissions?", - t); + LOG.warn("Failed to get pod with name:[" + this.hostName + "]. You should look into this if things aren't" + + " working as you expect. Are you missing serviceaccount permissions?", t); return null; } } @@ -90,8 +87,7 @@ public class StandardPodUtils implements PodUtils { private boolean isServiceAccountFound() { return Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_TOKEN_PATH).toFile().exists() - && Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH).toFile() - .exists(); + && Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH).toFile().exists(); } } diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java index e2402e14..8c4070cd 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java @@ -28,11 +28,9 @@ import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; -public class KubernetesProfileEnvironmentPostProcessor - implements EnvironmentPostProcessor, Ordered { +public class KubernetesProfileEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { - private static final Log LOG = LogFactory - .getLog(KubernetesProfileEnvironmentPostProcessor.class); + private static final Log LOG = LogFactory.getLog(KubernetesProfileEnvironmentPostProcessor.class); // Before ConfigFileApplicationListener so values there can use these ones private static final int ORDER = ConfigFileApplicationListener.DEFAULT_ORDER - 1; @@ -40,11 +38,10 @@ public class KubernetesProfileEnvironmentPostProcessor private static final String KUBERNETES_PROFILE = "kubernetes"; @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - final boolean kubernetesEnabled = environment - .getProperty("spring.cloud.kubernetes.enabled", Boolean.class, true); + final boolean kubernetesEnabled = environment.getProperty("spring.cloud.kubernetes.enabled", Boolean.class, + true); if (!kubernetesEnabled) { return; } @@ -64,8 +61,7 @@ public class KubernetesProfileEnvironmentPostProcessor } else { if (LOG.isDebugEnabled()) { - LOG.warn( - "Not running inside kubernetes. Skipping 'kubernetes' profile activation."); + LOG.warn("Not running inside kubernetes. Skipping 'kubernetes' profile activation."); } } } diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorDisabledTest.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorDisabledTest.java index b239a497..91f7f11c 100644 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorDisabledTest.java +++ b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorDisabledTest.java @@ -36,8 +36,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "management.health.kubernetes.enabled=false" }) public class HealthIndicatorDisabledTest { @@ -57,20 +56,18 @@ public class HealthIndicatorDisabledTest { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); } @Test public void healthEndpointShouldContainKubernetes() { this.webClient.get().uri("http://localhost:{port}/actuator/health", this.port) - .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk() - .expectBody(String.class).value(not(containsString("kubernetes"))); + .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody(String.class) + .value(not(containsString("kubernetes"))); } } diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorTest.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorTest.java index 1bfbc4ed..46775655 100644 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorTest.java +++ b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/HealthIndicatorTest.java @@ -35,8 +35,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; import static org.hamcrest.Matchers.containsString; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "management.endpoint.health.show-details=always" }) public class HealthIndicatorTest { @@ -56,12 +55,10 @@ public class HealthIndicatorTest { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @@ -69,8 +66,8 @@ public class HealthIndicatorTest { @Test public void healthEndpointShouldContainKubernetes() { this.webClient.get().uri("http://localhost:{port}/actuator/health", this.port) - .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk() - .expectBody(String.class).value(containsString("kubernetes")); + .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody(String.class) + .value(containsString("kubernetes")); } } diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/InfoContributorTest.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/InfoContributorTest.java index afd4c2aa..79e7fdfa 100644 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/InfoContributorTest.java +++ b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/InfoContributorTest.java @@ -35,8 +35,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; import static org.hamcrest.Matchers.containsString; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class) public class InfoContributorTest { @ClassRule @@ -55,21 +54,18 @@ public class InfoContributorTest { mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @Test public void infoEndpointShouldContainKubernetes() { - this.webClient.get().uri("http://localhost:{port}/actuator/info", this.port) - .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk() - .expectBody(String.class).value(containsString("kubernetes")); + this.webClient.get().uri("http://localhost:{port}/actuator/info", this.port).accept(MediaType.APPLICATION_JSON) + .exchange().expectStatus().isOk().expectBody(String.class).value(containsString("kubernetes")); } } diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/KubernetesAutoConfigurationTests.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/KubernetesAutoConfigurationTests.java index 6edd151a..2f00210a 100644 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/KubernetesAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/KubernetesAutoConfigurationTests.java @@ -33,8 +33,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = App.class, +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = App.class, properties = { "spring.cloud.kubernetes.client.password=mypassword", "spring.cloud.kubernetes.client.proxy-password=myproxypassword" }) public class KubernetesAutoConfigurationTests { @@ -50,12 +49,10 @@ public class KubernetesAutoConfigurationTests { KubernetesClient mockClient = server.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @@ -65,10 +62,8 @@ public class KubernetesAutoConfigurationTests { assertThat(context.getBeanNamesForType(Config.class)).hasSize(1); assertThat(context.getBeanNamesForType(KubernetesClient.class)).hasSize(1); assertThat(context.getBeanNamesForType(StandardPodUtils.class)).hasSize(1); - assertThat(context.getBeanNamesForType(KubernetesHealthIndicator.class)) - .hasSize(1); - assertThat(context.getBeanNamesForType(KubernetesInfoContributor.class)) - .hasSize(1); + assertThat(context.getBeanNamesForType(KubernetesHealthIndicator.class)).hasSize(1); + assertThat(context.getBeanNamesForType(KubernetesInfoContributor.class)).hasSize(1); Config config = context.getBean(Config.class); assertThat(config.getPassword()).isEqualTo("mypassword"); diff --git a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/LazilyInstantiateTest.java b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/LazilyInstantiateTest.java index 71a3864c..b9caa520 100644 --- a/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/LazilyInstantiateTest.java +++ b/spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/LazilyInstantiateTest.java @@ -53,8 +53,7 @@ public class LazilyInstantiateTest { @Test public void factoryReturnsSingletonFromSupplier() { - LazilyInstantiate lazyStringFactory = LazilyInstantiate - .using(this.mockSupplier); + LazilyInstantiate lazyStringFactory = LazilyInstantiate.using(this.mockSupplier); String singletonString = lazyStringFactory.get(); // verify @@ -63,8 +62,7 @@ public class LazilyInstantiateTest { @Test public void factoryOnlyCallsSupplierOnce() { - LazilyInstantiate lazyStringFactory = LazilyInstantiate - .using(this.mockSupplier); + LazilyInstantiate lazyStringFactory = LazilyInstantiate.using(this.mockSupplier); lazyStringFactory.get(); // mock will throw exception if it is called more than once diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConditionalOnKubernetesDiscoveryEnabled.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConditionalOnKubernetesDiscoveryEnabled.java index 0bbdcbbc..3be47732 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConditionalOnKubernetesDiscoveryEnabled.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConditionalOnKubernetesDiscoveryEnabled.java @@ -36,8 +36,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@ConditionalOnProperty(value = "spring.cloud.kubernetes.discovery.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.kubernetes.discovery.enabled", matchIfMissing = true) public @interface ConditionalOnKubernetesDiscoveryEnabled { } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolver.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolver.java index 1631ebaf..a8a390fd 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolver.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolver.java @@ -35,8 +35,7 @@ import org.apache.commons.logging.LogFactory; */ class DefaultIsServicePortSecureResolver { - private static final Log log = LogFactory - .getLog(DefaultIsServicePortSecureResolver.class); + private static final Log log = LogFactory.getLog(DefaultIsServicePortSecureResolver.class); private static final Set TRUTHY_STRINGS = new HashSet() { { @@ -54,33 +53,27 @@ class DefaultIsServicePortSecureResolver { } boolean resolve(Input input) { - final String securedLabelValue = input.getServiceLabels().getOrDefault("secured", - "false"); + final String securedLabelValue = input.getServiceLabels().getOrDefault("secured", "false"); if (TRUTHY_STRINGS.contains(securedLabelValue)) { if (log.isDebugEnabled()) { - log.debug("Considering service with name: " + input.getServiceName() - + " and port " + input.getPort() + log.debug("Considering service with name: " + input.getServiceName() + " and port " + input.getPort() + " is secure since the service contains a true value for the 'secured' label"); } return true; } - final String securedAnnotationValue = input.getServiceAnnotations() - .getOrDefault("secured", "false"); + final String securedAnnotationValue = input.getServiceAnnotations().getOrDefault("secured", "false"); if (TRUTHY_STRINGS.contains(securedAnnotationValue)) { if (log.isDebugEnabled()) { - log.debug("Considering service with name: " + input.getServiceName() - + " and port " + input.getPort() + log.debug("Considering service with name: " + input.getServiceName() + " and port " + input.getPort() + " is secure since the service contains a true value for the 'secured' annotation"); } return true; } - if (input.getPort() != null - && this.properties.getKnownSecurePorts().contains(input.getPort())) { + if (input.getPort() != null && this.properties.getKnownSecurePorts().contains(input.getPort())) { if (log.isDebugEnabled()) { - log.debug("Considering service with name: " + input.getServiceName() - + " and port " + input.getPort() + log.debug("Considering service with name: " + input.getServiceName() + " and port " + input.getPort() + " is secure due to the port being a known https port"); } return true; @@ -109,8 +102,7 @@ class DefaultIsServicePortSecureResolver { this.port = port; this.serviceName = serviceName; this.serviceLabels = serviceLabels == null ? new HashMap<>() : serviceLabels; - this.serviceAnnotations = serviceAnnotations == null ? new HashMap<>() - : serviceAnnotations; + this.serviceAnnotations = serviceAnnotations == null ? new HashMap<>() : serviceAnnotations; } public String getServiceName() { diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatch.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatch.java index 416c5371..f3c79372 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatch.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatch.java @@ -40,8 +40,7 @@ import org.springframework.scheduling.annotation.Scheduled; */ public class KubernetesCatalogWatch implements ApplicationEventPublisherAware { - private static final Logger logger = LoggerFactory - .getLogger(KubernetesCatalogWatch.class); + private static final Logger logger = LoggerFactory.getLogger(KubernetesCatalogWatch.class); private final KubernetesClient kubernetesClient; @@ -51,8 +50,7 @@ public class KubernetesCatalogWatch implements ApplicationEventPublisherAware { private ApplicationEventPublisher publisher; - public KubernetesCatalogWatch(KubernetesClient kubernetesClient, - KubernetesDiscoveryProperties properties) { + public KubernetesCatalogWatch(KubernetesClient kubernetesClient, KubernetesDiscoveryProperties properties) { this.kubernetesClient = kubernetesClient; this.properties = properties; } @@ -62,8 +60,7 @@ public class KubernetesCatalogWatch implements ApplicationEventPublisherAware { this.publisher = publisher; } - @Scheduled( - fixedDelayString = "${spring.cloud.kubernetes.discovery.catalogServicesWatchDelay:30000}") + @Scheduled(fixedDelayString = "${spring.cloud.kubernetes.discovery.catalogServicesWatchDelay:30000}") public void catalogServicesWatch() { try { List previousState = this.catalogEndpointsState.get(); @@ -71,24 +68,21 @@ public class KubernetesCatalogWatch implements ApplicationEventPublisherAware { // not all pods participate in the service discovery. only those that have // endpoints. List endpoints = this.properties.isAllNamespaces() - ? this.kubernetesClient.endpoints().inAnyNamespace() - .withLabels(properties.getServiceLabels()).list().getItems() - : this.kubernetesClient.endpoints() - .withLabels(properties.getServiceLabels()).list().getItems(); - List endpointsPodNames = endpoints.stream().map(Endpoints::getSubsets) - .filter(Objects::nonNull).flatMap(Collection::stream) - .map(EndpointSubset::getAddresses).filter(Objects::nonNull) - .flatMap(Collection::stream).map(EndpointAddress::getTargetRef) - .filter(Objects::nonNull).map(ObjectReference::getName) // pod name - // unique in - // namespace + ? this.kubernetesClient.endpoints().inAnyNamespace().withLabels(properties.getServiceLabels()) + .list().getItems() + : this.kubernetesClient.endpoints().withLabels(properties.getServiceLabels()).list().getItems(); + List endpointsPodNames = endpoints.stream().map(Endpoints::getSubsets).filter(Objects::nonNull) + .flatMap(Collection::stream).map(EndpointSubset::getAddresses).filter(Objects::nonNull) + .flatMap(Collection::stream).map(EndpointAddress::getTargetRef).filter(Objects::nonNull) + .map(ObjectReference::getName) // pod name + // unique in + // namespace .sorted(String::compareTo).collect(Collectors.toList()); this.catalogEndpointsState.set(endpointsPodNames); if (!endpointsPodNames.equals(previousState)) { - logger.trace("Received endpoints update from kubernetesClient: {}", - endpointsPodNames); + logger.trace("Received endpoints update from kubernetesClient: {}", endpointsPodNames); this.publisher.publishEvent(new HeartbeatEvent(this, endpointsPodNames)); } } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java index c0cb2a5f..67521677 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfiguration.java @@ -39,8 +39,7 @@ public class KubernetesCatalogWatchAutoConfiguration { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty( - name = "spring.cloud.kubernetes.discovery.catalog-services-watch.enabled", + @ConditionalOnProperty(name = "spring.cloud.kubernetes.discovery.catalog-services-watch.enabled", matchIfMissing = true) public KubernetesCatalogWatch kubernetesCatalogWatch(KubernetesClient client, KubernetesDiscoveryProperties properties) { diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java index 3479a602..70db8717 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java @@ -60,8 +60,8 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { private final SpelExpressionParser parser = new SpelExpressionParser(); - private final SimpleEvaluationContext evalCtxt = SimpleEvaluationContext - .forReadOnlyDataBinding().withInstanceMethods().build(); + private final SimpleEvaluationContext evalCtxt = SimpleEvaluationContext.forReadOnlyDataBinding() + .withInstanceMethods().build(); private KubernetesClient client; @@ -73,8 +73,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { new DefaultIsServicePortSecureResolver(kubernetesDiscoveryProperties)); } - KubernetesDiscoveryClient(KubernetesClient client, - KubernetesDiscoveryProperties kubernetesDiscoveryProperties, + KubernetesDiscoveryClient(KubernetesClient client, KubernetesDiscoveryProperties kubernetesDiscoveryProperties, KubernetesClientServicesFunction kubernetesClientServicesFunction, DefaultIsServicePortSecureResolver isServicePortSecureResolver) { @@ -99,12 +98,10 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { @Override public List getInstances(String serviceId) { - Assert.notNull(serviceId, - "[Assertion failed] - the object argument must not be null"); + Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null"); List subsetsNS = this.getEndPointsList(serviceId).stream() - .map(endpoints -> getSubsetsFromEndpoints(endpoints)) - .collect(Collectors.toList()); + .map(endpoints -> getSubsetsFromEndpoints(endpoints)).collect(Collectors.toList()); List instances = new ArrayList<>(); if (!subsetsNS.isEmpty()) { @@ -118,24 +115,20 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { public List getEndPointsList(String serviceId) { return this.properties.isAllNamespaces() - ? this.client.endpoints().inAnyNamespace() - .withField("metadata.name", serviceId) + ? this.client.endpoints().inAnyNamespace().withField("metadata.name", serviceId) .withLabels(properties.getServiceLabels()).list().getItems() : this.client.endpoints().withField("metadata.name", serviceId) .withLabels(properties.getServiceLabels()).list().getItems(); } - private List getNamespaceServiceInstances(EndpointSubsetNS es, - String serviceId) { + private List getNamespaceServiceInstances(EndpointSubsetNS es, String serviceId) { String namespace = es.getNamespace(); List subsets = es.getEndpointSubset(); List instances = new ArrayList<>(); if (!subsets.isEmpty()) { - final Service service = this.client.services().inNamespace(namespace) - .withName(serviceId).get(); + final Service service = this.client.services().inNamespace(namespace).withName(serviceId).get(); final Map serviceMetadata = this.getServiceMetadata(service); - KubernetesDiscoveryProperties.Metadata metadataProps = this.properties - .getMetadata(); + KubernetesDiscoveryProperties.Metadata metadataProps = this.properties.getMetadata(); for (EndpointSubset s : subsets) { // Extend the service metadata map with per-endpoint port information (if @@ -144,10 +137,8 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { if (metadataProps.isAddPorts()) { Map ports = s.getPorts().stream() .filter(port -> !StringUtils.isEmpty(port.getName())) - .collect(toMap(EndpointPort::getName, - port -> Integer.toString(port.getPort()))); - Map portMetadata = getMapWithPrefixedKeys(ports, - metadataProps.getPortsPrefix()); + .collect(toMap(EndpointPort::getName, port -> Integer.toString(port.getPort()))); + Map portMetadata = getMapWithPrefixedKeys(ports, metadataProps.getPortsPrefix()); if (log.isDebugEnabled()) { log.debug("Adding port metadata: " + portMetadata); } @@ -166,15 +157,11 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { } EndpointPort endpointPort = findEndpointPort(s); - instances.add(new KubernetesServiceInstance(instanceId, serviceId, - endpointAddress.getIp(), endpointPort.getPort(), - endpointMetadata, - this.isServicePortSecureResolver - .resolve(new DefaultIsServicePortSecureResolver.Input( - endpointPort.getPort(), - service.getMetadata().getName(), - service.getMetadata().getLabels(), - service.getMetadata().getAnnotations())))); + instances.add(new KubernetesServiceInstance(instanceId, serviceId, endpointAddress.getIp(), + endpointPort.getPort(), endpointMetadata, + this.isServicePortSecureResolver.resolve(new DefaultIsServicePortSecureResolver.Input( + endpointPort.getPort(), service.getMetadata().getName(), + service.getMetadata().getLabels(), service.getMetadata().getAnnotations())))); } } } @@ -184,19 +171,17 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { private Map getServiceMetadata(Service service) { final Map serviceMetadata = new HashMap<>(); - KubernetesDiscoveryProperties.Metadata metadataProps = this.properties - .getMetadata(); + KubernetesDiscoveryProperties.Metadata metadataProps = this.properties.getMetadata(); if (metadataProps.isAddLabels()) { - Map labelMetadata = getMapWithPrefixedKeys( - service.getMetadata().getLabels(), metadataProps.getLabelsPrefix()); + Map labelMetadata = getMapWithPrefixedKeys(service.getMetadata().getLabels(), + metadataProps.getLabelsPrefix()); if (log.isDebugEnabled()) { log.debug("Adding label metadata: " + labelMetadata); } serviceMetadata.putAll(labelMetadata); } if (metadataProps.isAddAnnotations()) { - Map annotationMetadata = getMapWithPrefixedKeys( - service.getMetadata().getAnnotations(), + Map annotationMetadata = getMapWithPrefixedKeys(service.getMetadata().getAnnotations(), metadataProps.getAnnotationsPrefix()); if (log.isDebugEnabled()) { log.debug("Adding annotation metadata: " + annotationMetadata); @@ -216,14 +201,12 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { else { Predicate portPredicate; if (!StringUtils.isEmpty(properties.getPrimaryPortName())) { - portPredicate = port -> properties.getPrimaryPortName() - .equalsIgnoreCase(port.getName()); + portPredicate = port -> properties.getPrimaryPortName().equalsIgnoreCase(port.getName()); } else { portPredicate = port -> true; } - endpointPort = ports.stream().filter(portPredicate).findAny() - .orElseThrow(IllegalStateException::new); + endpointPort = ports.stream().filter(portPredicate).findAny().orElseThrow(IllegalStateException::new); } return endpointPort; } @@ -244,8 +227,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { // returns a new map that contain all the entries of the original map // but with the keys prefixed // if the prefix is null or empty, the map itself is returned (unchanged of course) - private Map getMapWithPrefixedKeys(Map map, - String prefix) { + private Map getMapWithPrefixedKeys(Map map, String prefix) { if (map == null) { return new HashMap<>(); } @@ -271,8 +253,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { else { Expression filterExpr = this.parser.parseExpression(spelExpression); filteredServices = (Service instance) -> { - Boolean include = filterExpr.getValue(this.evalCtxt, instance, - Boolean.class); + Boolean include = filterExpr.getValue(this.evalCtxt, instance, Boolean.class); if (include == null) { return false; } @@ -283,9 +264,8 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { } public List getServices(Predicate filter) { - return this.kubernetesClientServicesFunction.apply(this.client).list().getItems() - .stream().filter(filter).map(s -> s.getMetadata().getName()) - .collect(Collectors.toList()); + return this.kubernetesClientServicesFunction.apply(this.client).list().getItems().stream().filter(filter) + .map(s -> s.getMetadata().getName()).collect(Collectors.toList()); } @Override diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java index c6a4b774..6bc15592 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java @@ -41,21 +41,18 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @ConditionalOnDiscoveryEnabled @ConditionalOnKubernetesEnabled -@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, - CommonsClientAutoConfiguration.class }) +@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class }) @AutoConfigureAfter({ KubernetesAutoConfiguration.class }) public class KubernetesDiscoveryClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public DefaultIsServicePortSecureResolver isServicePortSecureResolver( - KubernetesDiscoveryProperties properties) { + public DefaultIsServicePortSecureResolver isServicePortSecureResolver(KubernetesDiscoveryProperties properties) { return new DefaultIsServicePortSecureResolver(properties); } @Bean - public KubernetesClientServicesFunction servicesFunction( - KubernetesDiscoveryProperties properties) { + public KubernetesClientServicesFunction servicesFunction(KubernetesDiscoveryProperties properties) { if (properties.getServiceLabels().isEmpty()) { if (properties.isAllNamespaces()) { return (client) -> client.services().inAnyNamespace(); @@ -66,12 +63,10 @@ public class KubernetesDiscoveryClientAutoConfiguration { } else { if (properties.isAllNamespaces()) { - return (client) -> client.services().inAnyNamespace() - .withLabels(properties.getServiceLabels()); + return (client) -> client.services().inAnyNamespace().withLabels(properties.getServiceLabels()); } else { - return (client) -> client.services() - .withLabels(properties.getServiceLabels()); + return (client) -> client.services().withLabels(properties.getServiceLabels()); } } } @@ -82,8 +77,7 @@ public class KubernetesDiscoveryClientAutoConfiguration { } @Bean - public KubernetesRegistration getRegistration(KubernetesClient client, - KubernetesDiscoveryProperties properties) { + public KubernetesRegistration getRegistration(KubernetesClient client, KubernetesDiscoveryProperties properties) { return new KubernetesRegistration(client, properties); } @@ -99,12 +93,12 @@ public class KubernetesDiscoveryClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public KubernetesDiscoveryClient kubernetesDiscoveryClient( - KubernetesClient client, KubernetesDiscoveryProperties properties, + public KubernetesDiscoveryClient kubernetesDiscoveryClient(KubernetesClient client, + KubernetesDiscoveryProperties properties, KubernetesClientServicesFunction kubernetesClientServicesFunction, DefaultIsServicePortSecureResolver isServicePortSecureResolver) { - return new KubernetesDiscoveryClient(client, properties, - kubernetesClientServicesFunction, isServicePortSecureResolver); + return new KubernetesDiscoveryClient(client, properties, kubernetesClientServicesFunction, + isServicePortSecureResolver); } } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java index 16d20225..c3a9044a 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java @@ -28,8 +28,7 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty("spring.cloud.config.discovery.enabled") -@Import({ KubernetesAutoConfiguration.class, - KubernetesDiscoveryClientAutoConfiguration.class }) +@Import({ KubernetesAutoConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class }) public class KubernetesDiscoveryClientConfigClientBootstrapConfiguration { } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java index 6d7a2f20..c3d2bf4a 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryProperties.java @@ -148,11 +148,9 @@ public class KubernetesDiscoveryProperties { @Override public String toString() { - return new ToStringCreator(this).append("enabled", this.enabled) - .append("serviceName", this.serviceName).append("filter", this.filter) - .append("knownSecurePorts", this.knownSecurePorts) - .append("serviceLabels", this.serviceLabels) - .append("metadata", this.metadata).toString(); + return new ToStringCreator(this).append("enabled", this.enabled).append("serviceName", this.serviceName) + .append("filter", this.filter).append("knownSecurePorts", this.knownSecurePorts) + .append("serviceLabels", this.serviceLabels).append("metadata", this.metadata).toString(); } /** @@ -247,10 +245,8 @@ public class KubernetesDiscoveryProperties { @Override public String toString() { return new ToStringCreator(this).append("addLabels", this.addLabels) - .append("labelsPrefix", this.labelsPrefix) - .append("addAnnotations", this.addAnnotations) - .append("annotationsPrefix", this.annotationsPrefix) - .append("addPorts", this.addPorts) + .append("labelsPrefix", this.labelsPrefix).append("addAnnotations", this.addAnnotations) + .append("annotationsPrefix", this.annotationsPrefix).append("addPorts", this.addPorts) .append("portsPrefix", this.portsPrefix).toString(); } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java index 28043269..c48b8316 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstance.java @@ -63,8 +63,8 @@ public class KubernetesServiceInstance implements ServiceInstance { * @param metadata a map containing metadata. * @param secure indicates whether or not the connection needs to be secure. */ - public KubernetesServiceInstance(String instanceId, String serviceId, String host, - int port, Map metadata, Boolean secure) { + public KubernetesServiceInstance(String instanceId, String serviceId, String host, int port, + Map metadata, Boolean secure) { this.instanceId = instanceId; this.serviceId = serviceId; this.host = host; @@ -115,8 +115,7 @@ public class KubernetesServiceInstance implements ServiceInstance { private URI createUri(String scheme, String host, int port) { StringBuilder sb = new StringBuilder(); - sb.append(scheme).append(COLON).append(DSL).append(host).append(COLON) - .append(port); + sb.append(scheme).append(COLON).append(DSL).append(host).append(COLON).append(port); return URI.create(sb.toString()); } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClient.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClient.java index 039ca1ee..c3f9f8ab 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClient.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClient.java @@ -37,8 +37,7 @@ public class KubernetesReactiveDiscoveryClient implements ReactiveDiscoveryClien private final KubernetesDiscoveryClient kubernetesDiscoveryClient; - public KubernetesReactiveDiscoveryClient(KubernetesClient client, - KubernetesDiscoveryProperties properties, + public KubernetesReactiveDiscoveryClient(KubernetesClient client, KubernetesDiscoveryProperties properties, KubernetesClientServicesFunction kubernetesClientServicesFunction) { this.kubernetesDiscoveryClient = new KubernetesDiscoveryClient(client, properties, kubernetesClientServicesFunction); @@ -51,18 +50,14 @@ public class KubernetesReactiveDiscoveryClient implements ReactiveDiscoveryClien @Override public Flux getInstances(String serviceId) { - Assert.notNull(serviceId, - "[Assertion failed] - the object argument must not be null"); - return Flux - .defer(() -> Flux - .fromIterable(kubernetesDiscoveryClient.getInstances(serviceId))) + Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null"); + return Flux.defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getInstances(serviceId))) .subscribeOn(Schedulers.boundedElastic()); } @Override public Flux getServices() { - return Flux - .defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getServices())) + return Flux.defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getServices())) .subscribeOn(Schedulers.boundedElastic()); } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java index 55eba6e4..7546c000 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfiguration.java @@ -56,20 +56,17 @@ public class KubernetesReactiveDiscoveryClientAutoConfiguration { @Bean @ConditionalOnMissingBean - public KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient( - KubernetesClient client, KubernetesDiscoveryProperties properties, + public KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(KubernetesClient client, + KubernetesDiscoveryProperties properties, KubernetesClientServicesFunction kubernetesClientServicesFunction) { - return new KubernetesReactiveDiscoveryClient(client, properties, - kubernetesClientServicesFunction); + return new KubernetesReactiveDiscoveryClient(client, properties, kubernetesClientServicesFunction); } @Bean - @ConditionalOnClass( - name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator") + @ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator") @ConditionalOnDiscoveryHealthIndicatorEnabled public ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator( - KubernetesReactiveDiscoveryClient client, - DiscoveryClientHealthIndicatorProperties properties) { + KubernetesReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties) { return new ReactiveDiscoveryClientHealthIndicator(client, properties); } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesAutoServiceRegistration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesAutoServiceRegistration.java index fc89dc75..24388eec 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesAutoServiceRegistration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesAutoServiceRegistration.java @@ -38,11 +38,9 @@ import org.springframework.core.Ordered; */ @Deprecated // TODO Remove this class in 2.x as it is not used or necessary in Kubernetes -public class KubernetesAutoServiceRegistration - implements AutoServiceRegistration, SmartLifecycle, Ordered { +public class KubernetesAutoServiceRegistration implements AutoServiceRegistration, SmartLifecycle, Ordered { - private static final Log log = LogFactory - .getLog(KubernetesAutoServiceRegistration.class); + private static final Log log = LogFactory.getLog(KubernetesAutoServiceRegistration.class); private AtomicBoolean running = new AtomicBoolean(false); @@ -56,8 +54,7 @@ public class KubernetesAutoServiceRegistration private KubernetesRegistration registration; - public KubernetesAutoServiceRegistration(ApplicationContext context, - KubernetesServiceRegistry serviceRegistry, + public KubernetesAutoServiceRegistration(ApplicationContext context, KubernetesServiceRegistry serviceRegistry, KubernetesRegistration registration) { this.context = context; this.serviceRegistry = serviceRegistry; @@ -79,8 +76,7 @@ public class KubernetesAutoServiceRegistration public void start() { this.serviceRegistry.register(this.registration); - this.context.publishEvent( - new InstanceRegisteredEvent<>(this, this.registration.getProperties())); + this.context.publishEvent(new InstanceRegisteredEvent<>(this, this.registration.getProperties())); this.running.set(true); } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesRegistration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesRegistration.java index ef677725..aef1bb19 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesRegistration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesRegistration.java @@ -41,8 +41,7 @@ public class KubernetesRegistration implements Registration, Closeable { private AtomicBoolean running = new AtomicBoolean(false); - public KubernetesRegistration(KubernetesClient client, - KubernetesDiscoveryProperties properties) { + public KubernetesRegistration(KubernetesClient client, KubernetesDiscoveryProperties properties) { this.client = client; this.properties = properties; } @@ -94,8 +93,8 @@ public class KubernetesRegistration implements Registration, Closeable { @Override public String toString() { - return "KubernetesRegistration{" + "client=" + this.client + ", properties=" - + this.properties + ", running=" + this.running + '}'; + return "KubernetesRegistration{" + "client=" + this.client + ", properties=" + this.properties + ", running=" + + this.running + '}'; } } diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesServiceRegistry.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesServiceRegistry.java index 1bc5c8aa..d2266953 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesServiceRegistry.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/registry/KubernetesServiceRegistry.java @@ -26,8 +26,7 @@ import org.springframework.cloud.client.serviceregistry.ServiceRegistry; * * @author Mauricio Salatino */ -public class KubernetesServiceRegistry - implements ServiceRegistry { +public class KubernetesServiceRegistry implements ServiceRegistry { private static final Log log = LogFactory.getLog(KubernetesServiceRegistry.class); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolverTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolverTest.java index 49e939b8..aa77c28c 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolverTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/DefaultIsServicePortSecureResolverTest.java @@ -29,28 +29,15 @@ public class DefaultIsServicePortSecureResolverTest { final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.getKnownSecurePorts().add(12345); - final DefaultIsServicePortSecureResolver sut = new DefaultIsServicePortSecureResolver( - properties); + final DefaultIsServicePortSecureResolver sut = new DefaultIsServicePortSecureResolver(properties); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(null, "dummy"))) - .isFalse(); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(8080, "dummy"))) - .isFalse(); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(1234, "dummy"))) - .isFalse(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(null, "dummy"))).isFalse(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(8080, "dummy"))).isFalse(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(1234, "dummy"))).isFalse(); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(443, "dummy"))) - .isTrue(); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(8443, "dummy"))) - .isTrue(); - assertThat( - sut.resolve(new DefaultIsServicePortSecureResolver.Input(12345, "dummy"))) - .isTrue(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(443, "dummy"))).isTrue(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(8443, "dummy"))).isTrue(); + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(12345, "dummy"))).isTrue(); } @Test @@ -58,22 +45,22 @@ public class DefaultIsServicePortSecureResolverTest { final DefaultIsServicePortSecureResolver sut = new DefaultIsServicePortSecureResolver( new KubernetesDiscoveryProperties()); - assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(8080, "dummy", - new HashMap() { + assertThat( + sut.resolve(new DefaultIsServicePortSecureResolver.Input(8080, "dummy", new HashMap() { { put("secured", "true"); put("other", "value"); } }, new HashMap<>()))).isTrue(); - assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(1234, "dummy", - new HashMap() { + assertThat( + sut.resolve(new DefaultIsServicePortSecureResolver.Input(1234, "dummy", new HashMap() { { put("other", "value"); put("secured", "1"); } }, new HashMap<>()))).isTrue(); - assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(4321, "dummy", - new HashMap<>(), new HashMap() { + assertThat(sut.resolve(new DefaultIsServicePortSecureResolver.Input(4321, "dummy", new HashMap<>(), + new HashMap() { { put("other1", "value1"); put("secured", "yes"); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java index 20fa5725..9c86adc4 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogServicesWatchConfigurationTest.java @@ -70,12 +70,9 @@ public class KubernetesCatalogServicesWatchConfigurationTest { } private void setup(String... env) { - this.context = new SpringApplicationBuilder( - PropertyPlaceholderAutoConfiguration.class, - KubernetesClientTestConfiguration.class, - KubernetesCatalogWatchAutoConfiguration.class, - KubernetesDiscoveryClientAutoConfiguration.class) - .web(WebApplicationType.NONE).properties(env).run(); + this.context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class, + KubernetesClientTestConfiguration.class, KubernetesCatalogWatchAutoConfiguration.class, + KubernetesDiscoveryClientAutoConfiguration.class).web(WebApplicationType.NONE).properties(env).run(); } @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTest.java index 19075075..b97bad97 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchTest.java @@ -84,13 +84,10 @@ public class KubernetesCatalogWatchTest { @Test public void testRandomOrderChangePods() throws Exception { when(this.endpointsOperation.list()) - .thenReturn( - createSingleEndpointEndpointListByPodName("api-pod", "other-pod")) - .thenReturn(createSingleEndpointEndpointListByPodName("other-pod", - "api-pod")); + .thenReturn(createSingleEndpointEndpointListByPodName("api-pod", "other-pod")) + .thenReturn(createSingleEndpointEndpointListByPodName("other-pod", "api-pod")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); // second execution on shuffleServices @@ -102,13 +99,10 @@ public class KubernetesCatalogWatchTest { @Test public void testRandomOrderChangePodsAllNamespaces() throws Exception { when(this.endpointsOperation.list()) - .thenReturn( - createSingleEndpointEndpointListByPodName("api-pod", "other-pod")) - .thenReturn(createSingleEndpointEndpointListByPodName("other-pod", - "api-pod")); + .thenReturn(createSingleEndpointEndpointListByPodName("api-pod", "other-pod")) + .thenReturn(createSingleEndpointEndpointListByPodName("other-pod", "api-pod")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); @@ -122,13 +116,10 @@ public class KubernetesCatalogWatchTest { @Test public void testRandomOrderChangeServices() throws Exception { when(this.endpointsOperation.list()) - .thenReturn( - createEndpointsListByServiceName("api-service", "other-service")) - .thenReturn( - createEndpointsListByServiceName("other-service", "api-service")); + .thenReturn(createEndpointsListByServiceName("api-service", "other-service")) + .thenReturn(createEndpointsListByServiceName("other-service", "api-service")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); // second execution on shuffleServices @@ -140,13 +131,10 @@ public class KubernetesCatalogWatchTest { @Test public void testRandomOrderChangeServicesAllNamespaces() throws Exception { when(this.endpointsOperation.list()) - .thenReturn( - createEndpointsListByServiceName("api-service", "other-service")) - .thenReturn( - createEndpointsListByServiceName("other-service", "api-service")); + .thenReturn(createEndpointsListByServiceName("api-service", "other-service")) + .thenReturn(createEndpointsListByServiceName("other-service", "api-service")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); @@ -159,16 +147,14 @@ public class KubernetesCatalogWatchTest { @Test public void testEventBody() throws Exception { - when(this.endpointsOperation.list()).thenReturn( - createSingleEndpointEndpointListByPodName("api-pod", "other-pod")); + when(this.endpointsOperation.list()) + .thenReturn(createSingleEndpointEndpointListByPodName("api-pod", "other-pod")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); - verify(this.applicationEventPublisher) - .publishEvent(this.heartbeatEventArgumentCaptor.capture()); + verify(this.applicationEventPublisher).publishEvent(this.heartbeatEventArgumentCaptor.capture()); HeartbeatEvent event = this.heartbeatEventArgumentCaptor.getValue(); assertThat(event.getValue()).isInstanceOf(List.class); @@ -179,18 +165,16 @@ public class KubernetesCatalogWatchTest { @Test public void testEventBodyAllNamespaces() throws Exception { - when(this.endpointsOperation.list()).thenReturn( - createSingleEndpointEndpointListByPodName("api-pod", "other-pod")); + when(this.endpointsOperation.list()) + .thenReturn(createSingleEndpointEndpointListByPodName("api-pod", "other-pod")); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); - verify(this.applicationEventPublisher) - .publishEvent(this.heartbeatEventArgumentCaptor.capture()); + verify(this.applicationEventPublisher).publishEvent(this.heartbeatEventArgumentCaptor.capture()); HeartbeatEvent event = this.heartbeatEventArgumentCaptor.getValue(); assertThat(event.getValue()).isInstanceOf(List.class); @@ -206,8 +190,7 @@ public class KubernetesCatalogWatchTest { when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); // second execution on shuffleServices @@ -223,8 +206,7 @@ public class KubernetesCatalogWatchTest { when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); @@ -243,8 +225,7 @@ public class KubernetesCatalogWatchTest { when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); // second execution on shuffleServices @@ -261,8 +242,7 @@ public class KubernetesCatalogWatchTest { when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); @@ -277,13 +257,11 @@ public class KubernetesCatalogWatchTest { public void testEndpointsWithoutTargetRefs() { EndpointsList endpoints = createSingleEndpointEndpointListByPodName("api-pod"); - endpoints.getItems().get(0).getSubsets().get(0).getAddresses().get(0) - .setTargetRef(null); + endpoints.getItems().get(0).getSubsets().get(0).getAddresses().get(0).setTargetRef(null); when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().withLabels(anyMap())) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().withLabels(anyMap())).thenReturn(this.endpointsOperation); this.underTest.catalogServicesWatch(); // second execution on shuffleServices @@ -296,13 +274,11 @@ public class KubernetesCatalogWatchTest { public void testEndpointsWithoutTargetRefsAllNamespaces() { EndpointsList endpoints = createSingleEndpointEndpointListByPodName("api-pod"); - endpoints.getItems().get(0).getSubsets().get(0).getAddresses().get(0) - .setTargetRef(null); + endpoints.getItems().get(0).getSubsets().get(0).getAddresses().get(0).setTargetRef(null); when(this.endpointsOperation.list()).thenReturn(endpoints); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - when(this.kubernetesClient.endpoints().inAnyNamespace()) - .thenReturn(this.endpointsOperation); + when(this.kubernetesClient.endpoints().inAnyNamespace()).thenReturn(this.endpointsOperation); when(this.kubernetesClient.endpoints().inAnyNamespace().withLabels(anyMap())) .thenReturn(this.endpointsOperation); @@ -314,8 +290,7 @@ public class KubernetesCatalogWatchTest { } private EndpointsList createEndpointsListByServiceName(String... serviceNames) { - List endpoints = stream(serviceNames) - .map(s -> createEndpointsByPodName(s + "-singlePodUniqueId")) + List endpoints = stream(serviceNames).map(s -> createEndpointsByPodName(s + "-singlePodUniqueId")) .collect(Collectors.toList()); EndpointsList endpointsList = new EndpointsList(); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java index c3732d60..b74559be 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationPropertiesTests.java @@ -48,38 +48,31 @@ public class KubernetesDiscoveryClientAutoConfigurationPropertiesTests { public void kubernetesDiscoveryDisabled() throws Exception { setup("spring.cloud.kubernetes.discovery.enabled=false", "spring.cloud.kubernetes.discovery.catalog-services-watch.enabled=false"); - assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)) - .isEmpty(); + assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)).isEmpty(); } @Test public void kubernetesDiscoveryWhenKubernetesDisabled() throws Exception { setup("spring.cloud.kubernetes.enabled=false"); - assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)) - .isEmpty(); + assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)).isEmpty(); } @Test public void kubernetesDiscoveryWhenDiscoveryDisabled() throws Exception { setup("spring.cloud.discovery.enabled=false"); - assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)) - .isEmpty(); + assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)).isEmpty(); } @Test public void kubernetesDiscoveryDefaultEnabled() throws Exception { setup("spring.cloud.kubernetes.enabled=true"); - assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)) - .hasSize(1); + assertThat(this.context.getBeanNamesForType(KubernetesDiscoveryClient.class)).hasSize(1); } private void setup(String... env) { - this.context = new SpringApplicationBuilder( - PropertyPlaceholderAutoConfiguration.class, - KubernetesClientTestConfiguration.class, - KubernetesDiscoveryClientAutoConfiguration.class) - .web(org.springframework.boot.WebApplicationType.NONE) - .properties(env).run(); + this.context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class, + KubernetesClientTestConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class) + .web(org.springframework.boot.WebApplicationType.NONE).properties(env).run(); } @Configuration(proxyBeanMethods = false) diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java index 1f8a1b3b..1bbb4af5 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java @@ -39,12 +39,11 @@ public class KubernetesDiscoveryClientAutoConfigurationTests { @Test public void kubernetesDiscoveryClientCreated() { - assertThat(this.discoveryClient).isNotNull() - .isInstanceOf(CompositeDiscoveryClient.class); + assertThat(this.discoveryClient).isNotNull().isInstanceOf(CompositeDiscoveryClient.class); CompositeDiscoveryClient composite = (CompositeDiscoveryClient) this.discoveryClient; - assertThat(composite.getDiscoveryClients().stream() - .anyMatch(dc -> dc instanceof KubernetesDiscoveryClient)).isTrue(); + assertThat(composite.getDiscoveryClients().stream().anyMatch(dc -> dc instanceof KubernetesDiscoveryClient)) + .isTrue(); } @SpringBootConfiguration diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java index 61ef0d99..dbf8ce6d 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java @@ -60,31 +60,25 @@ public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests { @Test public void onWhenRequested() throws Exception { setup("server.port=7000", "spring.cloud.config.discovery.enabled=true", - "spring.cloud.kubernetes.discovery.enabled:true", - "spring.cloud.kubernetes.enabled:true", "spring.application.name:test", - "spring.cloud.config.discovery.service-id:configserver"); - assertEquals(1, this.context.getParent() - .getBeanNamesForType(DiscoveryClient.class).length); + "spring.cloud.kubernetes.discovery.enabled:true", "spring.cloud.kubernetes.enabled:true", + "spring.application.name:test", "spring.cloud.config.discovery.service-id:configserver"); + assertEquals(1, this.context.getParent().getBeanNamesForType(DiscoveryClient.class).length); DiscoveryClient client = this.context.getParent().getBean(DiscoveryClient.class); verify(client, atLeast(2)).getInstances("configserver"); - ConfigClientProperties locator = this.context - .getBean(ConfigClientProperties.class); + ConfigClientProperties locator = this.context.getBean(ConfigClientProperties.class); assertEquals("http://fake:8888/", locator.getUri()[0]); } private void setup(String... env) { AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(); TestPropertyValues.of(env).applyTo(parent); - parent.register(UtilAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, EnvironmentKnobbler.class, - KubernetesDiscoveryClientConfigClientBootstrapConfiguration.class, - DiscoveryClientConfigServiceBootstrapConfiguration.class, - ConfigClientProperties.class); + parent.register(UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, + EnvironmentKnobbler.class, KubernetesDiscoveryClientConfigClientBootstrapConfiguration.class, + DiscoveryClientConfigServiceBootstrapConfiguration.class, ConfigClientProperties.class); parent.refresh(); this.context = new AnnotationConfigApplicationContext(); this.context.setParent(parent); - this.context.register(PropertyPlaceholderAutoConfiguration.class, - KubernetesAutoConfiguration.class, + this.context.register(PropertyPlaceholderAutoConfiguration.class, KubernetesAutoConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class); this.context.refresh(); } @@ -95,10 +89,8 @@ public class KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests { @Bean public KubernetesDiscoveryClient kubernetesDiscoveryClient() { KubernetesDiscoveryClient client = mock(KubernetesDiscoveryClient.class); - ServiceInstance instance = new DefaultServiceInstance("configserver1", - "configserver", "fake", 8888, false); - given(client.getInstances("configserver")) - .willReturn(Collections.singletonList(instance)); + ServiceInstance instance = new DefaultServiceInstance("configserver1", "configserver", "fake", 8888, false); + given(client.getInstances("configserver")).willReturn(Collections.singletonList(instance)); return client; } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterMetadataTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterMetadataTest.java index c001699b..6f9c7fae 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterMetadataTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterMetadataTest.java @@ -100,21 +100,20 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddAnnotations()).thenReturn(false); when(this.metadata.isAddPorts()).thenReturn(false); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "lab"); - } - }, new HashMap() { - { - put("l1", "lab"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "lab"); + } + }, new HashMap() { + { + put("l1", "lab"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); @@ -130,27 +129,25 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddAnnotations()).thenReturn(false); when(this.metadata.isAddPorts()).thenReturn(false); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - put("l2", "v2"); - } - }, new HashMap() { - { - put("l1", "lab"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + put("l2", "v2"); + } + }, new HashMap() { + { + put("l1", "lab"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0).getMetadata()).containsOnly(entry("l1", "v1"), - entry("l2", "v2")); + assertThat(instances.get(0).getMetadata()).containsOnly(entry("l1", "v1"), entry("l2", "v2")); } @Test @@ -163,27 +160,25 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddAnnotations()).thenReturn(false); when(this.metadata.isAddPorts()).thenReturn(false); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - put("l2", "v2"); - } - }, new HashMap() { - { - put("l1", "lab"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + put("l2", "v2"); + } + }, new HashMap() { + { + put("l1", "lab"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0).getMetadata()).containsOnly(entry("l_l1", "v1"), - entry("l_l2", "v2")); + assertThat(instances.get(0).getMetadata()).containsOnly(entry("l_l1", "v1"), entry("l_l2", "v2")); } @Test @@ -195,27 +190,25 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddAnnotations()).thenReturn(true); when(this.metadata.isAddPorts()).thenReturn(false); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - } - }, new HashMap() { - { - put("a1", "v1"); - put("a2", "v2"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + } + }, new HashMap() { + { + put("a1", "v1"); + put("a2", "v2"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0).getMetadata()).containsOnly(entry("a1", "v1"), - entry("a2", "v2")); + assertThat(instances.get(0).getMetadata()).containsOnly(entry("a1", "v1"), entry("a2", "v2")); } @Test @@ -228,27 +221,25 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.getAnnotationsPrefix()).thenReturn("a_"); when(this.metadata.isAddPorts()).thenReturn(false); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - } - }, new HashMap() { - { - put("a1", "v1"); - put("a2", "v2"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + } + }, new HashMap() { + { + put("a1", "v1"); + put("a2", "v2"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0).getMetadata()).containsOnly(entry("a_a1", "v1"), - entry("a_a2", "v2")); + assertThat(instances.get(0).getMetadata()).containsOnly(entry("a_a1", "v1"), entry("a_a2", "v2")); } @Test @@ -260,22 +251,21 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddAnnotations()).thenReturn(false); when(this.metadata.isAddPorts()).thenReturn(true); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - } - }, new HashMap() { - { - put("a1", "v1"); - put("a2", "v2"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + } + }, new HashMap() { + { + put("a1", "v1"); + put("a2", "v2"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); @@ -292,22 +282,21 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddPorts()).thenReturn(true); when(this.metadata.getPortsPrefix()).thenReturn("p_"); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "v1"); - } - }, new HashMap() { - { - put("a1", "v1"); - put("a2", "v2"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "v1"); + } + }, new HashMap() { + { + put("a1", "v1"); + put("a2", "v2"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); @@ -326,58 +315,51 @@ public class KubernetesDiscoveryClientFilterMetadataTest { when(this.metadata.isAddPorts()).thenReturn(true); when(this.metadata.getPortsPrefix()).thenReturn("p_"); - setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", - new HashMap() { - { - put("l1", "la1"); - } - }, new HashMap() { - { - put("a1", "an1"); - put("a2", "an2"); - } - }, new HashMap() { - { - put(80, "http"); - put(5555, ""); - } - }); + setupServiceWithLabelsAndAnnotationsAndPorts(serviceId, "ns", new HashMap() { + { + put("l1", "la1"); + } + }, new HashMap() { + { + put("a1", "an1"); + put("a2", "an2"); + } + }, new HashMap() { + { + put(80, "http"); + put(5555, ""); + } + }); final List instances = this.underTest.getInstances(serviceId); assertThat(instances).hasSize(1); - assertThat(instances.get(0).getMetadata()).containsOnly(entry("a_a1", "an1"), - entry("a_a2", "an2"), entry("l_l1", "la1"), entry("p_http", "80")); + assertThat(instances.get(0).getMetadata()).containsOnly(entry("a_a1", "an1"), entry("a_a2", "an2"), + entry("l_l1", "la1"), entry("p_http", "80")); } - private void setupServiceWithLabelsAndAnnotationsAndPorts(String serviceId, - String namespace, Map labels, Map annotations, - Map ports) { - final Service service = new ServiceBuilder().withNewMetadata() - .withNamespace(namespace).withLabels(labels).withAnnotations(annotations) - .endMetadata().withNewSpec().withPorts(getServicePorts(ports)).endSpec() + private void setupServiceWithLabelsAndAnnotationsAndPorts(String serviceId, String namespace, + Map labels, Map annotations, Map ports) { + final Service service = new ServiceBuilder().withNewMetadata().withNamespace(namespace).withLabels(labels) + .withAnnotations(annotations).endMetadata().withNewSpec().withPorts(getServicePorts(ports)).endSpec() .build(); when(this.serviceOperation.withName(serviceId)).thenReturn(this.serviceResource); when(this.serviceResource.get()).thenReturn(service); when(this.kubernetesClient.services()).thenReturn(this.serviceOperation); - when(this.kubernetesClient.services().inNamespace(anyString())) - .thenReturn(this.serviceOperation); + when(this.kubernetesClient.services().inNamespace(anyString())).thenReturn(this.serviceOperation); ObjectMeta objectMeta = new ObjectMeta(); objectMeta.setNamespace(namespace); - final Endpoints endpoints = new EndpointsBuilder().withMetadata(objectMeta) - .addNewSubset().addAllToPorts(getEndpointPorts(ports)).addNewAddress() - .endAddress().endSubset().build(); + final Endpoints endpoints = new EndpointsBuilder().withMetadata(objectMeta).addNewSubset() + .addAllToPorts(getEndpointPorts(ports)).addNewAddress().endAddress().endSubset().build(); when(this.kubernetesClient.endpoints()).thenReturn(this.endpointsOperation); - EndpointsList endpointsList = new EndpointsList(null, - Collections.singletonList(endpoints), null, null); + EndpointsList endpointsList = new EndpointsList(null, Collections.singletonList(endpoints), null, null); when(filter.list()).thenReturn(endpointsList); when(filter.withLabels(anyMap())).thenReturn(filter); - when(this.kubernetesClient.endpoints().withField(eq("metadata.name"), - eq(serviceId))).thenReturn(filter); + when(this.kubernetesClient.endpoints().withField(eq("metadata.name"), eq(serviceId))).thenReturn(filter); } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterTest.java index 7f4e80c9..a2870d95 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientFilterTest.java @@ -54,8 +54,8 @@ public class KubernetesDiscoveryClientFilterTest { @Before public void setUp() { - this.underTest = new KubernetesDiscoveryClient(this.kubernetesClient, - this.properties, this.kubernetesClientServicesFunction); + this.underTest = new KubernetesDiscoveryClient(this.kubernetesClient, this.properties, + this.kubernetesClientServicesFunction); } @Test @@ -75,8 +75,7 @@ public class KubernetesDiscoveryClientFilterTest { when(this.serviceOperation.list()).thenReturn(serviceList); when(this.kubernetesClient.services()).thenReturn(this.serviceOperation); - when(this.properties.getFilter()) - .thenReturn("metadata.additionalProperties['spring-boot']"); + when(this.properties.getFilter()).thenReturn("metadata.additionalProperties['spring-boot']"); List filteredServices = this.underTest.getServices(); @@ -87,8 +86,7 @@ public class KubernetesDiscoveryClientFilterTest { @Test public void testFilteredServicesByPrefix() { - List springBootServiceNames = Arrays.asList("serviceA", "serviceB", - "serviceC"); + List springBootServiceNames = Arrays.asList("serviceA", "serviceB", "serviceC"); List services = createSpringBootServiceByName(springBootServiceNames); // Add non spring boot service @@ -103,8 +101,7 @@ public class KubernetesDiscoveryClientFilterTest { when(this.serviceOperation.list()).thenReturn(serviceList); when(this.kubernetesClient.services()).thenReturn(this.serviceOperation); - when(this.properties.getFilter()) - .thenReturn("metadata.name.startsWith('service')"); + when(this.properties.getFilter()).thenReturn("metadata.name.startsWith('service')"); List filteredServices = this.underTest.getServices(); @@ -115,8 +112,7 @@ public class KubernetesDiscoveryClientFilterTest { @Test public void testNoExpression() { - List springBootServiceNames = Arrays.asList("serviceA", "serviceB", - "serviceC"); + List springBootServiceNames = Arrays.asList("serviceA", "serviceB", "serviceC"); List services = createSpringBootServiceByName(springBootServiceNames); ServiceList serviceList = new ServiceList(); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java index a70aa292..f3032795 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTest.java @@ -52,12 +52,10 @@ public class KubernetesDiscoveryClientTest { mockClient = mockServer.getClient(); // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - mockClient.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @@ -66,11 +64,10 @@ public class KubernetesDiscoveryClientTest { Map labels = new HashMap(); labels.put("l", "v"); - Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("10") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef() + .withUid("10").endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset() + .build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -78,37 +75,34 @@ public class KubernetesDiscoveryClientTest { EndpointsList endpoints = new EndpointsList(); endpoints.setItems(endpointsList); - mockServer.expect().get().withPath( - "/api/v1/namespaces/test/endpoints?labelSelector=l%3Dv&fieldSelector=metadata.name%3Dendpoint") - .andReturn(200, endpoints).once(); - mockServer.expect().get() - .withPath("/api/v1/endpoints?fieldSelector=metadata.name%3Dendpoint") + .withPath( + "/api/v1/namespaces/test/endpoints?labelSelector=l%3Dv&fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - mockServer.expect().get().withPath( - "/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get().withPath("/api/v1/endpoints?fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - Service service = new ServiceBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).endMetadata().build(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") + .andReturn(200, endpoints).once(); - mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") - .andReturn(200, service).always(); + Service service = new ServiceBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().build(); + + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint").andReturn(200, service) + .always(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setServiceLabels(labels); properties.getMetadata().setAddLabels(false); properties.getMetadata().setAddAnnotations(false); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); final List instances = discoveryClient.getInstances("endpoint"); - assertThat(instances).hasSize(1) - .filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1) + assertThat(instances).hasSize(1).filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1) .filteredOn(s -> s.getInstanceId().equals("10")).hasSize(1); } @@ -117,11 +111,9 @@ public class KubernetesDiscoveryClientTest { Map labels = new HashMap(); labels.put("l2", "v2"); - Endpoints endPoint1 = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").withLabels(labels) - .endMetadata().addNewSubset().addNewAddress().withIp("ip1") - .withNewTargetRef().withUid("20").endTargetRef().endAddress() - .addNewPort("mgmt", "mgmt_tcp", 900, "TCP") + Endpoints endPoint1 = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef() + .withUid("20").endTargetRef().endAddress().addNewPort("mgmt", "mgmt_tcp", 900, "TCP") .addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); List endpointsList = new ArrayList<>(); @@ -134,30 +126,26 @@ public class KubernetesDiscoveryClientTest { "/api/v1/namespaces/test/endpoints?labelSelector=l2%3Dv2&fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - mockServer.expect().get().withPath( - "/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get().withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - Service service = new ServiceBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).withAnnotations(labels) - .endMetadata().build(); + Service service = new ServiceBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).withAnnotations(labels).endMetadata().build(); - mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") - .andReturn(200, service).always(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint").andReturn(200, service) + .always(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setPrimaryPortName("http_tcp"); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); final List instances = discoveryClient.getInstances("endpoint"); - assertThat(instances).hasSize(1) - .filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1) - .filteredOn(s -> s.getInstanceId().equals("20")).hasSize(1) - .filteredOn(s -> 80 == s.getPort()).hasSize(1); + assertThat(instances).hasSize(1).filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1) + .filteredOn(s -> s.getInstanceId().equals("20")).hasSize(1).filteredOn(s -> 80 == s.getPort()) + .hasSize(1); } @Test @@ -165,11 +153,10 @@ public class KubernetesDiscoveryClientTest { Map labels = new HashMap(); labels.put("l", "v"); - Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("30") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef() + .withUid("30").endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset() + .build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -177,19 +164,18 @@ public class KubernetesDiscoveryClientTest { EndpointsList endpoints = new EndpointsList(); endpoints.setItems(endpointsList); - mockServer.expect().get().withPath( - "/api/v1/namespaces/test/endpoints?labelSelector=l%3Dv&fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get() + .withPath( + "/api/v1/namespaces/test/endpoints?labelSelector=l%3Dv&fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setServiceLabels(labels); - final KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient( - mockClient, properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); - final List result_endpoints = discoveryClient - .getEndPointsList("endpoint"); + final List result_endpoints = discoveryClient.getEndPointsList("endpoint"); assertThat(result_endpoints).hasSize(1); } @@ -199,12 +185,11 @@ public class KubernetesDiscoveryClientTest { Map labels = new HashMap(); labels.put("l1", "v1"); - Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("40") - .endTargetRef().endAddress().addNewAddress().withIp("ip2") - .withNewTargetRef().withUid("50").endTargetRef().endAddress() - .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef() + .withUid("40").endTargetRef().endAddress().addNewAddress().withIp("ip2").withNewTargetRef() + .withUid("50").endTargetRef().endAddress().addNewPort("https", "https_tcp", 443, "TCP").endSubset() + .build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoint); @@ -216,53 +201,48 @@ public class KubernetesDiscoveryClientTest { "/api/v1/namespaces/test/endpoints?labelSelector=l1%3Dv1&fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - mockServer.expect().get().withPath( - "/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get().withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - Service service = new ServiceBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(labels).endMetadata().build(); + Service service = new ServiceBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(labels).endMetadata().build(); - mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") - .andReturn(200, service).always(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint").andReturn(200, service) + .always(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setServiceLabels(labels); properties.getMetadata().setAddAnnotations(false); properties.getMetadata().setAddLabels(false); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); final List instances = discoveryClient.getInstances("endpoint"); - assertThat(instances).hasSize(2).filteredOn(ServiceInstance::isSecure) - .extracting(ServiceInstance::getHost).containsOnly("ip1", "ip2"); + assertThat(instances).hasSize(2).filteredOn(ServiceInstance::isSecure).extracting(ServiceInstance::getHost) + .containsOnly("ip1", "ip2"); } @Test public void getServicesShouldReturnAllServicesWhenNoLabelsAreAppliedToTheClient() { - mockServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("s1").withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().addNewItem().withNewMetadata() - .withName("s2").withLabels(new HashMap() { - { - put("label", "value"); - put("label2", "value2"); - } - }).endMetadata().endItem().addNewItem().withNewMetadata() - .withName("s3").endMetadata().endItem().build()) - .once(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/services").andReturn(200, new ServiceListBuilder() + .addNewItem().withNewMetadata().withName("s1").withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().addNewItem().withNewMetadata().withName("s2") + .withLabels(new HashMap() { + { + put("label", "value"); + put("label2", "value2"); + } + }).endMetadata().endItem().addNewItem().withNewMetadata().withName("s3").endMetadata().endItem() + .build()).once(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); final List services = discoveryClient.getServices(); @@ -271,15 +251,14 @@ public class KubernetesDiscoveryClientTest { @Test public void getServicesShouldReturnOnlyMatchingServicesWhenLabelsAreAppliedToTheClient() { - mockServer.expect().get() - .withPath("/api/v1/namespaces/test/services?labelSelector=label%3Dvalue") - .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("s1").withLabels(new HashMap() { + mockServer.expect().get().withPath("/api/v1/namespaces/test/services?labelSelector=label%3Dvalue") + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("s1") + .withLabels(new HashMap() { { put("label", "value"); } - }).endMetadata().endItem().addNewItem().withNewMetadata() - .withName("s2").withLabels(new HashMap() { + }).endMetadata().endItem().addNewItem().withNewMetadata().withName("s2") + .withLabels(new HashMap() { { put("label", "value"); put("label2", "value2"); @@ -288,8 +267,7 @@ public class KubernetesDiscoveryClientTest { .once(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, client -> client.services().withLabels(new HashMap() { { put("label", "value"); @@ -303,17 +281,13 @@ public class KubernetesDiscoveryClientTest { @Test public void getInstancesShouldBeAbleToHandleEndpointsFromMultipleNamespaces() { - Endpoints endPoints1 = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("60") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endPoints1 = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef().withUid("60") + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); - Endpoints endpoints2 = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test2").endMetadata().addNewSubset() - .addNewAddress().withIp("ip2").withNewTargetRef().withUid("70") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endpoints2 = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test2") + .endMetadata().addNewSubset().addNewAddress().withIp("ip2").withNewTargetRef().withUid("70") + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); List endpointsList = new ArrayList<>(); endpointsList.add(endPoints1); @@ -322,25 +296,24 @@ public class KubernetesDiscoveryClientTest { EndpointsList endpoints = new EndpointsList(); endpoints.setItems(endpointsList); - mockServer.expect().get() - .withPath("/api/v1/endpoints?fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get().withPath("/api/v1/endpoints?fieldSelector=metadata.name%3Dendpoint") .andReturn(200, endpoints).once(); - mockServer.expect().get().withPath("/api/v1/namespaces/test/endpoints/endpoint") - .andReturn(200, endPoints1).once(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/endpoints/endpoint").andReturn(200, endPoints1) + .once(); - mockServer.expect().get().withPath("/api/v1/namespaces/test2/endpoints/endpoint") - .andReturn(200, endpoints2).once(); + mockServer.expect().get().withPath("/api/v1/namespaces/test2/endpoints/endpoint").andReturn(200, endpoints2) + .once(); - Service service1 = new ServiceBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test").withLabels(new HashMap() { + Service service1 = new ServiceBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .withLabels(new HashMap() { { put("l", "v"); } }).endMetadata().build(); - Service service2 = new ServiceBuilder().withNewMetadata().withName("endpoint") - .withNamespace("test2").withLabels(new HashMap() { + Service service2 = new ServiceBuilder().withNewMetadata().withName("endpoint").withNamespace("test2") + .withLabels(new HashMap() { { put("l", "v"); } @@ -353,38 +326,30 @@ public class KubernetesDiscoveryClientTest { ServiceList services = new ServiceList(); services.setItems(servicesList); - mockServer.expect().get() - .withPath("/api/v1/services?fieldSelector=metadata.name%3Dendpoint") + mockServer.expect().get().withPath("/api/v1/services?fieldSelector=metadata.name%3Dendpoint") .andReturn(200, services).once(); - mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint") - .andReturn(200, service1).always(); + mockServer.expect().get().withPath("/api/v1/namespaces/test/services/endpoint").andReturn(200, service1) + .always(); - mockServer.expect().get().withPath("/api/v1/namespaces/test2/services/endpoint") - .andReturn(200, service2).always(); + mockServer.expect().get().withPath("/api/v1/namespaces/test2/services/endpoint").andReturn(200, service2) + .always(); final KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setAllNamespaces(true); - final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, - properties, KubernetesClient::services, - new DefaultIsServicePortSecureResolver(properties)); + final DiscoveryClient discoveryClient = new KubernetesDiscoveryClient(mockClient, properties, + KubernetesClient::services, new DefaultIsServicePortSecureResolver(properties)); final List instances = discoveryClient.getInstances("endpoint"); assertThat(instances).hasSize(2); - assertThat(instances).filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()) - .hasSize(1); - assertThat(instances).filteredOn(s -> s.getHost().equals("ip2") && !s.isSecure()) - .hasSize(1); - assertThat(instances) - .filteredOn(s -> s.getServiceId().contains("endpoint") - && ((KubernetesServiceInstance) s).getNamespace().equals("test")) - .hasSize(1); - assertThat(instances) - .filteredOn(s -> s.getServiceId().contains("endpoint") - && ((KubernetesServiceInstance) s).getNamespace().equals("test2")) - .hasSize(1); + assertThat(instances).filteredOn(s -> s.getHost().equals("ip1") && !s.isSecure()).hasSize(1); + assertThat(instances).filteredOn(s -> s.getHost().equals("ip2") && !s.isSecure()).hasSize(1); + assertThat(instances).filteredOn(s -> s.getServiceId().contains("endpoint") + && ((KubernetesServiceInstance) s).getNamespace().equals("test")).hasSize(1); + assertThat(instances).filteredOn(s -> s.getServiceId().contains("endpoint") + && ((KubernetesServiceInstance) s).getNamespace().equals("test2")).hasSize(1); assertThat(instances).filteredOn(s -> s.getInstanceId().equals("60")).hasSize(1); assertThat(instances).filteredOn(s -> s.getInstanceId().equals("70")).hasSize(1); } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstanceTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstanceTests.java index 8cf648c6..94737610 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstanceTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesServiceInstanceTests.java @@ -36,9 +36,8 @@ public class KubernetesServiceInstanceTests { address.setIp("1.2.3.4"); EndpointPort port = new EndpointPort(); port.setPort(8080); - KubernetesServiceInstance instance = new KubernetesServiceInstance("123", - "myservice", address.getIp(), port.getPort(), Collections.emptyMap(), - secure); + KubernetesServiceInstance instance = new KubernetesServiceInstance("123", "myservice", address.getIp(), + port.getPort(), Collections.emptyMap(), secure); assertThat(instance.getInstanceId()).isEqualTo("123"); assertThat(instance.getServiceId()).isEqualTo("myservice"); diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfigurationTests.java index 9a2c7e62..338bc737 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientAutoConfigurationTests.java @@ -35,93 +35,69 @@ import static org.assertj.core.api.Assertions.assertThat; */ class KubernetesReactiveDiscoveryClientAutoConfigurationTests { - private ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class, - ReactiveCommonsClientAutoConfiguration.class, - KubernetesAutoConfiguration.class, - KubernetesDiscoveryClientAutoConfiguration.class, + private ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration( + AutoConfigurations.of(UtilAutoConfiguration.class, ReactiveCommonsClientAutoConfiguration.class, + KubernetesAutoConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class, KubernetesReactiveDiscoveryClientAutoConfiguration.class)); @Test public void shouldWorkWithDefaults() { contextRunner.run(context -> { assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class); - assertThat(context) - .hasSingleBean(ReactiveDiscoveryClientHealthIndicator.class); + assertThat(context).hasSingleBean(ReactiveDiscoveryClientHealthIndicator.class); }); } @Test public void shouldNotHaveDiscoveryClientWhenDiscoveryDisabled() { - contextRunner.withPropertyValues("spring.cloud.discovery.enabled=false") - .run(context -> { - assertThat(context) - .doesNotHaveBean("kubernetesReactiveDiscoveryClient"); - assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withPropertyValues("spring.cloud.discovery.enabled=false").run(context -> { + assertThat(context).doesNotHaveBean("kubernetesReactiveDiscoveryClient"); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } @Test public void shouldNotHaveDiscoveryClientWhenReactiveDiscoveryDisabled() { - contextRunner.withPropertyValues("spring.cloud.discovery.reactive.enabled=false") - .run(context -> { - assertThat(context) - .doesNotHaveBean("kubernetesReactiveDiscoveryClient"); - assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withPropertyValues("spring.cloud.discovery.reactive.enabled=false").run(context -> { + assertThat(context).doesNotHaveBean("kubernetesReactiveDiscoveryClient"); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } @Test public void shouldNotHaveDiscoveryClientWhenKubernetesDisabled() { - contextRunner.withPropertyValues("spring.cloud.kubernetes.enabled=false") - .run(context -> { - assertThat(context) - .doesNotHaveBean("kubernetesReactiveDiscoveryClient"); - assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withPropertyValues("spring.cloud.kubernetes.enabled=false").run(context -> { + assertThat(context).doesNotHaveBean("kubernetesReactiveDiscoveryClient"); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } @Test public void shouldNotHaveDiscoveryClientWhenKubernetesDiscoveryDisabled() { - contextRunner - .withPropertyValues("spring.cloud.kubernetes.discovery.enabled=false") - .run(context -> { - assertThat(context) - .doesNotHaveBean("kubernetesReactiveDiscoveryClient"); - assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withPropertyValues("spring.cloud.kubernetes.discovery.enabled=false").run(context -> { + assertThat(context).doesNotHaveBean("kubernetesReactiveDiscoveryClient"); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } @Test public void worksWithoutWebflux() { - contextRunner - .withClassLoader( - new FilteredClassLoader("org.springframework.web.reactive")) - .run(context -> { - assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.web.reactive")).run(context -> { + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } @Test public void worksWithoutActuator() { - contextRunner - .withClassLoader( - new FilteredClassLoader("org.springframework.boot.actuate")) - .run(context -> { - assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class); - assertThat(context).doesNotHaveBean( - ReactiveDiscoveryClientHealthIndicator.class); - }); + contextRunner.withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")).run(context -> { + assertThat(context).hasSingleBean(ReactiveDiscoveryClient.class); + assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); + }); } } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java index 6c89ba81..e1a90f77 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/reactive/KubernetesReactiveDiscoveryClientTests.java @@ -16,18 +16,20 @@ package org.springframework.cloud.kubernetes.discovery.reactive; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.EndpointsList; import io.fabric8.kubernetes.api.model.ServiceBuilder; +import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.api.model.ServiceListBuilder; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import reactor.core.publisher.Flux; @@ -56,18 +58,16 @@ class KubernetesReactiveDiscoveryClientTests { kubernetesClient.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); } @Test public void verifyDefaults(@Client KubernetesClient kubernetesClient) { KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); - assertThat(client.description()) - .isEqualTo("Kubernetes Reactive Discovery Client"); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); + assertThat(client.description()).isEqualTo("Kubernetes Reactive Discovery Client"); assertThat(client.getOrder()).isEqualTo(ReactiveDiscoveryClient.DEFAULT_ORDER); } @@ -75,259 +75,242 @@ class KubernetesReactiveDiscoveryClientTests { public void shouldReturnFluxOfServices(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("s1").withLabels(new HashMap() { + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("s1") + .withLabels(new HashMap() { { put("label", "value"); } - }).endMetadata().endItem().addNewItem().withNewMetadata() - .withName("s2").withLabels(new HashMap() { + }).endMetadata().endItem().addNewItem().withNewMetadata().withName("s2") + .withLabels(new HashMap() { { put("label", "value"); put("label2", "value2"); } - }).endMetadata().endItem().addNewItem().withNewMetadata() - .withName("s3").endMetadata().endItem().build()) + }).endMetadata().endItem().addNewItem().withNewMetadata().withName("s3").endMetadata().endItem() + .build()) .once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux services = client.getServices(); - StepVerifier.create(services).expectNext("s1", "s2", "s3").expectComplete() - .verify(); + StepVerifier.create(services).expectNext("s1", "s2", "s3").expectComplete().verify(); } @Test - public void shouldReturnEmptyFluxOfServicesWhenNoInstancesFound( - @Client KubernetesClient kubernetesClient, + public void shouldReturnEmptyFluxOfServicesWhenNoInstancesFound(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") .andReturn(200, new ServiceListBuilder().build()).once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux services = client.getServices(); StepVerifier.create(services).expectNextCount(0).expectComplete().verify(); } @Test - @Disabled // see gh-603 - public void shouldReturnEmptyFluxForNonExistingService( - @Client KubernetesClient kubernetesClient) { + public void shouldReturnEmptyFluxForNonExistingService(@Client KubernetesClient kubernetesClient, + @Server KubernetesServer kubernetesServer) { + kubernetesServer.expect().get() + .withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dnonexistent-service") + .andReturn(200, new EndpointsBuilder().build()).once(); + KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("nonexistent-service"); StepVerifier.create(instances).expectNextCount(0).expectComplete().verify(); } @Test - @Disabled // see gh-603 - public void shouldReturnEmptyFluxWhenServiceHasNoSubsets( - @Client KubernetesClient kubernetesClient, + public void shouldReturnEmptyFluxWhenServiceHasNoSubsets(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, - new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().build()) + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().build()) .once(); + kubernetesServer.expect().get() + .withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dexisting-service") + .andReturn(200, new EndpointsBuilder().build()).once(); + KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(0).expectComplete().verify(); } @Test - @Disabled // see gh-603 - public void shouldReturnFlux(@Client KubernetesClient kubernetesClient, - @Server KubernetesServer kubernetesServer) { - kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, - new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().build()) - .once(); + public void shouldReturnFlux(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { + ServiceList services = new ServiceListBuilder().addNewItem().withNewMetadata().withName("existing-service") + .withNamespace("test").withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().build(); - Endpoints endPoints = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("existing-service").withNamespace("test") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); + + List endpointsList = new ArrayList<>(); + endpointsList.add(endPoint); + + EndpointsList endpoints = new EndpointsList(); + endpoints.setItems(endpointsList); kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/endpoints/existing-service") - .andReturn(200, endPoints).once(); + .withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dexisting-service") + .andReturn(200, endpoints).once(); - kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/services/existing-service") - .andReturn(200, - new ServiceBuilder().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().build()) - .once(); + kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services/existing-service") + .andReturn(200, services.getItems().get(0)).once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + properties.getMetadata().setAddAnnotations(false); + properties.getMetadata().setAddLabels(false); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); } @Test - @Disabled // see gh-603 - public void shouldReturnFluxWithPrefixedMetadata( - @Client KubernetesClient kubernetesClient, + public void shouldReturnFluxWithPrefixedMetadata(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, - new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().build()) + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().build()) .once(); - Endpoints endPoints = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") - .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") - .endSubset().build(); + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") + .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP").endSubset().build(); + + List endpointsList = new ArrayList<>(); + endpointsList.add(endPoint); + + EndpointsList endpoints = new EndpointsList(); + endpoints.setItems(endpointsList); kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/endpoints/existing-service") - .andReturn(200, endPoints).once(); + .withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dexisting-service") + .andReturn(200, endpoints).once(); - kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/services/existing-service") - .andReturn(200, - new ServiceBuilder().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().build()) + kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services/existing-service") + .andReturn(200, new ServiceBuilder().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().build()) .once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.getMetadata().setAnnotationsPrefix("annotation."); properties.getMetadata().setLabelsPrefix("label."); properties.getMetadata().setPortsPrefix("port."); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); } @Test - @Disabled // see gh-603 public void shouldReturnFluxWhenServiceHasMultiplePortsAndPrimaryPortNameIsSet( - @Client KubernetesClient kubernetesClient, - @Server KubernetesServer kubernetesServer) { + @Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, - new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().build()) + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().build()) .once(); - Endpoints endPoints = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") + Endpoints endPoint = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); - kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/endpoints/existing-service") - .andReturn(200, endPoints).once(); + List endpointsList = new ArrayList<>(); + endpointsList.add(endPoint); + + EndpointsList endpoints = new EndpointsList(); + endpoints.setItems(endpointsList); kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/services/existing-service") - .andReturn(200, - new ServiceBuilder().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().build()) + .withPath("/api/v1/namespaces/test/endpoints?fieldSelector=metadata.name%3Dexisting-service") + .andReturn(200, endpoints).once(); + + kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services/existing-service") + .andReturn(200, new ServiceBuilder().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().build()) .once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); - properties.setPrimaryPortName("https"); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + properties.setPrimaryPortName("https_tcp"); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); } @Test - public void shouldReturnFluxOfServicesAcrossAllNamespaces( - @Client KubernetesClient kubernetesClient, + public void shouldReturnFluxOfServicesAcrossAllNamespaces(@Client KubernetesClient kubernetesClient, @Server KubernetesServer kubernetesServer) { kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services") - .andReturn(200, - new ServiceListBuilder().addNewItem().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().endItem().build()) + .andReturn(200, new ServiceListBuilder().addNewItem().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().endItem().build()) .once(); - Endpoints endpoints = new EndpointsBuilder().withNewMetadata() - .withName("endpoint").withNamespace("test").endMetadata().addNewSubset() - .addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") + Endpoints endpoints = new EndpointsBuilder().withNewMetadata().withName("endpoint").withNamespace("test") + .endMetadata().addNewSubset().addNewAddress().withIp("ip1").withNewTargetRef().withUid("uid1") .endTargetRef().endAddress().addNewPort("http", "http_tcp", 80, "TCP") .addNewPort("https", "https_tcp", 443, "TCP").endSubset().build(); EndpointsList endpointsList = new EndpointsList(); endpointsList.setItems(singletonList(endpoints)); - kubernetesServer.expect().get().withPath( - "/api/v1/endpoints?fieldSelector=metadata.name%3Dexisting-service") + kubernetesServer.expect().get().withPath("/api/v1/endpoints?fieldSelector=metadata.name%3Dexisting-service") .andReturn(200, endpointsList).once(); - kubernetesServer.expect().get() - .withPath("/api/v1/namespaces/test/services/existing-service") - .andReturn(200, - new ServiceBuilder().withNewMetadata() - .withName("existing-service") - .withLabels(new HashMap() { - { - put("label", "value"); - } - }).endMetadata().build()) + kubernetesServer.expect().get().withPath("/api/v1/namespaces/test/services/existing-service") + .andReturn(200, new ServiceBuilder().withNewMetadata().withName("existing-service") + .withLabels(new HashMap() { + { + put("label", "value"); + } + }).endMetadata().build()) .once(); KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(); properties.setAllNamespaces(true); - ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient( - kubernetesClient, properties, KubernetesClient::services); + ReactiveDiscoveryClient client = new KubernetesReactiveDiscoveryClient(kubernetesClient, properties, + KubernetesClient::services); Flux instances = client.getInstances("existing-service"); StepVerifier.create(instances).expectNextCount(1).expectComplete().verify(); } diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/support/KubernetesExtension.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/support/KubernetesExtension.java index 4ef954be..e03d31da 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/support/KubernetesExtension.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/support/KubernetesExtension.java @@ -33,20 +33,16 @@ import org.junit.jupiter.api.extension.ParameterResolver; /** * @author Tim Ysewyn */ -public class KubernetesExtension - implements ParameterResolver, BeforeEachCallback, AfterEachCallback { +public class KubernetesExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback { private final KubernetesServer mockServer = new KubernetesServer(); @Override - public boolean supportsParameter(ParameterContext parameterContext, - ExtensionContext context) { + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) { return (parameterContext.getParameter().isAnnotationPresent(Server.class) - && KubernetesServer.class - .isAssignableFrom(parameterContext.getParameter().getType())) + && KubernetesServer.class.isAssignableFrom(parameterContext.getParameter().getType())) || (parameterContext.getParameter().isAnnotationPresent(Client.class) - && KubernetesClient.class.isAssignableFrom( - parameterContext.getParameter().getType())); + && KubernetesClient.class.isAssignableFrom(parameterContext.getParameter().getType())); } @Override @@ -60,8 +56,8 @@ public class KubernetesExtension } @Override - public Object resolveParameter(ParameterContext parameterContext, - ExtensionContext extensionContext) throws ParameterResolutionException { + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { if (parameterContext.getParameter().isAnnotationPresent(Client.class)) { return mockServer.getClient(); } diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/main/java/org/springframework/cloud/kubernetes/examples/LeaderController.java b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/main/java/org/springframework/cloud/kubernetes/examples/LeaderController.java index 267ae488..39b142ac 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/main/java/org/springframework/cloud/kubernetes/examples/LeaderController.java +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/main/java/org/springframework/cloud/kubernetes/examples/LeaderController.java @@ -50,12 +50,10 @@ public class LeaderController { @GetMapping public String getInfo() { if (this.context == null) { - return String.format("I am '%s' but I am not a leader of the '%s'", this.host, - this.role); + return String.format("I am '%s' but I am not a leader of the '%s'", this.host, this.role); } - return String.format("I am '%s' and I am the leader of the '%s'", this.host, - this.role); + return String.format("I am '%s' and I am the leader of the '%s'", this.host, this.role); } /** @@ -68,8 +66,7 @@ public class LeaderController { @PutMapping public ResponseEntity revokeLeadership() { if (this.context == null) { - String message = String.format( - "Cannot revoke leadership because '%s' is not a leader", this.host); + String message = String.format("Cannot revoke leadership because '%s' is not a leader", this.host); return ResponseEntity.badRequest().body(message); } diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java index 686cbcf2..63ed3143 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java @@ -60,8 +60,7 @@ public class LeaderControllerTest { @Test public void shouldGetNonLeaderInfo() { - String message = String.format("I am '%s' but I am not a leader of the 'null'", - this.host); + String message = String.format("I am '%s' but I am not a leader of the 'null'", this.host); assertThat(this.leaderController.getInfo()).isEqualTo(message); } @@ -71,8 +70,7 @@ public class LeaderControllerTest { this.leaderController.handleEvent(this.mockOnGrantedEvent); - String message = String.format("I am '%s' and I am the leader of the 'null'", - this.host); + String message = String.format("I am '%s' and I am the leader of the 'null'", this.host); assertThat(this.leaderController.getInfo()).isEqualTo(message); } @@ -83,8 +81,7 @@ public class LeaderControllerTest { this.leaderController.handleEvent(this.mockOnGrantedEvent); this.leaderController.handleEvent(this.mockOnRevokedEvent); - String message = String.format("I am '%s' but I am not a leader of the 'null'", - this.host); + String message = String.format("I am '%s' but I am not a leader of the 'null'", this.host); assertThat(this.leaderController.getInfo()).isEqualTo(message); } @@ -105,8 +102,7 @@ public class LeaderControllerTest { public void shouldNotRevokeLeadershipIfNotLeader() { ResponseEntity responseEntity = this.leaderController.revokeLeadership(); - String message = String.format( - "Cannot revoke leadership because '%s' is not a leader", this.host); + String message = String.format("Cannot revoke leadership because '%s' is not a leader", this.host); assertThat(responseEntity.getBody()).isEqualTo(message); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); verify(this.mockContext, times(0)).yield(); diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/README.md b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/README.md new file mode 100644 index 00000000..27c01a76 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/README.md @@ -0,0 +1,94 @@ +## Kubernetes Spring Cloud LoadBalancer Example + +This example demonstrates how to use [Spring Cloud LoadBalancer](https://github.com/spring-cloud-incubator/spring-cloud-loadbalancer). In our example the REST `greeting service` calls the `name service`. +As the Spring Cloud LoadBalancer for Kubernetes is configured within this example, it will fetch from the Kubernetes API Server the list of the endpoints available for the name service and load-balance the request between the IP addresses available. + +### Running the example + +This project example runs on ALL the Kubernetes or OpenShift environments, but for development purposes you can use [Minikube - Kubernetes](https://kubernetes.io/docs/getting-started-guides/minikube/) tool +to install the platform locally within a virtual machine managed by VirtualBox, Xhyve or KVM, with no fuss. + +IMPORTANT: In order for this setup to work, you need to grant permissions to retrieve "pods", "services" and "enpoints" to the serviceaccont that will be used with the greeting-service. + +### Build/Deploy using Minikube + +First, create a new virtual machine provisioned with Kubernetes on your laptop using the command `minikube start`. + +Next, you can compile your project and generate the Kubernetes resources (yaml files containing the definition of the pod, deployment, build, service and route to be created) +like also to deploy the application on Kubernetes in one maven line by running: + +``` +mvn clean install fabric8:deploy -Dfabric8.generator.from=fabric8/java-jboss-openjdk8-jdk -Pkubernetes +``` + +### Call the Greeting service + +When maven has finished to compile the code but also to call the platform in order to deploy the yaml files generated and tell to the platform to start the process +to build/deploy the docker image and create the containers where the Spring Boot application will run 'greeting-service" and "name-service", you will be able to +check if the pods have been created using this command : + +``` +kc get pods +``` + +If the status of the Spring Boot pod application is `running` and ready state `1`, then you can +get the external address IP/Hostname to be used to call the service from your laptop + +``` +minikube service --url greeting-service +``` + +and then call the service using the curl client + +``` +curl https://IP_OR_HOSTNAME/greeting +``` + +to get a response as such + +``` +Hello from name-service-1-0dzb4!d +``` + +### Verify the load balancing + +First, scale the number of pods of the `name service` to 2 + +``` +kc scale --replicas=2 deployment name-service +``` + +Wait a few minutes before to issue the curl request to call the Greeting Service to let the platform to create the new pod. + +``` +kc get pods --selector=project=name-service +NAME READY STATUS RESTARTS AGE +name-service-1652024859-fsnfw 1/1 Running 0 33s +name-service-1652024859-wrzjs 1/1 Running 0 6m +``` + +If you issue the curl request to access the greeting service, you should see that the message response +contains a different id end of the message which corresponds to the name of the pod. + +``` +Hello from name-service-1-0ss0r! +``` + +As Spring Cloud LoadBalancer will question the Kubernetes API to get, base on the `name-service` name, the list of IP Addresses assigned to the service as endpoints, +you should see that you will get a response from one of the 2 pods running + +``` +kc get endpoints/name-service +NAME ENDPOINTS AGE +name-service 172.17.0.5:8080,172.17.0.6:8080 40m +``` + +Here is an example about what you will get + +``` +curl https://IP_OR_HOSTNAME/greeting +Hello from name-service-1652024859-hf3xv! +curl https://IP_OR_HOSTNAME/greeting +Hello from name-service-1652024859-426kv! +... +``` diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml new file mode 100644 index 00000000..648e4dc2 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml @@ -0,0 +1,92 @@ + + + + kubernetes-loadbalancer-example + org.springframework.cloud + 2.0.0-SNAPSHOT + + 4.0.0 + + greeting-service + Spring Cloud LoadBalancer :: Greeting Service + Spring Cloud LoadBalancer :: Greeting Service + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + io.fabric8 + fabric8-maven-plugin + + + fmp + + resource + + + + + + + + + + + org.springframework.boot + spring-boot-dependencies + pom + import + ${spring-boot.version} + + + + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-kubernetes-loadbalancer + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-kubernetes + ${project.version} + + + com.squareup.okhttp3 + okhttp + + + + diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/fabric8/route.yml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/fabric8/route.yml new file mode 100644 index 00000000..d6881f9f --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/fabric8/route.yml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Route +metadata: + name: greeting-service +spec: + port: + targetPort: 8080 + to: + kind: Service + name: greeting-service diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java new file mode 100644 index 00000000..b3f13ae3 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingController.java @@ -0,0 +1,57 @@ +/* + * Copyright 2020-2020 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.examples; + +import reactor.core.publisher.Mono; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * Greeting service controller. + * + * @author Gytis Trikleris + * @author Olga Maciaszek-Sharma + */ +@RestController +public class GreetingController { + + private final NameService nameService; + + public GreetingController(NameService nameService) { + this.nameService = nameService; + } + + /** + * Endpoint to get a greeting. This endpoint uses a name server to get a name for the + * greeting. + * + * Request to the name service is guarded with a circuit breaker. Therefore if a name + * service is not available or is too slow to response fallback name is used. + * + * Delay parameter can me used to make name service response slower. + * @param delay Milliseconds for how long the response from name service should be + * delayed. + * @return Greeting string. + */ + @GetMapping("/greeting") + public Mono getGreeting(@RequestParam(value = "delay", defaultValue = "0") int delay) { + return nameService.getName(delay).map(name -> String.format("Hello from %s!", name)); + } + +} diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingServiceApplication.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingServiceApplication.java new file mode 100644 index 00000000..fb649080 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/GreetingServiceApplication.java @@ -0,0 +1,46 @@ +/* + * Copyright 2020-2020 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.examples; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.context.annotation.Bean; +import org.springframework.web.reactive.function.client.WebClient; + +/** + * Entry point to the application. + * + * @author Gytis Trikleris + * @author Olga Maciaszek-Sharma + */ +@SpringBootApplication +@EnableDiscoveryClient +public class GreetingServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(GreetingServiceApplication.class, args); + } + + @LoadBalanced + @Bean + WebClient.Builder loadBalancedWebClientBuilder() { + return WebClient.builder(); + } + +} diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java new file mode 100644 index 00000000..333b1e38 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java @@ -0,0 +1,44 @@ +/* + * Copyright 2020-2020 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.examples; + +import reactor.core.publisher.Mono; + +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; + +/** + * Service invoking name-service via REST and guarded by Hystrix. + * + * @author Gytis Trikleris + * @author Olga Maciaszek-Sharma + */ +@Service +public class NameService { + + private final WebClient webClient; + + public NameService(WebClient.Builder webClientBuilder) { + webClient = webClientBuilder.build(); + } + + public Mono getName(int delay) { + return webClient.get().uri(String.format("http://name-service/name?delay=%d", delay)).retrieve() + .bodyToMono(String.class); + } + +} diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/resources/application.yml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/resources/application.yml new file mode 100644 index 00000000..5aaed995 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/src/main/resources/application.yml @@ -0,0 +1,10 @@ +spring: + application: + name: greeting-service + cloud: + loadbalancer: + ribbon: + enabled: false + +server: + port: 8080 diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml new file mode 100644 index 00000000..a95e5320 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml @@ -0,0 +1,67 @@ + + + + kubernetes-loadbalancer-example + org.springframework.cloud + 2.0.0-SNAPSHOT + + 4.0.0 + + name-service + + Spring Cloud LoadBalancer :: Name Service + Spring Cloud LoadBalancer :: Name Service + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + io.fabric8 + fabric8-maven-plugin + + + fmp + + resource + + + + + + + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-actuator + + + + diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/fabric8/route.yml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/fabric8/route.yml new file mode 100644 index 00000000..adb5a71a --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/fabric8/route.yml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Route +metadata: + name: name-service +spec: + port: + targetPort: 8080 + to: + kind: Service + name: name-service diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java new file mode 100644 index 00000000..a0887a2b --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameController.java @@ -0,0 +1,68 @@ +/* + * Copyright 2020-2020 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.examples; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.Mono; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * Name service controller. + * + * @author Gytis Trikleris + * @author Olga Maciaszek-Sharma + */ +@RestController +public class NameController { + + private static final Logger LOG = LoggerFactory.getLogger(NameController.class); + + private final String hostName = System.getenv("HOSTNAME"); + + @GetMapping("/") + public String ribbonPing() { + LOG.info("Ribbon ping"); + return hostName; + } + + /** + * Endpoint to get a name with a capability to delay a response for some number of + * milliseconds. + * @param delayValue Milliseconds for how long the response should be delayed. + * @return Host name. + */ + @GetMapping("/name") + public Mono getName(@RequestParam(value = "delay", defaultValue = "0") int delayValue) { + LOG.info(String.format("Returning a name '%s' with a delay '%d'", hostName, delayValue)); + delay(delayValue); + return Mono.just(hostName); + } + + private void delay(int delayValue) { + try { + Thread.sleep(delayValue); + } + catch (InterruptedException e) { + e.printStackTrace(); + } + } + +} diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameServiceApplication.java b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameServiceApplication.java new file mode 100644 index 00000000..98aef1b1 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameServiceApplication.java @@ -0,0 +1,34 @@ +/* + * Copyright 2020-2020 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.examples; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * Entry point to the application. + * + * @author Gytis Trikleris + */ +@SpringBootApplication +public class NameServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(NameServiceApplication.class, args); + } + +} diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/resources/application.yml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/resources/application.yml new file mode 100644 index 00000000..b08d6019 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/src/main/resources/application.yml @@ -0,0 +1,6 @@ +spring: + application: + name: name-service + +server: + port: 8080 \ No newline at end of file diff --git a/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml new file mode 100644 index 00000000..048c8ff6 --- /dev/null +++ b/spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml @@ -0,0 +1,115 @@ + + + + spring-cloud-kubernetes-examples + org.springframework.cloud + 2.0.0-SNAPSHOT + + 4.0.0 + kubernetes-loadbalancer-example + Spring Cloud LoadBalancer Example + pom + + + + kubernetes + + + + io.fabric8 + fabric8-maven-plugin + ${fabric8.maven.plugin.version} + + + fmp + + resource + build + + + + + + + + NodePort + + + + + + + + + + release + + + + io.fabric8 + fabric8-maven-plugin + ${fabric8.maven.plugin.version} + + + fmp + + resource + helm + + + + + + + + + + integration + + + + io.fabric8 + fabric8-maven-plugin + ${fabric8.maven.plugin.version} + + + fmp + + resource + build + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + run-integration-tests + integration-test + + integration-test + verify + + + + + false + false + + + + + + + + + name-service + greeting-service + + + diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index adce1fcb..1906382d 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -37,6 +37,7 @@ kubernetes-reload-example kubernetes-hello-world-example kubernetes-leader-election-example + kubernetes-loadbalancer-example diff --git a/spring-cloud-kubernetes-integration-tests/discovery/tests/src/test/java/org/springframework/cloud/kubernetes/it/ServicesIT.java b/spring-cloud-kubernetes-integration-tests/discovery/tests/src/test/java/org/springframework/cloud/kubernetes/it/ServicesIT.java index 2523c081..a30ca00b 100644 --- a/spring-cloud-kubernetes-integration-tests/discovery/tests/src/test/java/org/springframework/cloud/kubernetes/it/ServicesIT.java +++ b/spring-cloud-kubernetes-integration-tests/discovery/tests/src/test/java/org/springframework/cloud/kubernetes/it/ServicesIT.java @@ -32,16 +32,15 @@ public class ServicesIT { private static final String HOST = System.getProperty("service.host"); - private static final Integer PORT = Integer - .valueOf(System.getProperty("service.port")); + private static final Integer PORT = Integer.valueOf(System.getProperty("service.port")); - private static final String PROTOCOL = "true" - .equalsIgnoreCase(System.getProperty("service.secure")) ? "https" : "http"; + private static final String PROTOCOL = "true".equalsIgnoreCase(System.getProperty("service.secure")) ? "https" + : "http"; @Test public void testServicesEndpoint() { - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("services") - .then().statusCode(200).body(new StringContains(false, "service-a") { + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("services").then().statusCode(200) + .body(new StringContains(false, "service-a") { @Override protected boolean evalSubstringOf(String s) { return s.contains("service-a") && s.contains("service-b"); @@ -51,9 +50,8 @@ public class ServicesIT { @Test public void testInstancesEndpoint() { - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)) - .get("services/discovery-service-a/instances").then().statusCode(200) - .body("instanceId", hasSize(1)) + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("services/discovery-service-a/instances") + .then().statusCode(200).body("instanceId", hasSize(1)) .body("serviceId", hasItems("discovery-service-a")); } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java index 29e87c79..8b7bd7fe 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerAllNamespacesTests.java @@ -46,12 +46,10 @@ class LoadBalancerAllNamespacesTests { @BeforeAll static void setup() { - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - client.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); } @@ -59,23 +57,21 @@ class LoadBalancerAllNamespacesTests { @Test void testLoadBalancerDifferentNamespace() { createTestData("service-b", "b"); - String response = restTemplate.getForObject("http://service-b/greeting", - String.class); + String response = restTemplate.getForObject("http://service-b/greeting", String.class); Assertions.assertNotNull(response); Assertions.assertEquals("greeting", response); } private void createTestData(String name, String namespace) { - client.services().inNamespace(namespace).createNew().withNewMetadata() - .withName(name).withNamespace(namespace).endMetadata() - .withSpec(new ServiceSpecBuilder().withPorts(new ServicePortBuilder() - .withProtocol("TCP").withPort(randomServerPort).build()).build()) + client.services().inNamespace(namespace).createNew().withNewMetadata().withName(name).withNamespace(namespace) + .endMetadata() + .withSpec(new ServiceSpecBuilder() + .withPorts(new ServicePortBuilder().withProtocol("TCP").withPort(randomServerPort).build()) + .build()) .done(); - client.endpoints().inNamespace(namespace).createNew().withNewMetadata() - .withName("service-a").withNamespace(namespace).endMetadata() - .addNewSubset().addNewAddress().withIp("localhost").endAddress() - .addNewPort().withName("http").withPort(randomServerPort).endPort() - .endSubset().done(); + client.endpoints().inNamespace(namespace).createNew().withNewMetadata().withName("service-a") + .withNamespace(namespace).endMetadata().addNewSubset().addNewAddress().withIp("localhost").endAddress() + .addNewPort().withName("http").withPort(randomServerPort).endPort().endSubset().done(); } } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java index 41b01f68..e21c3fa6 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerTests.java @@ -44,12 +44,10 @@ class LoadBalancerTests { @BeforeAll static void setup() { - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, - client.getConfiguration().getMasterUrl()); + System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl()); System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); } @@ -57,8 +55,7 @@ class LoadBalancerTests { @Test void testLoadBalancerSameNamespace() { createTestData("service-a", "test"); - String response = restTemplate.getForObject("http://service-a/greeting", - String.class); + String response = restTemplate.getForObject("http://service-a/greeting", String.class); Assertions.assertNotNull(response); Assertions.assertEquals("greeting", response); } @@ -66,19 +63,18 @@ class LoadBalancerTests { @Test void testLoadBalancerDifferentNamespace() { createTestData("service-b", "b"); - Assertions.assertThrows(IllegalStateException.class, () -> restTemplate - .getForObject("http://service-b/greeting", String.class)); + Assertions.assertThrows(IllegalStateException.class, + () -> restTemplate.getForObject("http://service-b/greeting", String.class)); } private void createTestData(String name, String namespace) { - client.services().inNamespace(namespace).createNew().withNewMetadata() - .withName(name).endMetadata() - .withSpec(new ServiceSpecBuilder().withPorts(new ServicePortBuilder() - .withProtocol("TCP").withPort(randomServerPort).build()).build()) + client.services().inNamespace(namespace).createNew().withNewMetadata().withName(name).endMetadata() + .withSpec(new ServiceSpecBuilder() + .withPorts(new ServicePortBuilder().withProtocol("TCP").withPort(randomServerPort).build()) + .build()) .done(); - client.endpoints().inNamespace(namespace).createNew().withNewMetadata() - .withName("service-a").endMetadata().addNewSubset().addNewAddress() - .withIp("localhost").endAddress().addNewPort().withName("http") + client.endpoints().inNamespace(namespace).createNew().withNewMetadata().withName("service-a").endMetadata() + .addNewSubset().addNewAddress().withIp("localhost").endAddress().addNewPort().withName("http") .withPort(randomServerPort).endPort().endSubset().done(); } diff --git a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerWithServiceTests.java b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerWithServiceTests.java index 44a49670..8fc5b1a0 100644 --- a/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerWithServiceTests.java +++ b/spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/LoadBalancerWithServiceTests.java @@ -47,8 +47,7 @@ import static io.specto.hoverfly.junit.dsl.ResponseCreators.success; @ExtendWith(HoverflyExtension.class) class LoadBalancerWithServiceTests { - private static final Logger LOGGER = LoggerFactory - .getLogger(LoadBalancerWithServiceTests.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancerWithServiceTests.class); @Autowired RestTemplate restTemplate; @@ -60,8 +59,7 @@ class LoadBalancerWithServiceTests { static void setup() { System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, - "false"); + System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test"); } @@ -70,23 +68,19 @@ class LoadBalancerWithServiceTests { void testLoadBalancerInServiceMode(Hoverfly hoverfly) { LOGGER.info("Master URL: {}", client.getConfiguration().getMasterUrl()); hoverfly.simulate( - dsl(service("http://service-a.test.svc.cluster.local:8080") - .get("/greeting").willReturn(success().body("greeting"))), - dsl(service(client.getConfiguration().getMasterUrl().replace("/", "") - .replace("https:", "")) - .get("/api/v1/namespaces/test/services/service-a") - .willReturn(success().body( - json(buildService("service-a", 8080, "test")))))); - String response = restTemplate.getForObject("http://service-a/greeting", - String.class); + dsl(service("http://service-a.test.svc.cluster.local:8080").get("/greeting") + .willReturn(success().body("greeting"))), + dsl(service(client.getConfiguration().getMasterUrl().replace("/", "").replace("https:", "")) + .get("/api/v1/namespaces/test/services/service-a") + .willReturn(success().body(json(buildService("service-a", 8080, "test")))))); + String response = restTemplate.getForObject("http://service-a/greeting", String.class); Assertions.assertNotNull(response); Assertions.assertEquals("greeting", response); } private Service buildService(String name, int port, String namespace) { - return new ServiceBuilder().withNewMetadata().withName(name) - .withNamespace(namespace).withLabels(new HashMap<>()) - .withAnnotations(new HashMap<>()).endMetadata().withNewSpec().addNewPort() + return new ServiceBuilder().withNewMetadata().withName(name).withNamespace(namespace) + .withLabels(new HashMap<>()).withAnnotations(new HashMap<>()).endMetadata().withNewSpec().addNewPort() .withPort(port).endPort().endSpec().build(); } diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/src/test/java/org/springframework/cloud/kubernetes/it/GreetingIT.java b/spring-cloud-kubernetes-integration-tests/simple-configmap/src/test/java/org/springframework/cloud/kubernetes/it/GreetingIT.java index 64daf954..69d85ca8 100644 --- a/spring-cloud-kubernetes-integration-tests/simple-configmap/src/test/java/org/springframework/cloud/kubernetes/it/GreetingIT.java +++ b/spring-cloud-kubernetes-integration-tests/simple-configmap/src/test/java/org/springframework/cloud/kubernetes/it/GreetingIT.java @@ -34,16 +34,15 @@ public class GreetingIT { private static final String HOST = System.getProperty("service.host"); - private static final Integer PORT = Integer - .valueOf(System.getProperty("service.port")); + private static final Integer PORT = Integer.valueOf(System.getProperty("service.port")); - private static final String PROTOCOL = "true" - .equalsIgnoreCase(System.getProperty("service.secure")) ? "https" : "http"; + private static final String PROTOCOL = "true".equalsIgnoreCase(System.getProperty("service.secure")) ? "https" + : "http"; @Test public void firstTestThatTheDefaultMessageIsReturned() { - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting") - .then().statusCode(200).body("message", is("This is a dummy message")); + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting").then().statusCode(200) + .body("message", is("This is a dummy message")); } @Test @@ -51,8 +50,7 @@ public class GreetingIT { public void thenApplyAConfigMapAndEnsureThatTheMessageIsUpdated() { waitForApplicationToReload(); - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting") - .then().statusCode(200) + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting").then().statusCode(200) .body("message", is("Hello from Spring Cloud Kubernetes!")); } diff --git a/spring-cloud-kubernetes-integration-tests/simple-core/src/test/java/org/springframework/cloud/kubernetes/it/GreetingAndHealthIT.java b/spring-cloud-kubernetes-integration-tests/simple-core/src/test/java/org/springframework/cloud/kubernetes/it/GreetingAndHealthIT.java index c21a1377..aae8a8f6 100644 --- a/spring-cloud-kubernetes-integration-tests/simple-core/src/test/java/org/springframework/cloud/kubernetes/it/GreetingAndHealthIT.java +++ b/spring-cloud-kubernetes-integration-tests/simple-core/src/test/java/org/springframework/cloud/kubernetes/it/GreetingAndHealthIT.java @@ -30,23 +30,21 @@ public class GreetingAndHealthIT { private static final String HOST = System.getProperty("service.host"); - private static final Integer PORT = Integer - .valueOf(System.getProperty("service.port")); + private static final Integer PORT = Integer.valueOf(System.getProperty("service.port")); - private static final String PROTOCOL = "true" - .equalsIgnoreCase(System.getProperty("service.secure")) ? "https" : "http"; + private static final String PROTOCOL = "true".equalsIgnoreCase(System.getProperty("service.secure")) ? "https" + : "http"; @Test public void testGreetingEndpoint() { - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting") - .then().statusCode(200).body("message", is("Hello from k8s")); + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).get("greeting").then().statusCode(200) + .body("message", is("Hello from k8s")); } @Test public void testHealthEndpoint() { - given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)) - .contentType("application/json").get("actuator/health").then() - .statusCode(200).body("components.kubernetes.details.inside", is(true)); + given().baseUri(String.format("%s://%s:%d", PROTOCOL, HOST, PORT)).contentType("application/json") + .get("actuator/health").then().statusCode(200).body("components.kubernetes.details.inside", is(true)); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh index 3f266f2b..5cc30242 100755 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh @@ -123,7 +123,8 @@ main() { kubectl cluster-info --context kind-kind #setup nginx ingress - kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml +# kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml + kubectl apply -fhttps://raw.githubusercontent.com/kubernetes/ingress-nginx/12150e318b972a03fb49d827e6cabb8ef62247ef/deploy/static/provider/kind/deploy.yaml kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=360s # This creates the service account, role, and role binding necessary for Spring Cloud k8s apps diff --git a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java index 3754cfac..8600a25d 100644 --- a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java +++ b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/IstioBootstrapConfiguration.java @@ -59,8 +59,7 @@ public class IstioBootstrapConfiguration { private final ConfigurableEnvironment environment; - public IstioDetectionConfiguration(MeshUtils utils, - ConfigurableEnvironment environment) { + public IstioDetectionConfiguration(MeshUtils utils, ConfigurableEnvironment environment) { this.utils = utils; this.environment = environment; } @@ -86,15 +85,13 @@ public class IstioBootstrapConfiguration { } else { if (LOG.isDebugEnabled()) { - LOG.debug( - "Not running inside kubernetes with istio enabled. Skipping 'istio' profile activation."); + LOG.debug("Not running inside kubernetes with istio enabled. Skipping 'istio' profile activation."); } } } private boolean hasIstioProfile(Environment environment) { - return Arrays.stream(environment.getActiveProfiles()) - .anyMatch(ISTIO_PROFILE::equalsIgnoreCase); + return Arrays.stream(environment.getActiveProfiles()).anyMatch(ISTIO_PROFILE::equalsIgnoreCase); } } diff --git a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/utils/MeshUtils.java b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/utils/MeshUtils.java index 5f615f93..2325ee9a 100644 --- a/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/utils/MeshUtils.java +++ b/spring-cloud-kubernetes-istio/src/main/java/org/springframework/cloud/kubernetes/istio/utils/MeshUtils.java @@ -50,26 +50,21 @@ public class MeshUtils { // Check if Istio Envoy proxy is installed. Notice that the check is done to // localhost. // TODO: We can improve this initial detection if better methods are found. - String resource = "http://localhost:" - + this.istioClientProperties.getEnvoyPort(); - ResponseEntity response = this.restTemplate.getForEntity( - resource + "/" + this.istioClientProperties.getTestPath(), - String.class); + String resource = "http://localhost:" + this.istioClientProperties.getEnvoyPort(); + ResponseEntity response = this.restTemplate + .getForEntity(resource + "/" + this.istioClientProperties.getTestPath(), String.class); if (response.getStatusCode().is2xxSuccessful()) { LOG.info("Istio Resources Found."); return true; } - LOG.warn("Although Envoy proxy did respond at port" - + this.istioClientProperties.getEnvoyPort() - + ", it did not respond with HTTP 200 to path: " - + this.istioClientProperties.getTestPath() + LOG.warn("Although Envoy proxy did respond at port" + this.istioClientProperties.getEnvoyPort() + + ", it did not respond with HTTP 200 to path: " + this.istioClientProperties.getTestPath() + ". You may need to tweak the test path in order to get proper Istio support"); return false; } catch (Throwable t) { if (LOG.isDebugEnabled()) { - LOG.debug("Envoy proxy could not be located at port: " - + this.istioClientProperties.getEnvoyPort() + LOG.debug("Envoy proxy could not be located at port: " + this.istioClientProperties.getEnvoyPort() + ". Assuming that the application is not running inside the Istio Service Mesh"); } return false; diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java index 8257f8cb..736878fc 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/Leader.java @@ -47,8 +47,7 @@ public class Leader { return false; } - return Objects.equals(this.role, candidate.getRole()) - && Objects.equals(this.id, candidate.getId()); + return Objects.equals(this.role, candidate.getRole()) && Objects.equals(this.id, candidate.getId()); } @Override @@ -63,8 +62,7 @@ public class Leader { Leader leader = (Leader) o; - return Objects.equals(this.role, leader.role) - && Objects.equals(this.id, leader.id); + return Objects.equals(this.role, leader.role) && Objects.equals(this.id, leader.id); } @Override diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java index 05cf01f0..bc1fc504 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java @@ -41,20 +41,17 @@ import org.springframework.integration.leader.event.LeaderEventPublisher; @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(LeaderProperties.class) @ConditionalOnBean(KubernetesClient.class) -@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", - matchIfMissing = true) +@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", matchIfMissing = true) public class LeaderAutoConfiguration { @Bean @ConditionalOnMissingBean(LeaderEventPublisher.class) - public LeaderEventPublisher defaultLeaderEventPublisher( - ApplicationEventPublisher applicationEventPublisher) { + public LeaderEventPublisher defaultLeaderEventPublisher(ApplicationEventPublisher applicationEventPublisher) { return new DefaultLeaderEventPublisher(applicationEventPublisher); } @Bean - public Candidate candidate(LeaderProperties leaderProperties) - throws UnknownHostException { + public Candidate candidate(LeaderProperties leaderProperties) throws UnknownHostException { String id = Inet4Address.getLocalHost().getHostName(); String role = leaderProperties.getRole(); @@ -62,41 +59,32 @@ public class LeaderAutoConfiguration { } @Bean - public LeadershipController leadershipController(Candidate candidate, - LeaderProperties leaderProperties, LeaderEventPublisher leaderEventPublisher, - KubernetesClient kubernetesClient) { - return new LeadershipController(candidate, leaderProperties, leaderEventPublisher, - kubernetesClient); + public LeadershipController leadershipController(Candidate candidate, LeaderProperties leaderProperties, + LeaderEventPublisher leaderEventPublisher, KubernetesClient kubernetesClient) { + return new LeadershipController(candidate, leaderProperties, leaderEventPublisher, kubernetesClient); } @Bean public LeaderRecordWatcher leaderRecordWatcher(LeaderProperties leaderProperties, - LeadershipController leadershipController, - KubernetesClient kubernetesClient) { - return new LeaderRecordWatcher(leaderProperties, leadershipController, - kubernetesClient); + LeadershipController leadershipController, KubernetesClient kubernetesClient) { + return new LeaderRecordWatcher(leaderProperties, leadershipController, kubernetesClient); } @Bean - public PodReadinessWatcher hostPodWatcher(Candidate candidate, - KubernetesClient kubernetesClient, + public PodReadinessWatcher hostPodWatcher(Candidate candidate, KubernetesClient kubernetesClient, LeadershipController leadershipController) { - return new PodReadinessWatcher(candidate.getId(), kubernetesClient, - leadershipController); + return new PodReadinessWatcher(candidate.getId(), kubernetesClient, leadershipController); } @Bean(destroyMethod = "stop") - public LeaderInitiator leaderInitiator(LeaderProperties leaderProperties, - LeadershipController leadershipController, + public LeaderInitiator leaderInitiator(LeaderProperties leaderProperties, LeadershipController leadershipController, LeaderRecordWatcher leaderRecordWatcher, PodReadinessWatcher hostPodWatcher) { - return new LeaderInitiator(leaderProperties, leadershipController, - leaderRecordWatcher, hostPodWatcher); + return new LeaderInitiator(leaderProperties, leadershipController, leaderRecordWatcher, hostPodWatcher); } @Bean @ConditionalOnClass(InfoContributor.class) - public LeaderInfoContributor leaderInfoContributor( - LeadershipController leadershipController, Candidate candidate) { + public LeaderInfoContributor leaderInfoContributor(LeadershipController leadershipController, Candidate candidate) { return new LeaderInfoContributor(leadershipController, candidate); } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderContext.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderContext.java index 3106fd67..64457abf 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderContext.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderContext.java @@ -35,8 +35,7 @@ public class LeaderContext implements Context { @Override public boolean isLeader() { - return this.leadershipController.getLocalLeader() - .filter(l -> l.isCandidate(this.candidate)).isPresent(); + return this.leadershipController.getLocalLeader().filter(l -> l.isCandidate(this.candidate)).isPresent(); } @Override diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributor.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributor.java index fa14d39c..66cd3753 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributor.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributor.java @@ -30,8 +30,7 @@ public class LeaderInfoContributor implements InfoContributor { private final Candidate candidate; - public LeaderInfoContributor(LeadershipController leadershipController, - Candidate candidate) { + public LeaderInfoContributor(LeadershipController leadershipController, Candidate candidate) { this.leadershipController = leadershipController; this.candidate = candidate; } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInitiator.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInitiator.java index c79880ac..a1f2bbf1 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInitiator.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderInitiator.java @@ -44,8 +44,7 @@ public class LeaderInitiator implements SmartLifecycle { private boolean isRunning; - public LeaderInitiator(LeaderProperties leaderProperties, - LeadershipController leadershipController, + public LeaderInitiator(LeaderProperties leaderProperties, LeadershipController leadershipController, LeaderRecordWatcher leaderRecordWatcher, PodReadinessWatcher hostPodWatcher) { this.leaderProperties = leaderProperties; this.leadershipController = leadershipController; @@ -65,11 +64,9 @@ public class LeaderInitiator implements SmartLifecycle { this.leaderRecordWatcher.start(); this.hostPodWatcher.start(); this.scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); - this.scheduledExecutorService.scheduleAtFixedRate( - this.leadershipController::update, + this.scheduledExecutorService.scheduleAtFixedRate(this.leadershipController::update, this.leaderProperties.getUpdatePeriod().toMillis(), - this.leaderProperties.getUpdatePeriod().toMillis(), - TimeUnit.MILLISECONDS); + this.leaderProperties.getUpdatePeriod().toMillis(), TimeUnit.MILLISECONDS); this.isRunning = true; } } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcher.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcher.java index c0d3d663..69fc14fc 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcher.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcher.java @@ -29,8 +29,7 @@ import org.slf4j.LoggerFactory; */ public class LeaderRecordWatcher implements Watcher { - private static final Logger LOGGER = LoggerFactory - .getLogger(LeaderRecordWatcher.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LeaderRecordWatcher.class); private final Object lock = new Object(); @@ -42,8 +41,7 @@ public class LeaderRecordWatcher implements Watcher { private Watch watch; - public LeaderRecordWatcher(LeaderProperties leaderProperties, - LeadershipController leadershipController, + public LeaderRecordWatcher(LeaderProperties leaderProperties, LeadershipController leadershipController, KubernetesClient kubernetesClient) { this.leadershipController = leadershipController; this.leaderProperties = leaderProperties; @@ -56,10 +54,8 @@ public class LeaderRecordWatcher implements Watcher { if (this.watch == null) { LOGGER.debug("Starting leader record watcher"); this.watch = this.kubernetesClient.configMaps() - .inNamespace(this.leaderProperties - .getNamespace(this.kubernetesClient.getNamespace())) - .withName(this.leaderProperties.getConfigMapName()) - .watch(this); + .inNamespace(this.leaderProperties.getNamespace(this.kubernetesClient.getNamespace())) + .withName(this.leaderProperties.getConfigMapName()).watch(this); } } } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java index 898aeb18..c8982bc6 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeadershipController.java @@ -45,8 +45,7 @@ public class LeadershipController { private static final String KIND = "leaders"; - private static final Logger LOGGER = LoggerFactory - .getLogger(LeadershipController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LeadershipController.class); private final Candidate candidate; @@ -61,8 +60,7 @@ public class LeadershipController { private PodReadinessWatcher leaderReadinessWatcher; public LeadershipController(Candidate candidate, LeaderProperties leaderProperties, - LeaderEventPublisher leaderEventPublisher, - KubernetesClient kubernetesClient) { + LeaderEventPublisher leaderEventPublisher, KubernetesClient kubernetesClient) { this.candidate = candidate; this.leaderProperties = leaderProperties; this.leaderEventPublisher = leaderEventPublisher; @@ -109,8 +107,7 @@ public class LeadershipController { handleLeaderChange(null); } catch (KubernetesClientException e) { - LOGGER.warn("Failure when revoking leadership for '{}': {}", this.candidate, - e.getMessage()); + LOGGER.warn("Failure when revoking leadership for '{}': {}", this.candidate, e.getMessage()); } } @@ -118,9 +115,7 @@ public class LeadershipController { LOGGER.debug("Trying to acquire leadership for '{}'", this.candidate); if (!isPodReady(this.candidate.getId())) { - LOGGER.debug( - "Pod of '{}' is not ready at the moment, cannot acquire leadership", - this.candidate); + LOGGER.debug("Pod of '{}' is not ready at the moment, cannot acquire leadership", this.candidate); return; } @@ -133,13 +128,11 @@ public class LeadershipController { updateConfigMapEntry(configMap, data); } - Leader newLeader = new Leader(this.candidate.getRole(), - this.candidate.getId()); + Leader newLeader = new Leader(this.candidate.getRole(), this.candidate.getId()); handleLeaderChange(newLeader); } catch (KubernetesClientException e) { - LOGGER.warn("Failure when acquiring leadership for '{}': {}", this.candidate, - e.getMessage()); + LOGGER.warn("Failure when acquiring leadership for '{}': {}", this.candidate, e.getMessage()); notifyOnFailedToAcquire(); } } @@ -169,8 +162,7 @@ public class LeadershipController { LOGGER.debug("Leadership has been granted for '{}'", this.candidate); Context context = new LeaderContext(this.candidate, this); - this.leaderEventPublisher.publishOnGranted(this, context, - this.candidate.getRole()); + this.leaderEventPublisher.publishOnGranted(this, context, this.candidate.getRole()); try { this.candidate.onGranted(context); } @@ -184,16 +176,14 @@ public class LeadershipController { LOGGER.debug("Leadership has been revoked for '{}'", this.candidate); Context context = new LeaderContext(this.candidate, this); - this.leaderEventPublisher.publishOnRevoked(this, context, - this.candidate.getRole()); + this.leaderEventPublisher.publishOnRevoked(this, context, this.candidate.getRole()); this.candidate.onRevoked(context); } private void notifyOnFailedToAcquire() { if (this.leaderProperties.isPublishFailedEvents()) { Context context = new LeaderContext(this.candidate, this); - this.leaderEventPublisher.publishOnFailedToAcquire(this, context, - this.candidate.getRole()); + this.leaderEventPublisher.publishOnFailedToAcquire(this, context, this.candidate.getRole()); } } @@ -204,8 +194,8 @@ public class LeadershipController { } if (this.localLeader != null && !this.localLeader.isCandidate(this.candidate)) { - this.leaderReadinessWatcher = new PodReadinessWatcher( - this.localLeader.getId(), this.kubernetesClient, this); + this.leaderReadinessWatcher = new PodReadinessWatcher(this.localLeader.getId(), this.kubernetesClient, + this); this.leaderReadinessWatcher.start(); } } @@ -240,8 +230,7 @@ public class LeadershipController { private ConfigMap getConfigMap() { return this.kubernetesClient.configMaps() - .inNamespace(this.leaderProperties - .getNamespace(this.kubernetesClient.getNamespace())) + .inNamespace(this.leaderProperties.getNamespace(this.kubernetesClient.getNamespace())) .withName(this.leaderProperties.getConfigMapName()).get(); } @@ -249,21 +238,18 @@ public class LeadershipController { LOGGER.debug("Creating new config map with data: {}", data); ConfigMap newConfigMap = new ConfigMapBuilder().withNewMetadata() - .withName(this.leaderProperties.getConfigMapName()) - .addToLabels(PROVIDER_KEY, PROVIDER).addToLabels(KIND_KEY, KIND) - .endMetadata().addToData(data).build(); + .withName(this.leaderProperties.getConfigMapName()).addToLabels(PROVIDER_KEY, PROVIDER) + .addToLabels(KIND_KEY, KIND).endMetadata().addToData(data).build(); this.kubernetesClient.configMaps() - .inNamespace(this.leaderProperties - .getNamespace(this.kubernetesClient.getNamespace())) + .inNamespace(this.leaderProperties.getNamespace(this.kubernetesClient.getNamespace())) .create(newConfigMap); } private void updateConfigMapEntry(ConfigMap configMap, Map newData) { LOGGER.debug("Adding new data to config map: {}", newData); - ConfigMap newConfigMap = new ConfigMapBuilder(configMap).addToData(newData) - .build(); + ConfigMap newConfigMap = new ConfigMapBuilder(configMap).addToData(newData).build(); updateConfigMap(configMap, newConfigMap); } @@ -271,19 +257,16 @@ public class LeadershipController { private void removeConfigMapEntry(ConfigMap configMap, String key) { LOGGER.debug("Removing config map entry '{}'", key); - ConfigMap newConfigMap = new ConfigMapBuilder(configMap).removeFromData(key) - .build(); + ConfigMap newConfigMap = new ConfigMapBuilder(configMap).removeFromData(key).build(); updateConfigMap(configMap, newConfigMap); } private void updateConfigMap(ConfigMap oldConfigMap, ConfigMap newConfigMap) { this.kubernetesClient.configMaps() - .inNamespace(this.leaderProperties - .getNamespace(this.kubernetesClient.getNamespace())) + .inNamespace(this.leaderProperties.getNamespace(this.kubernetesClient.getNamespace())) .withName(this.leaderProperties.getConfigMapName()) - .lockResourceVersion(oldConfigMap.getMetadata().getResourceVersion()) - .replace(newConfigMap); + .lockResourceVersion(oldConfigMap.getMetadata().getResourceVersion()).replace(newConfigMap); } } diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcher.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcher.java index 4295c824..233edce4 100644 --- a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcher.java +++ b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcher.java @@ -32,8 +32,7 @@ import org.slf4j.LoggerFactory; */ public class PodReadinessWatcher implements Watcher { - private static final Logger LOGGER = LoggerFactory - .getLogger(PodReadinessWatcher.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PodReadinessWatcher.class); private final Object lock = new Object(); @@ -59,8 +58,7 @@ public class PodReadinessWatcher implements Watcher { synchronized (this.lock) { if (this.watch == null) { LOGGER.debug("Starting pod readiness watcher for '{}'", this.podName); - PodResource podResource = this.kubernetesClient - .pods().withName(this.podName); + PodResource podResource = this.kubernetesClient.pods().withName(this.podName); this.previousState = podResource.isReady(); this.watch = podResource.watch(this); } @@ -86,9 +84,8 @@ public class PodReadinessWatcher implements Watcher { if (this.previousState != currentState) { synchronized (this.lock) { if (this.previousState != currentState) { - LOGGER.debug( - "'{}' readiness status changed to '{}', triggering leadership update", - this.podName, currentState); + LOGGER.debug("'{}' readiness status changed to '{}', triggering leadership update", this.podName, + currentState); this.previousState = currentState; this.leadershipController.update(); } diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java index fee60341..a56b1472 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java @@ -48,9 +48,8 @@ public class LeaderAutoConfigurationTests { @Test public void infoEndpointShouldContainLeaderElection() { - this.webClient.get().uri("http://localhost:{port}/actuator/info", this.port) - .accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk() - .expectBody(String.class).value(containsString("kubernetes")); + this.webClient.get().uri("http://localhost:{port}/actuator/info", this.port).accept(MediaType.APPLICATION_JSON) + .exchange().expectStatus().isOk().expectBody(String.class).value(containsString("kubernetes")); } @SpringBootConfiguration diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderContextTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderContextTest.java index cb291fed..09247e5c 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderContextTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderContextTest.java @@ -49,14 +49,12 @@ public class LeaderContextTest { @BeforeEach public void before() { - this.leaderContext = new LeaderContext(this.mockCandidate, - this.mockLeadershipController); + this.leaderContext = new LeaderContext(this.mockCandidate, this.mockLeadershipController); } @Test public void testIsLeaderWithoutLeader() { - given(this.mockLeadershipController.getLocalLeader()) - .willReturn(Optional.empty()); + given(this.mockLeadershipController.getLocalLeader()).willReturn(Optional.empty()); boolean result = this.leaderContext.isLeader(); @@ -65,8 +63,7 @@ public class LeaderContextTest { @Test public void testIsLeaderWithAnotherLeader() { - given(this.mockLeadershipController.getLocalLeader()) - .willReturn(Optional.of(this.mockLeader)); + given(this.mockLeadershipController.getLocalLeader()).willReturn(Optional.of(this.mockLeader)); boolean result = this.leaderContext.isLeader(); @@ -75,8 +72,7 @@ public class LeaderContextTest { @Test public void testIsLeaderWhenLeader() { - given(this.mockLeadershipController.getLocalLeader()) - .willReturn(Optional.of(this.mockLeader)); + given(this.mockLeadershipController.getLocalLeader()).willReturn(Optional.of(this.mockLeader)); given(this.mockLeader.isCandidate(this.mockCandidate)).willReturn(true); boolean result = this.leaderContext.isLeader(); diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributorTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributorTest.java index 97de1bb3..d37de39b 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributorTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInfoContributorTest.java @@ -47,8 +47,7 @@ public class LeaderInfoContributorTest { @BeforeEach public void before() { - this.leaderInfoContributor = new LeaderInfoContributor( - this.mockLeadershipController, this.mockCandidate); + this.leaderInfoContributor = new LeaderInfoContributor(this.mockLeadershipController, this.mockCandidate); } @SuppressWarnings("unchecked") @@ -58,16 +57,14 @@ public class LeaderInfoContributorTest { leaderInfoContributor.contribute(builder); - Map details = (Map) builder.build() - .get("leaderElection"); + Map details = (Map) builder.build().get("leaderElection"); assertThat(details).containsEntry("leaderId", "Unknown"); } @SuppressWarnings("unchecked") @Test public void infoWhenLeader() { - given(this.mockLeadershipController.getLocalLeader()) - .willReturn(Optional.of(this.mockLeader)); + given(this.mockLeadershipController.getLocalLeader()).willReturn(Optional.of(this.mockLeader)); given(this.mockLeader.isCandidate(this.mockCandidate)).willReturn(true); given(this.mockLeader.getRole()).willReturn("testRole"); given(this.mockLeader.getId()).willReturn("id"); @@ -75,8 +72,7 @@ public class LeaderInfoContributorTest { leaderInfoContributor.contribute(builder); - Map details = (Map) builder.build() - .get("leaderElection"); + Map details = (Map) builder.build().get("leaderElection"); assertThat(details).containsEntry("isLeader", true); assertThat(details).containsEntry("leaderId", "id"); assertThat(details).containsEntry("role", "testRole"); @@ -85,16 +81,14 @@ public class LeaderInfoContributorTest { @SuppressWarnings("unchecked") @Test public void infoWhenAnotherIsLeader() { - given(this.mockLeadershipController.getLocalLeader()) - .willReturn(Optional.of(this.mockLeader)); + given(this.mockLeadershipController.getLocalLeader()).willReturn(Optional.of(this.mockLeader)); given(this.mockLeader.getRole()).willReturn("testRole"); given(this.mockLeader.getId()).willReturn("id"); Info.Builder builder = new Info.Builder(); leaderInfoContributor.contribute(builder); - Map details = (Map) builder.build() - .get("leaderElection"); + Map details = (Map) builder.build().get("leaderElection"); assertThat(details).containsEntry("isLeader", false); assertThat(details).containsEntry("leaderId", "id"); assertThat(details).containsEntry("role", "testRole"); diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInitiatorTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInitiatorTest.java index 844e66b2..b7afbe57 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInitiatorTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderInitiatorTest.java @@ -55,9 +55,8 @@ public class LeaderInitiatorTest { @BeforeEach public void before() { - this.leaderInitiator = new LeaderInitiator(this.mockLeaderProperties, - this.mockLeadershipController, this.mockLeaderRecordWatcher, - this.mockPodReadinessWatcher); + this.leaderInitiator = new LeaderInitiator(this.mockLeaderProperties, this.mockLeadershipController, + this.mockLeaderRecordWatcher, this.mockPodReadinessWatcher); } @AfterEach @@ -74,8 +73,7 @@ public class LeaderInitiatorTest { @Test public void shouldStart() throws InterruptedException { - given(this.mockLeaderProperties.getUpdatePeriod()) - .willReturn(Duration.ofMillis(1L)); + given(this.mockLeaderProperties.getUpdatePeriod()).willReturn(Duration.ofMillis(1L)); this.leaderInitiator.start(); @@ -88,8 +86,7 @@ public class LeaderInitiatorTest { @Test public void shouldStartOnlyOnce() { - given(this.mockLeaderProperties.getUpdatePeriod()) - .willReturn(Duration.ofMillis(10000L)); + given(this.mockLeaderProperties.getUpdatePeriod()).willReturn(Duration.ofMillis(10000L)); this.leaderInitiator.start(); this.leaderInitiator.start(); @@ -99,8 +96,7 @@ public class LeaderInitiatorTest { @Test public void shouldStop() { - given(this.mockLeaderProperties.getUpdatePeriod()) - .willReturn(Duration.ofMillis(10000L)); + given(this.mockLeaderProperties.getUpdatePeriod()).willReturn(Duration.ofMillis(10000L)); this.leaderInitiator.start(); this.leaderInitiator.stop(); @@ -113,8 +109,7 @@ public class LeaderInitiatorTest { @Test public void shouldStopOnlyOnce() { - given(this.mockLeaderProperties.getUpdatePeriod()) - .willReturn(Duration.ofMillis(10000L)); + given(this.mockLeaderProperties.getUpdatePeriod()).willReturn(Duration.ofMillis(10000L)); this.leaderInitiator.start(); this.leaderInitiator.stop(); @@ -125,8 +120,7 @@ public class LeaderInitiatorTest { @Test public void shouldStopAndExecuteCallback() { - given(this.mockLeaderProperties.getUpdatePeriod()) - .willReturn(Duration.ofMillis(10000L)); + given(this.mockLeaderProperties.getUpdatePeriod()).willReturn(Duration.ofMillis(10000L)); this.leaderInitiator.start(); this.leaderInitiator.stop(this.mockRunnable); diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcherTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcherTest.java index a609ee43..690608f0 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcherTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderRecordWatcherTest.java @@ -73,8 +73,8 @@ public class LeaderRecordWatcherTest { @BeforeEach public void before() { - this.watcher = new LeaderRecordWatcher(this.mockLeaderProperties, - this.mockLeadershipController, this.mockKubernetesClient); + this.watcher = new LeaderRecordWatcher(this.mockLeaderProperties, this.mockLeadershipController, + this.mockKubernetesClient); } @Test @@ -128,12 +128,9 @@ public class LeaderRecordWatcherTest { } private void initStubs() { - given(this.mockKubernetesClient.configMaps()) - .willReturn(this.mockConfigMapsOperation); - given(this.mockConfigMapsOperation.inNamespace(null)) - .willReturn(this.mockInNamespaceOperation); - given(this.mockInNamespaceOperation.withName(null)) - .willReturn(this.mockWithNameResource); + given(this.mockKubernetesClient.configMaps()).willReturn(this.mockConfigMapsOperation); + given(this.mockConfigMapsOperation.inNamespace(null)).willReturn(this.mockInNamespaceOperation); + given(this.mockInNamespaceOperation.withName(null)).willReturn(this.mockWithNameResource); given(this.mockWithNameResource.watch(this.watcher)).willReturn(this.mockWatch); } diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java index 68eb61c8..6de7ed25 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeadershipControllerTest.java @@ -50,9 +50,8 @@ public class LeadershipControllerTest { @BeforeEach public void before() { - this.leadershipController = new LeadershipController(this.mockCandidate, - this.mockLeaderProperties, this.mockLeaderEventPublisher, - this.mockKubernetesClient); + this.leadershipController = new LeadershipController(this.mockCandidate, this.mockLeaderProperties, + this.mockLeaderEventPublisher, this.mockKubernetesClient); } @Test diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcherTest.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcherTest.java index 4e8b308d..cc98056d 100644 --- a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcherTest.java +++ b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/PodReadinessWatcherTest.java @@ -72,8 +72,7 @@ public class PodReadinessWatcherTest { @BeforeEach public void before() { - this.watcher = new PodReadinessWatcher(POD_NAME, this.mockKubernetesClient, - this.mockLeadershipController); + this.watcher = new PodReadinessWatcher(POD_NAME, this.mockKubernetesClient, this.mockLeadershipController); } @Test diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java index df6f0eb1..fdd78224 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java +++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java @@ -30,10 +30,8 @@ import org.springframework.context.annotation.Configuration; */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(KubernetesLoadBalancerProperties.class) -@ConditionalOnProperty(value = "spring.cloud.kubernetes.loadbalancer.enabled", - matchIfMissing = true) -@LoadBalancerClients( - defaultConfiguration = KubernetesLoadBalancerClientConfiguration.class) +@ConditionalOnProperty(value = "spring.cloud.kubernetes.loadbalancer.enabled", matchIfMissing = true) +@LoadBalancerClients(defaultConfiguration = KubernetesLoadBalancerClientConfiguration.class) public class KubernetesLoadBalancerAutoConfiguration { @Bean diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerClientConfiguration.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerClientConfiguration.java index 4201f4c8..8a6e1af6 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerClientConfiguration.java +++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerClientConfiguration.java @@ -31,13 +31,11 @@ import org.springframework.core.env.Environment; public class KubernetesLoadBalancerClientConfiguration { @Bean - @ConditionalOnProperty(name = "spring.cloud.kubernetes.loadbalancer.mode", - havingValue = "SERVICE") + @ConditionalOnProperty(name = "spring.cloud.kubernetes.loadbalancer.mode", havingValue = "SERVICE") KubernetesServicesListSupplier kubernetesServicesListSupplier(Environment environment, KubernetesClient kubernetesClient, KubernetesServiceInstanceMapper mapper, KubernetesDiscoveryProperties discoveryProperties) { - return new KubernetesServicesListSupplier(environment, kubernetesClient, mapper, - discoveryProperties); + return new KubernetesServicesListSupplier(environment, kubernetesClient, mapper, discoveryProperties); } } diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java index cfe7bcef..32f43266 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java +++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapper.java @@ -54,10 +54,8 @@ public class KubernetesServiceInstanceMapper { if (ports.size() == 1) { port = ports.get(0); } - else if (ports.size() > 1 - && Utils.isNotNullOrEmpty(this.properties.getPortName())) { - Optional optPort = ports.stream() - .filter(it -> properties.getPortName().endsWith(it.getName())) + else if (ports.size() > 1 && Utils.isNotNullOrEmpty(this.properties.getPortName())) { + Optional optPort = ports.stream().filter(it -> properties.getPortName().endsWith(it.getName())) .findAny(); if (optPort.isPresent()) { port = optPort.get(); @@ -68,22 +66,20 @@ public class KubernetesServiceInstanceMapper { } final String host = createHost(service); final boolean secure = isSecure(service, port); - return new KubernetesServiceInstance(meta.getUid(), meta.getName(), host, - port.getPort(), getServiceMetadata(service), secure); + return new KubernetesServiceInstance(meta.getUid(), meta.getName(), host, port.getPort(), + getServiceMetadata(service), secure); } private Map getServiceMetadata(Service service) { final Map serviceMetadata = new HashMap<>(); - KubernetesDiscoveryProperties.Metadata metadataProps = this.discoveryProperties - .getMetadata(); + KubernetesDiscoveryProperties.Metadata metadataProps = this.discoveryProperties.getMetadata(); if (metadataProps.isAddLabels()) { - Map labelMetadata = getMapWithPrefixedKeys( - service.getMetadata().getLabels(), metadataProps.getLabelsPrefix()); + Map labelMetadata = getMapWithPrefixedKeys(service.getMetadata().getLabels(), + metadataProps.getLabelsPrefix()); serviceMetadata.putAll(labelMetadata); } if (metadataProps.isAddAnnotations()) { - Map annotationMetadata = getMapWithPrefixedKeys( - service.getMetadata().getAnnotations(), + Map annotationMetadata = getMapWithPrefixedKeys(service.getMetadata().getAnnotations(), metadataProps.getAnnotationsPrefix()); serviceMetadata.putAll(annotationMetadata); } @@ -91,8 +87,7 @@ public class KubernetesServiceInstanceMapper { return serviceMetadata; } - private Map getMapWithPrefixedKeys(Map map, - String prefix) { + private Map getMapWithPrefixedKeys(Map map, String prefix) { if (map == null) { return new HashMap<>(); } @@ -105,13 +100,11 @@ public class KubernetesServiceInstanceMapper { } private boolean isSecure(Service service, ServicePort port) { - final String securedLabelValue = service.getMetadata().getLabels() - .getOrDefault("secured", "false"); + final String securedLabelValue = service.getMetadata().getLabels().getOrDefault("secured", "false"); if (securedLabelValue.equals("true")) { return true; } - final String securedAnnotationValue = service.getMetadata().getAnnotations() - .getOrDefault("secured", "false"); + final String securedAnnotationValue = service.getMetadata().getAnnotations().getOrDefault("secured", "false"); if (securedAnnotationValue.equals("true")) { return true; } @@ -121,8 +114,8 @@ public class KubernetesServiceInstanceMapper { private String createHost(Service service) { return String.format("%s.%s.svc.%s", service.getMetadata().getName(), - StringUtils.isNotBlank(service.getMetadata().getNamespace()) - ? service.getMetadata().getNamespace() : "default", + StringUtils.isNotBlank(service.getMetadata().getNamespace()) ? service.getMetadata().getNamespace() + : "default", properties.getClusterDomain()); } diff --git a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java index 63447b91..9cb289a6 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java +++ b/spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServicesListSupplier.java @@ -46,9 +46,8 @@ public class KubernetesServicesListSupplier implements ServiceInstanceListSuppli private final KubernetesServiceInstanceMapper mapper; - KubernetesServicesListSupplier(Environment environment, - KubernetesClient kubernetesClient, KubernetesServiceInstanceMapper mapper, - KubernetesDiscoveryProperties discoveryProperties) { + KubernetesServicesListSupplier(Environment environment, KubernetesClient kubernetesClient, + KubernetesServiceInstanceMapper mapper, KubernetesDiscoveryProperties discoveryProperties) { this.environment = environment; this.kubernetesClient = kubernetesClient; this.discoveryProperties = discoveryProperties; @@ -70,11 +69,9 @@ public class KubernetesServicesListSupplier implements ServiceInstanceListSuppli } else { Service service = StringUtils.isNotBlank(this.kubernetesClient.getNamespace()) - ? this.kubernetesClient.services() - .inNamespace(this.kubernetesClient.getNamespace()) + ? this.kubernetesClient.services().inNamespace(this.kubernetesClient.getNamespace()) .withName(this.getServiceId()).get() - : this.kubernetesClient.services().withName(this.getServiceId()) - .get(); + : this.kubernetesClient.services().withName(this.getServiceId()).get(); if (service != null) { result.add(mapper.map(service)); } diff --git a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java index c49d5187..5fb1368b 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceInstanceMapperTests.java @@ -39,8 +39,8 @@ class KubernetesServiceInstanceMapperTests { KubernetesLoadBalancerProperties properties = new KubernetesLoadBalancerProperties(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(); Service service = buildService("test", "abc", 8080, null, new HashMap<>()); - KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper( - properties, discoveryProperties).map(service); + KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper(properties, discoveryProperties) + .map(service); Assertions.assertNotNull(instance); Assertions.assertEquals("test", instance.getServiceId()); Assertions.assertEquals("abc", instance.getInstanceId()); @@ -55,8 +55,8 @@ class KubernetesServiceInstanceMapperTests { ports.add(new ServicePortBuilder().withPort(8080).withName("web").build()); ports.add(new ServicePortBuilder().withPort(9000).withName("http").build()); Service service = buildService("test", "abc", ports, new HashMap<>()); - KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper( - properties, discoveryProperties).map(service); + KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper(properties, discoveryProperties) + .map(service); Assertions.assertNotNull(instance); Assertions.assertEquals("test", instance.getServiceId()); Assertions.assertEquals("abc", instance.getInstanceId()); @@ -68,8 +68,8 @@ class KubernetesServiceInstanceMapperTests { KubernetesLoadBalancerProperties properties = new KubernetesLoadBalancerProperties(); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(); Service service = buildService("test", "abc", 443, null, new HashMap<>()); - KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper( - properties, discoveryProperties).map(service); + KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper(properties, discoveryProperties) + .map(service); Assertions.assertNotNull(instance); Assertions.assertEquals("test", instance.getServiceId()); Assertions.assertEquals("abc", instance.getInstanceId()); @@ -84,8 +84,8 @@ class KubernetesServiceInstanceMapperTests { labels.put("secured", "true"); labels.put("label1", "123"); Service service = buildService("test", "abc", 8080, null, labels); - KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper( - properties, discoveryProperties).map(service); + KubernetesServiceInstance instance = new KubernetesServiceInstanceMapper(properties, discoveryProperties) + .map(service); Assertions.assertNotNull(instance); Assertions.assertEquals("test", instance.getServiceId()); Assertions.assertEquals("abc", instance.getInstanceId()); @@ -93,17 +93,13 @@ class KubernetesServiceInstanceMapperTests { Assertions.assertEquals(2, instance.getMetadata().keySet().size()); } - private Service buildService(String name, String uid, List ports, - Map labels) { - return new ServiceBuilder().withNewMetadata().withName(name).withNewUid(uid) - .addToLabels(labels).addToAnnotations(new HashMap<>(0)).endMetadata() - .withNewSpec().addAllToPorts(ports).endSpec().build(); + private Service buildService(String name, String uid, List ports, Map labels) { + return new ServiceBuilder().withNewMetadata().withName(name).withNewUid(uid).addToLabels(labels) + .addToAnnotations(new HashMap<>(0)).endMetadata().withNewSpec().addAllToPorts(ports).endSpec().build(); } - private Service buildService(String name, String uid, int port, String portName, - Map labels) { - ServicePort servicePort = new ServicePortBuilder().withPort(port) - .withName(portName).build(); + private Service buildService(String name, String uid, int port, String portName, Map labels) { + ServicePort servicePort = new ServicePortBuilder().withPort(port).withName(portName).build(); return buildService(name, uid, Collections.singletonList(servicePort), labels); } diff --git a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java index 9dd9c0ad..d1799cea 100644 --- a/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java +++ b/spring-cloud-kubernetes-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesServiceListSupplierTests.java @@ -69,18 +69,15 @@ class KubernetesServiceListSupplierTests { @Test void testPositiveMatch() { - when(environment.getProperty("loadbalancer.client.name")) - .thenReturn("test-service"); - when(mapper.map(any(Service.class))) - .thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false)); + when(environment.getProperty("loadbalancer.client.name")).thenReturn("test-service"); + when(mapper.map(any(Service.class))).thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false)); when(this.client.getNamespace()).thenReturn("test"); when(this.client.services()).thenReturn(this.serviceOperation); when(this.serviceOperation.inNamespace("test")).thenReturn(namespaceOperation); - when(this.namespaceOperation.withName("test-service")) - .thenReturn(this.serviceResource); + when(this.namespaceOperation.withName("test-service")).thenReturn(this.serviceResource); when(this.serviceResource.get()).thenReturn(buildService("test-service", 8080)); - KubernetesServicesListSupplier supplier = new KubernetesServicesListSupplier( - environment, client, mapper, new KubernetesDiscoveryProperties()); + KubernetesServicesListSupplier supplier = new KubernetesServicesListSupplier(environment, client, mapper, + new KubernetesDiscoveryProperties()); List instances = supplier.get().blockFirst(); assert instances != null; Assertions.assertEquals(1, instances.size()); @@ -88,29 +85,26 @@ class KubernetesServiceListSupplierTests { @Test void testPositiveMatchAllNamespaces() { - when(environment.getProperty("loadbalancer.client.name")) - .thenReturn("test-service"); - when(mapper.map(any(Service.class))) - .thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false)); + when(environment.getProperty("loadbalancer.client.name")).thenReturn("test-service"); + when(mapper.map(any(Service.class))).thenReturn(new KubernetesServiceInstance("", "", "", 0, null, false)); when(this.client.services()).thenReturn(this.serviceOperation); when(this.serviceOperation.inAnyNamespace()).thenReturn(this.multiDeletable); - when(this.multiDeletable.withField("metadata.name", "test-service")) - .thenReturn(this.multiDeletable); + when(this.multiDeletable.withField("metadata.name", "test-service")).thenReturn(this.multiDeletable); ServiceList serviceList = new ServiceList(); serviceList.getItems().add(buildService("test-service", 8080)); when(this.multiDeletable.list()).thenReturn(serviceList); KubernetesDiscoveryProperties discoveryProperties = new KubernetesDiscoveryProperties(); discoveryProperties.setAllNamespaces(true); - KubernetesServicesListSupplier supplier = new KubernetesServicesListSupplier( - environment, client, mapper, discoveryProperties); + KubernetesServicesListSupplier supplier = new KubernetesServicesListSupplier(environment, client, mapper, + discoveryProperties); List instances = supplier.get().blockFirst(); assert instances != null; Assertions.assertEquals(1, instances.size()); } private Service buildService(String name, int port) { - return new ServiceBuilder().withNewMetadata().withName(name).endMetadata() - .withNewSpec().addNewPort().withPort(port).endPort().endSpec().build(); + return new ServiceBuilder().withNewMetadata().withName(name).endMetadata().withNewSpec().addNewPort() + .withPort(port).endPort().endSpec().build(); } }