Merge branch 'fix-1715-drop-profiles-support' into fix-1681

Author: wind57

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigUtilsTests.java

@@ -190,8 +190,7 @@ void testSecretDataByLabelsThreeSecretsFound() {
 
 		MultipleSourcesContainer result = Fabric8ConfigUtils.secretsDataByLabels(client, "spring-k8s",
 				Map.of("tag", "fit", "color", "blue"), new MockEnvironment());
-		Assertions.assertThat(result.names()).contains("blue-circle-secret");
-		Assertions.assertThat(result.names()).contains("blue-square-secret");
+		Assertions.assertThat(result.names()).containsExactlyInAnyOrder("blue-circle-secret", "blue-square-secret");
 
 		@SuppressWarnings("unchecked")
 		Map<String, Object> dataBlueSecret = (Map<String, Object>) result.data().get("blue-circle-secret");
@@ -201,10 +200,6 @@ void testSecretDataByLabelsThreeSecretsFound() {
 		Map<String, Object> dataSquareSecret = (Map<String, Object>) result.data().get("blue-square-secret");
 		Assertions.assertThat(dataSquareSecret).containsExactlyInAnyOrderEntriesOf(Map.of("two", "2"));
 
-		@SuppressWarnings("unchecked")
-		Map<String, Object> dataSquareSecretK8s = (Map<String, Object>) result.data().get("blue-square-secret-k8s");
-		Assertions.assertThat(dataSquareSecretK8s).containsExactlyInAnyOrderEntriesOf(Map.of("four", "4"));
-
 	}
 
 	// secret "my-secret" is deployed; we search for it by name and do not find it.

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledConfigMapContextToSourceDataProviderNamespacedBatchReadTests.java

@@ -380,8 +380,6 @@ void searchWithLabelsOneConfigMapFound() {
 	}
 
 	/**
-<<<<<<< HEAD
-=======
 	 * two configmaps are deployed: "color-configmap" with label: "{color:blue}" and
 	 * "color-configmap-k8s" with label: "{color:red}". We search by "{color:blue}" and
 	 * find one configmap. Since profiles are enabled, we will also be reading
@@ -415,15 +413,13 @@ void searchWithLabelsOneConfigMapFoundAndOneFromProfileFound() {
 		Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
 		SourceData sourceData = data.apply(context);
 
-		assertThat(sourceData.sourceData().size()).isEqualTo(2);
+		assertThat(sourceData.sourceData().size()).isEqualTo(1);
 		assertThat(sourceData.sourceData().get("color-configmap.one")).isEqualTo("1");
-		assertThat(sourceData.sourceData().get("color-configmap-k8s.two")).isEqualTo("2");
-		assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.color-configmap-k8s.default");
+		assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.default");
 
 	}
 
 	/**
->>>>>>> main
 	 * <pre>
 	 *     - configmap "color-configmap" with label "{color:blue}"
 	 *     - configmap "shape-configmap" with labels "{color:blue, shape:round}"
@@ -485,15 +481,12 @@ void searchWithLabelsTwoConfigMapsFound() {
 		Fabric8ContextToSourceData data = new LabeledConfigMapContextToSourceDataProvider().get();
 		SourceData sourceData = data.apply(context);
 
-		assertThat(sourceData.sourceData().size()).isEqualTo(4);
+		assertThat(sourceData.sourceData().size()).isEqualTo(2);
 
 		assertThat(sourceData.sourceData().get("color-configmap.one")).isEqualTo("1");
 		assertThat(sourceData.sourceData().get("shape-configmap.two")).isEqualTo("2");
-		assertThat(sourceData.sourceData().get("color-configmap-k8s.four")).isEqualTo("4");
-		assertThat(sourceData.sourceData().get("shape-configmap-k8s.five")).isEqualTo("5");
 
-		assertThat(sourceData.sourceName())
-			.isEqualTo("configmap.color-configmap.color-configmap-k8s.shape-configmap.shape-configmap-k8s.default");
+		assertThat(sourceData.sourceName()).isEqualTo("configmap.color-configmap.shape-configmap.default");
 
 	}
 

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/LabeledSecretContextToSourceDataProviderNamespacedBatchReadTests.java

@@ -380,8 +380,6 @@ void searchWithLabelsOneSecretFound() {
 	}
 
 	/**
-<<<<<<< HEAD
-=======
 	 * two secrets are deployed: secret "color-secret" with label: "{color:blue}" and
 	 * "color-secret-k8s" with label: "{color:red}". We search by "{color:blue}" and find
 	 * one secret. Since profiles are enabled, we will also be reading "color-secret-k8s",
@@ -415,15 +413,13 @@ void searchWithLabelsOneSecretFoundAndOneFromProfileFound() {
 		Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
 		SourceData sourceData = data.apply(context);
 
-		Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
+		Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(1);
 		Assertions.assertThat(sourceData.sourceData().get("color-secret.one")).isEqualTo("1");
-		Assertions.assertThat(sourceData.sourceData().get("color-secret-k8s.two")).isEqualTo("2");
-		Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.color-secret-k8s.default");
+		Assertions.assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.default");
 
 	}
 
 	/**
->>>>>>> main
 	 * <pre>
 	 *     - secret "color-secret" with label "{color:blue}"
 	 *     - secret "shape-secret" with labels "{color:blue, shape:round}"
@@ -485,14 +481,11 @@ void searchWithLabelsTwoSecretsFound() {
 		Fabric8ContextToSourceData data = new LabeledSecretContextToSourceDataProvider().get();
 		SourceData sourceData = data.apply(context);
 
-		Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(4);
+		Assertions.assertThat(sourceData.sourceData().size()).isEqualTo(2);
 		assertThat(sourceData.sourceData().get("color-secret.one")).isEqualTo("1");
 		assertThat(sourceData.sourceData().get("shape-secret.two")).isEqualTo("2");
-		assertThat(sourceData.sourceData().get("color-secret-k8s.four")).isEqualTo("4");
-		assertThat(sourceData.sourceData().get("shape-secret-k8s.five")).isEqualTo("5");
 
-		assertThat(sourceData.sourceName())
-			.isEqualTo("secret.color-secret.color-secret-k8s.shape-secret.shape-secret-k8s.default");
+		assertThat(sourceData.sourceName()).isEqualTo("secret.color-secret.shape-secret.default");
 
 	}
 

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_profile/LabeledConfigMapWithProfile.java

@@ -151,15 +151,11 @@ void testBlue() {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * <pre>
+	 * <<<<<<< HEAD <pre>
 	 *   this one is taken from : "green-configmap.green-configmap-k8s.green-configmap-prod.green-purple-configmap.green-purple-configmap-k8s".
 	 *   We find "green-configmap", "green-configmap-k8s", "green-configmap-prod"  by labels.
 	 *   Also "green-purple-configmap" and "green-purple-configmap-k8s" are found.
-	 * </pre>
-=======
-	 * found by labels.
->>>>>>> main
+	 * </pre> ======= found by labels. >>>>>>> main
 	 */
 	@Test
 	void testGreen() {

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_profile/LabeledSecretWithProfile.java

@@ -75,12 +75,12 @@ abstract class LabeledSecretWithProfile {
 	 *     - 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}"
-<<<<<<< HEAD
-=======
+	<<<<<<< HEAD
+	=======
 	 *
 	 *     	a test that proves order: first read non-profile based secrets, thus profile based
 	 *     	secrets override non-profile ones.
->>>>>>> main
+	>>>>>>> main
 	 *     - secret with name "green-purple-secret", labels "{color: green, shape: round}", data: "{eight: 8}"
 	 *     - secret with name "green-purple-secret-k8s", labels "{color: black}", data: "{eight: eight-ish}"
 	 * </pre>
@@ -168,13 +168,13 @@ void testBlue() {
 
 	/**
 	 * <pre>
-<<<<<<< HEAD
+	<<<<<<< HEAD
 	 *   this one is taken from : "green-purple-secret.green-purple-secret-k8s.green-secret.green-secret-k8s.green-secret-prod".
 	 *   We find "green-secret", "green-secrets-k8s" and "green-secrets-prod" by labels.
 	 *   Also "green-purple-secret" and "green-purple-secret-k8s" are found.
-=======
+	=======
 	 *   We find "green-secret" by labels.
->>>>>>> main
+	>>>>>>> main
 	 * </pre>
 	 */
 	@Test