From 92325c3ecd34878302c9150201425a659d24b28e Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 31 Oct 2024 15:43:09 -0400
Subject: [PATCH] Only ignore profile activation and inclusion if the property
 source is profile specific (#2613)

---
 .../client/ConfigServerConfigDataLoader.java  |  2 +-
 .../ConfigServerConfigDataLoaderTests.java    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 81fd7157..fc0f8db0 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
@@ -167,7 +167,6 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 							String propertySourceName = propertySource.getName();
 							List<Option> options = new ArrayList<>();
 							options.add(Option.IGNORE_IMPORTS);
-							options.add(Option.IGNORE_PROFILES);
 							// TODO: the profile is now available on the backend
 							// in a future minor, add the profile associated with a
 							// PropertySource see
@@ -188,6 +187,7 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 										&& propertySourceName.matches(".*[-,]" + profile + "\\b.*"))) {
 									// // TODO: switch to Options.with() when implemented
 									options.add(Option.PROFILE_SPECIFIC);
+									options.add(Option.IGNORE_PROFILES);
 								}
 							}
 							return ConfigData.Options.of(options.toArray(new Option[0]));
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 a26f691d..356ce004 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
@@ -406,10 +406,16 @@ public class ConfigServerConfigDataLoaderTests {
 		assertThat(configData.getPropertySources()).hasSize(3);
 		assertThat(configData.getOptions(configData.getPropertySources().get(0))
 			.contains(ConfigData.Option.IGNORE_IMPORTS)).isTrue();
+		assertThat(configData.getOptions(configData.getPropertySources().get(0))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(1))
 			.contains(ConfigData.Option.IGNORE_IMPORTS)).isTrue();
+		assertThat(configData.getOptions(configData.getPropertySources().get(1))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(2))
 			.contains(ConfigData.Option.IGNORE_IMPORTS)).isTrue();
+		assertThat(configData.getOptions(configData.getPropertySources().get(2))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 
 	}
 
@@ -532,18 +538,32 @@ public class ConfigServerConfigDataLoaderTests {
 		assertThat(configData.getPropertySources()).hasSize(7);
 		assertThat(configData.getOptions(configData.getPropertySources().get(0))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(configData.getOptions(configData.getPropertySources().get(0))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(1))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isTrue();
+		assertThat(configData.getOptions(configData.getPropertySources().get(1))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
 		assertThat(configData.getOptions(configData.getPropertySources().get(2))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(configData.getOptions(configData.getPropertySources().get(2))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(3))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(configData.getOptions(configData.getPropertySources().get(3))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(4))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(configData.getOptions(configData.getPropertySources().get(4))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(5))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isFalse();
+		assertThat(configData.getOptions(configData.getPropertySources().get(5))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isFalse();
 		assertThat(configData.getOptions(configData.getPropertySources().get(6))
 			.contains(ConfigData.Option.PROFILE_SPECIFIC)).isTrue();
+		assertThat(configData.getOptions(configData.getPropertySources().get(6))
+			.contains(ConfigData.Option.IGNORE_PROFILES)).isTrue();
 	}
 
 	@Test