Merge pull request #1427 from SAP/fix/do_not_uppercase_service_plan_i…

…n_config Remove uppercasing of service plan property when building OAuth2ServiceConfiguration from service bindings
SAP · Jan 12, 2024 · dab6574 · dab6574
2 parents ec10df5 + 72defbc
commit dab6574
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/env/src/main/java/com/sap/cloud/security/config/ServiceBindingMapper.java b/env/src/main/java/com/sap/cloud/security/config/ServiceBindingMapper.java
@@ -42,8 +42,7 @@ public static OAuth2ServiceConfigurationBuilder mapToOAuth2ServiceConfigurationB
 		OAuth2ServiceConfigurationBuilder builder = OAuth2ServiceConfigurationBuilder.forService(service)
 				.withProperties(credentials.getEntries(String.class))
 				.withProperty(NAME, b.getName().orElse(""))
-				.withProperty(SERVICE_PLAN,
-						b.getServicePlan().orElse(ServiceConstants.Plan.APPLICATION.name()).toUpperCase());
+				.withProperty(SERVICE_PLAN, b.getServicePlan().orElse(ServiceConstants.Plan.APPLICATION.name()));
 
 		if (IAS.equals(service)) {
 			parseDomains(builder, credentials);

diff --git a/...p/cloud/security/spring/config/IdentityServicesPropertySourceFactoryBrokerNoHoleTest.java b/...p/cloud/security/spring/config/IdentityServicesPropertySourceFactoryBrokerNoHoleTest.java
@@ -44,15 +44,15 @@ void testInjectedPropertyValues() {
 		assertEquals("xsuaadomain", configuration.xsuaaDomain0);
 		assertEquals("xsappname2", configuration.xsuaaAppName0);
 		assertEquals("xsuaaInstance0", configuration.xsuaaName0);
-		assertEquals("application", configuration.xsuaaPlan0.toLowerCase());
+		assertEquals("application", configuration.xsuaaPlan0);
 		assertEquals("", configuration.unknown0);
 
 		/* Index 1 */
 		assertEquals("client-id", configuration.xsuaaClientId1);
 		assertEquals("client-secret", configuration.xsuaaClientSecret1);
 		assertEquals("xsappname", configuration.xsuaaAppName1);
 		assertEquals("xsuaaInstance1", configuration.xsuaaName1);
-		assertEquals("application", configuration.xsuaaPlan1.toLowerCase());
+		assertEquals("application", configuration.xsuaaPlan1);
 
 		/* Index 2 */
 		assertEquals("none", configuration.xsuaaClientId2);

diff --git a/...loud/security/spring/config/IdentityServicesPropertySourceFactoryFourXsuaaOneIasTest.java b/...loud/security/spring/config/IdentityServicesPropertySourceFactoryFourXsuaaOneIasTest.java
@@ -5,7 +5,6 @@
  */
 package com.sap.cloud.security.spring.config;
 
-import com.sap.cloud.security.config.ServiceConstants;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,27 +43,27 @@ void testInjectedPropertyValues() {
 		assertEquals("xsuaadomain", configuration.xsuaaDomain0);
 		assertEquals("xsappname2", configuration.xsuaaAppName0);
 		assertEquals("xsuaaInstance2", configuration.xsuaaName0);
-		assertEquals("application", configuration.xsuaaPlan0.toLowerCase());
+		assertEquals("application", configuration.xsuaaPlan0);
 		assertEquals("", configuration.unknown0);
 
 		/* Index 1 */
 		assertEquals("client-id-broker", configuration.xsuaaClientId1);
 		assertEquals("client-secret-broker", configuration.xsuaaClientSecret1);
 		assertEquals("xsuaaInstance0", configuration.xsuaaName1);
-		assertEquals("broker", configuration.xsuaaPlan1.toLowerCase());
+		assertEquals("broker", configuration.xsuaaPlan1);
 
 		/* Index 2 */
 		assertEquals("client-id-broker2", configuration.xsuaaClientId2);
 		assertEquals("client-secret-broker2", configuration.xsuaaClientSecret2);
 		assertEquals("xsuaaInstance1", configuration.xsuaaName2);
-		assertEquals("broker", configuration.xsuaaPlan2.toLowerCase());
+		assertEquals("broker", configuration.xsuaaPlan2);
 
 		/* Index 3 */
 		assertEquals("client-id", configuration.xsuaaClientId3);
 		assertEquals("client-secret", configuration.xsuaaClientSecret3);
 		assertEquals("xsappname", configuration.xsuaaAppName3);
 		assertEquals("xsuaaInstance3", configuration.xsuaaName3);
-		assertEquals("application", configuration.xsuaaPlan3.toLowerCase());
+		assertEquals("application", configuration.xsuaaPlan3);
 
 		/* IAS */
 		assertEquals("client-id-ias", configuration.identityClientId);
@@ -73,7 +72,7 @@ void testInjectedPropertyValues() {
 		assertTrue(configuration.identityDomains.contains("iasdomain.com"));
 		assertEquals(2, configuration.identityDomains.size());
 		assertEquals("identityInstance0", configuration.identityName0);
-		assertEquals(ServiceConstants.Plan.BROKER, ServiceConstants.Plan.from(configuration.identityPlan));
+		assertEquals("broker", configuration.identityPlan);
 	}
 }
 

diff --git a/.../java/com/sap/cloud/security/spring/config/IdentityServicesPropertySourceFactoryTest.java b/.../java/com/sap/cloud/security/spring/config/IdentityServicesPropertySourceFactoryTest.java
@@ -30,15 +30,15 @@ void testInjectedPropertyValues() {
 		assertEquals("xsuaadomain", configuration.xsuaaDomain);
 		assertEquals("xsappname", configuration.xsuaaAppName);
 		assertEquals("xsuaaInstance0", configuration.xsuaaName);
-		assertEquals("application", configuration.xsuaaPlan.toLowerCase());
+		assertEquals("application", configuration.xsuaaPlan);
 
 		assertEquals("", configuration.unknown);
 
 		assertEquals("client-id-ias", configuration.identityClientId);
 		assertEquals("client-secret-ias", configuration.identityClientSecret);
 		assertEquals("iasdomain", configuration.identityDomains.get(0));
 		assertEquals("identityInstance0", configuration.identityName);
-		assertEquals("broker", configuration.identityPlan.toLowerCase());
+		assertEquals("broker", configuration.identityPlan);
 	}
 }