+ * 1. read all secrets in the provided namespace + * 2. from the above, filter the ones that we care about (filter by labels) + * 3. with secret names from (2), find out if there are any profile based secrets (if profiles is not empty) + * 4. concat (2) and (3) and these are the secrets we are interested in + * 5. see if any of the secrets from (4) has a single yaml/properties file + * 6. gather all the names of the secrets (from 4) + data they hold + *+ */ + static MultipleSourcesContainer secretsDataByLabels(CoreV1Api client, String namespace, Map
+ * 1. read all config maps in the provided namespace + * 2. from the above, filter the ones that we care about (filter by labels) + * 3. with config maps names from (2), find out if there are any profile based ones (if profiles is not empty) + * 4. concat (2) and (3) and these are the config maps we are interested in + * 5. see if any from (4) has a single yaml/properties file + * 6. gather all the names of the config maps (from 4) + data they hold + *+ */ + static MultipleSourcesContainer configMapsDataByLabels(CoreV1Api client, String namespace, + Map
+ * 1. read all secrets in the provided namespace + * 2. from the above, filter the ones that we care about (by name) + * 3. see if any of the secrets has a single yaml/properties file + * 4. gather all the names of the secrets + decoded data they hold + **/ - static Map
+ * 1. read all config maps in the provided namespace + * 2. from the above, filter the ones that we care about (by name) + * 3. see if any of the config maps has a single yaml/properties file + * 4. gather all the names of the config maps + data they hold + *+ */ + static MultipleSourcesContainer configMapsDataByName(CoreV1Api client, String namespace, Set
+ * - configmap "color-configmap" with label "{color:blue}"
+ * - configmap "shape-configmap" with labels "{color:blue, shape:round}"
+ * - configmap "no-fit" with labels "{tag:no-fit}"
+ * - configmap "color-configmap-k8s" with label "{color:red}"
+ * - configmap "shape-configmap-k8s" with label "{shape:triangle}"
+ *
+ */
+ @Test
+ void searchWithLabelsTwoConfigMapsFoundAndOneFromProfileFound() {
+
+ V1ConfigMap colorConfigMap = new V1ConfigMapBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withName("color-configmap").withLabels(BLUE_LABEL).withNamespace(NAMESPACE).build())
+ .addToData("one", "1").build();
+
+ V1ConfigMap shapeConfigmap = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("shape-configmap")
+ .withLabels(Map.of("color", "blue", "shape", "round")).withNamespace(NAMESPACE).build())
+ .addToData("two", "2").build();
+
+ V1ConfigMap noFit = new V1ConfigMapBuilder().withMetadata(new V1ObjectMetaBuilder().withName("no-fit")
+ .withLabels(Map.of("tag", "no-fit")).withNamespace(NAMESPACE).build()).addToData("three", "3").build();
+
+ V1ConfigMap colorConfigmapK8s = new V1ConfigMapBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withName("color-configmap-k8s").withLabels(RED_LABEL).withNamespace(NAMESPACE).build())
+ .addToData("four", "4").build();
+
+ V1ConfigMap shapeConfigmapK8s = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("shape-configmap-k8s")
+ .withLabels(Map.of("shape", "triangle")).withNamespace(NAMESPACE).build())
+ .addToData("five", "5").build();
+
+ V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(colorConfigMap).addItemsItem(shapeConfigmap)
+ .addItemsItem(noFit).addItemsItem(colorConfigmapK8s).addItemsItem(shapeConfigmapK8s);
+
+ stubCall(configMapList);
+ CoreV1Api api = new CoreV1Api();
+ MockEnvironment environment = new MockEnvironment();
+ environment.setActiveProfiles("k8s");
+
+ NormalizedSource source = new LabeledConfigMapNormalizedSource(NAMESPACE, BLUE_LABEL, true,
+ ConfigUtils.Prefix.DELAYED, true);
+ KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment);
+
+ KubernetesClientContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
+ SourceData sourceData = data.apply(context);
+
+ Assertions.assertEquals(sourceData.sourceData().size(), 4);
+ Assertions.assertEquals(sourceData.sourceData()
+ .get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.one"), "1");
+ Assertions.assertEquals(sourceData.sourceData()
+ .get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.two"), "2");
+ Assertions.assertEquals(sourceData.sourceData()
+ .get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.four"), "4");
+ Assertions.assertEquals(sourceData.sourceData()
+ .get("color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.five"), "5");
+
+ Assertions.assertEquals(sourceData.sourceName(),
+ "configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
+
+ }
+
+ private void stubCall(V1ConfigMapList list) {
+ stubFor(get("/api/v1/namespaces/default/configmaps")
+ .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledSecretContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledSecretContextToSourceDataProviderTests.java
index 6e83c1ac6a..fcf220777e 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledSecretContextToSourceDataProviderTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/LabeledSecretContextToSourceDataProviderTests.java
@@ -18,6 +18,7 @@
import java.util.Base64;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -28,6 +29,7 @@
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.apis.CoreV1Api;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.openapi.models.V1Secret;
import io.kubernetes.client.openapi.models.V1SecretBuilder;
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.util.ClientBuilder;
@@ -36,9 +38,9 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.springframework.cloud.kubernetes.commons.config.ConfigUtils;
import org.springframework.cloud.kubernetes.commons.config.LabeledSecretNormalizedSource;
import org.springframework.cloud.kubernetes.commons.config.NormalizedSource;
-import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySource;
import org.springframework.cloud.kubernetes.commons.config.SourceData;
import org.springframework.mock.env.MockEnvironment;
@@ -86,26 +88,25 @@ void afterEach() {
@Test
void noMatch() {
- V1SecretList secretList = new V1SecretList().addItemsItem(new V1SecretBuilder()
+ V1Secret red = new V1SecretBuilder()
.withMetadata(new V1ObjectMetaBuilder().withLabels(Collections.singletonMap("color", "red"))
- .withNamespace(NAMESPACE).withName("red-secret").withResourceVersion("1").build())
- .addToData("color", Base64.getEncoder().encode("really-red".getBytes())).build());
+ .withNamespace(NAMESPACE).withName("red-secret").build())
+ .addToData("color", Base64.getEncoder().encode("really-red".getBytes())).build();
+ V1SecretList secretList = new V1SecretList().addItemsItem(red);
+ stubCall(secretList);
CoreV1Api api = new CoreV1Api();
- stubFor(get("/api/v1/namespaces/default/secrets?labelSelector=color%3Dred")
- .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
// blue does not match red
NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE,
- Collections.singletonMap("color", "blue"), false);
+ Collections.singletonMap("color", "blue"), false, false);
KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
new MockEnvironment());
- KubernetesClientContextToSourceData data = LabeledSecretContextToSourceDataProvider
- .of(LabeledSecretContextToSourceDataProviderTests.Dummy::sourceName).get();
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
- Assertions.assertEquals(sourceData.sourceName(), "secrets.color.default");
+ Assertions.assertEquals(sourceData.sourceName(), "secret.color.default");
Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap());
}
@@ -117,24 +118,22 @@ void noMatch() {
@Test
void singleSecretMatchAgainstLabels() {
- V1SecretList SECRETS_LIST = new V1SecretList().addItemsItem(new V1SecretBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withLabels(LABELS).withNamespace(NAMESPACE)
- .withResourceVersion("1").withName("test-secret").build())
- .addToData("color", "really-red".getBytes()).build());
+ V1Secret red = new V1SecretBuilder().withMetadata(
+ new V1ObjectMetaBuilder().withLabels(LABELS).withNamespace(NAMESPACE).withName("test-secret").build())
+ .addToData("color", "really-red".getBytes()).build();
+ V1SecretList secretList = new V1SecretList().addItemsItem(red);
+ stubCall(secretList);
CoreV1Api api = new CoreV1Api();
- stubFor(get("/api/v1/namespaces/default/secrets?labelSelector=label2%3Dvalue2%2Clabel1%3Dvalue1")
- .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(SECRETS_LIST))));
- NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, LABELS, false);
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, LABELS, false, false);
KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
new MockEnvironment());
- KubernetesClientContextToSourceData data = LabeledSecretContextToSourceDataProvider
- .of(LabeledSecretContextToSourceDataProviderTests.Dummy::sourceName).get();
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
- Assertions.assertEquals(sourceData.sourceName(), "secrets.test-secret.default");
+ Assertions.assertEquals(sourceData.sourceName(), "secret.test-secret.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
}
@@ -145,30 +144,26 @@ void singleSecretMatchAgainstLabels() {
@Test
void twoSecretsMatchAgainstLabels() {
- V1SecretList secretList = new V1SecretList();
- secretList.addItemsItem(new V1SecretBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withLabels(RED_LABEL).withNamespace(NAMESPACE)
- .withResourceVersion("1").withName("color-one").build())
- .addToData("colorOne", "really-red-one".getBytes()).build());
+ V1Secret one = new V1SecretBuilder().withMetadata(
+ new V1ObjectMetaBuilder().withLabels(RED_LABEL).withNamespace(NAMESPACE).withName("color-one").build())
+ .addToData("colorOne", "really-red-one".getBytes()).build();
- secretList.addItemsItem(new V1SecretBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withLabels(RED_LABEL).withNamespace(NAMESPACE)
- .withResourceVersion("1").withName("color-two").build())
- .addToData("colorTwo", "really-red-two".getBytes()).build());
+ V1Secret two = new V1SecretBuilder().withMetadata(
+ new V1ObjectMetaBuilder().withLabels(RED_LABEL).withNamespace(NAMESPACE).withName("color-two").build())
+ .addToData("colorTwo", "really-red-two".getBytes()).build();
+ V1SecretList secretList = new V1SecretList().addItemsItem(one).addItemsItem(two);
+ stubCall(secretList);
CoreV1Api api = new CoreV1Api();
- stubFor(get("/api/v1/namespaces/default/secrets?labelSelector=color%3Dred")
- .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
- NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, RED_LABEL, false);
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, RED_LABEL, false, false);
KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
new MockEnvironment());
- KubernetesClientContextToSourceData data = LabeledSecretContextToSourceDataProvider
- .of(LabeledSecretContextToSourceDataProviderTests.Dummy::sourceName).get();
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
- Assertions.assertEquals(sourceData.sourceName(), "secrets.color-one.color-two.default");
+ Assertions.assertEquals(sourceData.sourceName(), "secret.color-one.color-two.default");
Assertions.assertEquals(sourceData.sourceData().size(), 2);
Assertions.assertEquals(sourceData.sourceData().get("colorOne"), "really-red-one");
Assertions.assertEquals(sourceData.sourceData().get("colorTwo"), "really-red-two");
@@ -177,38 +172,276 @@ void twoSecretsMatchAgainstLabels() {
@Test
void namespaceMatch() {
- V1SecretList SECRETS_LIST = new V1SecretList().addItemsItem(new V1SecretBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withLabels(LABELS).withNamespace(NAMESPACE)
- .withResourceVersion("1").withName("test-secret").build())
- .addToData("color", "really-red".getBytes()).build());
+ V1Secret one = new V1SecretBuilder().withMetadata(
+ new V1ObjectMetaBuilder().withLabels(LABELS).withNamespace(NAMESPACE).withName("test-secret").build())
+ .addToData("color", "really-red".getBytes()).build();
+ V1SecretList secretList = new V1SecretList().addItemsItem(one);
+ stubCall(secretList);
CoreV1Api api = new CoreV1Api();
- stubFor(get("/api/v1/namespaces/default/secrets?labelSelector=label2%3Dvalue2%2Clabel1%3Dvalue1")
- .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(SECRETS_LIST))));
- NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE + "nope", LABELS, false);
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE + "nope", LABELS, false, false);
KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
new MockEnvironment());
- KubernetesClientContextToSourceData data = LabeledSecretContextToSourceDataProvider
- .of(LabeledSecretContextToSourceDataProviderTests.Dummy::sourceName).get();
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
SourceData sourceData = data.apply(context);
- Assertions.assertEquals(sourceData.sourceName(), "secrets.test-secret.default");
+ Assertions.assertEquals(sourceData.sourceName(), "secret.test-secret.default");
Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red"));
}
- // needed only to allow access to the super methods
- private static final class Dummy extends SecretsPropertySource {
+ /**
+ * one secret with name : "blue-secret" and labels "color=blue" is deployed. we search
+ * it with the same labels, find it, and assert that name of the SourceData (it must
+ * use its name, not its labels) and values in the SourceData must be prefixed (since
+ * we have provided an explicit prefix).
+ */
+ @Test
+ void testWithPrefix() {
- private Dummy() {
- super(SourceData.emptyRecord("dummy-name"));
- }
+ V1Secret one = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder().withLabels(Map.of("color", "blue"))
+ .withNamespace(NAMESPACE).withName("blue-secret").build())
+ .addToData("what-color", "blue-color".getBytes()).build();
+ V1SecretList secretList = new V1SecretList().addItemsItem(one);
+
+ stubCall(secretList);
+ CoreV1Api api = new CoreV1Api();
+
+ ConfigUtils.Prefix prefix = ConfigUtils.findPrefix("me", false, false, null);
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, Map.of("color", "blue"), false, prefix,
+ false);
+ KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
+ new MockEnvironment());
+
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
+ SourceData sourceData = data.apply(context);
+
+ Assertions.assertEquals("secret.blue-secret.default", sourceData.sourceName());
+ Assertions.assertEquals(Map.of("me.what-color", "blue-color"), sourceData.sourceData());
+ }
+
+ /**
+ * two secrets are deployed (name:blue-secret, name:another-blue-secret) and labels
+ * "color=blue" (on both). we search with the same labels, find them, and assert that
+ * name of the SourceData (it must use its name, not its labels) and values in the
+ * SourceData must be prefixed (since we have provided a delayed prefix).
+ *
+ * Also notice that the prefix is made up from both secret names.
+ *
+ */
+ @Test
+ void testTwoSecretsWithPrefix() {
+
+ V1Secret one = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder().withLabels(Map.of("color", "blue"))
+ .withNamespace(NAMESPACE).withName("blue-secret").build()).addToData("first", "blue".getBytes())
+ .build();
+
+ V1Secret two = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder().withLabels(Map.of("color", "blue"))
+ .withNamespace(NAMESPACE).withName("another-blue-secret").build())
+ .addToData("second", "blue".getBytes()).build();
+
+ V1SecretList secretList = new V1SecretList().addItemsItem(one).addItemsItem(two);
+
+ stubCall(secretList);
+ CoreV1Api api = new CoreV1Api();
+
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, Map.of("color", "blue"), false,
+ ConfigUtils.Prefix.DELAYED, false);
+ KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
+ new MockEnvironment());
+
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
+ SourceData sourceData = data.apply(context);
- private static String sourceName(String name, String namespace) {
- return getSourceName(name, namespace);
+ // maps don't have a defined order, so assert components separately
+ Assertions.assertEquals(46, sourceData.sourceName().length());
+ Assertions.assertTrue(sourceData.sourceName().contains("secret"));
+ Assertions.assertTrue(sourceData.sourceName().contains("blue-secret"));
+ Assertions.assertTrue(sourceData.sourceName().contains("another-blue-secret"));
+ Assertions.assertTrue(sourceData.sourceName().contains("default"));
+
+ Map
+ * - secret "color-secret" with label "{color:blue}"
+ * - secret "shape-secret" with labels "{color:blue, shape:round}"
+ * - secret "no-fit" with labels "{tag:no-fit}"
+ * - secret "color-secret-k8s" with label "{color:red}"
+ * - secret "shape-secret-k8s" with label "{shape:triangle}"
+ *
+ */
+ @Test
+ void searchWithLabelsTwoSecretsFoundAndOneFromProfileFound() {
+
+ V1Secret colorSecret = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withLabels(Map.of("color", "blue")).withNamespace(NAMESPACE).withName("color-secret").build())
+ .addToData("one", "1".getBytes()).build();
+
+ V1Secret shapeSecret = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withLabels(Map.of("color", "blue", "shape", "round"))
+ .withNamespace(NAMESPACE).withName("shape-secret").build())
+ .addToData("two", "2".getBytes()).build();
+
+ V1Secret noFit = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withLabels(Map.of("tag", "no-fit")).withNamespace(NAMESPACE).withName("no-fit").build())
+ .addToData("three", "3".getBytes()).build();
+
+ V1Secret colorSecretK8s = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withLabels(Map.of("color", "red")).withNamespace(NAMESPACE).withName("color-secret-k8s").build())
+ .addToData("four", "4".getBytes()).build();
+
+ V1Secret shapeSecretK8s = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withLabels(Map.of("shape", "triangle")).withNamespace(NAMESPACE).withName("shape-secret-k8s").build())
+ .addToData("five", "5".getBytes()).build();
+
+ V1SecretList secretList = new V1SecretList().addItemsItem(colorSecret).addItemsItem(shapeSecret)
+ .addItemsItem(noFit).addItemsItem(colorSecretK8s).addItemsItem(shapeSecretK8s);
+
+ stubCall(secretList);
+ CoreV1Api api = new CoreV1Api();
+ MockEnvironment environment = new MockEnvironment();
+ environment.setActiveProfiles("k8s");
+
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, Map.of("color", "blue"), false,
+ ConfigUtils.Prefix.DELAYED, true);
+ KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment);
+
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
+ SourceData sourceData = data.apply(context);
+
+ Assertions.assertEquals(sourceData.sourceData().size(), 4);
+ Assertions.assertEquals(
+ sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.one"), "1");
+ Assertions.assertEquals(
+ sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.two"), "2");
+ Assertions.assertEquals(
+ sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.four"), "4");
+ Assertions.assertEquals(
+ sourceData.sourceData().get("color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.five"), "5");
+
+ Assertions.assertEquals(sourceData.sourceName(),
+ "secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
+
+ }
+
+ /**
+ * yaml/properties gets special treatment
+ */
+ @Test
+ void testYaml() {
+ V1Secret colorSecret = new V1SecretBuilder().withMetadata(new V1ObjectMetaBuilder()
+ .withLabels(Map.of("color", "blue")).withNamespace(NAMESPACE).withName("color-secret").build())
+ .addToData("test.yaml", "color: blue".getBytes()).build();
+
+ V1SecretList secretList = new V1SecretList().addItemsItem(colorSecret);
+
+ stubCall(secretList);
+ CoreV1Api api = new CoreV1Api();
+
+ NormalizedSource source = new LabeledSecretNormalizedSource(NAMESPACE, Map.of("color", "blue"), false,
+ ConfigUtils.Prefix.DEFAULT, true);
+ KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE,
+ new MockEnvironment());
+
+ KubernetesClientContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
+ SourceData sourceData = data.apply(context);
+
+ Assertions.assertEquals(sourceData.sourceData().size(), 1);
+ Assertions.assertEquals(sourceData.sourceData().get("color"), "blue");
+ Assertions.assertEquals(sourceData.sourceName(), "secret.color-secret.default");
+ }
+
+ private void stubCall(V1SecretList list) {
+ stubFor(get("/api/v1/namespaces/default/secrets")
+ .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list))));
}
}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java
index a527c1d0b2..550e1762f2 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedConfigMapContextToSourceDataProviderTests.java
@@ -25,6 +25,7 @@
import io.kubernetes.client.openapi.Configuration;
import io.kubernetes.client.openapi.JSON;
import io.kubernetes.client.openapi.apis.CoreV1Api;
+import io.kubernetes.client.openapi.models.V1ConfigMap;
import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
import io.kubernetes.client.openapi.models.V1ConfigMapList;
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
@@ -34,12 +35,10 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.springframework.cloud.kubernetes.commons.config.ConfigMapPrefixContext;
-import org.springframework.cloud.kubernetes.commons.config.ConfigMapPropertySource;
+import org.springframework.cloud.kubernetes.commons.config.ConfigUtils;
import org.springframework.cloud.kubernetes.commons.config.NamedConfigMapNormalizedSource;
import org.springframework.cloud.kubernetes.commons.config.NormalizedSource;
import org.springframework.cloud.kubernetes.commons.config.SourceData;
-import org.springframework.core.env.Environment;
import org.springframework.mock.env.MockEnvironment;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
@@ -56,8 +55,14 @@ class NamedConfigMapContextToSourceDataProviderTests {
private static final String RED_CONFIG_MAP_NAME = "red";
+ private static final String RED_WITH_PROFILE_CONFIG_MAP_NAME = RED_CONFIG_MAP_NAME + "-with-profile";
+
private static final String BLUE_CONFIG_MAP_NAME = "blue";
+ private static final Map+ * one configmap deployed with name "red" + * we search by name, but for the "blue" one, as such not find it + **/ @Test void noMatch() { + V1ConfigMap redConfigMap = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME) - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("color", "really-red").build()); - + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(redConfigMap); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(BLUE_CONFIG_MAP_NAME, NAMESPACE, true, "", false); + + NormalizedSource source = new NamedConfigMapNormalizedSource(BLUE_CONFIG_MAP_NAME, NAMESPACE, true, false); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, new MockEnvironment()); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.blue.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.emptyMap()); + Assertions.assertEquals(sourceData.sourceData(), Map.of()); } /** - * we have a single config map deployed. it matches our query. + *
+ * one configmap deployed with name "red" + * we search by name, for the "red" one, as such we find it + **/ @Test void match() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME) - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("color", "really-red").build()); + V1ConfigMap configMap = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(configMap); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, "", false); + + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, false); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, new MockEnvironment()); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("color", "really-red")); + Assertions.assertEquals(sourceData.sourceData(), COLOR_REALLY_RED); } /** - * we have two config maps deployed. one matches the query name. the other matches the - * active profile + name, thus is taken also. + *
+ * - two configmaps deployed : "red" and "red-with-profile". + * - "red" is matched directly, "red-with-profile" is matched because we have an active profile + * "active-profile" + **/ @Test void matchIncludeSingleProfile() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata( - new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE) - .withResourceVersion("1").build()) - .addToData("color", "really-red").build()) - .addItemsItem(new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME + "-with-profile") - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("taste", "mango").build()); + V1ConfigMap red = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); + + V1ConfigMap redWithProfile = new V1ConfigMapBuilder().withMetadata( + new V1ObjectMetaBuilder().withName(RED_WITH_PROFILE_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(TASTE_MANGO).build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(red).addItemsItem(redWithProfile); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, "", true); + + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, true); MockEnvironment environment = new MockEnvironment(); environment.setActiveProfiles("with-profile"); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-profile.default"); @@ -172,37 +175,37 @@ void matchIncludeSingleProfile() { } /** - * we have two config maps deployed. one matches the query name. the other matches the - * active profile + name, thus is taken also. This takes into consideration the - * prefix, that we explicitly specify. Notice that prefix works for profile based - * config maps as well. + *
+ * - two configmaps deployed : "red" and "red-with-profile". + * - "red" is matched directly, "red-with-profile" is matched because we have an active profile + * "active-profile" + * - This takes into consideration the prefix, that we explicitly specify. + * Notice that prefix works for profile based config maps as well. + **/ @Test void matchIncludeSingleProfileWithPrefix() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata( - new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE) - .withResourceVersion("1").build()) - .addToData("color", "really-red").build()) - .addItemsItem(new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME + "-with-profile") - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("taste", "mango").build()); + V1ConfigMap red = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); + + V1ConfigMap redWithTaste = new V1ConfigMapBuilder().withMetadata( + new V1ObjectMetaBuilder().withName(RED_WITH_PROFILE_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(TASTE_MANGO).build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(red).addItemsItem(redWithTaste); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, "some", + + ConfigUtils.Prefix prefix = ConfigUtils.findPrefix("some", false, false, null); + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, prefix, true); MockEnvironment environment = new MockEnvironment(); environment.setActiveProfiles("with-profile"); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-profile.default"); @@ -213,46 +216,46 @@ void matchIncludeSingleProfileWithPrefix() { } /** - * we have three config maps deployed. one matches the query name. the other two match - * the active profile + name, thus are taken also. This takes into consideration the - * prefix, that we explicitly specify. Notice that prefix works for profile based - * config maps as well. + *
+ * - three configmaps deployed : "red", "red-with-taste" and "red-with-shape" + * - "red" is matched directly, the other two are matched because of active profiles + * - This takes into consideration the prefix, that we explicitly specify. + * Notice that prefix works for profile based config maps as well. + **/ @Test void matchIncludeTwoProfilesWithPrefix() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata( - new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE) - .withResourceVersion("1").build()) - .addToData("color", "really-red").build()) - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata( - new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME + "-with-taste") - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("taste", "mango").build()) - .addItemsItem(new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME + "-with-shape") - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("shape", "round").build()); + V1ConfigMap red = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); + + V1ConfigMap redWithTaste = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME + "-with-taste") + .withNamespace(NAMESPACE).withResourceVersion("1").build()) + .addToData(TASTE_MANGO).build(); + + V1ConfigMap redWithShape = new V1ConfigMapBuilder().withMetadata(new V1ObjectMetaBuilder() + .withName(RED_CONFIG_MAP_NAME + "-with-shape").withNamespace(NAMESPACE).build()) + .addToData("shape", "round").build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(red).addItemsItem(redWithTaste) + .addItemsItem(redWithShape); + + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, "some", + + ConfigUtils.Prefix prefix = ConfigUtils.findPrefix("some", false, false, null); + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, prefix, true); MockEnvironment environment = new MockEnvironment(); environment.setActiveProfiles("with-taste", "with-shape"); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-taste.red-with-shape.default"); + Assertions.assertEquals(sourceData.sourceName(), "configmap.red.red-with-shape.red-with-taste.default"); Assertions.assertEquals(sourceData.sourceData().size(), 3); Assertions.assertEquals(sourceData.sourceData().get("some.color"), "really-red"); Assertions.assertEquals(sourceData.sourceData().get("some.taste"), "mango"); @@ -260,24 +263,29 @@ void matchIncludeTwoProfilesWithPrefix() { } - // this test makes sure that even if NormalizedSource has no name (which is a valid - // case for config maps), - // it will default to "application" and such a config map will be read. + /** + *
+ * proves that an implicit configmap is going to be generated and read, even if + * we did not provide one + *+ */ @Test - void matchWithoutName() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem(new V1ConfigMapBuilder().withMetadata(new V1ObjectMetaBuilder().withName("application") - .withNamespace(NAMESPACE).withResourceVersion("1").build()).addToData("color", "red").build()); + void matchWithName() { + + V1ConfigMap red = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("application").withNamespace(NAMESPACE).build()) + .addToData("color", "red").build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(red); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(null, NAMESPACE, true, "some", false); + + ConfigUtils.Prefix prefix = ConfigUtils.findPrefix("some", false, false, null); + NormalizedSource source = new NamedConfigMapNormalizedSource("application", NAMESPACE, true, prefix, false); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, new MockEnvironment()); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.application.default"); @@ -285,56 +293,95 @@ void matchWithoutName() { } /** - * NamedSecretContextToSourceDataProvider gets as input a - * KubernetesClientConfigContext. This context has a namespace as well as a - * NormalizedSource, that has a namespace too. It is easy to get confused in code on - * which namespace to use. This test makes sure that we use the proper one. + *
+ * - NamedSecretContextToSourceDataProvider gets as input a KubernetesClientConfigContext. + * - This context has a namespace as well as a NormalizedSource, that has a namespace too. + * - This test makes sure that we use the proper one. + **/ @Test void namespaceMatch() { - V1ConfigMapList configMapList = new V1ConfigMapList() - .addItemsItem( - new V1ConfigMapBuilder() - .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME) - .withNamespace(NAMESPACE).withResourceVersion("1").build()) - .addToData("color", "really-red").build()); + V1ConfigMap configMap = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData(COLOR_REALLY_RED).build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(configMap); + stubCall(configMapList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/configmaps") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); - NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE + "nope", true, "", - false); + + String wrongNamespace = NAMESPACE + "nope"; + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, wrongNamespace, true, false); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, new MockEnvironment()); - KubernetesClientContextToSourceData data = NamedConfigMapContextToSourceDataProvider - .of(Dummy::processEntries, Dummy::sourceName, Dummy::prefix).get(); + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); Assertions.assertEquals(sourceData.sourceName(), "configmap.red.default"); - Assertions.assertEquals(sourceData.sourceData(), Collections.singletonMap("color", "really-red")); + Assertions.assertEquals(sourceData.sourceData(), COLOR_REALLY_RED); } - // needed only to allow access to the super methods - private static final class Dummy extends ConfigMapPropertySource { + /** + *
+ * - proves that single yaml file gets special treatment + *+ */ + @Test + void testSingleYaml() { + V1ConfigMap singleYaml = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName(RED_CONFIG_MAP_NAME).withNamespace(NAMESPACE).build()) + .addToData("single.yaml", "key: value").build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(singleYaml); - private Dummy() { - super(SourceData.emptyRecord("dummy-name")); - } + stubCall(configMapList); + CoreV1Api api = new CoreV1Api(); - private static String sourceName(String name, String namespace) { - return getSourceName(name, namespace); - } + NormalizedSource source = new NamedConfigMapNormalizedSource(RED_CONFIG_MAP_NAME, NAMESPACE, true, false); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, + new MockEnvironment()); - private static Map
+ * - one configmap is deployed with name "one" + * - profile is enabled with name "k8s" + * + * we assert that the name of the source is "one" and does not contain "one-dev" + *+ */ + @Test + void testCorrectNameWithProfile() { + V1ConfigMap one = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("one").withNamespace(NAMESPACE).build()) + .addToData("key", "value").build(); + V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(one); + + stubCall(configMapList); + CoreV1Api api = new CoreV1Api(); + + MockEnvironment environment = new MockEnvironment(); + environment.setActiveProfiles("k8s"); + + NormalizedSource source = new NamedConfigMapNormalizedSource("one", NAMESPACE, true, true); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); + + KubernetesClientContextToSourceData data = new NamedConfigMapContextToSourceDataProvider().get(); + SourceData sourceData = data.apply(context); + + Assertions.assertEquals(sourceData.sourceName(), "configmap.one.default"); + Assertions.assertEquals(sourceData.sourceData(), Map.of("key", "value")); + } + + private void stubCall(V1ConfigMapList list) { + stubFor(get("/api/v1/namespaces/default/configmaps") + .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list)))); } } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProviderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProviderTests.java index 8efc74fee9..2907eff028 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProviderTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/NamedSecretContextToSourceDataProviderTests.java @@ -26,17 +26,19 @@ import io.kubernetes.client.openapi.JSON; import io.kubernetes.client.openapi.apis.CoreV1Api; import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder; +import io.kubernetes.client.openapi.models.V1Secret; import io.kubernetes.client.openapi.models.V1SecretBuilder; import io.kubernetes.client.openapi.models.V1SecretList; +import io.kubernetes.client.openapi.models.V1SecretListBuilder; import io.kubernetes.client.util.ClientBuilder; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.springframework.cloud.kubernetes.commons.config.ConfigUtils; import org.springframework.cloud.kubernetes.commons.config.NamedSecretNormalizedSource; import org.springframework.cloud.kubernetes.commons.config.NormalizedSource; -import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySource; import org.springframework.cloud.kubernetes.commons.config.SourceData; import org.springframework.mock.env.MockEnvironment; @@ -47,8 +49,12 @@ class NamedSecretContextToSourceDataProviderTests { + private static final ConfigUtils.Prefix PREFIX = ConfigUtils.findPrefix("some", false, false, "irrelevant"); + private static final String NAMESPACE = "default"; + private static final Map
+ * - LabeledSecretContextToSourceDataProvider gets as input a KubernetesClientConfigContext. + * - This context has a namespace as well as a NormalizedSource, that has a namespace too. + * - This test makes sure that we use the proper one. + *+ */ @Test void namespaceMatch() { - V1SecretList secretList = new V1SecretList() - .addItemsItem( - new V1SecretBuilder() - .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red") - .withResourceVersion("1").build()) - .addToData("color", "really-red".getBytes()).build()); + V1Secret secret = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red").build()) + .addToData(COLOR_REALLY_RED).build(); + V1SecretList secretList = new V1SecretList().addItemsItem(secret); + stubCall(secretList); CoreV1Api api = new CoreV1Api(); - stubFor(get("/api/v1/namespaces/default/secrets") - .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList)))); - // blue does not match red - NormalizedSource source = new NamedSecretNormalizedSource("red", NAMESPACE + "nope", false); + String wrongNamespace = NAMESPACE + "nope"; + NormalizedSource source = new NamedSecretNormalizedSource("red", wrongNamespace, false, false); KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, new MockEnvironment()); - KubernetesClientContextToSourceData data = NamedSecretContextToSourceDataProvider.of(Dummy::sourceName).get(); + KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get(); SourceData sourceData = data.apply(context); - Assertions.assertEquals(sourceData.sourceName(), "secrets.red.default"); + Assertions.assertEquals(sourceData.sourceName(), "secret.red.default"); Assertions.assertEquals(sourceData.sourceData(), Map.of("color", "really-red")); } - // needed only to allow access to the super methods - private static final class Dummy extends SecretsPropertySource { + /** + * we have two secrets deployed. one matches the query name. the other matches the + * active profile + name, thus is taken also. + */ + @Test + void matchIncludeSingleProfile() { + + V1Secret red = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red").build()) + .addToData(COLOR_REALLY_RED).build(); + + V1Secret mango = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red-with-profile").build()) + .addToData("taste", "mango".getBytes()).build(); - private Dummy() { - super(SourceData.emptyRecord("dummy-name")); - } + V1SecretList secretList = new V1SecretList().addItemsItem(red).addItemsItem(mango); + + stubCall(secretList); + CoreV1Api api = new CoreV1Api(); + + NormalizedSource source = new NamedSecretNormalizedSource("red", NAMESPACE, false, true); + MockEnvironment environment = new MockEnvironment(); + environment.addActiveProfile("with-profile"); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); + + KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get(); + SourceData sourceData = data.apply(context); + + Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-profile.default"); + Assertions.assertEquals(sourceData.sourceData().size(), 2); + Assertions.assertEquals(sourceData.sourceData().get("color"), "really-red"); + Assertions.assertEquals(sourceData.sourceData().get("taste"), "mango"); + + } + + /** + * we have two secrets deployed. one matches the query name. the other matches the + * active profile + name, thus is taken also. This takes into consideration the + * prefix, that we explicitly specify. Notice that prefix works for profile based + * secrets as well. + */ + @Test + void matchIncludeSingleProfileWithPrefix() { + + V1Secret red = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red").build()) + .addToData(COLOR_REALLY_RED).build(); + + V1Secret mango = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red-with-taste").build()) + .addToData("taste", "mango".getBytes()).build(); + + V1SecretList secretList = new V1SecretList().addItemsItem(red).addItemsItem(mango); + + stubCall(secretList); + CoreV1Api api = new CoreV1Api(); - private static String sourceName(String name, String namespace) { - return getSourceName(name, namespace); - } + NormalizedSource source = new NamedSecretNormalizedSource("red", NAMESPACE, true, PREFIX, true); + MockEnvironment environment = new MockEnvironment(); + environment.addActiveProfile("with-taste"); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); + KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get(); + SourceData sourceData = data.apply(context); + + Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-taste.default"); + Assertions.assertEquals(sourceData.sourceData().size(), 2); + Assertions.assertEquals(sourceData.sourceData().get("some.color"), "really-red"); + Assertions.assertEquals(sourceData.sourceData().get("some.taste"), "mango"); + + } + + /** + * we have three secrets deployed. one matches the query name. the other two match the + * active profile + name, thus are taken also. This takes into consideration the + * prefix, that we explicitly specify. Notice that prefix works for profile based + * config maps as well. + */ + @Test + void matchIncludeTwoProfilesWithPrefix() { + + V1Secret red = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red").build()) + .addToData(COLOR_REALLY_RED).build(); + + V1Secret mango = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red-with-taste").build()) + .addToData("taste", "mango".getBytes()).build(); + + V1Secret shape = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withNamespace(NAMESPACE).withName("red-with-shape").build()) + .addToData("shape", "round".getBytes()).build(); + + V1SecretList secretList = new V1SecretList().addItemsItem(red).addItemsItem(mango).addItemsItem(shape); + + stubCall(secretList); + CoreV1Api api = new CoreV1Api(); + + NormalizedSource source = new NamedSecretNormalizedSource("red", NAMESPACE, true, PREFIX, true); + MockEnvironment environment = new MockEnvironment(); + environment.setActiveProfiles("with-taste", "with-shape"); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, environment); + + KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get(); + SourceData sourceData = data.apply(context); + + Assertions.assertEquals(sourceData.sourceName(), "secret.red.red-with-shape.red-with-taste.default"); + + Assertions.assertEquals(sourceData.sourceData().size(), 3); + Assertions.assertEquals(sourceData.sourceData().get("some.color"), "really-red"); + Assertions.assertEquals(sourceData.sourceData().get("some.taste"), "mango"); + Assertions.assertEquals(sourceData.sourceData().get("some.shape"), "round"); + + } + + /** + *
+ * - proves that single yaml file gets special treatment + *+ */ + @Test + void testSingleYaml() { + V1Secret singleYaml = new V1SecretBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("single-yaml").withNamespace(NAMESPACE).build()) + .addToData("single.yaml", "key: value".getBytes()).build(); + V1SecretList secretList = new V1SecretList().addItemsItem(singleYaml); + + stubCall(secretList); + CoreV1Api api = new CoreV1Api(); + + NormalizedSource source = new NamedSecretNormalizedSource("single-yaml", NAMESPACE, true, false); + KubernetesClientConfigContext context = new KubernetesClientConfigContext(api, source, NAMESPACE, + new MockEnvironment()); + + KubernetesClientContextToSourceData data = new NamedSecretContextToSourceDataProvider().get(); + SourceData sourceData = data.apply(context); + + Assertions.assertEquals(sourceData.sourceName(), "secret.single-yaml.default"); + Assertions.assertEquals(sourceData.sourceData(), Map.of("key", "value")); + } + + private void stubCall(V1SecretList list) { + stubFor(get("/api/v1/namespaces/default/secrets") + .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(list)))); } } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixApp.java new file mode 100644 index 0000000000..d80949f597 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixApp.java @@ -0,0 +1,35 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_prefix; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Four; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.One; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Three; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Two; + +@SpringBootApplication +@EnableConfigurationProperties({ One.class, Two.class, Three.class, Four.class }) +public class LabeledConfigMapWithPrefixApp { + + public static void main(String[] args) { + SpringApplication.run(LabeledConfigMapWithPrefixApp.class, args); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixBootstrapTests.java new file mode 100644 index 0000000000..7db7b3b40c --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixBootstrapTests.java @@ -0,0 +1,31 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_prefix; + +import org.springframework.boot.test.context.SpringBootTest; + +/** + * @author wind57 + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = LabeledConfigMapWithPrefixApp.class, + properties = { "spring.cloud.bootstrap.name=labeled-configmap-with-prefix", + "labeled.config.map.with.prefix.stub=true", "spring.main.cloud-platform=KUBERNETES", + "spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.client.namespace=spring-k8s" }) +class LabeledConfigMapWithPrefixBootstrapTests extends LabeledConfigMapWithPrefixTests { + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixConfigDataTests.java new file mode 100644 index 0000000000..27302005d6 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixConfigDataTests.java @@ -0,0 +1,62 @@ +/* + * Copyright 2013-2022 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.client.config.applications.labeled_config_map_with_prefix; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import io.kubernetes.client.util.ClientBuilder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.mockito.MockedStatic; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.KubernetesClientUtils; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; +import static org.mockito.Mockito.mockStatic; +import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.LabeledConfigMapWithPrefixConfigurationStub.stubData; + +/** + * @author wind57 + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = LabeledConfigMapWithPrefixApp.class, + properties = { "spring.cloud.application.name=labeled-configmap-with-prefix", + "labeled.config.map.with.prefix.stub=true", "spring.main.cloud-platform=KUBERNETES", + "spring.config.import=kubernetes:,classpath:./labeled-configmap-with-prefix.yaml", + "spring.cloud.kubernetes.client.namespace=spring-k8s" }) +class LabeledConfigMapWithPrefixConfigDataTests extends LabeledConfigMapWithPrefixTests { + + private static MockedStatic
+ * 'spring.cloud.kubernetes.configmap.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.configmap.sources[0].useNameAsPrefix=false'
+ * ("one.property", "one")
+ *
+ * As such: @ConfigurationProperties("one")
+ *
+ */
+ @Test
+ void testOne() {
+ this.webClient.get().uri("/labeled-configmap/prefix/one").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("one"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[1].explicitPrefix=two'
+ * ("property", "two")
+ *
+ * As such: @ConfigurationProperties("two")
+ *
+ */
+ @Test
+ void testTwo() {
+ this.webClient.get().uri("/labeled-configmap/prefix/two").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("two"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[2].labels=letter:c'
+ * ("property", "three")
+ *
+ * We find the configmap by labels, and use it's name as the prefix.
+ *
+ * As such: @ConfigurationProperties(prefix = "configmap-three")
+ *
+ */
+ @Test
+ void testThree() {
+ this.webClient.get().uri("/labeled-configmap/prefix/three").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("three"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[3].labels=letter:d'
+ * ("property", "four")
+ *
+ * We find the configmap by labels, and use it's name as the prefix.
+ *
+ * As such: @ConfigurationProperties(prefix = "configmap-four")
+ *
+ */
+ @Test
+ void testFour() {
+ this.webClient.get().uri("/labeled-configmap/prefix/four").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("four"));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/controller/LabeledConfigMapWithPrefixController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/controller/LabeledConfigMapWithPrefixController.java
new file mode 100644
index 0000000000..5e16b04b38
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/controller/LabeledConfigMapWithPrefixController.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_prefix.controller;
+
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Four;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties.Two;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LabeledConfigMapWithPrefixController {
+
+ private final One one;
+
+ private final Two two;
+
+ private final Three three;
+
+ private final Four four;
+
+ public LabeledConfigMapWithPrefixController(One one, Two two, Three three, Four four) {
+ this.one = one;
+ this.two = two;
+ this.three = three;
+ this.four = four;
+ }
+
+ @GetMapping("/labeled-configmap/prefix/one")
+ public String one() {
+ return one.getProperty();
+ }
+
+ @GetMapping("/labeled-configmap/prefix/two")
+ public String two() {
+ return two.getProperty();
+ }
+
+ @GetMapping("/labeled-configmap/prefix/three")
+ public String three() {
+ return three.getProperty();
+ }
+
+ @GetMapping("/labeled-configmap/prefix/four")
+ public String four() {
+ return four.getProperty();
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Four.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Four.java
new file mode 100644
index 0000000000..9e87586053
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Four.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "configmap-four")
+public class Four {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/One.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/One.java
similarity index 94%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/One.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/One.java
index 1e59b034ed..23bbec8696 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/One.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/One.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties;
+package org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Three.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Three.java
new file mode 100644
index 0000000000..03ab598e73
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Three.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "configmap-three")
+public class Three {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Two.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Two.java
similarity index 94%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Two.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Two.java
index 4dde04d3a1..3f0c26823e 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Two.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/properties/Two.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties;
+package org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_prefix.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileApp.java
new file mode 100644
index 0000000000..6135608b5d
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileApp.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_profile;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Blue;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Green;
+
+/**
+ * @author wind57
+ */
+@SpringBootApplication
+@EnableConfigurationProperties({ Blue.class, Green.class })
+public class LabeledConfigMapWithProfileApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(LabeledConfigMapWithProfileApp.class, args);
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileBootstrapTests.java
new file mode 100644
index 0000000000..770f618d15
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileBootstrapTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_profile;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles({ "k8s", "prod" })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+ classes = LabeledConfigMapWithProfileApp.class,
+ properties = { "spring.cloud.bootstrap.name=labeled-configmap-with-profile",
+ "labeled.config.map.with.profile.stub=true", "spring.main.cloud-platform=KUBERNETES",
+ "spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class LabeledConfigMapWithProfileBootstrapTests extends LabeledConfigMapWithProfileTests {
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileConfigDataTests.java
new file mode 100644
index 0000000000..8f29fcfefa
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileConfigDataTests.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.labeled_config_map_with_profile;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.util.ClientBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
+import org.springframework.test.context.ActiveProfiles;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.mockito.Mockito.mockStatic;
+import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.LabeledConfigMapWithProfileConfigurationStub.stubData;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles({ "k8s", "prod" })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+ classes = LabeledConfigMapWithProfileApp.class,
+ properties = { "spring.cloud.application.name=labeled-configmap-with-profile",
+ "labeled.config.map.with.profile.stub=true", "spring.main.cloud-platform=KUBERNETES",
+ "spring.config.import=kubernetes:,classpath:./labeled-configmap-with-profile.yaml",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class LabeledConfigMapWithProfileConfigDataTests extends LabeledConfigMapWithProfileTests {
+
+ private static MockedStatic+ * this one is taken from : "blue.one". We find "color-configmap" by labels, and + * "color-configmap-k8s" exists, but "includeProfileSpecificSources=false", thus not taken. + * Since "explicitPrefix=blue", we take "blue.one" + *+ */ + @Test + void testBlue() { + this.webClient.get().uri("/labeled-configmap/profile/blue").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("1")); + } + + /** + *
+ * this one is taken from : "green-configmap.green-configmap-k8s.green-configmap-prod". + * We find "green-configmap" by labels, also "green-configmap-k8s" and "green-configmap-prod" exists, + * because "includeProfileSpecificSources=true" is set. + *+ */ + @Test + void testGreen() { + this.webClient.get().uri("/labeled-configmap/profile/green").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("2#6#7")); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/controller/LabeledConfigMapWithProfileController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/controller/LabeledConfigMapWithProfileController.java new file mode 100644 index 0000000000..33cc1d11bf --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/controller/LabeledConfigMapWithProfileController.java @@ -0,0 +1,46 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_profile.controller; + +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Blue; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Green; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class LabeledConfigMapWithProfileController { + + private final Blue blue; + + private final Green green; + + public LabeledConfigMapWithProfileController(Blue blue, Green green) { + this.blue = blue; + this.green = green; + } + + @GetMapping("/labeled-configmap/profile/blue") + public String blue() { + return blue.getOne(); + } + + @GetMapping("/labeled-configmap/profile/green") + public String green() { + return green.getTwo() + "#" + green.getSix() + "#" + green.getSeven(); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Blue.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Blue.java new file mode 100644 index 0000000000..e1cad9515e --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Blue.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_profile.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("blue") +public class Blue { + + private String one; + + public String getOne() { + return one; + } + + public void setOne(String one) { + this.one = one; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Green.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Green.java new file mode 100644 index 0000000000..59bc828928 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/properties/Green.java @@ -0,0 +1,54 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_config_map_with_profile.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("green-configmap.green-configmap-k8s.green-configmap-prod") +public class Green { + + private String two; + + private String six; + + private String seven; + + public String getTwo() { + return two; + } + + public void setTwo(String two) { + this.two = two; + } + + public String getSix() { + return six; + } + + public void setSix(String six) { + this.six = six; + } + + public String getSeven() { + return seven; + } + + public void setSeven(String seven) { + this.seven = seven; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixApp.java new file mode 100644 index 0000000000..28484bcc14 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixApp.java @@ -0,0 +1,35 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_prefix; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Four; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.One; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Three; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Two; + +@SpringBootApplication +@EnableConfigurationProperties({ One.class, Two.class, Three.class, Four.class }) +public class LabeledSecretWithPrefixApp { + + public static void main(String[] args) { + SpringApplication.run(LabeledSecretWithPrefixApp.class, args); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixBootstrapTests.java new file mode 100644 index 0000000000..0987907d92 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixBootstrapTests.java @@ -0,0 +1,30 @@ +/* + * Copyright 2013-2022 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.client.config.applications.labeled_secret_with_prefix; + +import org.springframework.boot.test.context.SpringBootTest; + +/** + * @author wind57 + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = LabeledSecretWithPrefixApp.class, + properties = { "spring.cloud.bootstrap.name=labeled-secret-with-prefix", "labeled.secret.with.prefix.stub=true", + "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true", + "spring.cloud.kubernetes.client.namespace=spring-k8s" }) +class LabeledSecretWithPrefixBootstrapTests extends LabeledSecretWithPrefixTests { + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixConfigDataTests.java new file mode 100644 index 0000000000..af37c9acca --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixConfigDataTests.java @@ -0,0 +1,61 @@ +/* + * Copyright 2013-2022 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.client.config.applications.labeled_secret_with_prefix; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import io.kubernetes.client.util.ClientBuilder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.mockito.MockedStatic; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.KubernetesClientUtils; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; +import static org.mockito.Mockito.mockStatic; +import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.LabeledSecretWithPrefixConfigurationStub.stubData; + +/** + * @author wind57 + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = LabeledSecretWithPrefixApp.class, + properties = { "spring.cloud.application.name=labeled-secret-with-prefix", + "labeled.secret.with.prefix.stub=true", "spring.main.cloud-platform=KUBERNETES", + "spring.config.import=kubernetes:,classpath:./labeled-secret-with-prefix.yaml", + "spring.cloud.kubernetes.client.namespace=spring-k8s" }) +class LabeledSecretWithPrefixConfigDataTests extends LabeledSecretWithPrefixTests { + + private static MockedStatic
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[0].useNameAsPrefix=false'
+ * ("one.property", "one")
+ *
+ * As such: @ConfigurationProperties("one")
+ *
+ */
+ @Test
+ void testOne() {
+ this.webClient.get().uri("/labeled-secret/prefix/one").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("one"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[1].explicitPrefix=two'
+ * ("property", "two")
+ *
+ * As such: @ConfigurationProperties("two")
+ *
+ */
+ @Test
+ void testTwo() {
+ this.webClient.get().uri("/labeled-secret/prefix/two").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("two"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[2].labels=letter:c'
+ * ("property", "three")
+ *
+ * We find the secret by labels, and use it's name as the prefix.
+ *
+ * As such: @ConfigurationProperties(prefix = "secret-three")
+ *
+ */
+ @Test
+ void testThree() {
+ this.webClient.get().uri("/labeled-secret/prefix/three").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("three"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[3].labels=letter:d'
+ * ("property", "four")
+ *
+ * We find the secret by labels, and use it's name as the prefix.
+ *
+ * As such: @ConfigurationProperties(prefix = "secret-four")
+ *
+ */
+ @Test
+ void testFour() {
+ this.webClient.get().uri("/labeled-secret/prefix/four").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("four"));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/controller/LabeledSecretWithPrefixController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/controller/LabeledSecretWithPrefixController.java
new file mode 100644
index 0000000000..b6c6066bfb
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/controller/LabeledSecretWithPrefixController.java
@@ -0,0 +1,64 @@
+/*
+ * 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.client.config.applications.labeled_secret_with_prefix.controller;
+
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Four;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_prefix.properties.Two;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LabeledSecretWithPrefixController {
+
+ private final One one;
+
+ private final Two two;
+
+ private final Three three;
+
+ private final Four four;
+
+ public LabeledSecretWithPrefixController(One one, Two two, Three three, Four four) {
+ this.one = one;
+ this.two = two;
+ this.three = three;
+ this.four = four;
+ }
+
+ @GetMapping("/labeled-secret/prefix/one")
+ public String one() {
+ return one.getProperty();
+ }
+
+ @GetMapping("/labeled-secret/prefix/two")
+ public String two() {
+ return two.getProperty();
+ }
+
+ @GetMapping("/labeled-secret/prefix/three")
+ public String three() {
+ return three.getProperty();
+ }
+
+ @GetMapping("/labeled-secret/prefix/four")
+ public String four() {
+ return four.getProperty();
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Four.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Four.java
new file mode 100644
index 0000000000..aefd225d21
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Four.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "secret-four")
+public class Four {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/One.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/One.java
new file mode 100644
index 0000000000..6ad8b4346d
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/One.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("one")
+public class One {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Three.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Three.java
new file mode 100644
index 0000000000..ca661c7c77
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Three.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "secret-three")
+public class Three {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Two.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Two.java
new file mode 100644
index 0000000000..265b17e5be
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/properties/Two.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("two")
+public class Two {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileApp.java
new file mode 100644
index 0000000000..eae8cd695a
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileApp.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_profile;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_profile.properties.Blue;
+import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_profile.properties.Green;
+
+@SpringBootApplication
+@EnableConfigurationProperties({ Blue.class, Green.class })
+public class LabeledSecretWithProfileApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(LabeledSecretWithProfileApp.class, args);
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileBootstrapTests.java
new file mode 100644
index 0000000000..76ac55925a
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileBootstrapTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_profile;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles({ "k8s", "prod" })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = LabeledSecretWithProfileApp.class,
+ properties = { "spring.cloud.bootstrap.name=labeled-secret-with-profile",
+ "labeled.secret.with.profile.stub=true", "spring.main.cloud-platform=KUBERNETES",
+ "spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class LabeledSecretWithProfileBootstrapTests extends LabeledSecretWithProfileTests {
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileConfigDataTests.java
new file mode 100644
index 0000000000..f4d3a0c827
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/LabeledSecretWithProfileConfigDataTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.labeled_secret_with_profile;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.util.ClientBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
+import org.springframework.test.context.ActiveProfiles;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.mockito.Mockito.mockStatic;
+import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.LabeledSecretWithProfileConfigurationStub.stubData;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles({ "k8s", "prod" })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = LabeledSecretWithProfileApp.class,
+ properties = { "spring.application.name=labeled-secret-with-profile", "spring.main.cloud-platform=KUBERNETES",
+ "spring.config.import=kubernetes:,classpath:./labeled-secret-with-profile.yaml",
+ "spring.cloud.kubernetes.config.enabled=false" })
+class LabeledSecretWithProfileConfigDataTests extends LabeledSecretWithProfileTests {
+
+ private static MockedStatic
+ * - secret with name "color-secret", with labels: "{color: blue}" and "explicitPrefix: blue"
+ * - secret with name "green-secret", with labels: "{color: green}" and "explicitPrefix: blue-again"
+ * - secret with name "red-secret", with labels "{color: not-red}" and "useNameAsPrefix: true"
+ * - secret with name "yellow-secret" with labels "{color: not-yellow}" and useNameAsPrefix: true
+ * - secret with name "color-secret-k8s", with labels : "{color: not-blue}"
+ * - secret with name "green-secret-k8s", with labels : "{color: green-k8s}"
+ * - secret with name "green-secret-prod", with labels : "{color: green-prod}"
+ *
+ */
+
+/**
+ * Stubs for this test are in
+ * {@link org.springframework.cloud.kubernetes.client.config.boostrap.stubs.LabeledSecretWithProfileConfigurationStub}
+ *
+ * @author wind57
+ */
+abstract class LabeledSecretWithProfileTests {
+
+ @Autowired
+ private WebTestClient webClient;
+
+ @AfterEach
+ public void afterEach() {
+ WireMock.reset();
+ }
+
+ @AfterAll
+ static void afterAll() {
+ WireMock.shutdownServer();
+ }
+
+ /**
+ * + * this one is taken from : "blue.one". We find "color-secret" by labels, and + * "color-secrets-k8s" exists, but "includeProfileSpecificSources=false", thus not taken. + * Since "explicitPrefix=blue", we take "blue.one" + *+ */ + @Test + void testBlue() { + this.webClient.get().uri("/labeled-secret/profile/blue").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("1")); + } + + /** + *
+ * this one is taken from : "green-secret.green-secret-k8s.green-secret-prod". + * We find "green-secret" by labels, also "green-secrets-k8s" and "green-secrets-prod" exists, + * because "includeProfileSpecificSources=true" is set. + *+ */ + @Test + void testGreen() { + this.webClient.get().uri("/labeled-secret/profile/green").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("2#6#7")); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/controller/LabeledSecretWithProfileController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/controller/LabeledSecretWithProfileController.java new file mode 100644 index 0000000000..f342746dd7 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/controller/LabeledSecretWithProfileController.java @@ -0,0 +1,46 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_profile.controller; + +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_profile.properties.Blue; +import org.springframework.cloud.kubernetes.client.config.applications.labeled_secret_with_profile.properties.Green; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class LabeledSecretWithProfileController { + + private final Blue blue; + + private final Green green; + + public LabeledSecretWithProfileController(Blue blue, Green green) { + this.blue = blue; + this.green = green; + } + + @GetMapping("/labeled-secret/profile/blue") + public String blue() { + return blue.getOne(); + } + + @GetMapping("/labeled-secret/profile/green") + public String green() { + return green.getTwo() + "#" + green.getSix() + "#" + green.getSeven(); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Blue.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Blue.java new file mode 100644 index 0000000000..7231da17ac --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Blue.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_profile.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("blue") +public class Blue { + + private String one; + + public String getOne() { + return one; + } + + public void setOne(String one) { + this.one = one; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Green.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Green.java new file mode 100644 index 0000000000..04c7e5c585 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_profile/properties/Green.java @@ -0,0 +1,54 @@ +/* + * Copyright 2013-2021 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.client.config.applications.labeled_secret_with_profile.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("green-secret.green-secret-k8s.green-secret-prod") +public class Green { + + private String two; + + private String six; + + private String seven; + + public String getTwo() { + return two; + } + + public void setTwo(String two) { + this.two = two; + } + + public String getSix() { + return six; + } + + public void setSix(String six) { + this.six = six; + } + + public String getSeven() { + return seven; + } + + public void setSeven(String seven) { + this.seven = seven; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/IncludeProfileSpecificSourcesApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixApp.java similarity index 78% rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/IncludeProfileSpecificSourcesApp.java rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixApp.java index d719c4220e..d6457a5bc8 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/IncludeProfileSpecificSourcesApp.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixApp.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources; +package org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_prefix; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.One; -import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.Three; -import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.Two; +import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_prefix.properties.One; +import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_prefix.properties.Three; +import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_prefix.properties.Two; @SpringBootApplication @EnableConfigurationProperties({ One.class, Two.class, Three.class }) -public class IncludeProfileSpecificSourcesApp { +public class NamedConfigMapWithPrefixApp { public static void main(String[] args) { - SpringApplication.run(IncludeProfileSpecificSourcesApp.class, args); + SpringApplication.run(NamedConfigMapWithPrefixApp.class, args); } } diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixBootstrapTests.java new file mode 100644 index 0000000000..a7600c8e39 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixBootstrapTests.java @@ -0,0 +1,30 @@ +/* + * Copyright 2013-2022 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.client.config.applications.named_config_map_with_prefix; + +import org.springframework.boot.test.context.SpringBootTest; + +/** + * @author Ryan Baxter + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedConfigMapWithPrefixApp.class, + properties = { "spring.cloud.bootstrap.name=named-configmap-with-prefix", + "named.config.map.with.prefix.stub=true", "spring.main.cloud-platform=KUBERNETES", + "spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.client.namespace=spring-k8s" }) +class NamedConfigMapWithPrefixBootstrapTests extends NamedConfigMapWithPrefixTests { + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixConfigDataTests.java new file mode 100644 index 0000000000..725ff856e8 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixConfigDataTests.java @@ -0,0 +1,60 @@ +/* + * Copyright 2013-2022 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.client.config.applications.named_config_map_with_prefix; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import io.kubernetes.client.util.ClientBuilder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.mockito.MockedStatic; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.client.KubernetesClientUtils; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; +import static org.mockito.Mockito.mockStatic; +import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.NamedConfigMapWithPrefixConfigurationStub.stubData; + +/** + * @author Ryan Baxter + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedConfigMapWithPrefixApp.class, + properties = { "spring.cloud.application.name=named-configmap-with-prefix", + "named.config.map.with.prefix.stub=true", "spring.main.cloud-platform=KUBERNETES", + "spring.config.import=kubernetes:,classpath:./named-configmap-with-prefix.yaml" }) +class NamedConfigMapWithPrefixConfigDataTests extends NamedConfigMapWithPrefixTests { + + private static MockedStatic
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[0].useNameAsPrefix=false'
+ * 'spring.cloud.kubernetes.config.sources[0].includeProfileSpecificSources=true'
+ * ("one.property", "one-from-k8s")
+ *
+ * As such: @ConfigurationProperties("one"), value is overridden by the one that we read from
+ * the profile based source.
+ *
+ */
+ @Test
+ void testOne() {
+ this.webClient.get().uri("/named-configmap/profile/one").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("one-from-k8s"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[1].explicitPrefix=two'
+ * 'spring.cloud.kubernetes.config.sources[1].includeProfileSpecificSources=false'
+ * ("property", "two")
+ *
+ * As such: @ConfigurationProperties("two").
+ *
+ * Even if there is a profile based source, we disabled reading it.
+ *
+ */
+ @Test
+ void testTwo() {
+ this.webClient.get().uri("/named-configmap/profile/two").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("two"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.config.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.config.sources[2].name=configmap-three'
+ * 'spring.cloud.kubernetes.config.sources[1].includeProfileSpecificSources=true'
+ * ("property", "three")
+ *
+ * As such: @ConfigurationProperties(prefix = "config-three"), value is overridden by the one that we read from
+ * the profile based source
+ *
+ */
+ @Test
+ void testThree() {
+ this.webClient.get().uri("/named-configmap/profile/three").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("three-from-k8s"));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/controller/IncludeProfileSpecificSourcesController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/controller/NamedConfigMapWithProfileController.java
similarity index 73%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/controller/IncludeProfileSpecificSourcesController.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/controller/NamedConfigMapWithProfileController.java
index fd8e4db04d..3a1bd2b1d2 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/controller/IncludeProfileSpecificSourcesController.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/controller/NamedConfigMapWithProfileController.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.controller;
+package org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_profile.controller;
-import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.One;
-import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.Three;
-import org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties.Two;
+import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_profile.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_profile.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_profile.properties.Two;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
-public class IncludeProfileSpecificSourcesController {
+public class NamedConfigMapWithProfileController {
private final One one;
@@ -31,23 +31,23 @@ public class IncludeProfileSpecificSourcesController {
private final Three three;
- public IncludeProfileSpecificSourcesController(One one, Two two, Three three) {
+ public NamedConfigMapWithProfileController(One one, Two two, Three three) {
this.one = one;
this.two = two;
this.three = three;
}
- @GetMapping("/profile-specific/one")
+ @GetMapping("/named-configmap/profile/one")
public String one() {
return one.getProperty();
}
- @GetMapping("/profile-specific/two")
+ @GetMapping("/named-configmap/profile/two")
public String two() {
return two.getProperty();
}
- @GetMapping("/profile-specific/three")
+ @GetMapping("/named-configmap/profile/three")
public String three() {
return three.getProperty();
}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/One.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/One.java
new file mode 100644
index 0000000000..ac8e271586
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/One.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_config_map_with_profile.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("one")
+public class One {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Three.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Three.java
similarity index 90%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Three.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Three.java
index e96da1ebd6..77d6656dc8 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/include_profile_specific_sources/properties/Three.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Three.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.include_profile_specific_sources.properties;
+package org.springframework.cloud.kubernetes.client.config.applications.named_config_map_with_profile.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
-@ConfigurationProperties("three")
+@ConfigurationProperties("configmap-three")
public class Three {
private String property;
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Two.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Two.java
new file mode 100644
index 0000000000..3d5bbb80d0
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/properties/Two.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_config_map_with_profile.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("two")
+public class Two {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/WithPrefixApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixApp.java
similarity index 81%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/WithPrefixApp.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixApp.java
index 0bdbb15a00..036776a6ac 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/WithPrefixApp.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixApp.java
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix;
+package org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.One;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.Three;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.Two;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.Two;
@SpringBootApplication
@EnableConfigurationProperties({ One.class, Two.class, Three.class })
-public class WithPrefixApp {
+public class NamedSecretWithPrefixApp {
public static void main(String[] args) {
- SpringApplication.run(WithPrefixApp.class, args);
+ SpringApplication.run(NamedSecretWithPrefixApp.class, args);
}
}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixBootstrapTests.java
new file mode 100644
index 0000000000..9c11d631b2
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixBootstrapTests.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.named_secret_with_prefix;
+
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * @author Ryan Baxter
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithPrefixApp.class,
+ properties = { "spring.cloud.bootstrap.name=named-secret-with-prefix", "named.secret.with.prefix.stub=true",
+ "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class NamedSecretWithPrefixBootstrapTests extends NamedSecretWithPrefixTests {
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixConfigDataTests.java
new file mode 100644
index 0000000000..7022d4141d
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixConfigDataTests.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.named_secret_with_prefix;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.util.ClientBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.mockito.Mockito.mockStatic;
+import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.NamedSecretWithPrefixConfigurationStub.stubData;
+
+/**
+ * @author Ryan Baxter
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithPrefixApp.class,
+ properties = { "spring.cloud.application.name=named-secret-with-prefix", "named.secret.with.prefix.stub=true",
+ "spring.main.cloud-platform=KUBERNETES",
+ "spring.config.import=kubernetes:,classpath:./named-secret-with-prefix.yaml",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class NamedSecretWithPrefixConfigDataTests extends NamedSecretWithPrefixTests {
+
+ private static MockedStatic
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[0].useNameAsPrefix=false'
+ * ("one.property", "one")
+ *
+ * As such: @ConfigurationProperties("one")
+ *
+ */
+ @Test
+ void testOne() {
+ this.webClient.get().uri("/named-secret/prefix/one").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("one"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[1].explicitPrefix=two'
+ * ("property", "two")
+ *
+ * As such: @ConfigurationProperties("two")
+ *
+ */
+ @Test
+ void testTwo() {
+ this.webClient.get().uri("/named-secret/prefix/two").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("two"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[2].name=config-map-three'
+ * ("property", "three")
+ *
+ * As such: @ConfigurationProperties(prefix = "config-map-three")
+ *
+ */
+ @Test
+ void testThree() {
+ this.webClient.get().uri("/named-secret/prefix/three").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("three"));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/controller/Controller.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/controller/NamedSecretWithPrefixController.java
similarity index 75%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/controller/Controller.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/controller/NamedSecretWithPrefixController.java
index e4d655780c..facc299a6e 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/controller/Controller.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/controller/NamedSecretWithPrefixController.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.controller;
+package org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.controller;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.One;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.Three;
-import org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties.Two;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties.Two;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
-public class Controller {
+public class NamedSecretWithPrefixController {
private final One one;
@@ -31,23 +31,23 @@ public class Controller {
private final Three three;
- public Controller(One one, Two two, Three three) {
+ public NamedSecretWithPrefixController(One one, Two two, Three three) {
this.one = one;
this.two = two;
this.three = three;
}
- @GetMapping("/prefix/one")
+ @GetMapping("/named-secret/prefix/one")
public String one() {
return one.getProperty();
}
- @GetMapping("/prefix/two")
+ @GetMapping("/named-secret/prefix/two")
public String two() {
return two.getProperty();
}
- @GetMapping("/prefix/three")
+ @GetMapping("/named-secret/prefix/three")
public String three() {
return three.getProperty();
}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/One.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/One.java
similarity index 95%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/One.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/One.java
index 4a9eb5e436..80127c1bc7 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/One.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/One.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties;
+package org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Three.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Three.java
new file mode 100644
index 0000000000..658e23d903
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Three.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_secret_with_prefix.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "secret-three")
+public class Three {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/Two.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Two.java
similarity index 95%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/Two.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Two.java
index 7a3d9d8dc7..a28aca72c4 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/config_map_name_as_prefix/properties/Two.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/properties/Two.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.kubernetes.client.config.applications.config_map_name_as_prefix.properties;
+package org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_prefix.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithLabelApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithLabelApp.java
new file mode 100644
index 0000000000..64c7643cae
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithLabelApp.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_secret_with_profile;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.Two;
+
+@SpringBootApplication
+@EnableConfigurationProperties({ One.class, Two.class, Three.class })
+public class NamedSecretWithLabelApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(NamedSecretWithLabelApp.class, args);
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileBootstrapTests.java
new file mode 100644
index 0000000000..dc6b22b741
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileBootstrapTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.named_secret_with_profile;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles("k8s")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithLabelApp.class,
+ properties = { "spring.cloud.bootstrap.name=named-secret-with-profile", "named.secret.with.profile.stub=true",
+ "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class NamedSecretWithProfileBootstrapTests extends NamedSecretWithProfileTests {
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileConfigDataTests.java
new file mode 100644
index 0000000000..b0f0439d66
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileConfigDataTests.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.named_secret_with_profile;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.util.ClientBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
+import org.springframework.test.context.ActiveProfiles;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.mockito.Mockito.mockStatic;
+import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.NamedSecretWithProfileConfigurationStub.stubData;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles("k8s")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithLabelApp.class,
+ properties = { "spring.cloud.application.name=named-secret-with-profile", "named.secret.with.profile.stub=true",
+ "spring.main.cloud-platform=KUBERNETES",
+ "spring.config.import=kubernetes:,classpath:./named-secret-with-profile.yaml",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class NamedSecretWithProfileConfigDataTests extends NamedSecretWithProfileTests {
+
+ private static MockedStatic
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[0].useNameAsPrefix=false'
+ * 'spring.cloud.kubernetes.secrets.sources[0].includeProfileSpecificSources=true'
+ * ("one.property", "one-from-k8s")
+ *
+ * As such: @ConfigurationProperties("one"), value is overridden by the one that we read from
+ * the profile based source.
+ *
+ */
+ @Test
+ void testOne() {
+ this.webClient.get().uri("/named-secret/profile/one").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("one-from-k8s"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[1].explicitPrefix=two'
+ * 'spring.cloud.kubernetes.secrets.sources[1].includeProfileSpecificSources=false'
+ * ("property", "two")
+ *
+ * As such: @ConfigurationProperties("two").
+ *
+ * Even if there is a profile based source, we disabled reading it.
+ *
+ */
+ @Test
+ void testTwo() {
+ this.webClient.get().uri("/named-secret/profile/two").exchange().expectStatus().isOk().expectBody(String.class)
+ .value(Matchers.equalTo("two"));
+ }
+
+ /**
+ *
+ * 'spring.cloud.kubernetes.secrets.useNameAsPrefix=true'
+ * 'spring.cloud.kubernetes.secrets.sources[2].name=secret-three'
+ * 'spring.cloud.kubernetes.secrets.sources[1].includeProfileSpecificSources=true'
+ * ("property", "three")
+ *
+ * As such: @ConfigurationProperties(prefix = "secret-three"), value is overridden by the one that we read from
+ * * the profile based source
+ *
+ */
+ @Test
+ void testThree() {
+ this.webClient.get().uri("/named-secret/profile/three").exchange().expectStatus().isOk()
+ .expectBody(String.class).value(Matchers.equalTo("three-from-k8s"));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/controller/NamedSecretWithProfileController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/controller/NamedSecretWithProfileController.java
new file mode 100644
index 0000000000..93758cc0bf
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/controller/NamedSecretWithProfileController.java
@@ -0,0 +1,55 @@
+/*
+ * 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.client.config.applications.named_secret_with_profile.controller;
+
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.One;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.Three;
+import org.springframework.cloud.kubernetes.client.config.applications.named_secret_with_profile.properties.Two;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class NamedSecretWithProfileController {
+
+ private final One one;
+
+ private final Two two;
+
+ private final Three three;
+
+ public NamedSecretWithProfileController(One one, Two two, Three three) {
+ this.one = one;
+ this.two = two;
+ this.three = three;
+ }
+
+ @GetMapping("/named-secret/profile/one")
+ public String one() {
+ return one.getProperty();
+ }
+
+ @GetMapping("/named-secret/profile/two")
+ public String two() {
+ return two.getProperty();
+ }
+
+ @GetMapping("/named-secret/profile/three")
+ public String three() {
+ return three.getProperty();
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/One.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/One.java
new file mode 100644
index 0000000000..f2d558ef98
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/One.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_secret_with_profile.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("one")
+public class One {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Three.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Three.java
new file mode 100644
index 0000000000..d4418e3278
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Three.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_secret_with_profile.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "secret-three")
+public class Three {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Two.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Two.java
new file mode 100644
index 0000000000..64a8f67ecc
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/properties/Two.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2021 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.client.config.applications.named_secret_with_profile.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("two")
+public class Two {
+
+ private String property;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesApp.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesApp.java
new file mode 100644
index 0000000000..17f7d3c768
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesApp.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Color;
+import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Name;
+import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Shape;
+import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Type;
+
+@SpringBootApplication
+@EnableConfigurationProperties({ Name.class, Shape.class, Color.class, Type.class })
+public class SingleSourceMultipleFilesApp {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SingleSourceMultipleFilesApp.class, args);
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesBootstrapTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesBootstrapTests.java
new file mode 100644
index 0000000000..c5f3fb1a54
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesBootstrapTests.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles("color")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+ classes = SingleSourceMultipleFilesApp.class,
+ properties = { "spring.cloud.bootstrap.name=single-source-multiple-files",
+ "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s", "single.source.multiple.files.stub=true" })
+class SingleSourceMultipleFilesBootstrapTests extends SingleSourceMultipleFilesTests {
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesConfigDataTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesConfigDataTests.java
new file mode 100644
index 0000000000..dd9caf954a
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesConfigDataTests.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.util.ClientBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockito.MockedStatic;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.kubernetes.client.KubernetesClientUtils;
+import org.springframework.test.context.ActiveProfiles;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.mockito.Mockito.mockStatic;
+import static org.springframework.cloud.kubernetes.client.config.boostrap.stubs.SingleSourceMultipleFilesConfigurationStub.stubData;
+
+/**
+ * @author wind57
+ */
+@ActiveProfiles("color")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+ classes = SingleSourceMultipleFilesApp.class,
+ properties = { "spring.main.cloud-platform=KUBERNETES",
+ "spring.config.import=kubernetes:,classpath:./single-source-multiple-files.yaml",
+ "spring.cloud.kubernetes.client.namespace=spring-k8s" })
+class SingleSourceMultipleFilesConfigDataTests extends SingleSourceMultipleFilesTests {
+
+ private static MockedStatic+ * "fruit-color.properties" is taken since "spring.application.name=fruit" and + * "color" is an active profile + *+ */ + @Test + void color() { + this.webClient.get().uri("/single_source-multiple-files/color").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("raw:green###ripe:yellow")); + } + + /** + *
+ * "fruit.properties" is read, since it matches "spring.application.name" + *+ */ + @Test + void name() { + this.webClient.get().uri("/single_source-multiple-files/name").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("banana")); + } + + /** + *
+ * shape profile is not active, thus property "fruit-shape.properties" is skipped + * and as such, a null comes here. + *+ */ + @Test + void shape() { + this.webClient.get().uri("/single_source-multiple-files/shape").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.nullValue()); + } + + /** + *
+ * this is a non-file property in the configmap + *+ */ + @Test + void type() { + this.webClient.get().uri("/single_source-multiple-files/type").exchange().expectStatus().isOk() + .expectBody(String.class).value(Matchers.equalTo("yummy")); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/controller/SingleSourceMultipleFilesController.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/controller/SingleSourceMultipleFilesController.java new file mode 100644 index 0000000000..8fb655618c --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/controller/SingleSourceMultipleFilesController.java @@ -0,0 +1,64 @@ +/* + * Copyright 2013-2021 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.client.config.applications.single_source_multiple_files.controller; + +import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Color; +import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Name; +import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Shape; +import org.springframework.cloud.kubernetes.client.config.applications.single_source_multiple_files.properties.Type; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class SingleSourceMultipleFilesController { + + private final Name name; + + private final Shape shape; + + private final Color color; + + private final Type type; + + public SingleSourceMultipleFilesController(Name name, Shape shape, Color color, Type type) { + this.name = name; + this.shape = shape; + this.color = color; + this.type = type; + } + + @GetMapping("/single_source-multiple-files/type") + public String type() { + return type.getType(); + } + + @GetMapping("/single_source-multiple-files/shape") + public String shape() { + return shape.getRaw(); + } + + @GetMapping("/single_source-multiple-files/color") + public String color() { + return "raw:" + color.getRaw() + "###" + "ripe:" + color.getRipe(); + } + + @GetMapping("/single_source-multiple-files/name") + public String name() { + return name.getName(); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Color.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Color.java new file mode 100644 index 0000000000..8d5cb2d44d --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Color.java @@ -0,0 +1,44 @@ +/* + * Copyright 2013-2021 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.client.config.applications.single_source_multiple_files.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "color.when") +public class Color { + + private String raw; + + private String ripe; + + public String getRaw() { + return raw; + } + + public void setRaw(String raw) { + this.raw = raw; + } + + public String getRipe() { + return ripe; + } + + public void setRipe(String ripe) { + this.ripe = ripe; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Name.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Name.java new file mode 100644 index 0000000000..21df50111a --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Name.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("cool") +public class Name { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Shape.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Shape.java new file mode 100644 index 0000000000..3a041536d8 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Shape.java @@ -0,0 +1,44 @@ +/* + * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("shape.when") +public class Shape { + + private String raw; + + private String ripe; + + public String getRaw() { + return raw; + } + + public void setRaw(String raw) { + this.raw = raw; + } + + public String getRipe() { + return ripe; + } + + public void setRipe(String ripe) { + this.ripe = ripe; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Type.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Type.java new file mode 100644 index 0000000000..a8e4338b74 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/properties/Type.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013-2022 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.client.config.applications.single_source_multiple_files.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("fruit") +public class Type { + + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithPrefixConfigurationStub.java new file mode 100644 index 0000000000..c55e19164a --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithPrefixConfigurationStub.java @@ -0,0 +1,100 @@ +/* + * Copyright 2013-2022 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.client.config.boostrap.stubs; + +import java.util.Collections; +import java.util.Map; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import io.kubernetes.client.openapi.ApiClient; +import io.kubernetes.client.openapi.JSON; +import io.kubernetes.client.openapi.models.V1ConfigMap; +import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; +import io.kubernetes.client.openapi.models.V1ConfigMapList; +import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder; +import io.kubernetes.client.util.ClientBuilder; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; + +/** + * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap + * context; with some stub data already present. + * + * @author wind57 + */ +@Order(0) +@Configuration +@ConditionalOnProperty("labeled.config.map.with.prefix.stub") +public class LabeledConfigMapWithPrefixConfigurationStub { + + @Bean + public WireMockServer wireMock() { + WireMockServer server = new WireMockServer(options().dynamicPort()); + server.start(); + WireMock.configureFor("localhost", server.port()); + return server; + } + + @Bean + public ApiClient apiClient(WireMockServer wireMockServer) { + ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build(); + io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient); + apiClient.setDebugging(true); + stubData(); + return apiClient; + } + + public static void stubData() { + + V1ConfigMap one = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("configmap-one").withNamespace("spring-k8s") + .withLabels(Map.of("letter", "a")).build()) + .addToData(Collections.singletonMap("one.property", "one")).build(); + + V1ConfigMap two = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("configmap-two").withNamespace("spring-k8s") + .withLabels(Map.of("letter", "b")).build()) + .addToData(Collections.singletonMap("property", "two")).build(); + + V1ConfigMap three = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("configmap-three").withNamespace("spring-k8s") + .withLabels(Map.of("letter", "c")).build()) + .addToData(Collections.singletonMap("property", "three")).build(); + + V1ConfigMap four = new V1ConfigMapBuilder() + .withMetadata(new V1ObjectMetaBuilder().withName("configmap-four").withNamespace("spring-k8s") + .withLabels(Map.of("letter", "d")).build()) + .addToData(Collections.singletonMap("property", "four")).build(); + + // the actual stub for CoreV1Api calls + V1ConfigMapList configMapList = new V1ConfigMapList(); + configMapList.addItemsItem(one); + configMapList.addItemsItem(two); + configMapList.addItemsItem(three); + configMapList.addItemsItem(four); + + WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps") + .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))); + } + +} diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithProfileConfigurationStub.java new file mode 100644 index 0000000000..6feb584856 --- /dev/null +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledConfigMapWithProfileConfigurationStub.java @@ -0,0 +1,135 @@ +/* + * Copyright 2013-2022 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.client.config.boostrap.stubs; + +import java.util.Collections; +import java.util.Map; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import io.kubernetes.client.openapi.ApiClient; +import io.kubernetes.client.openapi.JSON; +import io.kubernetes.client.openapi.models.V1ConfigMap; +import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; +import io.kubernetes.client.openapi.models.V1ConfigMapList; +import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder; +import io.kubernetes.client.util.ClientBuilder; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; + +import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; + +/** + * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap + * context; with some stub data already present. + * + * @author wind57 + */ +@Order(0) +@Configuration +@ConditionalOnProperty("labeled.config.map.with.profile.stub") +public class LabeledConfigMapWithProfileConfigurationStub { + + @Bean + public WireMockServer wireMock() { + WireMockServer server = new WireMockServer(options().dynamicPort()); + server.start(); + WireMock.configureFor("localhost", server.port()); + return server; + } + + @Bean + public ApiClient apiClient(WireMockServer wireMockServer) { + ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build(); + io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient); + apiClient.setDebugging(true); + stubData(); + return apiClient; + } + + /* + *
- configmap with name "color-configmap", with labels: "{color: blue}" and
+ * "explicitPrefix: blue" - configmap with name "green-configmap", with labels:
+ * "{color: green}" and "explicitPrefix: blue-again" - configmap with name
+ * "red-configmap", with labels "{color: not-red}" and "useNameAsPrefix: true" -
+ * configmap with name "yellow-configmap" with labels "{color: not-yellow}" and
+ * useNameAsPrefix: true - configmap with name "color-configmap-k8s", with labels :
+ * "{color: not-blue}" - configmap with name "green-configmap-k8s", with labels :
+ * "{color: green-k8s}" - configmap with name "green-configmap-prod", with labels :
+ * "{color: green-prod}"
+ */
+ public static void stubData() {
+
+ // is found by labels
+ V1ConfigMap colorConfigMap = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("color-configmap").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "blue")).build())
+ .addToData(Collections.singletonMap("one", "1")).build();
+
+ // is not taken, since "profileSpecificSources=false" for the above
+ V1ConfigMap colorConfigMapK8s = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("color-configmap-k8s").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "not-blue")).build())
+ .addToData(Collections.singletonMap("five", "5")).build();
+
+ // is found by labels
+ V1ConfigMap greenConfigMap = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-configmap").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green")).build())
+ .addToData(Collections.singletonMap("two", "2")).build();
+
+ V1ConfigMap greenConfigMapK8s = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-configmap-k8s").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green-k8s")).build())
+ .addToData(Collections.singletonMap("six", "6")).build();
+
+ // is taken because prod profile is active and "profileSpecificSources=true"
+ V1ConfigMap greenConfigMapProd = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-configmap-prod").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green-prod")).build())
+ .addToData(Collections.singletonMap("seven", "7")).build();
+
+ // not taken
+ V1ConfigMap redConfigMap = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("red-configmap").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "red")).build())
+ .addToData(Collections.singletonMap("three", "3")).build();
+
+ // not taken
+ V1ConfigMap yellowConfigMap = new V1ConfigMapBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("yellow-configmap").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "yellow")).build())
+ .addToData(Collections.singletonMap("four", "4")).build();
+
+ // the actual stub for CoreV1Api calls
+ V1ConfigMapList configMaps = new V1ConfigMapList();
+ configMaps.addItemsItem(colorConfigMap);
+ configMaps.addItemsItem(colorConfigMapK8s);
+ configMaps.addItemsItem(greenConfigMap);
+ configMaps.addItemsItem(greenConfigMapK8s);
+ configMaps.addItemsItem(greenConfigMapProd);
+ configMaps.addItemsItem(redConfigMap);
+ configMaps.addItemsItem(yellowConfigMap);
+
+ WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
+ .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMaps))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithPrefixConfigurationStub.java
new file mode 100644
index 0000000000..ea30c86b88
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithPrefixConfigurationStub.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013-2022 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.client.config.boostrap.stubs;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.openapi.models.V1Secret;
+import io.kubernetes.client.openapi.models.V1SecretBuilder;
+import io.kubernetes.client.openapi.models.V1SecretList;
+import io.kubernetes.client.util.ClientBuilder;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+/**
+ * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap
+ * context; with some stub data already present.
+ *
+ * @author wind57
+ */
+@Order(0)
+@Configuration
+@ConditionalOnProperty("labeled.secret.with.prefix.stub")
+public class LabeledSecretWithPrefixConfigurationStub {
+
+ @Bean
+ public WireMockServer wireMock() {
+ WireMockServer server = new WireMockServer(options().dynamicPort());
+ server.start();
+ WireMock.configureFor("localhost", server.port());
+ return server;
+ }
+
+ @Bean
+ public ApiClient apiClient(WireMockServer wireMockServer) {
+ ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build();
+ io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient);
+ apiClient.setDebugging(true);
+ stubData();
+ return apiClient;
+ }
+
+ public static void stubData() {
+ V1Secret one = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-one").withNamespace("spring-k8s")
+ .withLabels(Map.of("letter", "a")).withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("one.property", "one".getBytes())).build();
+
+ V1Secret two = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-two").withNamespace("spring-k8s")
+ .withLabels(Map.of("letter", "b")).withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "two".getBytes())).build();
+
+ V1Secret three = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-three").withNamespace("spring-k8s")
+ .withLabels(Map.of("letter", "c")).withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "three".getBytes())).build();
+
+ V1Secret four = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-four").withNamespace("spring-k8s")
+ .withLabels(Map.of("letter", "d")).withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "four".getBytes())).build();
+
+ // the actual stub for CoreV1Api calls
+ V1SecretList secrets = new V1SecretList();
+ secrets.addItemsItem(one);
+ secrets.addItemsItem(two);
+ secrets.addItemsItem(three);
+ secrets.addItemsItem(four);
+
+ WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
+ .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithProfileConfigurationStub.java
new file mode 100644
index 0000000000..8a7b98a7bc
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/LabeledSecretWithProfileConfigurationStub.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013-2022 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.client.config.boostrap.stubs;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.openapi.models.V1Secret;
+import io.kubernetes.client.openapi.models.V1SecretBuilder;
+import io.kubernetes.client.openapi.models.V1SecretList;
+import io.kubernetes.client.util.ClientBuilder;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+/**
+ * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap
+ * context; with some stub data already present.
+ *
+ * @author wind57
+ */
+@Order(0)
+@Configuration
+@ConditionalOnProperty("labeled.secret.with.profile.stub")
+public class LabeledSecretWithProfileConfigurationStub {
+
+ @Bean
+ public WireMockServer wireMock() {
+ WireMockServer server = new WireMockServer(options().dynamicPort());
+ server.start();
+ WireMock.configureFor("localhost", server.port());
+ return server;
+ }
+
+ @Bean
+ public ApiClient apiClient(WireMockServer wireMockServer) {
+ ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build();
+ io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient);
+ apiClient.setDebugging(true);
+ stubData();
+ return apiClient;
+ }
+
+ /*
+ * - secret with name "color-secret", with labels: "{color: blue}" and
+ * "explicitPrefix: blue" - secret with name "green-secret", with labels:
+ * "{color: green}" and "explicitPrefix: blue-again" - secret with name "red-secret",
+ * with labels "{color: not-red}" and "useNameAsPrefix: true" - secret with name
+ * "yellow-secret" with labels "{color: not-yellow}" and useNameAsPrefix: true -
+ * secret with name "color-secret-k8s", with labels : "{color: not-blue}" - secret
+ * with name "green-secret-k8s", with labels : "{color: green-k8s}" - secret with name
+ * "green-secret-prod", with labels : "{color: green-prod}"
+ */
+ public static void stubData() {
+
+ // is found by labels
+ V1Secret colorSecret = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("color-secret").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "blue")).build())
+ .addToData(Collections.singletonMap("one", "1".getBytes())).build();
+
+ // is not taken, since "profileSpecificSources=false" for the above
+ V1Secret colorSecretK8s = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("color-secret-k8s").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "not-blue")).build())
+ .addToData(Collections.singletonMap("five", "5".getBytes())).build();
+
+ // is found by labels
+ V1Secret greenSecret = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-secret").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green")).build())
+ .addToData(Collections.singletonMap("two", "2".getBytes())).build();
+
+ V1Secret greenSecretK8s = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-secret-k8s").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green-k8s")).build())
+ .addToData(Collections.singletonMap("six", "6".getBytes())).build();
+
+ // is taken because prod profile is active and "profileSpecificSources=true"
+ V1Secret shapeSecretProd = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("green-secret-prod").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "green-prod")).build())
+ .addToData(Collections.singletonMap("seven", "7".getBytes())).build();
+
+ // not taken
+ V1Secret redSecret = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("red-secret").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "not-red")).build())
+ .addToData(Collections.singletonMap("three", "3".getBytes())).build();
+
+ // not taken
+ V1Secret yellowSecret = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("yellow-secret").withNamespace("spring-k8s")
+ .withLabels(Map.of("color", "not-yellow")).build())
+ .addToData(Collections.singletonMap("four", "4".getBytes())).build();
+
+ // the actual stub for CoreV1Api calls
+ V1SecretList secrets = new V1SecretList();
+ secrets.addItemsItem(colorSecret);
+ secrets.addItemsItem(colorSecretK8s);
+ secrets.addItemsItem(greenSecret);
+ secrets.addItemsItem(greenSecretK8s);
+ secrets.addItemsItem(shapeSecretProd);
+ secrets.addItemsItem(redSecret);
+ secrets.addItemsItem(yellowSecret);
+
+ WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
+ .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/ConfigMapNameAsPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithPrefixConfigurationStub.java
similarity index 95%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/ConfigMapNameAsPrefixConfigurationStub.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithPrefixConfigurationStub.java
index a639d71378..c021349cd1 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/ConfigMapNameAsPrefixConfigurationStub.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithPrefixConfigurationStub.java
@@ -44,8 +44,8 @@
*/
@Order(0)
@Configuration
-@ConditionalOnProperty("config.map.name.as.prefix.stub")
-public class ConfigMapNameAsPrefixConfigurationStub {
+@ConditionalOnProperty("named.config.map.with.prefix.stub")
+public class NamedConfigMapWithPrefixConfigurationStub {
@Bean
public WireMockServer wireMock() {
@@ -64,7 +64,7 @@ public ApiClient apiClient(WireMockServer wireMockServer) {
return apiClient;
}
- private void stubData() {
+ public static void stubData() {
V1ConfigMap one = new V1ConfigMapBuilder()
.withMetadata(new V1ObjectMetaBuilder().withName("config-map-one").withNamespace("spring-k8s")
.withResourceVersion("1").build())
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/IncludeProfileSpecificSourcesConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithProfileConfigurationStub.java
similarity index 65%
rename from spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/IncludeProfileSpecificSourcesConfigurationStub.java
rename to spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithProfileConfigurationStub.java
index ee37d971c0..ea83ae13e1 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/IncludeProfileSpecificSourcesConfigurationStub.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedConfigMapWithProfileConfigurationStub.java
@@ -44,8 +44,8 @@
*/
@Order(0)
@Configuration
-@ConditionalOnProperty("include.profile.specific.sources")
-class IncludeProfileSpecificSourcesConfigurationStub {
+@ConditionalOnProperty("named.config.map.with.profile.stub")
+public class NamedConfigMapWithProfileConfigurationStub {
@Bean
public WireMockServer wireMock() {
@@ -64,34 +64,37 @@ public ApiClient apiClient(WireMockServer wireMockServer) {
return apiClient;
}
- private void stubData() {
+ public static void stubData() {
+
V1ConfigMap one = new V1ConfigMapBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withName("config-map-one-dev").withNamespace("spring-k8s")
- .withResourceVersion("1").build())
+ .withMetadata(new V1ObjectMetaBuilder().withName("configmap-one").withNamespace("spring-k8s").build())
.addToData(Collections.singletonMap("one.property", "one")).build();
+ V1ConfigMap oneFromK8s = new V1ConfigMapBuilder()
+ .withMetadata(
+ new V1ObjectMetaBuilder().withName("configmap-one-k8s").withNamespace("spring-k8s").build())
+ .addToData(Collections.singletonMap("one.property", "one-from-k8s")).build();
+
V1ConfigMap two = new V1ConfigMapBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withName("config-map-two").withNamespace("spring-k8s")
- .withResourceVersion("1").build())
- .addToData(Collections.singletonMap("two.property", "two")).build();
+ .withMetadata(new V1ObjectMetaBuilder().withName("configmap-two").withNamespace("spring-k8s").build())
+ .addToData(Collections.singletonMap("property", "two")).build();
- V1ConfigMap twoDev = new V1ConfigMapBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withName("config-map-two-dev").withNamespace("spring-k8s")
- .withResourceVersion("1").build())
- .addToData(Collections.singletonMap("two.property", "twoDev")).build();
+ V1ConfigMap twoFromK8s = new V1ConfigMapBuilder()
+ .withMetadata(
+ new V1ObjectMetaBuilder().withName("configmap-two-k8s").withNamespace("spring-k8s").build())
+ .addToData(Collections.singletonMap("property", "two-from-k8s")).build();
V1ConfigMap three = new V1ConfigMapBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withName("config-map-three").withNamespace("spring-k8s")
- .withResourceVersion("1").build())
- .addToData(Collections.singletonMap("three.property", "three")).build();
+ .withMetadata(new V1ObjectMetaBuilder().withName("configmap-three").withNamespace("spring-k8s").build())
+ .addToData(Collections.singletonMap("property", "three")).build();
- V1ConfigMap threeDev = new V1ConfigMapBuilder()
- .withMetadata(new V1ObjectMetaBuilder().withName("config-map-three-dev").withNamespace("spring-k8s")
- .withResourceVersion("1").build())
- .addToData(Collections.singletonMap("three.property", "threeDev")).build();
+ V1ConfigMap threeFromK8s = new V1ConfigMapBuilder()
+ .withMetadata(
+ new V1ObjectMetaBuilder().withName("configmap-three-k8s").withNamespace("spring-k8s").build())
+ .addToData(Collections.singletonMap("property", "three-from-k8s")).build();
V1ConfigMapList allConfigMaps = new V1ConfigMapList();
- allConfigMaps.setItems(Arrays.asList(one, two, twoDev, three, threeDev));
+ allConfigMaps.setItems(Arrays.asList(one, oneFromK8s, two, twoFromK8s, three, threeFromK8s));
// the actual stub for CoreV1Api calls
WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithPrefixConfigurationStub.java
new file mode 100644
index 0000000000..dc8ab3dfd5
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithPrefixConfigurationStub.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2013-2022 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.client.config.boostrap.stubs;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.openapi.models.V1Secret;
+import io.kubernetes.client.openapi.models.V1SecretBuilder;
+import io.kubernetes.client.openapi.models.V1SecretList;
+import io.kubernetes.client.util.ClientBuilder;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+/**
+ * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap
+ * context; with some stub data already present.
+ *
+ * @author wind57
+ */
+@Order(0)
+@Configuration
+@ConditionalOnProperty("named.secret.with.prefix.stub")
+public class NamedSecretWithPrefixConfigurationStub {
+
+ @Bean
+ public WireMockServer wireMock() {
+ WireMockServer server = new WireMockServer(options().dynamicPort());
+ server.start();
+ WireMock.configureFor("localhost", server.port());
+ return server;
+ }
+
+ @Bean
+ public ApiClient apiClient(WireMockServer wireMockServer) {
+ ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build();
+ io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient);
+ stubData();
+ return apiClient;
+ }
+
+ public static void stubData() {
+ V1Secret one = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-one").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("one.property", "one".getBytes())).build();
+
+ V1Secret two = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-two").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "two".getBytes())).build();
+
+ V1Secret three = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-three").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "three".getBytes())).build();
+
+ V1SecretList allSecrets = new V1SecretList();
+ allSecrets.setItems(Arrays.asList(one, two, three));
+
+ // the actual stub for CoreV1Api calls
+ WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
+ .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithProfileConfigurationStub.java
new file mode 100644
index 0000000000..6031358a1c
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/NamedSecretWithProfileConfigurationStub.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2013-2022 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.client.config.boostrap.stubs;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.openapi.models.V1Secret;
+import io.kubernetes.client.openapi.models.V1SecretBuilder;
+import io.kubernetes.client.openapi.models.V1SecretList;
+import io.kubernetes.client.util.ClientBuilder;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+/**
+ * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap
+ * context; with some stub data already present.
+ *
+ * @author wind57
+ */
+@Order(0)
+@Configuration
+@ConditionalOnProperty("named.secret.with.profile.stub")
+public class NamedSecretWithProfileConfigurationStub {
+
+ @Bean
+ public WireMockServer wireMock() {
+ WireMockServer server = new WireMockServer(options().dynamicPort());
+ server.start();
+ WireMock.configureFor("localhost", server.port());
+ return server;
+ }
+
+ @Bean
+ public ApiClient apiClient(WireMockServer wireMockServer) {
+ ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build();
+ io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient);
+ stubData();
+ return apiClient;
+ }
+
+ public static void stubData() {
+ V1Secret one = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-one").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("one.property", "one".getBytes())).build();
+
+ V1Secret oneWithProfile = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-one-k8s").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("one.property", "one-from-k8s".getBytes())).build();
+
+ V1Secret two = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-two").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "two".getBytes())).build();
+
+ V1Secret twoWithProfile = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-two-k8s").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "two-from-k8s".getBytes())).build();
+
+ V1Secret three = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-three").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "three".getBytes())).build();
+
+ V1Secret threeFromProfile = new V1SecretBuilder()
+ .withMetadata(new V1ObjectMetaBuilder().withName("secret-three-k8s").withNamespace("spring-k8s")
+ .withResourceVersion("1").build())
+ .addToData(Collections.singletonMap("property", "three-from-k8s".getBytes())).build();
+
+ V1SecretList allSecrets = new V1SecretList();
+ allSecrets.setItems(Arrays.asList(one, oneWithProfile, two, twoWithProfile, three, threeFromProfile));
+
+ // the actual stub for CoreV1Api calls
+ WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
+ .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));
+ }
+
+}
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/SingleSourceMultipleFilesConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/SingleSourceMultipleFilesConfigurationStub.java
new file mode 100644
index 0000000000..e92948d747
--- /dev/null
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/boostrap/stubs/SingleSourceMultipleFilesConfigurationStub.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2013-2022 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.client.config.boostrap.stubs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.openapi.models.V1ConfigMap;
+import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
+import io.kubernetes.client.openapi.models.V1ConfigMapList;
+import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
+import io.kubernetes.client.util.ClientBuilder;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+/**
+ * A test bootstrap that takes care to initialize ApiClient _before_ our main bootstrap
+ * context; with some stub data already present.
+ *
+ * @author wind57
+ */
+@Order(0)
+@Configuration
+@ConditionalOnProperty("single.source.multiple.files.stub")
+public class SingleSourceMultipleFilesConfigurationStub {
+
+ @Bean
+ public WireMockServer wireMock() {
+ WireMockServer server = new WireMockServer(options().dynamicPort());
+ server.start();
+ WireMock.configureFor("localhost", server.port());
+ return server;
+ }
+
+ @Bean
+ public ApiClient apiClient(WireMockServer wireMockServer) {
+ ApiClient apiClient = new ClientBuilder().setBasePath("http://localhost:" + wireMockServer.port()).build();
+ io.kubernetes.client.openapi.Configuration.setDefaultApiClient(apiClient);
+ stubData();
+ return apiClient;
+ }
+
+ public static void stubData() {
+
+ Map