Handle JSON keys containing a dot from CF environment as a single pat…

…h segment See spring-projectsgh-18915
hyk001 · Feb 11, 2020 · 6828a15 · 6828a15
1 parent b0aba9e
commit 6828a15
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...rc/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java b/...rc/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -230,6 +230,9 @@ private String getPropertyName(String path, String key) {
 		if (key.startsWith("[")) {
 			return path + key;
 		}
+		if (key.contains(".")) {
+			return path + "[" + key + "]";
+		}
 		return path + "." + key;
 	}
 

diff --git a/...pringframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java b/...pringframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java
@@ -117,6 +117,16 @@ public void testServicePropertiesWithoutNA() {
 		assertThat(getProperty("vcap.services.mysql.credentials.port")).isEqualTo("3306");
 	}
 
+	@Test
+	void testServicePropertiesContainingKeysWithDot() {
+		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
+				"VCAP_SERVICES={\"user-provided\":[{\"name\":\"test\",\"label\":\"test-label\","
+						+ "\"credentials\":{\"key.with.dots\":\"some-value\"}}]}");
+		this.initializer.postProcessEnvironment(this.context.getEnvironment(), null);
+		assertThat(getProperty("vcap.services.test.name")).isEqualTo("test");
+		assertThat(getProperty("vcap.services.test.credentials[key.with.dots]")).isEqualTo("some-value");
+	}
+
 	private String getProperty(String key) {
 		return this.context.getEnvironment().getProperty(key);
 	}