From 14fdd5e5045d44fa5d8a8b48dcf4f9f4bcbbe7fb Mon Sep 17 00:00:00 2001
From: 98001yash <yashchauhan.gaya@gmail.com>
Date: Sat, 19 Sep 2026 16:42:39 +0530
Subject: [PATCH] Expose profile metadata in config property sources

Signed-off-by: 98001yash <yashchauhan.gaya@gmail.com>
---
 .../client/ConfigServerConfigDataLoader.java  | 55 +++++++++++--------
 .../config/environment/PropertySource.java    | 21 ++++++-
 .../ConfigServerConfigDataLoaderTests.java    | 31 +++++++++++
 .../NativeEnvironmentRepository.java          | 10 +++-
 4 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
index 6f7f804310..2b173d3c72 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java
@@ -132,14 +132,17 @@ public ConfigData doLoad(ConfigDataLoaderContext context, ConfigServerConfigData
 					log(result);
 
 					// result.getPropertySources() can be null if using xml
+					Map<PropertySource<?>, String> propertySourceProfiles = new HashMap<>();
 					if (result.getPropertySources() != null) {
 						for (org.springframework.cloud.config.environment.PropertySource source : result
 							.getPropertySources()) {
 							@SuppressWarnings("unchecked")
 							Map<String, Object> map = translateOrigins(source.getName(),
 									(Map<String, Object>) source.getSource());
-							propertySources.add(0,
-									new OriginTrackedMapPropertySource("configserver:" + source.getName(), map, true));
+							OriginTrackedMapPropertySource propertySource = new OriginTrackedMapPropertySource(
+									"configserver:" + source.getName(), map, true);
+							propertySources.add(0, propertySource);
+							propertySourceProfiles.put(propertySource, source.getProfile());
 						}
 					}
 
@@ -165,31 +168,37 @@ else if (ALL_OPTIONS.size() > 2) {
 						// boot 2.4.5+
 						return new ConfigData(propertySources, propertySource -> {
 							String propertySourceName = propertySource.getName();
+							String profile = propertySourceProfiles.get(propertySource);
 							List<Option> options = new ArrayList<>();
 							options.add(Option.IGNORE_IMPORTS);
-							// TODO: the profile is now available on the backend
-							// in a future minor, add the profile associated with a
-							// PropertySource see
-							// https://github.com/spring-cloud/spring-cloud-config/issues/1874
-							for (String profile : resource.getAcceptedProfiles()) {
-								// TODO: switch to match
-								// , is used as a profile-separator for property sources
-								// from vault
-								// - is the default profile-separator for property sources
-								// TODO This is error prone logic see
-								// https://github.com/spring-cloud/spring-cloud-config/issues/2291
-								// When we see the overrides property source name we
-								// should always prioritize those
-								// properties over everything else, even profile specific
-								// property sources so also
-								// label this property source profile specific.
-								if (OVERRIDES_NAME.equals(propertySourceName) || (!DEFAULT_PROFILE.equals(profile)
-										&& propertySourceName.matches(".*[-,]" + profile + "\\b.*"))) {
-									// // TODO: switch to Options.with() when implemented
-									options.add(Option.PROFILE_SPECIFIC);
-									options.add(Option.IGNORE_PROFILES);
+
+							if (OVERRIDES_NAME.equals(propertySourceName)) {
+								options.add(Option.PROFILE_SPECIFIC);
+								options.add(Option.IGNORE_PROFILES);
+							}
+							else if (profile != null) {
+								for (String acceptedProfile : resource.getAcceptedProfiles()) {
+									if (!DEFAULT_PROFILE.equals(profile) && profile.equals(acceptedProfile)) {
+										options.add(Option.PROFILE_SPECIFIC);
+										options.add(Option.IGNORE_PROFILES);
+										break;
+									}
 								}
 							}
+							else {
+								// Backward compatibility with Config Server versions that
+								// do not
+								// provide profile metadata.
+								for (String acceptedProfile : resource.getAcceptedProfiles()) {
+									if (!DEFAULT_PROFILE.equals(acceptedProfile)
+											&& propertySourceName.matches(".*[-,]" + acceptedProfile + "\\b.*")) {
+										options.add(Option.PROFILE_SPECIFIC);
+										options.add(Option.IGNORE_PROFILES);
+										break;
+									}
+								}
+							}
+
 							return ConfigData.Options.of(options.toArray(new Option[0]));
 						});
 					}
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java
index ba4f2fe2c2..b0d2193ed7 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java
@@ -35,19 +35,34 @@ public class PropertySource {
 
 	private Map<?, ?> source;
 
+	private String profile;
+
 	private org.springframework.core.env.PropertySource<?> originalPropertySource;
 
 	@JsonCreator
-	public PropertySource(@JsonProperty("name") String name, @JsonProperty("source") Map<?, ?> source) {
+	public PropertySource(@JsonProperty("name") String name, @JsonProperty("source") Map<?, ?> source,
+			@JsonProperty("profile") String profile) {
 		this.name = name;
 		this.source = source;
+		this.profile = profile;
+	}
+
+	public PropertySource(String name, Map<?, ?> source) {
+		this(name, source, (String) null);
 	}
 
 	@JsonIgnore
 	public PropertySource(String name, Map<?, ?> source,
 			org.springframework.core.env.PropertySource<?> originalPropertySource) {
+		this(name, source, null, originalPropertySource);
+	}
+
+	@JsonIgnore
+	public PropertySource(String name, Map<?, ?> source, String profile,
+			org.springframework.core.env.PropertySource<?> originalPropertySource) {
 		this.name = name;
 		this.source = source;
+		this.profile = profile;
 		this.originalPropertySource = originalPropertySource;
 	}
 
@@ -59,6 +74,10 @@ public String getName() {
 		return this.source;
 	}
 
+	public String getProfile() {
+		return this.profile;
+	}
+
 	@JsonIgnore
 	public org.springframework.core.env.PropertySource<?> getOriginalPropertySource() {
 		return this.originalPropertySource;
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java
index 6d05d80d25..d1fb88d0db 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java
@@ -618,6 +618,37 @@ void testProfileSpecificPropertySources() {
 			.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
 	}
 
+	@Test
+	void testProfileSpecificPropertySourceWithExplicitProfile() {
+		PropertySource profileSpecific = new PropertySource("some-unrelated-name",
+				Collections.singletonMap("foo", "bar"), "dev");
+		PropertySource nonProfileSpecific = new PropertySource("application.properties",
+				Collections.singletonMap("foo", "bar"));
+
+		ConfigData configData = setupConfigServerConfigDataLoader(Arrays.asList(profileSpecific, nonProfileSpecific),
+				"application", "dev");
+
+		assertThat(configData.getPropertySources()).hasSize(3);
+
+		ConfigData.Options profileSpecificOptions = configData.getOptions(configData.getPropertySources()
+			.stream()
+			.filter(propertySource -> propertySource.getName().equals("configserver:some-unrelated-name"))
+			.findFirst()
+			.orElseThrow());
+
+		assertThat(profileSpecificOptions.contains(ConfigData.Option.PROFILE_SPECIFIC)).isTrue();
+		assertThat(profileSpecificOptions.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
+
+		ConfigData.Options nonProfileSpecificOptions = configData.getOptions(configData.getPropertySources()
+			.stream()
+			.filter(propertySource -> propertySource.getName().equals("configserver:application.properties"))
+			.findFirst()
+			.orElseThrow());
+
+		assertThat(nonProfileSpecificOptions.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(nonProfileSpecificOptions.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
+	}
+
 	@Test
 	void testProfileSpecificPropertySourcesWithDefaultProfile() {
 		PropertySource p1 = new PropertySource("overrides", Collections.singletonMap("foo", "bar"));
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
index aff495c03a..aa9dc62843 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
@@ -285,6 +285,7 @@ protected Environment clean(Environment env,
 				continue;
 			}
 			String[] locations = null;
+			String profile = null;
 
 			PropertySourceConfigData configData = propertySourceToConfigData.get(source.getOriginalPropertySource());
 			// try and get information directly from ConfigData
@@ -292,6 +293,7 @@ protected Environment clean(Environment env,
 				StandardConfigDataResource configDataResource = (StandardConfigDataResource) configData.resource;
 				// use StandardConfigDataResource as that format is expected still
 				name = configDataResource.toString();
+				profile = configDataResource.getProfile();
 				locations = configDataLocations(configData.location.split());
 			}
 			else {
@@ -302,9 +304,10 @@ protected Environment clean(Environment env,
 					locations = new String[] { matcher.group(2) };
 				}
 			}
+
 			name = name.replace("\\", "/"); // change windows path '\' into '/'
 			name = name.replaceAll("\\[(?=\\w:)", "[/"); // change [D:/path] into
-															// [/D:/path]
+			// [/D:/path]
 			name = name.replace("applicationConfig: [", "");
 			name = name.replace("file [", "file:");
 			name = name.replace("class path resource [", "classpath:/");
@@ -325,11 +328,12 @@ protected Environment clean(Environment env,
 			logger.info("Adding property source: " + originalName);
 			if (originalName.contains("document #")) {
 				// this is a multi-document file, use originalName for uniqueness.
-				result.add(new PropertySource(originalName, source.getSource()));
+				result.add(new PropertySource(originalName, source.getSource(), profile,
+						source.getOriginalPropertySource()));
 			}
 			else {
 				// many other file tests rely on the mangled name
-				result.add(new PropertySource(name, source.getSource()));
+				result.add(new PropertySource(name, source.getSource(), profile, source.getOriginalPropertySource()));
 			}
 		}
 		return result;