Merge 704d425 into 3f7db51

ibm-developer · Nov 16, 2017 · 52b358d · 52b358d
2 parents 3f7db51 + 704d425
commit 52b358d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/lib/lib.js b/lib/lib.js
@@ -104,7 +104,7 @@ function IBMCloudEnv() {
 				return processJSONPath(vcapApplicationString, patternComponents[1]);
 			}
 		} else {
-			// patternComponents[1] is a service instance name, find it in VCAP_SERVIES and return credentials object
+			// patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
 			let jsonPath = '$..[?(@.name=="' + patternComponents[1] + '")].credentials';
 			return processJSONPath(vcapServicesString, jsonPath);
 		}

diff --git a/server/config/mappings.json b/server/config/mappings.json
@@ -24,6 +24,11 @@
 			"cloudfoundry:$.application_name"
 		]
 	},
+	"cf_var4":{
+		"searchPatterns": [
+			"cloudfoundry:$.*[?(@.name == 'service1-name1')].credentials.username"
+		]
+	},
 	"env_var1":{
 		"searchPatterns": [
 			"env:ENV_VAR_STRING"

diff --git a/test/fake-env-vars.js b/test/fake-env-vars.js
@@ -3,13 +3,13 @@ process.env.VCAP_SERVICES = JSON.stringify({
 		{
 			name: "service1-name1",
 			credentials: {
-				username: "service1-username1",
+				username: "service1-username1"
 			}
 		},
 		{
 			name: "service1-name2",
 			credentials: {
-				username: "service1-username2",
+				username: "service1-username2"
 			}
 		}
 	],

diff --git a/test/test.js b/test/test.js
@@ -43,6 +43,11 @@ describe('App', function () {
 		expect(IBMCloudEnv.getDictionary("cf_var3")).to.be.an("object");
 		expect(IBMCloudEnv.getDictionary("cf_var3")).to.have.a.property("value");
 		expect(IBMCloudEnv.getDictionary("cf_var3").value).to.equal("test-application");
+
+		expect(IBMCloudEnv.getString("cf_var4")).to.equal("service1-username1");
+		expect(IBMCloudEnv.getDictionary("cf_var4")).to.be.an("object");
+		expect(IBMCloudEnv.getDictionary("cf_var4")).to.have.a.property("value");
+		expect(IBMCloudEnv.getDictionary("cf_var4").value).to.equal("service1-username1");
 	});
 
 	it('Should be able to get simple string from environment var', function () {