fix issue

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

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MountSecretPropertySource.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013-present 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.commons.config;
+
+/**
+ * @author wind57
+ */
+public final class MountSecretPropertySource extends SecretsPropertySource {
+
+	public MountSecretPropertySource(SourceData sourceData) {
+		super(sourceData);
+	}
+
+}

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java

@@ -152,33 +152,33 @@ protected void putPathConfig(CompositePropertySource composite) {
 	 * @author wind57
 	 */
 	private static class SecretsPropertySourceCollector
-			implements Collector<Path, List<SecretsPropertySource>, List<SecretsPropertySource>> {
+			implements Collector<Path, List<MountSecretPropertySource>, List<MountSecretPropertySource>> {
 
 		@Override
-		public Supplier<List<SecretsPropertySource>> supplier() {
+		public Supplier<List<MountSecretPropertySource>> supplier() {
 			return ArrayList::new;
 		}
 
 		@Override
-		public BiConsumer<List<SecretsPropertySource>, Path> accumulator() {
+		public BiConsumer<List<MountSecretPropertySource>, Path> accumulator() {
 			return (list, filePath) -> {
-				SecretsPropertySource source = property(filePath);
+				MountSecretPropertySource source = property(filePath);
 				if (source != null) {
 					list.add(source);
 				}
 			};
 		}
 
 		@Override
-		public BinaryOperator<List<SecretsPropertySource>> combiner() {
+		public BinaryOperator<List<MountSecretPropertySource>> combiner() {
 			return (left, right) -> {
 				left.addAll(right);
 				return left;
 			};
 		}
 
 		@Override
-		public Function<List<SecretsPropertySource>, List<SecretsPropertySource>> finisher() {
+		public Function<List<MountSecretPropertySource>, List<MountSecretPropertySource>> finisher() {
 			return Function.identity();
 		}
 
@@ -187,15 +187,15 @@ public Set<Characteristics> characteristics() {
 			return EnumSet.of(Characteristics.UNORDERED, Characteristics.IDENTITY_FINISH);
 		}
 
-		private SecretsPropertySource property(Path filePath) {
+		private MountSecretPropertySource property(Path filePath) {
 
 			String fileName = filePath.getFileName().toString();
 
 			try {
 				String content = new String(Files.readAllBytes(filePath)).trim();
 				String sourceName = fileName.toLowerCase(Locale.ROOT);
 				SourceData sourceData = new SourceData(sourceName, Map.of(fileName, content));
-				return new SecretsPropertySource(sourceData);
+				return new MountSecretPropertySource(sourceData);
 			}
 			catch (IOException e) {
 				LOG.warn("Error reading properties file", e);

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java

@@ -27,6 +27,7 @@
 import org.springframework.cloud.bootstrap.config.BootstrapPropertySource;
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.cloud.kubernetes.commons.config.MountConfigMapPropertySource;
+import org.springframework.cloud.kubernetes.commons.config.MountSecretPropertySource;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
@@ -88,6 +89,7 @@ public static boolean reload(PropertySourceLocator locator, ConfigurableEnvironm
 	 * @deprecated this method will not be public in the next major release.
 	 */
 	@Deprecated(forRemoval = false)
+	@SuppressWarnings("unchecked")
 	public static <S extends PropertySource<?>> List<S> findPropertySources(Class<S> sourceClass,
 			ConfigurableEnvironment environment) {
 		List<S> managedSources = new ArrayList<>();
@@ -110,6 +112,10 @@ else if (source instanceof MountConfigMapPropertySource mountConfigMapPropertySo
 				// we know that the type is correct here
 				managedSources.add((S) mountConfigMapPropertySource);
 			}
+			else if (source instanceof MountSecretPropertySource mountSecretPropertySource) {
+				// we know that the type is correct here
+				managedSources.add((S) mountSecretPropertySource);
+			}
 			else if (source instanceof BootstrapPropertySource<?> bootstrapPropertySource) {
 				PropertySource<?> propertySource = bootstrapPropertySource.getDelegate();
 				LOG.debug(() -> "bootstrap delegate class : " + propertySource.getClass());
@@ -120,6 +126,10 @@ else if (propertySource instanceof MountConfigMapPropertySource mountConfigMapPr
 					// we know that the type is correct here
 					managedSources.add((S) mountConfigMapPropertySource);
 				}
+				else if (propertySource instanceof MountSecretPropertySource mountSecretPropertySource) {
+					// we know that the type is correct here
+					managedSources.add((S) mountSecretPropertySource);
+				}
 			}
 		}
 

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtilTests.java

@@ -27,6 +27,7 @@
 
 import org.springframework.cloud.bootstrap.config.BootstrapPropertySource;
 import org.springframework.cloud.kubernetes.commons.config.MountConfigMapPropertySource;
+import org.springframework.cloud.kubernetes.commons.config.MountSecretPropertySource;
 import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySource;
 import org.springframework.cloud.kubernetes.commons.config.SourceData;
 import org.springframework.core.env.CompositePropertySource;
@@ -157,23 +158,25 @@ public Object getProperty(String name) {
 	void testSecretsPropertySource() {
 		MockEnvironment environment = new MockEnvironment();
 		MutablePropertySources propertySources = environment.getPropertySources();
-		propertySources.addFirst(new SecretsPropertySource(new SourceData("secret", Map.of("a", "b"))));
+		propertySources.addFirst(new MountSecretPropertySource(new SourceData("secret", Map.of("a", "b"))));
 
 		List<? extends PropertySource> result = ConfigReloadUtil.findPropertySources(PlainPropertySource.class,
 				environment);
-		assertThat(result.size()).isEqualTo(0);
+		assertThat(result.size()).isEqualTo(1);
+		assertThat(result.get(0).getProperty("a")).isEqualTo("b");
 	}
 
 	@Test
 	void testBootstrapSecretsPropertySource() {
 		MockEnvironment environment = new MockEnvironment();
 		MutablePropertySources propertySources = environment.getPropertySources();
 		propertySources
-			.addFirst(new OneBootstrap<>(new SecretsPropertySource(new SourceData("secret", Map.of("a", "b")))));
+			.addFirst(new OneBootstrap<>(new MountSecretPropertySource(new SourceData("secret", Map.of("a", "b")))));
 
 		List<? extends PropertySource> result = ConfigReloadUtil.findPropertySources(PlainPropertySource.class,
 				environment);
-		assertThat(result.size()).isEqualTo(0);
+		assertThat(result.size()).isEqualTo(1);
+		assertThat(result.get(0).getProperty("a")).isEqualTo("b");
 	}
 
 	private static final class OneComposite extends CompositePropertySource {