fix

Signed-off-by: wind57 <[email protected]>

Author: wind57

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

@@ -199,8 +199,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");
@@ -210,10 +209,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/LabeledConfigMapContextToSourceDataProviderTests.java

@@ -376,10 +376,10 @@ 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 "color-configmap-k8s", even if its labels do not match provided ones.
+	 * 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
+	 * "color-configmap-k8s", even if its labels do not match provided ones.
 	 */
 	@Test
 	void searchWithLabelsOneConfigMapFoundAndOneFromProfileFound() {
@@ -409,15 +409,14 @@ 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>
+	 * <pre>
 	 *     - configmap "color-configmap" with label "{color:blue}"
 	 *     - configmap "shape-configmap" with labels "{color:blue, shape:round}"
 	 *     - configmap "no-fit" with labels "{tag:no-fit}"
@@ -477,15 +476,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/LabeledSecretContextToSourceDataProviderTests.java

@@ -376,10 +376,10 @@ 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", even if its labels do not match provided ones.
+	 * 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",
+	 * even if its labels do not match provided ones.
 	 */
 	@Test
 	void searchWithLabelsOneSecretFoundAndOneFromProfileFound() {
@@ -409,15 +409,14 @@ 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>
+	 * <pre>
 	 *     - secret "color-secret" with label "{color:blue}"
 	 *     - secret "shape-secret" with labels "{color:blue, shape:round}"
 	 *     - secret "no-fit" with labels "{tag:no-fit}"
@@ -477,14 +476,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");
 
 	}