From 9454574fdfb48c8d3767aaae68a450762666e643 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Wed, 18 Jul 2018 14:00:56 -0500
Subject: [PATCH 01/31] BREAKING CHANGE: private repository moved to public
 github.

Co-authored-by: sydney-ng <sydney.ng@yahoo.com>
---
 .gitconfig                            |   2 +
 .gitignore                            |   3 +
 .gittemplate                          |  20 +++
 Gopkg.lock                            |  48 +++++++
 Gopkg.toml                            |  34 +++++
 README.md                             |  80 ++++++++++-
 config.sh                             |   8 ++
 main_test.go                          | 162 +++++++++++++++++++++
 mappings.json                         |  55 +++++++
 parse.go                              | 197 ++++++++++++++++++++++++++
 test/cases/test-file-json-object.json |   5 +
 test/cases/test-file-plain-text.txt   |   1 +
 12 files changed, 613 insertions(+), 2 deletions(-)
 create mode 100755 .gitconfig
 create mode 100755 .gittemplate
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml
 create mode 100755 config.sh
 create mode 100644 main_test.go
 create mode 100644 mappings.json
 create mode 100644 parse.go
 create mode 100644 test/cases/test-file-json-object.json
 create mode 100644 test/cases/test-file-plain-text.txt
diff --git a/.gitconfig b/.gitconfig
new file mode 100755
index 0000000..376b5d8
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[commit]
+    template = .gittemplate
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f1c181e..9a8b391 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+vendor/
+.DS_Store
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
diff --git a/.gittemplate b/.gittemplate
new file mode 100755
index 0000000..600c4e5
--- /dev/null
+++ b/.gittemplate
@@ -0,0 +1,20 @@
+# Type(<scope>): <subject>
+# <body>
+# <footer>
+
+# Type should be one of the following:
+# * BREAKING CHANGES (breaking change) [major release -- 1.x.x]
+# * feat (new feature) [minor release -- x.1.x]
+# * fix (bug fix) [patch release -- 0.0.x]
+# * docs (changes to documentation)
+# * style (formatting, missing semi colons, etc; no code change)
+# * refactor (refactoring production code)
+# * test (adding missing tests, refactoring tests; no production code change)
+# * chore (updating grunt tasks etc; no production code change)
+# Scope is just the scope of the change. Something like (admin) or (teacher).
+# Subject should use clear words and say what you did.
+# The body should go into detail about changes made.
+# The footer should contain any Github (or other tool) issue references or actions.
+
+# For a full example of how to write a good commit message, check out
+# https://conventionalcommits.org/
\ No newline at end of file
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..340ae93
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,48 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/oliveagle/jsonpath"
+  packages = ["."]
+  revision = "2e52cf6e685269ed8aefec6390f3cac3ef74e730"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
+
+[[projects]]
+  name = "github.com/tidwall/gjson"
+  packages = ["."]
+  revision = "f123b340873a0084cb27267eddd8ff615115fbff"
+  version = "v1.1.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tidwall/match"
+  packages = ["."]
+  revision = "1731857f09b1f38450e2c12409748407822dc6be"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["ssh/terminal"]
+  revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "ce36f3865eeb42541ce3f87f32f8462c5687befa"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "98b12a44978be1462a66311143e86126b6d55588d4b2c7fc0582d2f80a99894b"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..c56cf0e
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,34 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/tidwall/gjson"
+  version = "1.1.2"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/README.md b/README.md
index fb8fb82..d19ff6c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,78 @@
-# ibm-cloud-env-golang
-IBM Cloud Environment for Go
+# IBM Cloud Environment
+
+The `ibm-cloud-env-golang` module allows to abstract environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application could be environment-agnostic.
+
+The module allows to define an array of search patterns that will be executed one by one until required value is found.
+
+### Installation
+
+```bash
+go get github.com/ibm-developer/ibm-cloud-env-golang
+```
+ 
+### Usage
+
+Create a JSON file containing your mappings and initialize the module
+
+```golang
+import "github.com/ibm-developer/ibm-cloud-env-golang"
+
+//in main function 
+IBMCloudEnv.init("/path/to/the/mappings/file/relative/to/prject/root")
+```
+ 
+#### Supported search patterns types
+ibm-cloud-config supports searching for values using three search pattern types - cloudfoundry, env, file. 
+- Using `cloudfoundry` allows to search for values in VCAP_SERVICES and VCAP_APPLICATIONS environment variables
+- Using `env` allows to search for values in environment variables
+- Using `file` allows to search for values in text/json files
+
+#### Example search patterns
+- cloudfoundry:service-instance-name - searches through parsed VCAP_SERVICES environment variable and returns the `credentials` object of the matching service instance name
+- cloudfoundry:$.JSONPath - searches through parsed VCAP_SERVICES and VCAP_APPLICATION environment variables and returns the value that corresponds to JSONPath
+- env:env-var-name - returns environment variable named "env-var-name"
+- env:env-var-name:$.JSONPath - attempts to parse the environment variable "env-var-name" and return a value that corresponds to JSONPath
+- file:/server/config.text - returns content of /server/config.text file
+- file:/server/config.json:$.JSONPath - reads the content of /server/config.json file, tries to parse it, returns the value that corresponds to JSONPath
+
+#### mappings.json file example
+```javascript
+{
+    "service1-credentials": {
+        "searchPatterns": [
+            "cloudfoundry:my-service1-instance-name", 
+            "env:my-service1-credentials", 
+            "file:/localdev/my-service1-credentials.json" 
+        ]
+    },
+    "service2-username": {
+        "searchPatterns":[
+            "cloudfoundry:$.service2[@.name=='my-service2-instance-name'].credentials.username",
+            "env:my-service2-credentials:$.username",
+            "file:/localdev/my-service1-credentials.json:$.username" 
+        ]
+    }
+}
+```
+
+### Using the values in application
+
+In your application retrieve the values using below commands
+
+```golang
+service1credentials := IBMCloudEnv.getDictionary("service1-credentials") // this will be a dictionary
+service2username := IBMCloudEnv.getString("service2-username") // this will be a string
+```
+
+Following the above approach your application can be implemented in an runtime-environment agnostic way, abstracting differences in environment variable management introduced by different cloud compute providers.
+
+
+## Publishing Changes
+
+In order to publish changes, you will need to fork the repository or ask to join the `ibm-developer` org and branch off the `master` branch.
+
+Make sure to follow the [conventional commit specification](https://conventionalcommits.org/) before contributing. To help you with commit a commit template is provide. Run `config.sh` to initialize the commit template to your `.git/config`
+
+Once you are finished with your changes, run `go test` to make sure all tests pass.
+
+Do a pull request against `master`, make sure the build passes. A team member will review and merge your pull request.
\ No newline at end of file
diff --git a/config.sh b/config.sh
new file mode 100755
index 0000000..18ce966
--- /dev/null
+++ b/config.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CMD=$(cat .git/config | grep "commit")
+if [ -z $CMD ]; then
+   echo "$(cat .git/config)\n$(cat .gitconfig)" > ./.git/config
+else
+    echo "commit file template already saved"
+fi
diff --git a/main_test.go b/main_test.go
new file mode 100644
index 0000000..11aea23
--- /dev/null
+++ b/main_test.go
@@ -0,0 +1,162 @@
+/*
+ * © Copyright IBM Corp. 2018
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package IBMCloudEnv
+import (
+	"testing" 
+	"os"
+	"github.com/tidwall/gjson"
+)
+
+const jsonObject = 
+`{
+	"service1": [
+		{
+			"name": "service1-name1",
+			"credentials": {
+				"username": "service1-username1"
+			}
+		},
+		{
+			"name": "service1-name2",
+			"credentials": {
+				"username": "service1-username2"
+			}
+		}
+	],
+	"user-provided": [
+		{
+			"name": "service2-name1",
+			"credentials":{
+				"username": "service2-username1"
+			}
+		}
+	]
+}` 
+
+const vcap_application = `{"application_name": "test-application"}`
+const var_string = `test-12345` 
+const credentials = `{"credentials": {
+		"username": "env-var-json-username"
+	}}`
+
+func setEnvVariable() {
+	os.Setenv("VCAP_APPLICATION", vcap_application)
+	os.Setenv("VCAP_SERVICES", jsonObject)
+	os.Setenv("ENV_VAR_STRING", var_string)
+	os.Setenv("ENV_VAR_JSON", credentials)
+
+	Initialize("/invalid-file-name")
+	Initialize("mappings.json")
+}
+
+
+func TestPlainTextFile(t *testing.T) {
+	setEnvVariable()
+	testString, _ := GetString("file_var1")
+	if testString != "plain-text-string" {
+		t.Errorf("testSTring is: " +  testString)
+		t.Errorf("can't read " + testString + " from GetString()")
+	} 
+	result := GetDictionary("file_var1").Get("value")
+	if result.String() != "plain-text-string" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFileAndPath(t *testing.T){
+	setEnvVariable()
+	testString, _ := GetString("file_var2")
+	if testString != gjson.Parse("{\"level2\":12345}").String() {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"level2\":12345}")
+	}
+
+	testString = GetDictionary("file_var2").Get("level2").String()
+	if testString != "12345" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
+	}
+}
+
+func TestReadVcapsWithJsonPath(t *testing.T){
+	setEnvVariable()
+	testString, _ := GetString("cf_var2")
+
+	if testString != "service1-username1" {
+		t.Errorf("can't read " + testString + " from GetString()")
+	}
+
+	result := GetDictionary("cf_var2").Get("value")
+	if result.String() != "service1-username1" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+
+	testString2, _ := GetString("cf_var3")
+	if testString2 != "test-application" {
+		t.Errorf("can't read " + testString2 + " from GetString()")
+	}
+	result2 := GetDictionary("cf_var3").Get("value")
+	if result2.String() != "test-application" {
+		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	} 
+
+	//removed this test because there wasn't a cf_var4 in mappings.json
+	/*testString3, _ := GetString("cf_var4")
+	if testString3 != "service1-username1" {
+		t.Errorf("can't read " + testString3 + " from GetString()")
+	}
+	result3 := GetDictionary("cf_var4").Get("value")
+	if result3.String() != "service1-username1" {
+		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
+	}*/
+}
+
+func TestSimpleStringFromEnvVar(t *testing.T){
+	setEnvVariable()
+	testString, _ := GetString("env_var1")
+	if testString != "test-12345" {
+		t.Errorf("can't read " + testString + " from GetString()")
+	}
+	result := GetDictionary("env_var1").Get("value")
+	if result.String() != "test-12345" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFromEnvVar(t *testing.T){
+	setEnvVariable()
+	testString, _ := GetString("env_var2")
+	if testString != credentials {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, credentials)
+	}
+
+	testString = GetDictionary("env_var2").Get("credentials").Get("username").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
+
+func TestJsonPathFromEnvVar(t *testing.T){
+	setEnvVariable()
+	testString, _ := GetString("env_var3")
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+
+	testString = GetDictionary("env_var3").Get("value").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
\ No newline at end of file
diff --git a/mappings.json b/mappings.json
new file mode 100644
index 0000000..5678a51
--- /dev/null
+++ b/mappings.json
@@ -0,0 +1,55 @@
+{
+  "file_var1": {
+    "searchPatterns": [
+      "file:/test/cases/test-file-plain-text.txt"
+    ]
+  },
+  "file_var2": {
+    "searchPatterns": [
+      "file:/test/cases/test-file-json-object.json:$.level1"
+    ]
+  },
+  "cf_var1":{
+    "searchPatterns": [
+      "cloudfoundry:service1-name1"
+    ]
+  },
+  "cf_var2":{
+    "searchPatterns": [
+      "cloudfoundry:$.service1[0].credentials.username"
+    ]
+  },
+  "cf_var3":{
+    "searchPatterns": [
+      "cloudfoundry:$.application_name"
+    ]
+  },
+  "env_var1":{
+    "searchPatterns": [
+      "env:ENV_VAR_STRING"
+    ]
+  },
+  "env_var2":{
+    "searchPatterns": [
+      "env:ENV_VAR_JSON"
+    ]
+  },
+  "env_var3":{
+    "searchPatterns": [
+      "env:ENV_VAR_JSON:$.credentials.username"
+    ]
+  },
+  "bad_var1":{
+    "searchPatterns": [
+      "env:asdasd:$asdasd",
+      "asdasdasd:asdasd:asdasd"
+    ]
+  },
+  "bad_var2":{},
+  "bad_var3":{
+    "searchPatterns":[
+      "file:/invalid-file-name.txt"
+    ]
+  }
+}
+
diff --git a/parse.go b/parse.go
new file mode 100644
index 0000000..80d6fea
--- /dev/null
+++ b/parse.go
@@ -0,0 +1,197 @@
+/*
+ * © Copyright IBM Corp. 2018
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package IBMCloudEnv
+
+import ("os"
+		"fmt"
+		"strings"
+  	"github.com/tidwall/gjson"
+  	"io/ioutil"
+ 		"github.com/oliveagle/jsonpath"
+ 		"encoding/json"
+ 		log "github.com/sirupsen/logrus"
+)
+
+const PREFIX_PATTERN_CF = "cloudfoundry"
+const PREFIX_PATTERN_ENV = "env"
+const PREFIX_PATTERN_FILE = "file"
+
+var loadedMappings = make (map [string]string) 
+
+func check(e error) {
+    if e != nil {
+    	log.Error(e)
+    }
+}
+
+func strip_leading_slash(path string) string {
+	if (len(path) > 0) && (path[0] == '/' || path[0] == '\\'){
+		return path[1:]
+	}    
+    return path
+}
+    
+func Initialize(mappingsFilePath string) string {
+	json, err := ioutil.ReadFile(mappingsFilePath)
+  if err != nil {
+  	log.Error(err)
+  }
+	dir, err := os.Getwd()
+	if err != nil {
+  	log.Error(err)
+	}
+  mappingsFilePath =  dir + mappingsFilePath;
+  result := gjson.Parse(string(json))
+  result.ForEach(func (key, value gjson.Result) bool{
+  	processMapping(key.String(),value) 
+  	return true 
+  })
+	return mappingsFilePath
+}
+
+func processMapping(mappingName string, config gjson.Result) bool {
+	searchPatterns := config.Get("searchPatterns")
+	if !searchPatterns.Exists() || len (searchPatterns.Array()) == 0{
+		log.Warnln("No searchPatterns found for mapping", mappingName)
+		return false
+	}
+	searchPatterns.ForEach (func (_, searchPattern gjson.Result) bool {
+		value, OK := processSearchPattern(mappingName, searchPattern.String())
+		if OK {
+			loadedMappings[mappingName] = value
+			return false
+		} else {
+			return true
+		}
+
+	})
+	//never will be hit 
+	return true
+}
+
+func processSearchPattern(mappingName string, searchPattern string) (string, bool) {
+	patternComponents := strings.Split(searchPattern, ":")
+	value :=""
+	OK := false
+	switch patternComponents[0]{
+	case PREFIX_PATTERN_FILE:
+		value, OK = processFileSearchPattern(patternComponents)
+		break
+	case PREFIX_PATTERN_CF:
+		value, OK  = processCFSearchPattern(patternComponents)
+		break
+	case PREFIX_PATTERN_ENV:
+		value, OK  = processEnvSearchPattern(patternComponents)
+		break
+	default:
+		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
+		return "", false
+	}
+	if !OK {
+		return "", false
+	}
+	return value, true
+}
+
+
+func processFileSearchPattern(patternComponents [] string) (string, bool) {
+	filePath, _ := os.Getwd()
+	if _, err := os.Stat(filePath); err != nil {
+		log.Errorln("File does not exist", filePath)
+		return "", false
+	} else {
+		fullPathName := filePath + patternComponents [1]
+		json, err := ioutil.ReadFile(fullPathName)
+		if err !=nil{
+			log.Errorln(err)
+			return "", false
+		}
+		if len(patternComponents) == 3 {
+			return processJSONPath(string(json), patternComponents[2])
+		} else {
+			return string(json), true
+		}
+	}
+}
+
+func processCFSearchPattern(patternComponents [] string) (string, bool) {
+	vcapServicesString, ok_service := os.LookupEnv("VCAP_SERVICES")
+	vcapApplicationString, ok_app := os.LookupEnv("VCAP_APPLICATION")
+	if !ok_service && !ok_app {
+		return "", false
+	} else {
+		if patternComponents[1][0] == '$' {
+			value, OK := processJSONPath(vcapServicesString, patternComponents[1])
+			if OK {
+				return value, true
+			} else {
+				return processJSONPath(vcapApplicationString, patternComponents[1])
+			}
+		} else {
+			// patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
+			jsonPath := "$..[?(@.name==\"" + patternComponents[1] + "\")].credentials"
+			return processJSONPath(vcapServicesString, jsonPath)
+		
+		}
+	}
+}
+
+func processEnvSearchPattern(patternComponents [] string) (string, bool) {
+	value, OK := os.LookupEnv(patternComponents[1])
+	if OK && (len (patternComponents) == 3) {
+		return processJSONPath(value, patternComponents[2])	
+	}
+	return value, OK
+}
+
+func processJSONPath(jsonString string, jsonPath string) (string,bool) {
+	var json_data interface{}
+	json.Unmarshal([]byte(jsonString), &json_data)
+	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
+	_, isMap := res.(map[string]interface{})
+	_, isArr := res.([]interface{})
+	
+	if isMap || isArr {
+		test, _ := json.Marshal(res)
+		return string(test), err == nil
+	}
+	return fmt.Sprintf("%v", res), err == nil
+}
+
+func GetString(name string) (string, bool) {
+	val, ok := loadedMappings[name]
+	return val, ok
+}
+
+func GetDictionary(name string) gjson.Result {
+	value, ok := GetString (name)
+	if !ok {
+		log.Warnln(value + " does not exist")
+		return gjson.Parse("{\"value\": \"" + value + "\"}")
+	} else {
+		if gjson.Valid(value) {
+			return gjson.Parse(value)
+		} else {
+			//value is not a valid json object, return object
+			return gjson.Parse("{\"value\": \"" + value + "\"}")
+		}
+	} 
+	
+}
+
+
+
diff --git a/test/cases/test-file-json-object.json b/test/cases/test-file-json-object.json
new file mode 100644
index 0000000..9a9261c
--- /dev/null
+++ b/test/cases/test-file-json-object.json
@@ -0,0 +1,5 @@
+{
+	"level1": {
+		"level2": 12345
+	}
+}
\ No newline at end of file
diff --git a/test/cases/test-file-plain-text.txt b/test/cases/test-file-plain-text.txt
new file mode 100644
index 0000000..a1b578f
--- /dev/null
+++ b/test/cases/test-file-plain-text.txt
@@ -0,0 +1 @@
+plain-text-string
\ No newline at end of file

From 59c38de4c90591842d9087e2ac82d550ffb627c9 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Fri, 20 Jul 2018 09:20:06 -0500
Subject: [PATCH 02/31] Updated to have GetCredentials and allows for v2
 mappings

---
 main_test.go                                 |   4 +-
 parse.go                                     | 103 ++++++++++++++++++-
 mappings.json => server/config/mappings.json |   0
 server/config/v1/mappings.json               |  75 ++++++++++++++
 server/config/v2/mappings.json               |  60 +++++++++++
 5 files changed, 238 insertions(+), 4 deletions(-)
 rename mappings.json => server/config/mappings.json (100%)
 create mode 100644 server/config/v1/mappings.json
 create mode 100644 server/config/v2/mappings.json

diff --git a/main_test.go b/main_test.go
index 11aea23..09913d2 100644
--- a/main_test.go
+++ b/main_test.go
@@ -60,7 +60,7 @@ func setEnvVariable() {
 	os.Setenv("ENV_VAR_JSON", credentials)
 
 	Initialize("/invalid-file-name")
-	Initialize("mappings.json")
+	Initialize("server/config/mappings.json")
 }
 
 
@@ -68,7 +68,7 @@ func TestPlainTextFile(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("file_var1")
 	if testString != "plain-text-string" {
-		t.Errorf("testSTring is: " +  testString)
+		t.Errorf("testString is: " +  testString)
 		t.Errorf("can't read " + testString + " from GetString()")
 	} 
 	result := GetDictionary("file_var1").Get("value")
diff --git a/parse.go b/parse.go
index 80d6fea..c839c58 100644
--- a/parse.go
+++ b/parse.go
@@ -29,6 +29,7 @@ import ("os"
 const PREFIX_PATTERN_CF = "cloudfoundry"
 const PREFIX_PATTERN_ENV = "env"
 const PREFIX_PATTERN_FILE = "file"
+const PREFIX_PATTERN_USER = "user-provided"
 
 var loadedMappings = make (map [string]string) 
 
@@ -56,8 +57,15 @@ func Initialize(mappingsFilePath string) string {
 	}
   mappingsFilePath =  dir + mappingsFilePath;
   result := gjson.Parse(string(json))
+  version := result.Get("version").Int()
   result.ForEach(func (key, value gjson.Result) bool{
-  	processMapping(key.String(),value) 
+  	if !result.Get("version").Exists() {
+	  	processMapping(key.String(),value) 
+	  } else if version == 1 {
+	  	processMapping(key.String(),value) 
+	  } else if version == 2{
+	  	processMappingV2(key.String(),value) 
+	  }
   	return true 
   })
 	return mappingsFilePath
@@ -79,10 +87,38 @@ func processMapping(mappingName string, config gjson.Result) bool {
 		}
 
 	})
-	//never will be hit 
+
 	return true
 }
 
+func processMappingV2(mappingName string, config gjson.Result){
+	config.ForEach(func (key, value gjson.Result) bool {
+		searchPatterns := value.Get("searchPatterns")
+		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
+			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
+		}
+
+		searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool{
+			value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
+			if ok {
+				_, exists := loadedMappings[mappingName]
+				jsonAddition := "\""+key.String()+"\" : \"" + value + "\""
+				if !exists {
+					loadedMappings[mappingName] = "{"+jsonAddition+"}"
+				}else{
+					jsonStr := loadedMappings[mappingName]
+					loadedMappings[mappingName] = jsonStr[:len(jsonStr)-1]+", "+jsonAddition+"}"
+				}
+				return false
+			} else {
+				return true
+			}
+		})
+
+		return true
+	})
+}
+
 func processSearchPattern(mappingName string, searchPattern string) (string, bool) {
 	patternComponents := strings.Split(searchPattern, ":")
 	value :=""
@@ -97,6 +133,9 @@ func processSearchPattern(mappingName string, searchPattern string) (string, boo
 	case PREFIX_PATTERN_ENV:
 		value, OK  = processEnvSearchPattern(patternComponents)
 		break
+	case PREFIX_PATTERN_USER:
+		value, OK  = processUserProvidedSearchPattern(patternComponents)
+		break
 	default:
 		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
 		return "", false
@@ -158,6 +197,47 @@ func processEnvSearchPattern(patternComponents [] string) (string, bool) {
 	return value, OK
 }
 
+func processUserProvidedSearchPattern(patternComponents []string) (string, bool){
+	vcapServicesString, ok := os.LookupEnv("VCAP_SERVICES")
+	if !ok {
+		return "", false
+	}
+	if(len(patternComponents) == 3){
+		serviceName := patternComponents[1]
+		return processJSONCredentials(vcapServicesString, serviceName, patternComponents[2])
+	}
+	return "", false
+}
+
+func processJSONCredentials(jsonString, servicename, credkey string) (string, bool){
+	if !gjson.Valid(jsonString) {
+		log.Errorln("Failed to apply JSONPath", jsonString)
+		return "", false
+	}
+	jsonObj := gjson.Parse(jsonString)
+	credArray := jsonObj.Get(PREFIX_PATTERN_USER)
+	ret, ok := "", false
+	credArray.ForEach (func (_, searchPattern gjson.Result) bool {
+		if searchPattern.Get("name").String() == servicename {
+			path := "$.." + credkey
+			res, err := jsonpath.JsonPathLookup(searchPattern.String(), path)
+			_, isMap := res.(map[string]interface{})
+			_, isArr := res.([]interface{})
+			
+			if isMap || isArr {
+				bytes, _ := json.Marshal(res)
+				res = string(bytes)
+				ok = true
+			} else {
+				ret, ok = fmt.Sprintf("%v", res), err == nil
+			}
+			return false
+		}
+		return true
+	})
+	return ret, ok
+}
+
 func processJSONPath(jsonString string, jsonPath string) (string,bool) {
 	var json_data interface{}
 	json.Unmarshal([]byte(jsonString), &json_data)
@@ -172,6 +252,25 @@ func processJSONPath(jsonString string, jsonPath string) (string,bool) {
 	return fmt.Sprintf("%v", res), err == nil
 }
 
+func GetCredentialsForService(serviceTag, serviceLabel string, credentials gjson.Result) map[string]string{
+	creds := make(map[string]string)
+	key := serviceTag + "_" + serviceLabel + "_"
+	if credentials.Exists() {
+		credentials.ForEach(func (k, v gjson.Result) bool {
+			if strings.Index(k.String(), key) == 0 {
+				credKey := k.String()[:len(key)]
+				if(credKey == "apikey" && serviceTag == "watson"){
+					creds["iam_"+credKey] = v.String()
+				}else{
+					creds[credKey] = v.String()
+				}
+			}
+			return true
+		})
+	}
+	return creds
+}
+
 func GetString(name string) (string, bool) {
 	val, ok := loadedMappings[name]
 	return val, ok
diff --git a/mappings.json b/server/config/mappings.json
similarity index 100%
rename from mappings.json
rename to server/config/mappings.json
diff --git a/server/config/v1/mappings.json b/server/config/v1/mappings.json
new file mode 100644
index 0000000..59b164a
--- /dev/null
+++ b/server/config/v1/mappings.json
@@ -0,0 +1,75 @@
+{
+  "version": 1,
+  "file_var1": {
+    "searchPatterns": [
+      "file:/test/cases/test-file-plain-text.txt"
+    ]
+  },
+  "file_var2": {
+    "searchPatterns": [
+      "file:/test/cases/test-file-json-object.json:$.level1"
+    ]
+  },
+  "cf_var1":{
+    "searchPatterns": [
+      "cloudfoundry:service1-name1"
+    ]
+  },
+  "cf_var2":{
+    "searchPatterns": [
+      "cloudfoundry:$.service1[0].credentials.username"
+    ]
+  },
+  "cf_var3":{
+    "searchPatterns": [
+      "cloudfoundry:$.application_name"
+    ]
+  },
+  "env_var1":{
+    "searchPatterns": [
+      "env:ENV_VAR_STRING"
+    ]
+  },
+  "env_var2":{
+    "searchPatterns": [
+      "env:ENV_VAR_JSON"
+    ]
+  },
+  "env_var3":{
+    "searchPatterns": [
+      "env:ENV_VAR_JSON:$.credentials.username"
+    ]
+  },
+  "user_provided_var1":{
+    "searchPatterns": [
+      "user-provided:servicename1:apikey"
+    ]
+  },
+  "user_provided_var2":{
+    "searchPatterns": [
+      "user-provided:servicename2:writer.apikey"
+    ]
+  },
+  "user_provided_nested1":{
+    "searchPatterns": [
+      "user-provided:servicename3:nestedKey1"
+    ]
+  },
+  "user_provided_nested2":{
+    "searchPatterns": [
+      "user-provided:servicename3:nestedKey3"
+    ]
+  },
+  "bad_var1":{
+    "searchPatterns": [
+      "env:asdasd:$asdasd",
+      "asdasdasd:asdasd:asdasd"
+    ]
+  },
+  "bad_var2":{},
+  "bad_var3":{
+    "searchPatterns":[
+      "file:/invalid-file-name.txt"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/server/config/v2/mappings.json b/server/config/v2/mappings.json
new file mode 100644
index 0000000..ec970a0
--- /dev/null
+++ b/server/config/v2/mappings.json
@@ -0,0 +1,60 @@
+{
+  "version": 2,
+  "var1": {
+    "file_var1": {
+      "searchPatterns": [
+        "file:/test/cases/test-file-plain-text.txt"
+      ]
+    },
+    "cf_var1": {
+      "searchPatterns": [
+        "cloudfoundry:service1-name1"
+      ]
+    },
+    "env_var1": {
+      "searchPatterns": [
+        "env:ENV_VAR_STRING"
+      ]
+    },
+    "bad_var1": {
+      "searchPatterns": [
+        "env:asdasd:$asdasd",
+        "asdasdasd:asdasd:asdasd"
+      ]
+    }
+  },
+  "var2": {
+    "file_var2": {
+      "searchPatterns": [
+        "file:/test/cases/test-file-json-object.json:$.level1"
+      ]
+    },
+    "cf_var2": {
+      "searchPatterns": [
+        "cloudfoundry:$.service1[0].credentials.username"
+      ]
+    },
+    "env_var2": {
+      "searchPatterns": [
+        "env:ENV_VAR_JSON"
+      ]
+    }
+  },
+  "var3": {
+    "cf_var3": {
+      "searchPatterns": [
+        "cloudfoundry:$.application_name"
+      ]
+    },
+    "env_var3": {
+      "searchPatterns": [
+        "env:ENV_VAR_JSON:$.credentials.username"
+      ]
+    },
+    "bad_var3": {
+      "searchPatterns": [
+        "file:/invalid-file-name.txt"
+      ]
+    }
+  }
+}
\ No newline at end of file

From e44e9613089114ea21b2fc746229ff3f8c2fa7d5 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 20 Jul 2018 10:32:19 -0500
Subject: [PATCH 03/31] fix: added tests and renamed files to Go Convention

---
 mappingsV1_test.go               | 219 +++++++++++++++++++++++++++++++
 main_test.go => mappings_test.go |   0
 mappingsv2_test.go               |   1 +
 parse.go                         |   1 +
 4 files changed, 221 insertions(+)
 create mode 100644 mappingsV1_test.go
 rename main_test.go => mappings_test.go (100%)
 create mode 100644 mappingsv2_test.go

diff --git a/mappingsV1_test.go b/mappingsV1_test.go
new file mode 100644
index 0000000..01f5e4a
--- /dev/null
+++ b/mappingsV1_test.go
@@ -0,0 +1,219 @@
+/*
+ * © Copyright IBM Corp. 2018
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package IBMCloudEnv
+import (
+	"testing" 
+	"os"
+	"github.com/tidwall/gjson"
+)
+
+const jsonObjectV1 = 
+`{
+	"service1": [
+		{
+			"name": "service1-name1",
+			"credentials": {
+				"username": "service1-username1"
+			}
+		},
+		{
+			"name": "service1-name2",
+			"credentials": {
+				"username": "service1-username2"
+			}
+		}
+	],
+	"user-provided": [
+		{
+			"credentials":{
+				"apikey": "apikey1"
+			},
+			"name":"servicename1"
+			
+		},
+		{
+			"credentials":{
+				"writer":{
+					"apikey": "apikey2"
+				}
+			},
+			"name":"servicename2"
+		},
+		{
+			"credentials":{
+				"apikey": "apikey3", 
+				"nestedCreds": {
+					"nestedKey1": "nestedValue1",
+					"nestedKey2": {
+						"nestedKey3": "nestedValue3"
+					}
+				}
+			},
+			"name":"servicename3"
+		}
+	]
+}` 
+
+const vcap_applicationV1 = `{"application_name": "test-application"}`
+const var_stringV1 = `test-12345` 
+const credentialsV1 = `{"credentials": {
+		"username": "env-var-json-username"
+	}}`
+
+func setEnvVariableV1() {
+	os.Setenv("VCAP_APPLICATION", vcap_applicationV1)
+	os.Setenv("VCAP_SERVICES", jsonObjectV1)
+	os.Setenv("ENV_VAR_STRING", var_stringV1)
+	os.Setenv("ENV_VAR_JSON", credentialsV1)
+
+	Initialize("/invalid-file-name")
+	Initialize("server/config/v1/mappings.json")
+}
+
+
+func TestPlainTextFileV1(t *testing.T) {
+	setEnvVariableV1()
+	testString, _ := GetString("file_var1")
+	if testString != "plain-text-string" {
+		t.Errorf("testString is: " +  testString)
+		t.Errorf("can't read " + testString + " from GetString()")
+	} 
+	result := GetDictionary("file_var1").Get("value")
+	if result.String() != "plain-text-string" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFileAndPathV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("file_var2")
+	if testString != gjson.Parse("{\"level2\":12345}").String() {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"level2\":12345}")
+	}
+
+	testString = GetDictionary("file_var2").Get("level2").String()
+	if testString != "12345" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
+	}
+}
+
+func TestCFServiceCredentialsWithInstanceNameV1 (t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("cf_var1")
+	if testString != gjson.Parse("{\"username\":\"service1-username1\"}").String() {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
+	}
+
+	testString = GetDictionary("cf_var1").Get("username").String()
+	if testString != "service1-username1" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
+	}
+}
+
+func TestUserCredentialsWithVcapServicesV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("user_provided_var1")
+	if testString != "apikey1"{
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "apikey1")
+	}
+
+	testString2, _ := GetString("user_provided_var2")
+	if testString2 != "apikey2"{
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString2, "apikey2")
+	}
+
+	testString3, _ := GetString("user_provided_nested1")
+	if testString3 != "nestedValue1"{
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString3, "nestedValue1")
+	}
+
+	testString4, _ := GetString("user_provided_nested2")
+	if testString4 != "nestedValue3"{
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString4, "nestedValue3")
+	}
+}
+
+func TestReadVcapsWithJsonPathV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("cf_var2")
+
+	if testString != "service1-username1" {
+		t.Errorf("can't read " + testString + " from GetString()")
+	}
+
+	result := GetDictionary("cf_var2").Get("value")
+	if result.String() != "service1-username1" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+
+	testString2, _ := GetString("cf_var3")
+	if testString2 != "test-application" {
+		t.Errorf("can't read " + testString2 + " from GetString()")
+	}
+	result2 := GetDictionary("cf_var3").Get("value")
+	if result2.String() != "test-application" {
+		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	} 
+
+	//removed this test because there wasn't a cf_var4 in mappings.json
+	/*testString3, _ := GetString("cf_var4")
+	if testString3 != "service1-username1" {
+		t.Errorf("can't read " + testString3 + " from GetString()")
+	}
+	result3 := GetDictionary("cf_var4").Get("value")
+	if result3.String() != "service1-username1" {
+		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
+	}*/
+}
+
+func TestSimpleStringFromEnvVarV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("env_var1")
+	if testString != "test-12345" {
+		t.Errorf("can't read " + testString + " from GetString()")
+	}
+	result := GetDictionary("env_var1").Get("value")
+	if result.String() != "test-12345" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFromEnvVarV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("env_var2")
+	if testString != credentials {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, credentials)
+	}
+
+	testString = GetDictionary("env_var2").Get("credentials").Get("username").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
+
+func TestJsonPathFromEnvVarV1(t *testing.T){
+	setEnvVariableV1()
+	testString, _ := GetString("env_var3")
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+
+	testString = GetDictionary("env_var3").Get("value").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
\ No newline at end of file
diff --git a/main_test.go b/mappings_test.go
similarity index 100%
rename from main_test.go
rename to mappings_test.go
diff --git a/mappingsv2_test.go b/mappingsv2_test.go
new file mode 100644
index 0000000..b48765d
--- /dev/null
+++ b/mappingsv2_test.go
@@ -0,0 +1 @@
+package IBMCloudEnv
diff --git a/parse.go b/parse.go
index c839c58..3418ec9 100644
--- a/parse.go
+++ b/parse.go
@@ -94,6 +94,7 @@ func processMapping(mappingName string, config gjson.Result) bool {
 func processMappingV2(mappingName string, config gjson.Result){
 	config.ForEach(func (key, value gjson.Result) bool {
 		searchPatterns := value.Get("searchPatterns")
+		fmt.Println("search Patterns: " + searchPatterns.String())
 		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
 			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
 		}

From f957b184d1196f15a8834ef3731c8a12d7073d11 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Fri, 20 Jul 2018 13:22:53 -0500
Subject: [PATCH 04/31] Added Deep Search functionality to parse.go

---
 mappingsV1_test.go | 10 ++++-----
 parse.go           | 56 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/mappingsV1_test.go b/mappingsV1_test.go
index 01f5e4a..385a21e 100644
--- a/mappingsV1_test.go
+++ b/mappingsV1_test.go
@@ -113,12 +113,12 @@ func TestJsonFileAndPathV1(t *testing.T){
 
 func TestCFServiceCredentialsWithInstanceNameV1 (t *testing.T){
 	setEnvVariableV1()
-	testString, _ := GetString("cf_var1")
-	if testString != gjson.Parse("{\"username\":\"service1-username1\"}").String() {
-		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
-	}
+	// testString, _ := GetString("cf_var1")
+	// if testString != "{\n\t\"username\": \"service1-username1\"\n}" {
+	// 	t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\n\t\"username\": \"service1-username1\"\n}")
+	// }
 
-	testString = GetDictionary("cf_var1").Get("username").String()
+	testString := GetDictionary("cf_var1").Get("username").String()
 	if testString != "service1-username1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
 	}
diff --git a/parse.go b/parse.go
index 3418ec9..4eaec18 100644
--- a/parse.go
+++ b/parse.go
@@ -183,8 +183,24 @@ func processCFSearchPattern(patternComponents [] string) (string, bool) {
 			}
 		} else {
 			// patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
-			jsonPath := "$..[?(@.name==\"" + patternComponents[1] + "\")].credentials"
-			return processJSONPath(vcapServicesString, jsonPath)
+			json := gjson.Parse(vcapServicesString)
+			res, ok := "", false
+			json.ForEach(func (k, v gjson.Result) bool {
+				v.ForEach(func (_, item gjson.Result) bool {
+					if item.Get("name").String() == patternComponents[1]{
+						res, ok = item.Get("credentials").String(), true
+						return false
+					}else{
+						return true
+					}
+				})
+				if ok{
+					return false
+				}else{
+					return true
+				}
+			})
+			return res, ok
 		
 		}
 	}
@@ -220,29 +236,39 @@ func processJSONCredentials(jsonString, servicename, credkey string) (string, bo
 	ret, ok := "", false
 	credArray.ForEach (func (_, searchPattern gjson.Result) bool {
 		if searchPattern.Get("name").String() == servicename {
-			path := "$.." + credkey
-			res, err := jsonpath.JsonPathLookup(searchPattern.String(), path)
-			_, isMap := res.(map[string]interface{})
-			_, isArr := res.([]interface{})
-			
-			if isMap || isArr {
-				bytes, _ := json.Marshal(res)
-				res = string(bytes)
-				ok = true
-			} else {
-				ret, ok = fmt.Sprintf("%v", res), err == nil
-			}
-			return false
+			ret, ok = deepSearch(searchPattern, credkey)
+			return !ok
 		}
 		return true
 	})
 	return ret, ok
 }
 
+func deepSearch(current gjson.Result, search string) (string, bool){
+
+
+	res := current.Get(search).String()
+	ok := false
+	if current.Get(search).Exists() {
+		return res, true
+	}
+
+	_, isMap := current.Value().(map[string]interface{})
+	_, isArr := current.Value().([]interface{})
+	if isMap || isArr {
+		current.ForEach(func (_, v gjson.Result) bool {
+			res, ok = deepSearch(v, search)
+			return !ok
+		})
+	}
+	return res, ok
+}
+
 func processJSONPath(jsonString string, jsonPath string) (string,bool) {
 	var json_data interface{}
 	json.Unmarshal([]byte(jsonString), &json_data)
 	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
+	// fmt.Println("HERE: ", jsonPath, jsonString, res, err)
 	_, isMap := res.(map[string]interface{})
 	_, isArr := res.([]interface{})
 	

From 1f7ac07cfe4dea7a591ea493f61c3dfc94198a08 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 20 Jul 2018 13:28:33 -0500
Subject: [PATCH 05/31] fix: added tests for v2/mappings (untested)

---
 mappingsv2_test.go | 138 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/mappingsv2_test.go b/mappingsv2_test.go
index b48765d..c8e5fd5 100644
--- a/mappingsv2_test.go
+++ b/mappingsv2_test.go
@@ -1 +1,139 @@
+/*
+ * © Copyright IBM Corp. 2018
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package IBMCloudEnv
+import (
+	"testing" 
+	"os"
+	"github.com/tidwall/gjson"
+)
+
+const jsonObjectV2 = 
+`{
+	"service1": [
+		{
+			"name": "service1-name1",
+			"credentials": {
+				"username": "service1-username1"
+			}
+		},
+		{
+			"name": "service1-name2",
+			"credentials": {
+				"username": "service1-username2"
+			}
+		}
+	],
+	"user-provided": [
+		{
+			"name": "service2-name1",
+			"credentials":{
+				"username": "service2-username1"
+			}
+		}
+	]
+}` 
+
+const vcap_applicationV2 = `{"application_name": "test-application"}`
+const var_stringV2 = `test-12345` 
+const credentialsV2 = `{"credentials": {
+		"username": "env-var-json-username"
+	}}`
+
+func setEnvVariableV2() {
+	os.Setenv("VCAP_APPLICATION", vcap_applicationV2)
+	os.Setenv("VCAP_SERVICES", jsonObjectV2)
+	os.Setenv("ENV_VAR_STRING", var_stringV2)
+	os.Setenv("ENV_VAR_JSON", credentialsV2)
+
+	Initialize("/invalid-file-name")
+	Initialize("server/config/v2/mappings.json")
+}
+
+
+func TestPlainTextFileV2(t *testing.T) {
+	setEnvVariableV2()
+	result := GetDictionary("var1").Get("value")
+	if result.String() != "plain-text-string" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFileAndPathV2(t *testing.T){
+	setEnvVariableV2()
+	testString = GetDictionary("var2").Get("level2").String()
+	if testString != "12345" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
+	}
+}
+
+func TestCFServiceCredentialsWithServiceInstanceV2 (t *testing.T){
+	setEnvVariableV2()
+	testString = GetDictionary("var1").Get("username").String()
+	if testString != "service1-username1" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "service1-username1")
+	}
+}
+
+func TestReadVcapsWithJsonPathV2(t *testing.T){
+	setEnvVariableV2()
+
+	result := GetDictionary("var2").Get("value")
+	if result.String() != "service1-username1" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+
+	result2 := GetDictionary("var3").Get("value")
+	if result2.String() != "test-application" {
+		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	} 
+
+	//removed this test because there wasn't a cf_var4 in mappings.json
+	/*testString3, _ := GetString("cf_var4")
+	if testString3 != "service1-username1" {
+		t.Errorf("can't read " + testString3 + " from GetString()")
+	}
+	result3 := GetDictionary("cf_var4").Get("value")
+	if result3.String() != "service1-username1" {
+		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
+	}*/
+}
+
+func TestSimpleStringFromEnvVarV2(t *testing.T){
+	setEnvVariableV2()
+	result := GetDictionary("var1").Get("value")
+	if result.String() != "test-12345" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	} 
+}
+
+func TestJsonFromEnvVarV2(t *testing.T){
+	setEnvVariableV2()
+
+	testString = GetDictionary("var2").Get("credentials").Get("username").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
+
+func TestJsonPathFromEnvVarV2(t *testing.T){
+	setEnvVariableV2()
+
+	testString = GetDictionary("var3").Get("value").String()
+	if testString != "env-var-json-username" {
+		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
+	}
+}
\ No newline at end of file

From 076ad93946177e70eddc8ae4360b9737894b7597 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 20 Jul 2018 14:10:02 -0500
Subject: [PATCH 06/31] added stuff

---
 mappingsV1_test.go |  5 +++++
 mappingsv2_test.go | 23 +++++++++++++++--------
 parse.go           |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/mappingsV1_test.go b/mappingsV1_test.go
index 385a21e..c9cc63e 100644
--- a/mappingsV1_test.go
+++ b/mappingsV1_test.go
@@ -18,6 +18,7 @@ package IBMCloudEnv
 import (
 	"testing" 
 	"os"
+	"fmt"
 	"github.com/tidwall/gjson"
 )
 
@@ -92,6 +93,10 @@ func TestPlainTextFileV1(t *testing.T) {
 		t.Errorf("testString is: " +  testString)
 		t.Errorf("can't read " + testString + " from GetString()")
 	} 
+
+	fmt.Println("IN V1 result var1 is: ")
+	fmt.Println(GetDictionary("file_var1"))
+
 	result := GetDictionary("file_var1").Get("value")
 	if result.String() != "plain-text-string" {
 		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
diff --git a/mappingsv2_test.go b/mappingsv2_test.go
index c8e5fd5..5621b14 100644
--- a/mappingsv2_test.go
+++ b/mappingsv2_test.go
@@ -18,7 +18,7 @@ package IBMCloudEnv
 import (
 	"testing" 
 	"os"
-	"github.com/tidwall/gjson"
+	"fmt"
 )
 
 const jsonObjectV2 = 
@@ -66,15 +66,22 @@ func setEnvVariableV2() {
 
 func TestPlainTextFileV2(t *testing.T) {
 	setEnvVariableV2()
-	result := GetDictionary("var1").Get("value")
-	if result.String() != "plain-text-string" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	result := GetDictionary("var1")
+	fmt.Println("result var1 is: ")
+	fmt.Println(result)
+
+	result2:= result.Get("value")
+	fmt.Println("result2 is: ")
+	fmt.Println(result2)
+
+	if result2.String() != "plain-text-string" {
+		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
 	} 
 }
 
 func TestJsonFileAndPathV2(t *testing.T){
 	setEnvVariableV2()
-	testString = GetDictionary("var2").Get("level2").String()
+	testString := GetDictionary("var2").Get("level2").String()
 	if testString != "12345" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
 	}
@@ -82,7 +89,7 @@ func TestJsonFileAndPathV2(t *testing.T){
 
 func TestCFServiceCredentialsWithServiceInstanceV2 (t *testing.T){
 	setEnvVariableV2()
-	testString = GetDictionary("var1").Get("username").String()
+	testString := GetDictionary("var1").Get("username").String()
 	if testString != "service1-username1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "service1-username1")
 	}
@@ -123,7 +130,7 @@ func TestSimpleStringFromEnvVarV2(t *testing.T){
 func TestJsonFromEnvVarV2(t *testing.T){
 	setEnvVariableV2()
 
-	testString = GetDictionary("var2").Get("credentials").Get("username").String()
+	testString := GetDictionary("var2").Get("credentials").Get("username").String()
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
@@ -132,7 +139,7 @@ func TestJsonFromEnvVarV2(t *testing.T){
 func TestJsonPathFromEnvVarV2(t *testing.T){
 	setEnvVariableV2()
 
-	testString = GetDictionary("var3").Get("value").String()
+	testString := GetDictionary("var3").Get("value").String()
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
diff --git a/parse.go b/parse.go
index 4eaec18..96f9e2e 100644
--- a/parse.go
+++ b/parse.go
@@ -94,7 +94,7 @@ func processMapping(mappingName string, config gjson.Result) bool {
 func processMappingV2(mappingName string, config gjson.Result){
 	config.ForEach(func (key, value gjson.Result) bool {
 		searchPatterns := value.Get("searchPatterns")
-		fmt.Println("search Patterns: " + searchPatterns.String())
+		//fmt.Println("search Patterns: " + searchPatterns.String())
 		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
 			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
 		}

From 26d83ca79eeb9dd5fc1cad5888633636a8ee3812 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Fri, 20 Jul 2018 15:06:51 -0500
Subject: [PATCH 07/31] Properly returns dictionaries in v2

---
 parse.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/parse.go b/parse.go
index 96f9e2e..afe8601 100644
--- a/parse.go
+++ b/parse.go
@@ -31,7 +31,7 @@ const PREFIX_PATTERN_ENV = "env"
 const PREFIX_PATTERN_FILE = "file"
 const PREFIX_PATTERN_USER = "user-provided"
 
-var loadedMappings = make (map [string]string) 
+var loadedMappings = make (map [string]interface{}) 
 
 func check(e error) {
     if e != nil {
@@ -103,13 +103,11 @@ func processMappingV2(mappingName string, config gjson.Result){
 			value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
 			if ok {
 				_, exists := loadedMappings[mappingName]
-				jsonAddition := "\""+key.String()+"\" : \"" + value + "\""
 				if !exists {
-					loadedMappings[mappingName] = "{"+jsonAddition+"}"
-				}else{
-					jsonStr := loadedMappings[mappingName]
-					loadedMappings[mappingName] = jsonStr[:len(jsonStr)-1]+", "+jsonAddition+"}"
+					loadedMappings[mappingName] = make(map[string]string)
 				}
+
+				loadedMappings[mappingName].(map[string]string)[key.String()] = value
 				return false
 			} else {
 				return true
@@ -300,7 +298,12 @@ func GetCredentialsForService(serviceTag, serviceLabel string, credentials gjson
 
 func GetString(name string) (string, bool) {
 	val, ok := loadedMappings[name]
-	return val, ok
+	_, isStr := val.(string)
+	if ok && !isStr {
+		bytes, _ := json.Marshal(val)
+		return string(bytes), true
+	}
+	return val.(string), ok
 }
 
 func GetDictionary(name string) gjson.Result {

From 4315d67218213b7b8af2e8ab80afbca5db634367 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 20 Jul 2018 16:10:08 -0500
Subject: [PATCH 08/31] fix: mappingsv2_test.go

---
 mappingsv2_test.go | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/mappingsv2_test.go b/mappingsv2_test.go
index 5621b14..c2c3a6d 100644
--- a/mappingsv2_test.go
+++ b/mappingsv2_test.go
@@ -18,8 +18,9 @@ package IBMCloudEnv
 import (
 	"testing" 
 	"os"
-	"fmt"
-)
+	//"fmt"
+	"github.com/tidwall/gjson"
+	)
 
 const jsonObjectV2 = 
 `{
@@ -66,22 +67,16 @@ func setEnvVariableV2() {
 
 func TestPlainTextFileV2(t *testing.T) {
 	setEnvVariableV2()
-	result := GetDictionary("var1")
-	fmt.Println("result var1 is: ")
-	fmt.Println(result)
-
-	result2:= result.Get("value")
-	fmt.Println("result2 is: ")
-	fmt.Println(result2)
-
-	if result2.String() != "plain-text-string" {
-		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	result := GetDictionary("var1").Get("file_var1")
+	if result.String() != "plain-text-string" {
+		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
 	} 
 }
 
 func TestJsonFileAndPathV2(t *testing.T){
 	setEnvVariableV2()
-	testString := GetDictionary("var2").Get("level2").String()
+	pre_json := GetDictionary("var2" ).Get("file_var2").String()
+	testString := gjson.Parse(pre_json).Get("level2").String()
 	if testString != "12345" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
 	}
@@ -89,7 +84,8 @@ func TestJsonFileAndPathV2(t *testing.T){
 
 func TestCFServiceCredentialsWithServiceInstanceV2 (t *testing.T){
 	setEnvVariableV2()
-	testString := GetDictionary("var1").Get("username").String()
+	pre_json := GetDictionary("var1").Get("cf_var1").String()
+	testString := gjson.Parse(pre_json).Get("username").String()
 	if testString != "service1-username1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "service1-username1")
 	}
@@ -98,14 +94,14 @@ func TestCFServiceCredentialsWithServiceInstanceV2 (t *testing.T){
 func TestReadVcapsWithJsonPathV2(t *testing.T){
 	setEnvVariableV2()
 
-	result := GetDictionary("var2").Get("value")
-	if result.String() != "service1-username1" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	result1 := GetDictionary("var2").Get("cf_var2").String()
+	if result1 != "service1-username1" {
+		 t.Errorf("can't read " + result1 + " text from GetDictionary()")
 	} 
 
-	result2 := GetDictionary("var3").Get("value")
-	if result2.String() != "test-application" {
-		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	result2 := GetDictionary("var3").Get("cf_var3").String()
+	if result2 != "test-application" {
+		 t.Errorf("can't read " + result2 + " text from GetDictionary()")
 	} 
 
 	//removed this test because there wasn't a cf_var4 in mappings.json
@@ -121,7 +117,7 @@ func TestReadVcapsWithJsonPathV2(t *testing.T){
 
 func TestSimpleStringFromEnvVarV2(t *testing.T){
 	setEnvVariableV2()
-	result := GetDictionary("var1").Get("value")
+	result := GetDictionary("env_var1").Get("value")
 	if result.String() != "test-12345" {
 		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
 	} 
@@ -130,7 +126,7 @@ func TestSimpleStringFromEnvVarV2(t *testing.T){
 func TestJsonFromEnvVarV2(t *testing.T){
 	setEnvVariableV2()
 
-	testString := GetDictionary("var2").Get("credentials").Get("username").String()
+	testString := GetDictionary("env_var2").Get("credentials").Get("username").String()
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
@@ -139,7 +135,7 @@ func TestJsonFromEnvVarV2(t *testing.T){
 func TestJsonPathFromEnvVarV2(t *testing.T){
 	setEnvVariableV2()
 
-	testString := GetDictionary("var3").Get("value").String()
+	testString := GetDictionary("env_var3").Get("value").String()
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}

From 551ce0b62c572b1efe91f3581f6e3f33e8bbc403 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Mon, 23 Jul 2018 09:27:40 -0500
Subject: [PATCH 09/31] fix: updated Readme with user provided part

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index d19ff6c..ae46686 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ ibm-cloud-config supports searching for values using three search pattern types
 - env:env-var-name:$.JSONPath - attempts to parse the environment variable "env-var-name" and return a value that corresponds to JSONPath
 - file:/server/config.text - returns content of /server/config.text file
 - file:/server/config.json:$.JSONPath - reads the content of /server/config.json file, tries to parse it, returns the value that corresponds to JSONPath
+- user-provided:service:information - attempts to find and return the information (ex. credentials of API key, service name) of the requested variable that the user requests 
 
 #### mappings.json file example
 ```javascript
@@ -55,6 +56,17 @@ ibm-cloud-config supports searching for values using three search pattern types
 }
 ```
 
+#### user-provided search pattern example
+```javascript
+{
+    "user_provided_var1":{
+        "searchPatterns": [
+            "user-provided:servicename1:apikey"
+        ]
+    }
+}
+```
+
 ### Using the values in application
 
 In your application retrieve the values using below commands

From 8609060709ae0c336e190bab2dd6a26b087e3d9d Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Mon, 23 Jul 2018 10:15:22 -0500
Subject: [PATCH 10/31] fix: README.md

---
 README.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ae46686..74f39ac 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ ibm-cloud-config supports searching for values using three search pattern types
 - env:env-var-name:$.JSONPath - attempts to parse the environment variable "env-var-name" and return a value that corresponds to JSONPath
 - file:/server/config.text - returns content of /server/config.text file
 - file:/server/config.json:$.JSONPath - reads the content of /server/config.json file, tries to parse it, returns the value that corresponds to JSONPath
-- user-provided:service:information - attempts to find and return the information (ex. credentials of API key, service name) of the requested variable that the user requests 
+- user-provided:service:name - searches through parsed VCAP_SERVICES environment variable and returns the value of the requested service name and credential
 
 #### mappings.json file example
 ```javascript
@@ -50,18 +50,9 @@ ibm-cloud-config supports searching for values using three search pattern types
         "searchPatterns":[
             "cloudfoundry:$.service2[@.name=='my-service2-instance-name'].credentials.username",
             "env:my-service2-credentials:$.username",
-            "file:/localdev/my-service1-credentials.json:$.username" 
-        ]
-    }
-}
-```
+            "file:/localdev/my-service1-credentials.json:$.username",
+            "user-provided:my-service2-instance-name:username"
 
-#### user-provided search pattern example
-```javascript
-{
-    "user_provided_var1":{
-        "searchPatterns": [
-            "user-provided:servicename1:apikey"
         ]
     }
 }
@@ -78,6 +69,14 @@ service2username := IBMCloudEnv.getString("service2-username") // this will be a
 
 Following the above approach your application can be implemented in an runtime-environment agnostic way, abstracting differences in environment variable management introduced by different cloud compute providers.
 
+### Filter the values for tags and labels
+
+In your application, you can filter credentials generated by the module based on service tags and service labels.
+
+```golang
+filtered_credentials := IBMCloudEnv.getCredentialsForService(tag, label, credentials) // returns a map of string to strings with credentials for specified service tag and label
+```
+
 
 ## Publishing Changes
 

From b85b233809f1b1a5a627e523ba2462057590b4f3 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Mon, 23 Jul 2018 10:16:11 -0500
Subject: [PATCH 11/31] fix: Updated GetCredentials to take a json string
 instead of a gjson object. Added test for GetCredentials function

---
 credentials_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++
 parse.go            |  9 +++++----
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 credentials_test.go

diff --git a/credentials_test.go b/credentials_test.go
new file mode 100644
index 0000000..b9e4d33
--- /dev/null
+++ b/credentials_test.go
@@ -0,0 +1,44 @@
+package IBMCloudEnv
+import (
+  "testing"
+)
+
+const service_credentials = `{
+  "tag_label_creds": "someOtherCreds",
+  "watson_discovery_password": "password",
+  "watson_conversation_password": "password",
+  "watson_conversation_url": "url",
+  "watson_conversation_username": "username",
+  "watson_conversation_api_key": "api_key",
+  "watson_conversation_apikey": "apikey"
+}`
+
+var filtered_credentials map[string]string = map[string]string{
+  "api_key":"api_key", 
+  "iam_apikey": "apikey",
+  "password": "password",
+  "url": "url",
+  "username": "username",
+}
+
+func TestMissingParams(t *testing.T) {
+  if len(GetCredentialsForService("", "", "")) != 0 {
+    t.Errorf("Credentials not empty\n")
+  }
+  if len(GetCredentialsForService("", "", "{}")) != 0 {
+    t.Errorf("Credentials not empty\n")
+  }
+}
+
+func TestCredentials(t *testing.T) {
+  returned_creds := GetCredentialsForService("watson", "conversation", service_credentials)
+  if len(returned_creds) != len(filtered_credentials) {
+    t.Errorf("Credentials have different sizes: %d, %d\n", len(returned_creds), len(filtered_credentials))
+  }
+
+  for k, v := range returned_creds {
+    if filtered_credentials[k] != v{
+      t.Errorf("Credentials have different values for key %s: %s, %s", k, filtered_credentials[k], v)
+    }
+  }
+}
\ No newline at end of file
diff --git a/parse.go b/parse.go
index afe8601..668e1f5 100644
--- a/parse.go
+++ b/parse.go
@@ -277,13 +277,14 @@ func processJSONPath(jsonString string, jsonPath string) (string,bool) {
 	return fmt.Sprintf("%v", res), err == nil
 }
 
-func GetCredentialsForService(serviceTag, serviceLabel string, credentials gjson.Result) map[string]string{
+func GetCredentialsForService(serviceTag, serviceLabel, credentials string) map[string]string{
+	creds_json := gjson.Parse(credentials)
 	creds := make(map[string]string)
 	key := serviceTag + "_" + serviceLabel + "_"
-	if credentials.Exists() {
-		credentials.ForEach(func (k, v gjson.Result) bool {
+	if creds_json.Exists() {
+		creds_json.ForEach(func (k, v gjson.Result) bool {
 			if strings.Index(k.String(), key) == 0 {
-				credKey := k.String()[:len(key)]
+				credKey := k.String()[len(key):]
 				if(credKey == "apikey" && serviceTag == "watson"){
 					creds["iam_"+credKey] = v.String()
 				}else{

From c1f58f019ff4b73624eea4c91d006c03d6664ace Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Mon, 23 Jul 2018 10:19:02 -0500
Subject: [PATCH 12/31] fix: renaming functions/files

---
 README.md                | 8 ++++----
 parse.go => cloud_env.go | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename parse.go => cloud_env.go (100%)

diff --git a/README.md b/README.md
index 74f39ac..06dad86 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Create a JSON file containing your mappings and initialize the module
 import "github.com/ibm-developer/ibm-cloud-env-golang"
 
 //in main function 
-IBMCloudEnv.init("/path/to/the/mappings/file/relative/to/prject/root")
+IBMCloudEnv.Initialize("/path/to/the/mappings/file/relative/to/prject/root")
 ```
  
 #### Supported search patterns types
@@ -63,8 +63,8 @@ ibm-cloud-config supports searching for values using three search pattern types
 In your application retrieve the values using below commands
 
 ```golang
-service1credentials := IBMCloudEnv.getDictionary("service1-credentials") // this will be a dictionary
-service2username := IBMCloudEnv.getString("service2-username") // this will be a string
+service1credentials := IBMCloudEnv.GetDictionary("service1-credentials") // this will be a dictionary
+service2username := IBMCloudEnv.GetString("service2-username") // this will be a string
 ```
 
 Following the above approach your application can be implemented in an runtime-environment agnostic way, abstracting differences in environment variable management introduced by different cloud compute providers.
@@ -74,7 +74,7 @@ Following the above approach your application can be implemented in an runtime-e
 In your application, you can filter credentials generated by the module based on service tags and service labels.
 
 ```golang
-filtered_credentials := IBMCloudEnv.getCredentialsForService(tag, label, credentials) // returns a map of string to strings with credentials for specified service tag and label
+filtered_credentials := IBMCloudEnv.GetCredentialsForService(tag, label, credentials) // returns a map of string to strings with credentials for specified service tag and label
 ```
 
 
diff --git a/parse.go b/cloud_env.go
similarity index 100%
rename from parse.go
rename to cloud_env.go

From 06232d00bbb47d200c30f9f9712e0316ef3a9831 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 10:01:01 -0500
Subject: [PATCH 13/31] fix: Update README Supported Search Pattern Types

added user-provided description in supported search patterns types
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 06dad86..0585dbc 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,11 @@ IBMCloudEnv.Initialize("/path/to/the/mappings/file/relative/to/prject/root")
 ```
  
 #### Supported search patterns types
-ibm-cloud-config supports searching for values using three search pattern types - cloudfoundry, env, file. 
+ibm-cloud-config supports searching for values using four search pattern types - cloudfoundry, env, file, user-provided. 
 - Using `cloudfoundry` allows to search for values in VCAP_SERVICES and VCAP_APPLICATIONS environment variables
 - Using `env` allows to search for values in environment variables
 - Using `file` allows to search for values in text/json files
+- Using `user-provided` allows to search for values in VCAP_SERVICES for service credentials
 
 #### Example search patterns
 - cloudfoundry:service-instance-name - searches through parsed VCAP_SERVICES environment variable and returns the `credentials` object of the matching service instance name
@@ -86,4 +87,4 @@ Make sure to follow the [conventional commit specification](https://conventional
 
 Once you are finished with your changes, run `go test` to make sure all tests pass.
 
-Do a pull request against `master`, make sure the build passes. A team member will review and merge your pull request.
\ No newline at end of file
+Do a pull request against `master`, make sure the build passes. A team member will review and merge your pull request.

From 2007280771060214c51d9c37b2da21f2516d1067 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 10:17:32 -0500
Subject: [PATCH 14/31] fix: removed comments on cloud_env.go

---
 cloud_env.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cloud_env.go b/cloud_env.go
index 668e1f5..425293e 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -94,7 +94,6 @@ func processMapping(mappingName string, config gjson.Result) bool {
 func processMappingV2(mappingName string, config gjson.Result){
 	config.ForEach(func (key, value gjson.Result) bool {
 		searchPatterns := value.Get("searchPatterns")
-		//fmt.Println("search Patterns: " + searchPatterns.String())
 		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
 			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
 		}
@@ -266,7 +265,6 @@ func processJSONPath(jsonString string, jsonPath string) (string,bool) {
 	var json_data interface{}
 	json.Unmarshal([]byte(jsonString), &json_data)
 	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
-	// fmt.Println("HERE: ", jsonPath, jsonString, res, err)
 	_, isMap := res.(map[string]interface{})
 	_, isArr := res.([]interface{})
 	

From 09f211ff7543622b256d5f68d9f28be3d5b93bcb Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 10:18:53 -0500
Subject: [PATCH 15/31] fix: removed comments mappingsv1_test.go

---
 mappingsV1_test.go | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/mappingsV1_test.go b/mappingsV1_test.go
index c9cc63e..6836f3a 100644
--- a/mappingsV1_test.go
+++ b/mappingsV1_test.go
@@ -118,11 +118,7 @@ func TestJsonFileAndPathV1(t *testing.T){
 
 func TestCFServiceCredentialsWithInstanceNameV1 (t *testing.T){
 	setEnvVariableV1()
-	// testString, _ := GetString("cf_var1")
-	// if testString != "{\n\t\"username\": \"service1-username1\"\n}" {
-	// 	t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\n\t\"username\": \"service1-username1\"\n}")
-	// }
-
+	
 	testString := GetDictionary("cf_var1").Get("username").String()
 	if testString != "service1-username1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
@@ -173,16 +169,6 @@ func TestReadVcapsWithJsonPathV1(t *testing.T){
 	if result2.String() != "test-application" {
 		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
 	} 
-
-	//removed this test because there wasn't a cf_var4 in mappings.json
-	/*testString3, _ := GetString("cf_var4")
-	if testString3 != "service1-username1" {
-		t.Errorf("can't read " + testString3 + " from GetString()")
-	}
-	result3 := GetDictionary("cf_var4").Get("value")
-	if result3.String() != "service1-username1" {
-		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
-	}*/
 }
 
 func TestSimpleStringFromEnvVarV1(t *testing.T){
@@ -221,4 +207,4 @@ func TestJsonPathFromEnvVarV1(t *testing.T){
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
-}
\ No newline at end of file
+}

From 4f4e4650062a5495691a9f1b432df59e22d760c6 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 10:19:20 -0500
Subject: [PATCH 16/31] fix: remove comments mappings_test.go

---
 mappings_test.go | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/mappings_test.go b/mappings_test.go
index 09913d2..7c6162e 100644
--- a/mappings_test.go
+++ b/mappings_test.go
@@ -111,16 +111,6 @@ func TestReadVcapsWithJsonPath(t *testing.T){
 	if result2.String() != "test-application" {
 		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
 	} 
-
-	//removed this test because there wasn't a cf_var4 in mappings.json
-	/*testString3, _ := GetString("cf_var4")
-	if testString3 != "service1-username1" {
-		t.Errorf("can't read " + testString3 + " from GetString()")
-	}
-	result3 := GetDictionary("cf_var4").Get("value")
-	if result3.String() != "service1-username1" {
-		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
-	}*/
 }
 
 func TestSimpleStringFromEnvVar(t *testing.T){
@@ -159,4 +149,4 @@ func TestJsonPathFromEnvVar(t *testing.T){
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
-}
\ No newline at end of file
+}

From dae7f9d154150df7781a69b6e8d0b5b53e5d8845 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 10:20:22 -0500
Subject: [PATCH 17/31] chore: remove comments mappingsv2_test.go

---
 mappingsv2_test.go | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/mappingsv2_test.go b/mappingsv2_test.go
index c2c3a6d..90935b2 100644
--- a/mappingsv2_test.go
+++ b/mappingsv2_test.go
@@ -18,7 +18,6 @@ package IBMCloudEnv
 import (
 	"testing" 
 	"os"
-	//"fmt"
 	"github.com/tidwall/gjson"
 	)
 
@@ -82,7 +81,7 @@ func TestJsonFileAndPathV2(t *testing.T){
 	}
 }
 
-func TestCFServiceCredentialsWithServiceInstanceV2 (t *testing.T){
+func TestCFServiceCredentialsWithServiceInstanceV2(t *testing.T){
 	setEnvVariableV2()
 	pre_json := GetDictionary("var1").Get("cf_var1").String()
 	testString := gjson.Parse(pre_json).Get("username").String()
@@ -103,16 +102,6 @@ func TestReadVcapsWithJsonPathV2(t *testing.T){
 	if result2 != "test-application" {
 		 t.Errorf("can't read " + result2 + " text from GetDictionary()")
 	} 
-
-	//removed this test because there wasn't a cf_var4 in mappings.json
-	/*testString3, _ := GetString("cf_var4")
-	if testString3 != "service1-username1" {
-		t.Errorf("can't read " + testString3 + " from GetString()")
-	}
-	result3 := GetDictionary("cf_var4").Get("value")
-	if result3.String() != "service1-username1" {
-		 t.Errorf("can't read " + result3.String() + " text from GetDictionary()")
-	}*/
 }
 
 func TestSimpleStringFromEnvVarV2(t *testing.T){
@@ -139,4 +128,4 @@ func TestJsonPathFromEnvVarV2(t *testing.T){
 	if testString != "env-var-json-username" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
-}
\ No newline at end of file
+}

From 05d71cb1f1f3a22a9dcd7ac67e46139b6ffef543 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Tue, 24 Jul 2018 15:25:33 -0500
Subject: [PATCH 18/31] fix: updated gopkg to include all libraries

---
 Gopkg.lock | 10 +++++-----
 Gopkg.toml |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 340ae93..a095265 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -10,8 +10,8 @@
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
+  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
+  version = "v1.0.6"
 
 [[projects]]
   name = "github.com/tidwall/gjson"
@@ -29,7 +29,7 @@
   branch = "master"
   name = "golang.org/x/crypto"
   packages = ["ssh/terminal"]
-  revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
+  revision = "c126467f60eb25f8f27e5a981f32a87e3965053f"
 
 [[projects]]
   branch = "master"
@@ -38,11 +38,11 @@
     "unix",
     "windows"
   ]
-  revision = "ce36f3865eeb42541ce3f87f32f8462c5687befa"
+  revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "98b12a44978be1462a66311143e86126b6d55588d4b2c7fc0582d2f80a99894b"
+  inputs-digest = "41f36e8b9555227845c3ccc6cabebac258114d897d7e71c38283f31ed4269e1e"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index c56cf0e..ff7916d 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -25,6 +25,14 @@
 #   unused-packages = true
 
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/oliveagle/jsonpath"
+
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.6"
+
 [[constraint]]
   name = "github.com/tidwall/gjson"
   version = "1.1.2"

From f91e14e6a52bc83341bd91626a69e26d267f08e7 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Tue, 24 Jul 2018 15:41:24 -0500
Subject: [PATCH 19/31] chore: Update README.md

Fixed wording from Pull Request #3
---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0585dbc..11ffb72 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # IBM Cloud Environment
 
-The `ibm-cloud-env-golang` module allows to abstract environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application could be environment-agnostic.
+The `ibm-cloud-env-golang` package allows to abstract environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application could be environment-agnostic.
 
-The module allows to define an array of search patterns that will be executed one by one until required value is found.
+The package allows to define an array of search patterns that will be executed one by one until required value is found.
 
 ### Installation
 
@@ -22,26 +22,27 @@ IBMCloudEnv.Initialize("/path/to/the/mappings/file/relative/to/prject/root")
 ```
  
 #### Supported search patterns types
-ibm-cloud-config supports searching for values using four search pattern types - cloudfoundry, env, file, user-provided. 
+ibm-cloud-config supports searching for values using four search pattern types - user-provided, cloudfoundry, env, file.
+- Using `user-provided` allows to search for values in VCAP_SERVICES for service credentials
 - Using `cloudfoundry` allows to search for values in VCAP_SERVICES and VCAP_APPLICATIONS environment variables
 - Using `env` allows to search for values in environment variables
 - Using `file` allows to search for values in text/json files
-- Using `user-provided` allows to search for values in VCAP_SERVICES for service credentials
 
 #### Example search patterns
+- user-provided:service:name - searches through parsed VCAP_SERVICES environment variable and returns the value of the requested service name and credential
 - cloudfoundry:service-instance-name - searches through parsed VCAP_SERVICES environment variable and returns the `credentials` object of the matching service instance name
 - cloudfoundry:$.JSONPath - searches through parsed VCAP_SERVICES and VCAP_APPLICATION environment variables and returns the value that corresponds to JSONPath
 - env:env-var-name - returns environment variable named "env-var-name"
 - env:env-var-name:$.JSONPath - attempts to parse the environment variable "env-var-name" and return a value that corresponds to JSONPath
 - file:/server/config.text - returns content of /server/config.text file
 - file:/server/config.json:$.JSONPath - reads the content of /server/config.json file, tries to parse it, returns the value that corresponds to JSONPath
-- user-provided:service:name - searches through parsed VCAP_SERVICES environment variable and returns the value of the requested service name and credential
 
 #### mappings.json file example
 ```javascript
 {
     "service1-credentials": {
         "searchPatterns": [
+            "user-provided:my-service1-instance-name:service1-credentials",
             "cloudfoundry:my-service1-instance-name", 
             "env:my-service1-credentials", 
             "file:/localdev/my-service1-credentials.json" 
@@ -49,11 +50,10 @@ ibm-cloud-config supports searching for values using four search pattern types -
     },
     "service2-username": {
         "searchPatterns":[
+            "user-provided:my-service2-instance-name:username",
             "cloudfoundry:$.service2[@.name=='my-service2-instance-name'].credentials.username",
             "env:my-service2-credentials:$.username",
-            "file:/localdev/my-service1-credentials.json:$.username",
-            "user-provided:my-service2-instance-name:username"
-
+            "file:/localdev/my-service1-credentials.json:$.username"
         ]
     }
 }

From 1ceb370755052393f009bfb8cdd0ba728f3a9208 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Tue, 24 Jul 2018 16:42:16 -0500
Subject: [PATCH 20/31] chore: fixed indentations to only use spaces

---
 cloud_env.go | 458 +++++++++++++++++++++++++--------------------------
 1 file changed, 228 insertions(+), 230 deletions(-)

diff --git a/cloud_env.go b/cloud_env.go
index 425293e..eec211a 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -17,13 +17,13 @@
 package IBMCloudEnv
 
 import ("os"
-		"fmt"
-		"strings"
-  	"github.com/tidwall/gjson"
-  	"io/ioutil"
- 		"github.com/oliveagle/jsonpath"
- 		"encoding/json"
- 		log "github.com/sirupsen/logrus"
+    "fmt"
+    "strings"
+    "github.com/tidwall/gjson"
+    "io/ioutil"
+    "github.com/oliveagle/jsonpath"
+    "encoding/json"
+    log "github.com/sirupsen/logrus"
 )
 
 const PREFIX_PATTERN_CF = "cloudfoundry"
@@ -35,290 +35,288 @@ var loadedMappings = make (map [string]interface{})
 
 func check(e error) {
     if e != nil {
-    	log.Error(e)
+      log.Error(e)
     }
 }
 
 func strip_leading_slash(path string) string {
-	if (len(path) > 0) && (path[0] == '/' || path[0] == '\\'){
-		return path[1:]
-	}    
-    return path
+  if (len(path) > 0) && (path[0] == '/' || path[0] == '\\'){
+    return path[1:]
+  }
+  return path
 }
     
 func Initialize(mappingsFilePath string) string {
-	json, err := ioutil.ReadFile(mappingsFilePath)
+  json, err := ioutil.ReadFile(mappingsFilePath)
+  if err != nil {
+    log.Error(err)
+  }
+  dir, err := os.Getwd()
   if err != nil {
-  	log.Error(err)
+    log.Error(err)
   }
-	dir, err := os.Getwd()
-	if err != nil {
-  	log.Error(err)
-	}
   mappingsFilePath =  dir + mappingsFilePath;
   result := gjson.Parse(string(json))
   version := result.Get("version").Int()
   result.ForEach(func (key, value gjson.Result) bool{
-  	if !result.Get("version").Exists() {
-	  	processMapping(key.String(),value) 
-	  } else if version == 1 {
-	  	processMapping(key.String(),value) 
-	  } else if version == 2{
-	  	processMappingV2(key.String(),value) 
-	  }
-  	return true 
+    if !result.Get("version").Exists() {
+      processMapping(key.String(),value) 
+    } else if version == 1 {
+      processMapping(key.String(),value) 
+    } else if version == 2{
+      processMappingV2(key.String(),value) 
+    }
+    return true 
   })
-	return mappingsFilePath
+  return mappingsFilePath
 }
 
 func processMapping(mappingName string, config gjson.Result) bool {
-	searchPatterns := config.Get("searchPatterns")
-	if !searchPatterns.Exists() || len (searchPatterns.Array()) == 0{
-		log.Warnln("No searchPatterns found for mapping", mappingName)
-		return false
-	}
-	searchPatterns.ForEach (func (_, searchPattern gjson.Result) bool {
-		value, OK := processSearchPattern(mappingName, searchPattern.String())
-		if OK {
-			loadedMappings[mappingName] = value
-			return false
-		} else {
-			return true
-		}
-
-	})
+  searchPatterns := config.Get("searchPatterns")
+  if !searchPatterns.Exists() || len (searchPatterns.Array()) == 0{
+    log.Warnln("No searchPatterns found for mapping", mappingName)
+    return false
+  }
+  searchPatterns.ForEach (func (_, searchPattern gjson.Result) bool {
+    value, OK := processSearchPattern(mappingName, searchPattern.String())
+    if OK {
+      loadedMappings[mappingName] = value
+      return false
+    } else {
+      return true
+    }
+  })
 
-	return true
+  return true
 }
 
 func processMappingV2(mappingName string, config gjson.Result){
-	config.ForEach(func (key, value gjson.Result) bool {
-		searchPatterns := value.Get("searchPatterns")
-		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
-			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
-		}
+  config.ForEach(func (key, value gjson.Result) bool {
+    searchPatterns := value.Get("searchPatterns")
+    if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
+      log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
+    }
 
-		searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool{
-			value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
-			if ok {
-				_, exists := loadedMappings[mappingName]
-				if !exists {
-					loadedMappings[mappingName] = make(map[string]string)
-				}
+    searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool{
+      value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
+      if ok {
+        _, exists := loadedMappings[mappingName]
+        if !exists {
+          loadedMappings[mappingName] = make(map[string]string)
+        }
 
-				loadedMappings[mappingName].(map[string]string)[key.String()] = value
-				return false
-			} else {
-				return true
-			}
-		})
+        loadedMappings[mappingName].(map[string]string)[key.String()] = value
+        return false
+      } else {
+        return true
+      }
+    })
 
-		return true
-	})
+    return true
+  })
 }
 
 func processSearchPattern(mappingName string, searchPattern string) (string, bool) {
-	patternComponents := strings.Split(searchPattern, ":")
-	value :=""
-	OK := false
-	switch patternComponents[0]{
-	case PREFIX_PATTERN_FILE:
-		value, OK = processFileSearchPattern(patternComponents)
-		break
-	case PREFIX_PATTERN_CF:
-		value, OK  = processCFSearchPattern(patternComponents)
-		break
-	case PREFIX_PATTERN_ENV:
-		value, OK  = processEnvSearchPattern(patternComponents)
-		break
-	case PREFIX_PATTERN_USER:
-		value, OK  = processUserProvidedSearchPattern(patternComponents)
-		break
-	default:
-		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
-		return "", false
-	}
-	if !OK {
-		return "", false
-	}
-	return value, true
+  patternComponents := strings.Split(searchPattern, ":")
+  value :=""
+  OK := false
+  switch patternComponents[0]{
+  case PREFIX_PATTERN_FILE:
+    value, OK = processFileSearchPattern(patternComponents)
+    break
+  case PREFIX_PATTERN_CF:
+    value, OK  = processCFSearchPattern(patternComponents)
+    break
+  case PREFIX_PATTERN_ENV:
+    value, OK  = processEnvSearchPattern(patternComponents)
+    break
+  case PREFIX_PATTERN_USER:
+    value, OK  = processUserProvidedSearchPattern(patternComponents)
+    break
+  default:
+    log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
+    return "", false
+  }
+  if !OK {
+    return "", false
+  }
+  return value, true
 }
 
 
 func processFileSearchPattern(patternComponents [] string) (string, bool) {
-	filePath, _ := os.Getwd()
-	if _, err := os.Stat(filePath); err != nil {
-		log.Errorln("File does not exist", filePath)
-		return "", false
-	} else {
-		fullPathName := filePath + patternComponents [1]
-		json, err := ioutil.ReadFile(fullPathName)
-		if err !=nil{
-			log.Errorln(err)
-			return "", false
-		}
-		if len(patternComponents) == 3 {
-			return processJSONPath(string(json), patternComponents[2])
-		} else {
-			return string(json), true
-		}
-	}
+  filePath, _ := os.Getwd()
+  if _, err := os.Stat(filePath); err != nil {
+    log.Errorln("File does not exist", filePath)
+    return "", false
+  } else {
+    fullPathName := filePath + patternComponents [1]
+    json, err := ioutil.ReadFile(fullPathName)
+    if err !=nil{
+      log.Errorln(err)
+      return "", false
+    }
+    if len(patternComponents) == 3 {
+      return processJSONPath(string(json), patternComponents[2])
+    } else {
+      return string(json), true
+    }
+  }
 }
 
 func processCFSearchPattern(patternComponents [] string) (string, bool) {
-	vcapServicesString, ok_service := os.LookupEnv("VCAP_SERVICES")
-	vcapApplicationString, ok_app := os.LookupEnv("VCAP_APPLICATION")
-	if !ok_service && !ok_app {
-		return "", false
-	} else {
-		if patternComponents[1][0] == '$' {
-			value, OK := processJSONPath(vcapServicesString, patternComponents[1])
-			if OK {
-				return value, true
-			} else {
-				return processJSONPath(vcapApplicationString, patternComponents[1])
-			}
-		} else {
-			// patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
-			json := gjson.Parse(vcapServicesString)
-			res, ok := "", false
-			json.ForEach(func (k, v gjson.Result) bool {
-				v.ForEach(func (_, item gjson.Result) bool {
-					if item.Get("name").String() == patternComponents[1]{
-						res, ok = item.Get("credentials").String(), true
-						return false
-					}else{
-						return true
-					}
-				})
-				if ok{
-					return false
-				}else{
-					return true
-				}
-			})
-			return res, ok
-		
-		}
-	}
+  vcapServicesString, ok_service := os.LookupEnv("VCAP_SERVICES")
+  vcapApplicationString, ok_app := os.LookupEnv("VCAP_APPLICATION")
+  if !ok_service && !ok_app {
+    return "", false
+  } else {
+    if patternComponents[1][0] == '$' {
+      value, OK := processJSONPath(vcapServicesString, patternComponents[1])
+      if OK {
+        return value, true
+      } else {
+        return processJSONPath(vcapApplicationString, patternComponents[1])
+      }
+    } else {
+      // patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
+      json := gjson.Parse(vcapServicesString)
+      res, ok := "", false
+      json.ForEach(func (k, v gjson.Result) bool {
+        v.ForEach(func (_, item gjson.Result) bool {
+          if item.Get("name").String() == patternComponents[1]{
+            res, ok = item.Get("credentials").String(), true
+            return false
+          }else{
+            return true
+          }
+        })
+        if ok{
+          return false
+        }else{
+          return true
+        }
+      })
+      return res, ok
+    
+    }
+  }
 }
 
 func processEnvSearchPattern(patternComponents [] string) (string, bool) {
-	value, OK := os.LookupEnv(patternComponents[1])
-	if OK && (len (patternComponents) == 3) {
-		return processJSONPath(value, patternComponents[2])	
-	}
-	return value, OK
+  value, OK := os.LookupEnv(patternComponents[1])
+  if OK && (len (patternComponents) == 3) {
+    return processJSONPath(value, patternComponents[2]) 
+  }
+  return value, OK
 }
 
 func processUserProvidedSearchPattern(patternComponents []string) (string, bool){
-	vcapServicesString, ok := os.LookupEnv("VCAP_SERVICES")
-	if !ok {
-		return "", false
-	}
-	if(len(patternComponents) == 3){
-		serviceName := patternComponents[1]
-		return processJSONCredentials(vcapServicesString, serviceName, patternComponents[2])
-	}
-	return "", false
+  vcapServicesString, ok := os.LookupEnv("VCAP_SERVICES")
+  if !ok {
+    return "", false
+  }
+  if(len(patternComponents) == 3){
+    serviceName := patternComponents[1]
+    return processJSONCredentials(vcapServicesString, serviceName, patternComponents[2])
+  }
+  return "", false
 }
 
 func processJSONCredentials(jsonString, servicename, credkey string) (string, bool){
-	if !gjson.Valid(jsonString) {
-		log.Errorln("Failed to apply JSONPath", jsonString)
-		return "", false
-	}
-	jsonObj := gjson.Parse(jsonString)
-	credArray := jsonObj.Get(PREFIX_PATTERN_USER)
-	ret, ok := "", false
-	credArray.ForEach (func (_, searchPattern gjson.Result) bool {
-		if searchPattern.Get("name").String() == servicename {
-			ret, ok = deepSearch(searchPattern, credkey)
-			return !ok
-		}
-		return true
-	})
-	return ret, ok
+  if !gjson.Valid(jsonString) {
+    log.Errorln("Failed to apply JSONPath", jsonString)
+    return "", false
+  }
+  jsonObj := gjson.Parse(jsonString)
+  credArray := jsonObj.Get(PREFIX_PATTERN_USER)
+  ret, ok := "", false
+  credArray.ForEach (func (_, searchPattern gjson.Result) bool {
+    if searchPattern.Get("name").String() == servicename {
+      ret, ok = deepSearch(searchPattern, credkey)
+      return !ok
+    }
+    return true
+  })
+  return ret, ok
 }
 
 func deepSearch(current gjson.Result, search string) (string, bool){
 
 
-	res := current.Get(search).String()
-	ok := false
-	if current.Get(search).Exists() {
-		return res, true
-	}
+  res := current.Get(search).String()
+  ok := false
+  if current.Get(search).Exists() {
+    return res, true
+  }
 
-	_, isMap := current.Value().(map[string]interface{})
-	_, isArr := current.Value().([]interface{})
-	if isMap || isArr {
-		current.ForEach(func (_, v gjson.Result) bool {
-			res, ok = deepSearch(v, search)
-			return !ok
-		})
-	}
-	return res, ok
+  _, isMap := current.Value().(map[string]interface{})
+  _, isArr := current.Value().([]interface{})
+  if isMap || isArr {
+    current.ForEach(func (_, v gjson.Result) bool {
+      res, ok = deepSearch(v, search)
+      return !ok
+    })
+  }
+  return res, ok
 }
 
 func processJSONPath(jsonString string, jsonPath string) (string,bool) {
-	var json_data interface{}
-	json.Unmarshal([]byte(jsonString), &json_data)
-	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
-	_, isMap := res.(map[string]interface{})
-	_, isArr := res.([]interface{})
-	
-	if isMap || isArr {
-		test, _ := json.Marshal(res)
-		return string(test), err == nil
-	}
-	return fmt.Sprintf("%v", res), err == nil
+  var json_data interface{}
+  json.Unmarshal([]byte(jsonString), &json_data)
+  res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
+  _, isMap := res.(map[string]interface{})
+  _, isArr := res.([]interface{})
+  
+  if isMap || isArr {
+    test, _ := json.Marshal(res)
+    return string(test), err == nil
+  }
+  return fmt.Sprintf("%v", res), err == nil
 }
 
 func GetCredentialsForService(serviceTag, serviceLabel, credentials string) map[string]string{
-	creds_json := gjson.Parse(credentials)
-	creds := make(map[string]string)
-	key := serviceTag + "_" + serviceLabel + "_"
-	if creds_json.Exists() {
-		creds_json.ForEach(func (k, v gjson.Result) bool {
-			if strings.Index(k.String(), key) == 0 {
-				credKey := k.String()[len(key):]
-				if(credKey == "apikey" && serviceTag == "watson"){
-					creds["iam_"+credKey] = v.String()
-				}else{
-					creds[credKey] = v.String()
-				}
-			}
-			return true
-		})
-	}
-	return creds
+  creds_json := gjson.Parse(credentials)
+  creds := make(map[string]string)
+  key := serviceTag + "_" + serviceLabel + "_"
+  if creds_json.Exists() {
+    creds_json.ForEach(func (k, v gjson.Result) bool {
+      if strings.Index(k.String(), key) == 0 {
+        credKey := k.String()[len(key):]
+        if(credKey == "apikey" && serviceTag == "watson"){
+          creds["iam_"+credKey] = v.String()
+        }else{
+          creds[credKey] = v.String()
+        }
+      }
+      return true
+    })
+  }
+  return creds
 }
 
 func GetString(name string) (string, bool) {
-	val, ok := loadedMappings[name]
-	_, isStr := val.(string)
-	if ok && !isStr {
-		bytes, _ := json.Marshal(val)
-		return string(bytes), true
-	}
-	return val.(string), ok
+  val, ok := loadedMappings[name]
+  _, isStr := val.(string)
+  if ok && !isStr {
+    bytes, _ := json.Marshal(val)
+    return string(bytes), true
+  }
+  return val.(string), ok
 }
 
 func GetDictionary(name string) gjson.Result {
-	value, ok := GetString (name)
-	if !ok {
-		log.Warnln(value + " does not exist")
-		return gjson.Parse("{\"value\": \"" + value + "\"}")
-	} else {
-		if gjson.Valid(value) {
-			return gjson.Parse(value)
-		} else {
-			//value is not a valid json object, return object
-			return gjson.Parse("{\"value\": \"" + value + "\"}")
-		}
-	} 
-	
+  value, ok := GetString (name)
+  if !ok {
+    log.Warnln(value + " does not exist")
+    return gjson.Parse("{\"value\": \"" + value + "\"}")
+  } else {
+    if gjson.Valid(value) {
+      return gjson.Parse(value)
+    } else {
+      //value is not a valid json object, return object
+      return gjson.Parse("{\"value\": \"" + value + "\"}")
+    }
+  }
 }
 
 

From fc3c3d8e375197de8860277bdd69b8b4a4205b8f Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Wed, 25 Jul 2018 09:59:28 -0500
Subject: [PATCH 21/31] chore: .go files are correctly formatted

---
 cloud_env.go        | 505 ++++++++++++++++++++++----------------------
 credentials_test.go |  45 ++--
 mappingsV1_test.go  |  57 +++--
 mappings_test.go    |  43 ++--
 mappingsv2_test.go  |  45 ++--
 5 files changed, 345 insertions(+), 350 deletions(-)

diff --git a/cloud_env.go b/cloud_env.go
index eec211a..f20953f 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -16,14 +16,15 @@
 
 package IBMCloudEnv
 
-import ("os"
-    "fmt"
-    "strings"
-    "github.com/tidwall/gjson"
-    "io/ioutil"
-    "github.com/oliveagle/jsonpath"
-    "encoding/json"
-    log "github.com/sirupsen/logrus"
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/oliveagle/jsonpath"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	"io/ioutil"
+	"os"
+	"strings"
 )
 
 const PREFIX_PATTERN_CF = "cloudfoundry"
@@ -31,293 +32,289 @@ const PREFIX_PATTERN_ENV = "env"
 const PREFIX_PATTERN_FILE = "file"
 const PREFIX_PATTERN_USER = "user-provided"
 
-var loadedMappings = make (map [string]interface{}) 
+var loadedMappings = make(map[string]interface{})
 
 func check(e error) {
-    if e != nil {
-      log.Error(e)
-    }
+	if e != nil {
+		log.Error(e)
+	}
 }
 
 func strip_leading_slash(path string) string {
-  if (len(path) > 0) && (path[0] == '/' || path[0] == '\\'){
-    return path[1:]
-  }
-  return path
+	if (len(path) > 0) && (path[0] == '/' || path[0] == '\\') {
+		return path[1:]
+	}
+	return path
 }
-    
+
 func Initialize(mappingsFilePath string) string {
-  json, err := ioutil.ReadFile(mappingsFilePath)
-  if err != nil {
-    log.Error(err)
-  }
-  dir, err := os.Getwd()
-  if err != nil {
-    log.Error(err)
-  }
-  mappingsFilePath =  dir + mappingsFilePath;
-  result := gjson.Parse(string(json))
-  version := result.Get("version").Int()
-  result.ForEach(func (key, value gjson.Result) bool{
-    if !result.Get("version").Exists() {
-      processMapping(key.String(),value) 
-    } else if version == 1 {
-      processMapping(key.String(),value) 
-    } else if version == 2{
-      processMappingV2(key.String(),value) 
-    }
-    return true 
-  })
-  return mappingsFilePath
+	json, err := ioutil.ReadFile(mappingsFilePath)
+	if err != nil {
+		log.Error(err)
+	}
+	dir, err := os.Getwd()
+	if err != nil {
+		log.Error(err)
+	}
+	mappingsFilePath = dir + mappingsFilePath
+	result := gjson.Parse(string(json))
+	version := result.Get("version").Int()
+	result.ForEach(func(key, value gjson.Result) bool {
+		if !result.Get("version").Exists() {
+			processMapping(key.String(), value)
+		} else if version == 1 {
+			processMapping(key.String(), value)
+		} else if version == 2 {
+			processMappingV2(key.String(), value)
+		}
+		return true
+	})
+	return mappingsFilePath
 }
 
 func processMapping(mappingName string, config gjson.Result) bool {
-  searchPatterns := config.Get("searchPatterns")
-  if !searchPatterns.Exists() || len (searchPatterns.Array()) == 0{
-    log.Warnln("No searchPatterns found for mapping", mappingName)
-    return false
-  }
-  searchPatterns.ForEach (func (_, searchPattern gjson.Result) bool {
-    value, OK := processSearchPattern(mappingName, searchPattern.String())
-    if OK {
-      loadedMappings[mappingName] = value
-      return false
-    } else {
-      return true
-    }
-  })
+	searchPatterns := config.Get("searchPatterns")
+	if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0 {
+		log.Warnln("No searchPatterns found for mapping", mappingName)
+		return false
+	}
+	searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool {
+		value, OK := processSearchPattern(mappingName, searchPattern.String())
+		if OK {
+			loadedMappings[mappingName] = value
+			return false
+		} else {
+			return true
+		}
+
+	})
 
-  return true
+	return true
 }
 
-func processMappingV2(mappingName string, config gjson.Result){
-  config.ForEach(func (key, value gjson.Result) bool {
-    searchPatterns := value.Get("searchPatterns")
-    if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0{
-      log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
-    }
+func processMappingV2(mappingName string, config gjson.Result) {
+	config.ForEach(func(key, value gjson.Result) bool {
+		searchPatterns := value.Get("searchPatterns")
+		if !searchPatterns.Exists() || len(searchPatterns.Array()) == 0 {
+			log.Warningln("No credentials found uusing searchPatterns under ", mappingName)
+		}
 
-    searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool{
-      value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
-      if ok {
-        _, exists := loadedMappings[mappingName]
-        if !exists {
-          loadedMappings[mappingName] = make(map[string]string)
-        }
+		searchPatterns.ForEach(func(_, searchPattern gjson.Result) bool {
+			value, ok := processSearchPattern(fmt.Sprintf("$%s[%s]", mappingName, key.String()), searchPattern.String())
+			if ok {
+				_, exists := loadedMappings[mappingName]
+				if !exists {
+					loadedMappings[mappingName] = make(map[string]string)
+				}
 
-        loadedMappings[mappingName].(map[string]string)[key.String()] = value
-        return false
-      } else {
-        return true
-      }
-    })
+				loadedMappings[mappingName].(map[string]string)[key.String()] = value
+				return false
+			} else {
+				return true
+			}
+		})
 
-    return true
-  })
+		return true
+	})
 }
 
 func processSearchPattern(mappingName string, searchPattern string) (string, bool) {
-  patternComponents := strings.Split(searchPattern, ":")
-  value :=""
-  OK := false
-  switch patternComponents[0]{
-  case PREFIX_PATTERN_FILE:
-    value, OK = processFileSearchPattern(patternComponents)
-    break
-  case PREFIX_PATTERN_CF:
-    value, OK  = processCFSearchPattern(patternComponents)
-    break
-  case PREFIX_PATTERN_ENV:
-    value, OK  = processEnvSearchPattern(patternComponents)
-    break
-  case PREFIX_PATTERN_USER:
-    value, OK  = processUserProvidedSearchPattern(patternComponents)
-    break
-  default:
-    log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
-    return "", false
-  }
-  if !OK {
-    return "", false
-  }
-  return value, true
+	patternComponents := strings.Split(searchPattern, ":")
+	value := ""
+	OK := false
+	switch patternComponents[0] {
+	case PREFIX_PATTERN_FILE:
+		value, OK = processFileSearchPattern(patternComponents)
+		break
+	case PREFIX_PATTERN_CF:
+		value, OK = processCFSearchPattern(patternComponents)
+		break
+	case PREFIX_PATTERN_ENV:
+		value, OK = processEnvSearchPattern(patternComponents)
+		break
+	case PREFIX_PATTERN_USER:
+		value, OK = processUserProvidedSearchPattern(patternComponents)
+		break
+	default:
+		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
+		return "", false
+	}
+	if !OK {
+		return "", false
+	}
+	return value, true
 }
 
-
-func processFileSearchPattern(patternComponents [] string) (string, bool) {
-  filePath, _ := os.Getwd()
-  if _, err := os.Stat(filePath); err != nil {
-    log.Errorln("File does not exist", filePath)
-    return "", false
-  } else {
-    fullPathName := filePath + patternComponents [1]
-    json, err := ioutil.ReadFile(fullPathName)
-    if err !=nil{
-      log.Errorln(err)
-      return "", false
-    }
-    if len(patternComponents) == 3 {
-      return processJSONPath(string(json), patternComponents[2])
-    } else {
-      return string(json), true
-    }
-  }
+func processFileSearchPattern(patternComponents []string) (string, bool) {
+	filePath, _ := os.Getwd()
+	if _, err := os.Stat(filePath); err != nil {
+		log.Errorln("File does not exist", filePath)
+		return "", false
+	} else {
+		fullPathName := filePath + patternComponents[1]
+		json, err := ioutil.ReadFile(fullPathName)
+		if err != nil {
+			log.Errorln(err)
+			return "", false
+		}
+		if len(patternComponents) == 3 {
+			return processJSONPath(string(json), patternComponents[2])
+		} else {
+			return string(json), true
+		}
+	}
 }
 
-func processCFSearchPattern(patternComponents [] string) (string, bool) {
-  vcapServicesString, ok_service := os.LookupEnv("VCAP_SERVICES")
-  vcapApplicationString, ok_app := os.LookupEnv("VCAP_APPLICATION")
-  if !ok_service && !ok_app {
-    return "", false
-  } else {
-    if patternComponents[1][0] == '$' {
-      value, OK := processJSONPath(vcapServicesString, patternComponents[1])
-      if OK {
-        return value, true
-      } else {
-        return processJSONPath(vcapApplicationString, patternComponents[1])
-      }
-    } else {
-      // patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
-      json := gjson.Parse(vcapServicesString)
-      res, ok := "", false
-      json.ForEach(func (k, v gjson.Result) bool {
-        v.ForEach(func (_, item gjson.Result) bool {
-          if item.Get("name").String() == patternComponents[1]{
-            res, ok = item.Get("credentials").String(), true
-            return false
-          }else{
-            return true
-          }
-        })
-        if ok{
-          return false
-        }else{
-          return true
-        }
-      })
-      return res, ok
-    
-    }
-  }
-}
+func processCFSearchPattern(patternComponents []string) (string, bool) {
+	vcapServicesString, ok_service := os.LookupEnv("VCAP_SERVICES")
+	vcapApplicationString, ok_app := os.LookupEnv("VCAP_APPLICATION")
+	if !ok_service && !ok_app {
+		return "", false
+	} else {
+		if patternComponents[1][0] == '$' {
+			value, OK := processJSONPath(vcapServicesString, patternComponents[1])
+			if OK {
+				return value, true
+			} else {
+				return processJSONPath(vcapApplicationString, patternComponents[1])
+			}
+		} else {
+			// patternComponents[1] is a service instance name, find it in VCAP_SERVICES and return credentials object
+			json := gjson.Parse(vcapServicesString)
+			res, ok := "", false
+			json.ForEach(func(k, v gjson.Result) bool {
+				v.ForEach(func(_, item gjson.Result) bool {
+					if item.Get("name").String() == patternComponents[1] {
+						res, ok = item.Get("credentials").String(), true
+						return false
+					} else {
+						return true
+					}
+				})
+				if ok {
+					return false
+				} else {
+					return true
+				}
+			})
+			return res, ok
 
-func processEnvSearchPattern(patternComponents [] string) (string, bool) {
-  value, OK := os.LookupEnv(patternComponents[1])
-  if OK && (len (patternComponents) == 3) {
-    return processJSONPath(value, patternComponents[2]) 
-  }
-  return value, OK
+		}
+	}
 }
 
-func processUserProvidedSearchPattern(patternComponents []string) (string, bool){
-  vcapServicesString, ok := os.LookupEnv("VCAP_SERVICES")
-  if !ok {
-    return "", false
-  }
-  if(len(patternComponents) == 3){
-    serviceName := patternComponents[1]
-    return processJSONCredentials(vcapServicesString, serviceName, patternComponents[2])
-  }
-  return "", false
+func processEnvSearchPattern(patternComponents []string) (string, bool) {
+	value, OK := os.LookupEnv(patternComponents[1])
+	if OK && (len(patternComponents) == 3) {
+		return processJSONPath(value, patternComponents[2])
+	}
+	return value, OK
 }
 
-func processJSONCredentials(jsonString, servicename, credkey string) (string, bool){
-  if !gjson.Valid(jsonString) {
-    log.Errorln("Failed to apply JSONPath", jsonString)
-    return "", false
-  }
-  jsonObj := gjson.Parse(jsonString)
-  credArray := jsonObj.Get(PREFIX_PATTERN_USER)
-  ret, ok := "", false
-  credArray.ForEach (func (_, searchPattern gjson.Result) bool {
-    if searchPattern.Get("name").String() == servicename {
-      ret, ok = deepSearch(searchPattern, credkey)
-      return !ok
-    }
-    return true
-  })
-  return ret, ok
+func processUserProvidedSearchPattern(patternComponents []string) (string, bool) {
+	vcapServicesString, ok := os.LookupEnv("VCAP_SERVICES")
+	if !ok {
+		return "", false
+	}
+	if len(patternComponents) == 3 {
+		serviceName := patternComponents[1]
+		return processJSONCredentials(vcapServicesString, serviceName, patternComponents[2])
+	}
+	return "", false
 }
 
-func deepSearch(current gjson.Result, search string) (string, bool){
+func processJSONCredentials(jsonString, servicename, credkey string) (string, bool) {
+	if !gjson.Valid(jsonString) {
+		log.Errorln("Failed to apply JSONPath", jsonString)
+		return "", false
+	}
+	jsonObj := gjson.Parse(jsonString)
+	credArray := jsonObj.Get(PREFIX_PATTERN_USER)
+	ret, ok := "", false
+	credArray.ForEach(func(_, searchPattern gjson.Result) bool {
+		if searchPattern.Get("name").String() == servicename {
+			ret, ok = deepSearch(searchPattern, credkey)
+			return !ok
+		}
+		return true
+	})
+	return ret, ok
+}
 
+func deepSearch(current gjson.Result, search string) (string, bool) {
 
-  res := current.Get(search).String()
-  ok := false
-  if current.Get(search).Exists() {
-    return res, true
-  }
+	res := current.Get(search).String()
+	ok := false
+	if current.Get(search).Exists() {
+		return res, true
+	}
 
-  _, isMap := current.Value().(map[string]interface{})
-  _, isArr := current.Value().([]interface{})
-  if isMap || isArr {
-    current.ForEach(func (_, v gjson.Result) bool {
-      res, ok = deepSearch(v, search)
-      return !ok
-    })
-  }
-  return res, ok
+	_, isMap := current.Value().(map[string]interface{})
+	_, isArr := current.Value().([]interface{})
+	if isMap || isArr {
+		current.ForEach(func(_, v gjson.Result) bool {
+			res, ok = deepSearch(v, search)
+			return !ok
+		})
+	}
+	return res, ok
 }
 
-func processJSONPath(jsonString string, jsonPath string) (string,bool) {
-  var json_data interface{}
-  json.Unmarshal([]byte(jsonString), &json_data)
-  res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
-  _, isMap := res.(map[string]interface{})
-  _, isArr := res.([]interface{})
-  
-  if isMap || isArr {
-    test, _ := json.Marshal(res)
-    return string(test), err == nil
-  }
-  return fmt.Sprintf("%v", res), err == nil
+func processJSONPath(jsonString string, jsonPath string) (string, bool) {
+	var json_data interface{}
+	json.Unmarshal([]byte(jsonString), &json_data)
+	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
+	_, isMap := res.(map[string]interface{})
+	_, isArr := res.([]interface{})
+
+	if isMap || isArr {
+		test, _ := json.Marshal(res)
+		return string(test), err == nil
+	}
+	return fmt.Sprintf("%v", res), err == nil
 }
 
-func GetCredentialsForService(serviceTag, serviceLabel, credentials string) map[string]string{
-  creds_json := gjson.Parse(credentials)
-  creds := make(map[string]string)
-  key := serviceTag + "_" + serviceLabel + "_"
-  if creds_json.Exists() {
-    creds_json.ForEach(func (k, v gjson.Result) bool {
-      if strings.Index(k.String(), key) == 0 {
-        credKey := k.String()[len(key):]
-        if(credKey == "apikey" && serviceTag == "watson"){
-          creds["iam_"+credKey] = v.String()
-        }else{
-          creds[credKey] = v.String()
-        }
-      }
-      return true
-    })
-  }
-  return creds
+func GetCredentialsForService(serviceTag, serviceLabel, credentials string) map[string]string {
+	creds_json := gjson.Parse(credentials)
+	creds := make(map[string]string)
+	key := serviceTag + "_" + serviceLabel + "_"
+	if creds_json.Exists() {
+		creds_json.ForEach(func(k, v gjson.Result) bool {
+			if strings.Index(k.String(), key) == 0 {
+				credKey := k.String()[len(key):]
+				if credKey == "apikey" && serviceTag == "watson" {
+					creds["iam_"+credKey] = v.String()
+				} else {
+					creds[credKey] = v.String()
+				}
+			}
+			return true
+		})
+	}
+	return creds
 }
 
 func GetString(name string) (string, bool) {
-  val, ok := loadedMappings[name]
-  _, isStr := val.(string)
-  if ok && !isStr {
-    bytes, _ := json.Marshal(val)
-    return string(bytes), true
-  }
-  return val.(string), ok
+	val, ok := loadedMappings[name]
+	_, isStr := val.(string)
+	if ok && !isStr {
+		bytes, _ := json.Marshal(val)
+		return string(bytes), true
+	}
+	return val.(string), ok
 }
 
 func GetDictionary(name string) gjson.Result {
-  value, ok := GetString (name)
-  if !ok {
-    log.Warnln(value + " does not exist")
-    return gjson.Parse("{\"value\": \"" + value + "\"}")
-  } else {
-    if gjson.Valid(value) {
-      return gjson.Parse(value)
-    } else {
-      //value is not a valid json object, return object
-      return gjson.Parse("{\"value\": \"" + value + "\"}")
-    }
-  }
+	value, ok := GetString(name)
+	if !ok {
+		log.Warnln(value + " does not exist")
+		return gjson.Parse("{\"value\": \"" + value + "\"}")
+	} else {
+		if gjson.Valid(value) {
+			return gjson.Parse(value)
+		} else {
+			//value is not a valid json object, return object
+			return gjson.Parse("{\"value\": \"" + value + "\"}")
+		}
+	}
 }
-
-
-
diff --git a/credentials_test.go b/credentials_test.go
index b9e4d33..0f3de0c 100644
--- a/credentials_test.go
+++ b/credentials_test.go
@@ -1,6 +1,7 @@
 package IBMCloudEnv
+
 import (
-  "testing"
+	"testing"
 )
 
 const service_credentials = `{
@@ -14,31 +15,31 @@ const service_credentials = `{
 }`
 
 var filtered_credentials map[string]string = map[string]string{
-  "api_key":"api_key", 
-  "iam_apikey": "apikey",
-  "password": "password",
-  "url": "url",
-  "username": "username",
+	"api_key":    "api_key",
+	"iam_apikey": "apikey",
+	"password":   "password",
+	"url":        "url",
+	"username":   "username",
 }
 
 func TestMissingParams(t *testing.T) {
-  if len(GetCredentialsForService("", "", "")) != 0 {
-    t.Errorf("Credentials not empty\n")
-  }
-  if len(GetCredentialsForService("", "", "{}")) != 0 {
-    t.Errorf("Credentials not empty\n")
-  }
+	if len(GetCredentialsForService("", "", "")) != 0 {
+		t.Errorf("Credentials not empty\n")
+	}
+	if len(GetCredentialsForService("", "", "{}")) != 0 {
+		t.Errorf("Credentials not empty\n")
+	}
 }
 
 func TestCredentials(t *testing.T) {
-  returned_creds := GetCredentialsForService("watson", "conversation", service_credentials)
-  if len(returned_creds) != len(filtered_credentials) {
-    t.Errorf("Credentials have different sizes: %d, %d\n", len(returned_creds), len(filtered_credentials))
-  }
+	returned_creds := GetCredentialsForService("watson", "conversation", service_credentials)
+	if len(returned_creds) != len(filtered_credentials) {
+		t.Errorf("Credentials have different sizes: %d, %d\n", len(returned_creds), len(filtered_credentials))
+	}
 
-  for k, v := range returned_creds {
-    if filtered_credentials[k] != v{
-      t.Errorf("Credentials have different values for key %s: %s, %s", k, filtered_credentials[k], v)
-    }
-  }
-}
\ No newline at end of file
+	for k, v := range returned_creds {
+		if filtered_credentials[k] != v {
+			t.Errorf("Credentials have different values for key %s: %s, %s", k, filtered_credentials[k], v)
+		}
+	}
+}
diff --git a/mappingsV1_test.go b/mappingsV1_test.go
index 6836f3a..c84692b 100644
--- a/mappingsV1_test.go
+++ b/mappingsV1_test.go
@@ -15,15 +15,15 @@
  */
 
 package IBMCloudEnv
+
 import (
-	"testing" 
-	"os"
 	"fmt"
 	"github.com/tidwall/gjson"
+	"os"
+	"testing"
 )
 
-const jsonObjectV1 = 
-`{
+const jsonObjectV1 = `{
 	"service1": [
 		{
 			"name": "service1-name1",
@@ -67,10 +67,10 @@ const jsonObjectV1 =
 			"name":"servicename3"
 		}
 	]
-}` 
+}`
 
 const vcap_applicationV1 = `{"application_name": "test-application"}`
-const var_stringV1 = `test-12345` 
+const var_stringV1 = `test-12345`
 const credentialsV1 = `{"credentials": {
 		"username": "env-var-json-username"
 	}}`
@@ -85,25 +85,24 @@ func setEnvVariableV1() {
 	Initialize("server/config/v1/mappings.json")
 }
 
-
 func TestPlainTextFileV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("file_var1")
 	if testString != "plain-text-string" {
-		t.Errorf("testString is: " +  testString)
+		t.Errorf("testString is: " + testString)
 		t.Errorf("can't read " + testString + " from GetString()")
-	} 
+	}
 
 	fmt.Println("IN V1 result var1 is: ")
 	fmt.Println(GetDictionary("file_var1"))
 
 	result := GetDictionary("file_var1").Get("value")
 	if result.String() != "plain-text-string" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFileAndPathV1(t *testing.T){
+func TestJsonFileAndPathV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("file_var2")
 	if testString != gjson.Parse("{\"level2\":12345}").String() {
@@ -116,39 +115,39 @@ func TestJsonFileAndPathV1(t *testing.T){
 	}
 }
 
-func TestCFServiceCredentialsWithInstanceNameV1 (t *testing.T){
+func TestCFServiceCredentialsWithInstanceNameV1(t *testing.T) {
 	setEnvVariableV1()
-	
+
 	testString := GetDictionary("cf_var1").Get("username").String()
 	if testString != "service1-username1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "{\"username\":\"service1-username1\"}")
 	}
 }
 
-func TestUserCredentialsWithVcapServicesV1(t *testing.T){
+func TestUserCredentialsWithVcapServicesV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("user_provided_var1")
-	if testString != "apikey1"{
+	if testString != "apikey1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "apikey1")
 	}
 
 	testString2, _ := GetString("user_provided_var2")
-	if testString2 != "apikey2"{
+	if testString2 != "apikey2" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString2, "apikey2")
 	}
 
 	testString3, _ := GetString("user_provided_nested1")
-	if testString3 != "nestedValue1"{
+	if testString3 != "nestedValue1" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString3, "nestedValue1")
 	}
 
 	testString4, _ := GetString("user_provided_nested2")
-	if testString4 != "nestedValue3"{
+	if testString4 != "nestedValue3" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString4, "nestedValue3")
 	}
 }
 
-func TestReadVcapsWithJsonPathV1(t *testing.T){
+func TestReadVcapsWithJsonPathV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("cf_var2")
 
@@ -158,8 +157,8 @@ func TestReadVcapsWithJsonPathV1(t *testing.T){
 
 	result := GetDictionary("cf_var2").Get("value")
 	if result.String() != "service1-username1" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 
 	testString2, _ := GetString("cf_var3")
 	if testString2 != "test-application" {
@@ -167,11 +166,11 @@ func TestReadVcapsWithJsonPathV1(t *testing.T){
 	}
 	result2 := GetDictionary("cf_var3").Get("value")
 	if result2.String() != "test-application" {
-		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	}
 }
 
-func TestSimpleStringFromEnvVarV1(t *testing.T){
+func TestSimpleStringFromEnvVarV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("env_var1")
 	if testString != "test-12345" {
@@ -179,11 +178,11 @@ func TestSimpleStringFromEnvVarV1(t *testing.T){
 	}
 	result := GetDictionary("env_var1").Get("value")
 	if result.String() != "test-12345" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFromEnvVarV1(t *testing.T){
+func TestJsonFromEnvVarV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("env_var2")
 	if testString != credentials {
@@ -196,7 +195,7 @@ func TestJsonFromEnvVarV1(t *testing.T){
 	}
 }
 
-func TestJsonPathFromEnvVarV1(t *testing.T){
+func TestJsonPathFromEnvVarV1(t *testing.T) {
 	setEnvVariableV1()
 	testString, _ := GetString("env_var3")
 	if testString != "env-var-json-username" {
diff --git a/mappings_test.go b/mappings_test.go
index 7c6162e..bfd7c19 100644
--- a/mappings_test.go
+++ b/mappings_test.go
@@ -15,14 +15,14 @@
  */
 
 package IBMCloudEnv
+
 import (
-	"testing" 
-	"os"
 	"github.com/tidwall/gjson"
+	"os"
+	"testing"
 )
 
-const jsonObject = 
-`{
+const jsonObject = `{
 	"service1": [
 		{
 			"name": "service1-name1",
@@ -45,10 +45,10 @@ const jsonObject =
 			}
 		}
 	]
-}` 
+}`
 
 const vcap_application = `{"application_name": "test-application"}`
-const var_string = `test-12345` 
+const var_string = `test-12345`
 const credentials = `{"credentials": {
 		"username": "env-var-json-username"
 	}}`
@@ -63,21 +63,20 @@ func setEnvVariable() {
 	Initialize("server/config/mappings.json")
 }
 
-
 func TestPlainTextFile(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("file_var1")
 	if testString != "plain-text-string" {
-		t.Errorf("testString is: " +  testString)
+		t.Errorf("testString is: " + testString)
 		t.Errorf("can't read " + testString + " from GetString()")
-	} 
+	}
 	result := GetDictionary("file_var1").Get("value")
 	if result.String() != "plain-text-string" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFileAndPath(t *testing.T){
+func TestJsonFileAndPath(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("file_var2")
 	if testString != gjson.Parse("{\"level2\":12345}").String() {
@@ -90,7 +89,7 @@ func TestJsonFileAndPath(t *testing.T){
 	}
 }
 
-func TestReadVcapsWithJsonPath(t *testing.T){
+func TestReadVcapsWithJsonPath(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("cf_var2")
 
@@ -100,8 +99,8 @@ func TestReadVcapsWithJsonPath(t *testing.T){
 
 	result := GetDictionary("cf_var2").Get("value")
 	if result.String() != "service1-username1" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 
 	testString2, _ := GetString("cf_var3")
 	if testString2 != "test-application" {
@@ -109,11 +108,11 @@ func TestReadVcapsWithJsonPath(t *testing.T){
 	}
 	result2 := GetDictionary("cf_var3").Get("value")
 	if result2.String() != "test-application" {
-		 t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result2.String() + " text from GetDictionary()")
+	}
 }
 
-func TestSimpleStringFromEnvVar(t *testing.T){
+func TestSimpleStringFromEnvVar(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("env_var1")
 	if testString != "test-12345" {
@@ -121,11 +120,11 @@ func TestSimpleStringFromEnvVar(t *testing.T){
 	}
 	result := GetDictionary("env_var1").Get("value")
 	if result.String() != "test-12345" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFromEnvVar(t *testing.T){
+func TestJsonFromEnvVar(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("env_var2")
 	if testString != credentials {
@@ -138,7 +137,7 @@ func TestJsonFromEnvVar(t *testing.T){
 	}
 }
 
-func TestJsonPathFromEnvVar(t *testing.T){
+func TestJsonPathFromEnvVar(t *testing.T) {
 	setEnvVariable()
 	testString, _ := GetString("env_var3")
 	if testString != "env-var-json-username" {
diff --git a/mappingsv2_test.go b/mappingsv2_test.go
index 90935b2..807cbfc 100644
--- a/mappingsv2_test.go
+++ b/mappingsv2_test.go
@@ -15,14 +15,14 @@
  */
 
 package IBMCloudEnv
+
 import (
-	"testing" 
-	"os"
 	"github.com/tidwall/gjson"
-	)
+	"os"
+	"testing"
+)
 
-const jsonObjectV2 = 
-`{
+const jsonObjectV2 = `{
 	"service1": [
 		{
 			"name": "service1-name1",
@@ -45,10 +45,10 @@ const jsonObjectV2 =
 			}
 		}
 	]
-}` 
+}`
 
 const vcap_applicationV2 = `{"application_name": "test-application"}`
-const var_stringV2 = `test-12345` 
+const var_stringV2 = `test-12345`
 const credentialsV2 = `{"credentials": {
 		"username": "env-var-json-username"
 	}}`
@@ -63,25 +63,24 @@ func setEnvVariableV2() {
 	Initialize("server/config/v2/mappings.json")
 }
 
-
 func TestPlainTextFileV2(t *testing.T) {
 	setEnvVariableV2()
 	result := GetDictionary("var1").Get("file_var1")
 	if result.String() != "plain-text-string" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFileAndPathV2(t *testing.T){
+func TestJsonFileAndPathV2(t *testing.T) {
 	setEnvVariableV2()
-	pre_json := GetDictionary("var2" ).Get("file_var2").String()
+	pre_json := GetDictionary("var2").Get("file_var2").String()
 	testString := gjson.Parse(pre_json).Get("level2").String()
 	if testString != "12345" {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "12345")
 	}
 }
 
-func TestCFServiceCredentialsWithServiceInstanceV2(t *testing.T){
+func TestCFServiceCredentialsWithServiceInstanceV2(t *testing.T) {
 	setEnvVariableV2()
 	pre_json := GetDictionary("var1").Get("cf_var1").String()
 	testString := gjson.Parse(pre_json).Get("username").String()
@@ -90,29 +89,29 @@ func TestCFServiceCredentialsWithServiceInstanceV2(t *testing.T){
 	}
 }
 
-func TestReadVcapsWithJsonPathV2(t *testing.T){
+func TestReadVcapsWithJsonPathV2(t *testing.T) {
 	setEnvVariableV2()
 
 	result1 := GetDictionary("var2").Get("cf_var2").String()
 	if result1 != "service1-username1" {
-		 t.Errorf("can't read " + result1 + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result1 + " text from GetDictionary()")
+	}
 
 	result2 := GetDictionary("var3").Get("cf_var3").String()
 	if result2 != "test-application" {
-		 t.Errorf("can't read " + result2 + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result2 + " text from GetDictionary()")
+	}
 }
 
-func TestSimpleStringFromEnvVarV2(t *testing.T){
+func TestSimpleStringFromEnvVarV2(t *testing.T) {
 	setEnvVariableV2()
 	result := GetDictionary("env_var1").Get("value")
 	if result.String() != "test-12345" {
-		 t.Errorf("can't read " + result.String() + " text from GetDictionary()")
-	} 
+		t.Errorf("can't read " + result.String() + " text from GetDictionary()")
+	}
 }
 
-func TestJsonFromEnvVarV2(t *testing.T){
+func TestJsonFromEnvVarV2(t *testing.T) {
 	setEnvVariableV2()
 
 	testString := GetDictionary("env_var2").Get("credentials").Get("username").String()
@@ -121,7 +120,7 @@ func TestJsonFromEnvVarV2(t *testing.T){
 	}
 }
 
-func TestJsonPathFromEnvVarV2(t *testing.T){
+func TestJsonPathFromEnvVarV2(t *testing.T) {
 	setEnvVariableV2()
 
 	testString := GetDictionary("env_var3").Get("value").String()

From 1cc7a049edee8eadde05f8f8e07fbe44c8ffdf0a Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Wed, 25 Jul 2018 13:53:08 -0500
Subject: [PATCH 22/31] chore: fix rephrases

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 11ffb72..65a7a56 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # IBM Cloud Environment
 
-The `ibm-cloud-env-golang` package allows to abstract environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application could be environment-agnostic.
+The `ibm-cloud-env-golang` package allows for the abstraction of environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application can be environment-agnostic.
 
-The package allows to define an array of search patterns that will be executed one by one until required value is found.
+The module allows for an array of search patterns that will be executed one by one until required value is found.
 
 ### Installation
 

From 13324a1f60e2be1e9f96084363d29c0bf561eb95 Mon Sep 17 00:00:00 2001
From: Adam Brown <adamcbrown1997@gmail.com>
Date: Wed, 25 Jul 2018 14:39:49 -0500
Subject: [PATCH 23/31] chore: Replaced the term module with package

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 65a7a56..8685dac 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 The `ibm-cloud-env-golang` package allows for the abstraction of environment variables from various Cloud compute providers, such as, but not limited to, CloudFoundry and Kubernetes, so the application can be environment-agnostic.
 
-The module allows for an array of search patterns that will be executed one by one until required value is found.
+The package allows for an array of search patterns that will be executed one by one until required value is found.
 
 ### Installation
 
@@ -12,7 +12,7 @@ go get github.com/ibm-developer/ibm-cloud-env-golang
  
 ### Usage
 
-Create a JSON file containing your mappings and initialize the module
+Create a JSON file containing your mappings and initialize the package
 
 ```golang
 import "github.com/ibm-developer/ibm-cloud-env-golang"
@@ -72,7 +72,7 @@ Following the above approach your application can be implemented in an runtime-e
 
 ### Filter the values for tags and labels
 
-In your application, you can filter credentials generated by the module based on service tags and service labels.
+In your application, you can filter credentials generated by the package based on service tags and service labels.
 
 ```golang
 filtered_credentials := IBMCloudEnv.GetCredentialsForService(tag, label, credentials) // returns a map of string to strings with credentials for specified service tag and label

From d143ea14f0fd20fef820213468fa225e1a0e753b Mon Sep 17 00:00:00 2001
From: Adam Brown <adamcbrown1997@gmail.com>
Date: Fri, 27 Jul 2018 13:35:08 -0500
Subject: [PATCH 24/31] Updated README.md with new user-provided pattern

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8685dac..31596de 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ ibm-cloud-config supports searching for values using four search pattern types -
 - Using `file` allows to search for values in text/json files
 
 #### Example search patterns
-- user-provided:service:name - searches through parsed VCAP_SERVICES environment variable and returns the value of the requested service name and credential
+- user-provided:service-instance-name:credential-key - searches through parsed VCAP_SERVICES environment variable and returns the value of the requested service name and credential
 - cloudfoundry:service-instance-name - searches through parsed VCAP_SERVICES environment variable and returns the `credentials` object of the matching service instance name
 - cloudfoundry:$.JSONPath - searches through parsed VCAP_SERVICES and VCAP_APPLICATION environment variables and returns the value that corresponds to JSONPath
 - env:env-var-name - returns environment variable named "env-var-name"

From bf3df109a06c9bdf4e2e5d7205ed4a534bce3d57 Mon Sep 17 00:00:00 2001
From: Adam Brown <adamcbrown1997@gmail.com>
Date: Fri, 27 Jul 2018 13:37:03 -0500
Subject: [PATCH 25/31] Added copyright to credentials.go

---
 credentials_test.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/credentials_test.go b/credentials_test.go
index 0f3de0c..3aa2e47 100644
--- a/credentials_test.go
+++ b/credentials_test.go
@@ -1,3 +1,19 @@
+/*
+* © Copyright IBM Corp. 2018
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package IBMCloudEnv
 
 import (

From 7c251b97cf2d81f11b3616d10df3ea9c89658545 Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Fri, 27 Jul 2018 14:38:25 -0500
Subject: [PATCH 26/31] chore: fixed copyright alignment

---
 credentials_test.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/credentials_test.go b/credentials_test.go
index 3aa2e47..bdde159 100644
--- a/credentials_test.go
+++ b/credentials_test.go
@@ -1,18 +1,18 @@
 /*
-* © Copyright IBM Corp. 2018
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * © Copyright IBM Corp. 2018
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package IBMCloudEnv
 

From df4ad28b518dce2e18d46903641372d9733e9be5 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 27 Jul 2018 14:42:48 -0500
Subject: [PATCH 27/31] fix: fixed alignment of filtered credentials

---
 credentials_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/credentials_test.go b/credentials_test.go
index bdde159..7cfecb2 100644
--- a/credentials_test.go
+++ b/credentials_test.go
@@ -21,13 +21,13 @@ import (
 )
 
 const service_credentials = `{
-  "tag_label_creds": "someOtherCreds",
-  "watson_discovery_password": "password",
-  "watson_conversation_password": "password",
-  "watson_conversation_url": "url",
-  "watson_conversation_username": "username",
-  "watson_conversation_api_key": "api_key",
-  "watson_conversation_apikey": "apikey"
+	"tag_label_creds": "someOtherCreds",
+	"watson_discovery_password": "password",
+	"watson_conversation_password": "password",
+	"watson_conversation_url": "url",
+	"watson_conversation_username": "username",
+	"watson_conversation_api_key": "api_key",
+	"watson_conversation_apikey": "apikey"
 }`
 
 var filtered_credentials map[string]string = map[string]string{

From d5a926dd0fe7cd343474aa7faf48559f147c9e86 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 27 Jul 2018 15:16:19 -0500
Subject: [PATCH 28/31] fix: added travis & fixed linting errors

---
 .travis.yml  |  44 ++++++
 Gopkg.lock   | 381 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 Gopkg.toml   |   5 +
 cloud_env.go |  22 +--
 4 files changed, 433 insertions(+), 19 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..91a093c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,44 @@
+# This is a weird way of telling Travis to use the fast container-based test
+# runner instead of the slow VM-based runner.
+sudo: false
+
+language: go
+
+# Only the last two Go releases are supported by the Go team with security
+# updates. Any older versions be considered deprecated. Don't bother testing
+# with them.
+go:
+  - "1.10.x"
+
+# Only clone the most recent commit.
+git:
+  depth: 1
+
+# Install dep & run dep ensure
+before_install:                                                                
+ - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh  
+ - dep ensure
+
+# Skip the install step. Don't `go get` dependencies. Only build with the code
+# in vendor/
+install: true
+
+# Don't email me the results of the test runs.
+notifications:
+  email: false
+
+# Anything in before_script that returns a nonzero exit code will flunk the
+# build and immediately stop. It's sorta like having set -e enabled in bash.
+# Make sure golangci-lint is vendored by running
+#   dep ensure -add github.com/golangci/golangci-lint/cmd/golangci-lint
+# ...and adding this to your Gopkg.toml file.
+#   required = ["github.com/golangci/golangci-lint/cmd/golangci-lint"]
+before_script:
+  - go install ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+
+# script always runs to completion (set +e). If we have linter issues AND a
+# failing test, we want to see both. Configure golangci-lint with a
+# .golangci.yml file at the top level of your repo.
+script:
+  - golangci-lint run       # run a bunch of code checkers/linters in parallel
+  - go test -v -race ./...  # Run all the tests with the race detector enabled
\ No newline at end of file
diff --git a/Gopkg.lock b/Gopkg.lock
index a095265..0499f08 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,18 +1,306 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  branch = "master"
+  name = "github.com/GoASTScanner/gas"
+  packages = [
+    ".",
+    "rules"
+  ]
+  revision = "a9de4d6c1589158e002cc336c495bf11fbf3ea06"
+  source = "github.com/golangci/gas"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/OpenPeeDeeP/depguard"
+  packages = ["."]
+  revision = "f2dff4f73566d1b9bd73f9bfd765030fbae5263a"
+
+[[projects]]
+  name = "github.com/client9/misspell"
+  packages = ["."]
+  revision = "b90dc15cfd220ecf8bbc9043ecb928cef381f011"
+  version = "v0.3.4"
+
+[[projects]]
+  name = "github.com/fatih/color"
+  packages = ["."]
+  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+  version = "v1.7.0"
+
+[[projects]]
+  name = "github.com/fsnotify/fsnotify"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  version = "v1.4.7"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = ["proto"]
+  revision = "636bf0302bc95575d69441b25a2603156ffdddf1"
+  version = "v1.1.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/check"
+  packages = [
+    "cmd/structcheck",
+    "cmd/varcheck"
+  ]
+  revision = "cfe4005ccda277a820149d44d6ededc400cc99a2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/go-misc"
+  packages = ["deadcode"]
+  revision = "927a3d87b613e9f6f0fb7ef8bb8de8b83c30a5a2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/goconst"
+  packages = ["."]
+  revision = "041c5f2b40f3dd334a4a6ee6a3f84ca3fc70680a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/gocyclo"
+  packages = ["pkg/gocyclo"]
+  revision = "0a533e8fa43d6605069e94f455bf9d79d4b8ea8c"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/gofmt"
+  packages = [
+    "gofmt",
+    "goimports"
+  ]
+  revision = "2076e05ced53480baa8ba14a05b80a415bec9377"
+
+[[projects]]
+  name = "github.com/golangci/golangci-lint"
+  packages = [
+    "cmd/golangci-lint",
+    "pkg/commands",
+    "pkg/config",
+    "pkg/exitcodes",
+    "pkg/fsutils",
+    "pkg/golinters",
+    "pkg/goutils",
+    "pkg/lint",
+    "pkg/lint/astcache",
+    "pkg/lint/linter",
+    "pkg/lint/lintersdb",
+    "pkg/logutils",
+    "pkg/packages",
+    "pkg/printers",
+    "pkg/report",
+    "pkg/result",
+    "pkg/result/processors",
+    "pkg/timeutils"
+  ]
+  revision = "1774bf22a26aa1203677a947092345d1e61e6e26"
+  version = "v1.9.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/govet"
+  packages = [
+    ".",
+    "lib/cfg",
+    "lib/whitelist"
+  ]
+  revision = "54e733a64097854cf4d8fa80ccf48012a487ae1a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/ineffassign"
+  packages = ["."]
+  revision = "7b41b0f84881918dab3c16c5e5148d8aa55d27b4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/lint-1"
+  packages = ["."]
+  revision = "4bf9709227d15e5f14c84a381e315a4695c4a372"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/maligned"
+  packages = ["."]
+  revision = "b1d89398deca2fd3f8578e5a9551e819bd01ca5f"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/prealloc"
+  packages = ["."]
+  revision = "215b22d4de21190b80ce05e7d8466677c1aa3223"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/revgrep"
+  packages = ["."]
+  revision = "8a5b4160227a907a1065f982c6943efca449d309"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golangci/unconvert"
+  packages = ["."]
+  revision = "28b1c447d1f4a810737ee6ab40ea6c1d0ceae4ad"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/hcl"
+  packages = [
+    ".",
+    "hcl/ast",
+    "hcl/parser",
+    "hcl/printer",
+    "hcl/scanner",
+    "hcl/strconv",
+    "hcl/token",
+    "json/parser",
+    "json/scanner",
+    "json/token"
+  ]
+  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kisielk/errcheck"
+  packages = [
+    "golangci",
+    "internal/errcheck"
+  ]
+  revision = "46cecd339393da3e3742fc0045eb5e5ec0dd6563"
+  source = "github.com/golangci/errcheck"
+
+[[projects]]
+  name = "github.com/kisielk/gotool"
+  packages = [
+    ".",
+    "internal/load"
+  ]
+  revision = "80517062f582ea3340cd4baf70e86d539ae7d84d"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/magiconair/properties"
+  packages = ["."]
+  revision = "c2353362d570a7bfa228149c62842019201cfb71"
+  version = "v1.8.0"
+
+[[projects]]
+  name = "github.com/mattn/go-colorable"
+  packages = ["."]
+  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
+  version = "v0.0.9"
+
+[[projects]]
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+  version = "v0.0.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mibk/dupl"
+  packages = [
+    ".",
+    "job",
+    "printer",
+    "suffixtree",
+    "syntax",
+    "syntax/golang"
+  ]
+  revision = "53b9af5a45362a6f2896cfa39cc17d17ba9667ea"
+  source = "github.com/golangci/dupl"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"
+
+[[projects]]
+  name = "github.com/nbutton23/zxcvbn-go"
+  packages = [
+    ".",
+    "adjacency",
+    "data",
+    "entropy",
+    "frequency",
+    "match",
+    "matching",
+    "scoring",
+    "utils/math"
+  ]
+  revision = "eafdab6b0663b4b528c35975c8b0e78be6e25261"
+  version = "v0.1"
+
 [[projects]]
   branch = "master"
   name = "github.com/oliveagle/jsonpath"
   packages = ["."]
   revision = "2e52cf6e685269ed8aefec6390f3cac3ef74e730"
 
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
+  version = "v1.2.0"
+
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
   revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
   version = "v1.0.6"
 
+[[projects]]
+  name = "github.com/spf13/afero"
+  packages = [
+    ".",
+    "mem"
+  ]
+  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/spf13/cast"
+  packages = ["."]
+  revision = "8965335b8c7107321228e3e3702cab9832751bac"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/spf13/cobra"
+  packages = ["."]
+  revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+  version = "v0.0.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/jwalterweatherman"
+  packages = ["."]
+  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "github.com/spf13/viper"
+  packages = ["."]
+  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+  version = "v1.0.2"
+
 [[projects]]
   name = "github.com/tidwall/gjson"
   packages = ["."]
@@ -40,9 +328,100 @@
   ]
   revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "internal/gen",
+    "internal/triegen",
+    "internal/ucd",
+    "transform",
+    "unicode/cldr",
+    "unicode/norm",
+    "width"
+  ]
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/tools"
+  packages = [
+    "go/ast/astutil",
+    "go/buildutil",
+    "go/callgraph",
+    "go/callgraph/cha",
+    "go/callgraph/rta",
+    "go/callgraph/static",
+    "go/gcexportdata",
+    "go/internal/gcimporter",
+    "go/loader",
+    "go/ssa",
+    "go/ssa/ssautil",
+    "go/types/typeutil",
+    "imports",
+    "internal/fastwalk"
+  ]
+  revision = "10e39b9b093209d1d6c03acc2252a399ece6b112"
+  source = "github.com/golangci/tools"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
+
+[[projects]]
+  branch = "master"
+  name = "honnef.co/go/tools"
+  packages = [
+    "deprecated",
+    "functions",
+    "internal/sharedcheck",
+    "lint",
+    "lint/lintutil",
+    "simple",
+    "staticcheck",
+    "staticcheck/vrp",
+    "unused",
+    "version"
+  ]
+  revision = "986cd2acf8dbf500b75aef5636a8107de6044e63"
+  source = "github.com/golangci/go-tools"
+
+[[projects]]
+  branch = "master"
+  name = "mvdan.cc/interfacer"
+  packages = ["check"]
+  revision = "822e100dd73a2677e406ccc437efdb4a82e67033"
+
+[[projects]]
+  branch = "master"
+  name = "mvdan.cc/lint"
+  packages = ["."]
+  revision = "adc824a0674b99099789b6188a058d485eaf61c0"
+
+[[projects]]
+  branch = "fix-crash-on-nil-constant"
+  name = "mvdan.cc/unparam"
+  packages = ["check"]
+  revision = "f30d69ad8b55690d0e814cdd96e955834e0d0ee1"
+  source = "github.com/golangci/unparam"
+
+[[projects]]
+  branch = "master"
+  name = "sourcegraph.com/sourcegraph/go-diff"
+  packages = ["diff"]
+  revision = "3f415a150aec0685cb81b73cc201e762e075006d"
+
+[[projects]]
+  branch = "master"
+  name = "sourcegraph.com/sqs/pbtypes"
+  packages = ["."]
+  revision = "d3ebe8f20ae404b082e57662738480545bc2ad3d"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "41f36e8b9555227845c3ccc6cabebac258114d897d7e71c38283f31ed4269e1e"
+  inputs-digest = "f2b45f26154da20c290d3d9f765afdf26ec1635c04677b8b1c32fcd353b7e628"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index ff7916d..1734596 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -24,6 +24,7 @@
 #   go-tests = true
 #   unused-packages = true
 
+required = ["github.com/golangci/golangci-lint/cmd/golangci-lint"]
 
 [[constraint]]
   branch = "master"
@@ -40,3 +41,7 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/golangci/golangci-lint"
+  version = "1.9.1"
diff --git a/cloud_env.go b/cloud_env.go
index f20953f..c7e6419 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -34,19 +34,6 @@ const PREFIX_PATTERN_USER = "user-provided"
 
 var loadedMappings = make(map[string]interface{})
 
-func check(e error) {
-	if e != nil {
-		log.Error(e)
-	}
-}
-
-func strip_leading_slash(path string) string {
-	if (len(path) > 0) && (path[0] == '/' || path[0] == '\\') {
-		return path[1:]
-	}
-	return path
-}
-
 func Initialize(mappingsFilePath string) string {
 	json, err := ioutil.ReadFile(mappingsFilePath)
 	if err != nil {
@@ -125,16 +112,12 @@ func processSearchPattern(mappingName string, searchPattern string) (string, boo
 	switch patternComponents[0] {
 	case PREFIX_PATTERN_FILE:
 		value, OK = processFileSearchPattern(patternComponents)
-		break
 	case PREFIX_PATTERN_CF:
 		value, OK = processCFSearchPattern(patternComponents)
-		break
 	case PREFIX_PATTERN_ENV:
 		value, OK = processEnvSearchPattern(patternComponents)
-		break
 	case PREFIX_PATTERN_USER:
 		value, OK = processUserProvidedSearchPattern(patternComponents)
-		break
 	default:
 		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
 		return "", false
@@ -262,7 +245,10 @@ func deepSearch(current gjson.Result, search string) (string, bool) {
 
 func processJSONPath(jsonString string, jsonPath string) (string, bool) {
 	var json_data interface{}
-	json.Unmarshal([]byte(jsonString), &json_data)
+	err := json.Unmarshal([]byte(jsonString), &json_data)
+	if err != nil {
+		return "", false
+	} 
 	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
 	_, isMap := res.(map[string]interface{})
 	_, isArr := res.([]interface{})

From c11bd0ae8386055f97b296dca6ba05d267fd0f59 Mon Sep 17 00:00:00 2001
From: Sydney <sydney.ng@ibm.com>
Date: Fri, 27 Jul 2018 16:02:30 -0500
Subject: [PATCH 29/31] fix: removed travis comments

---
 .travis.yml | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91a093c..62d407b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,25 @@
-# This is a weird way of telling Travis to use the fast container-based test
-# runner instead of the slow VM-based runner.
 sudo: false
 
 language: go
 
-# Only the last two Go releases are supported by the Go team with security
-# updates. Any older versions be considered deprecated. Don't bother testing
-# with them.
 go:
   - "1.10.x"
 
-# Only clone the most recent commit.
 git:
   depth: 1
 
-# Install dep & run dep ensure
-before_install:                                                                
- - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh  
- - dep ensure
+before_install:
+  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh  
+  - dep ensure
 
-# Skip the install step. Don't `go get` dependencies. Only build with the code
-# in vendor/
 install: true
 
-# Don't email me the results of the test runs.
 notifications:
   email: false
 
-# Anything in before_script that returns a nonzero exit code will flunk the
-# build and immediately stop. It's sorta like having set -e enabled in bash.
-# Make sure golangci-lint is vendored by running
-#   dep ensure -add github.com/golangci/golangci-lint/cmd/golangci-lint
-# ...and adding this to your Gopkg.toml file.
-#   required = ["github.com/golangci/golangci-lint/cmd/golangci-lint"]
 before_script:
   - go install ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
 
-# script always runs to completion (set +e). If we have linter issues AND a
-# failing test, we want to see both. Configure golangci-lint with a
-# .golangci.yml file at the top level of your repo.
 script:
-  - golangci-lint run       # run a bunch of code checkers/linters in parallel
-  - go test -v -race ./...  # Run all the tests with the race detector enabled
\ No newline at end of file
+  - golangci-lint run
+  - go test -v -race ./...
\ No newline at end of file

From 80b6b7527aebf3f0e73af558ab90c6b05f674dfa Mon Sep 17 00:00:00 2001
From: sydney-ng <sydney.ng@yahoo.com>
Date: Fri, 27 Jul 2018 16:02:37 -0500
Subject: [PATCH 30/31] fix: add user provided for default unknown prefix

---
 cloud_env.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud_env.go b/cloud_env.go
index c7e6419..63a01f9 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -119,7 +119,7 @@ func processSearchPattern(mappingName string, searchPattern string) (string, boo
 	case PREFIX_PATTERN_USER:
 		value, OK = processUserProvidedSearchPattern(patternComponents)
 	default:
-		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: cloudfoundry, env, file")
+		log.Warnln("Unknown searchPattern prefix", patternComponents[0], "Supported prefixes: user-provided, cloudfoundry, env, file")
 		return "", false
 	}
 	if !OK {

From d1565dbbb3d419051ddc22bb828bbfe8baaab418 Mon Sep 17 00:00:00 2001
From: Adam Brown <Adam.C.Brown@ibm.com>
Date: Mon, 6 Aug 2018 12:23:00 -0500
Subject: [PATCH 31/31] fix: GetString properly fails when given a mapping
 variable that does not exist

---
 Gopkg.lock       | 33 ++++++++++++++++++++++++---------
 cloud_env.go     | 10 +++++++---
 mappings_test.go | 11 +++++++++++
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 0499f08..09c1d38 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -15,7 +15,7 @@
   branch = "master"
   name = "github.com/OpenPeeDeeP/depguard"
   packages = ["."]
-  revision = "f2dff4f73566d1b9bd73f9bfd765030fbae5263a"
+  revision = "a69c782687b207067fa0e371408bb18f38e1355f"
 
 [[projects]]
   name = "github.com/client9/misspell"
@@ -35,6 +35,21 @@
   revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
   version = "v1.4.7"
 
+[[projects]]
+  name = "github.com/gobwas/glob"
+  packages = [
+    ".",
+    "compiler",
+    "match",
+    "syntax",
+    "syntax/ast",
+    "syntax/lexer",
+    "util/runes",
+    "util/strings"
+  ]
+  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+  version = "v0.2.3"
+
 [[projects]]
   name = "github.com/gogo/protobuf"
   packages = ["proto"]
@@ -99,8 +114,8 @@
     "pkg/result/processors",
     "pkg/timeutils"
   ]
-  revision = "1774bf22a26aa1203677a947092345d1e61e6e26"
-  version = "v1.9.1"
+  revision = "973c9fdfd8c3f4a633a1a8fd37ef3d2f0f733d54"
+  version = "v1.9.3"
 
 [[projects]]
   branch = "master"
@@ -110,7 +125,7 @@
     "lib/cfg",
     "lib/whitelist"
   ]
-  revision = "54e733a64097854cf4d8fa80ccf48012a487ae1a"
+  revision = "e3b43b6cb1916e0000f244f26ee752733e544429"
 
 [[projects]]
   branch = "master"
@@ -304,8 +319,8 @@
 [[projects]]
   name = "github.com/tidwall/gjson"
   packages = ["."]
-  revision = "f123b340873a0084cb27267eddd8ff615115fbff"
-  version = "v1.1.2"
+  revision = "1e3f6aeaa5bad08d777ea7807b279a07885dd8b2"
+  version = "v1.1.3"
 
 [[projects]]
   branch = "master"
@@ -317,7 +332,7 @@
   branch = "master"
   name = "golang.org/x/crypto"
   packages = ["ssh/terminal"]
-  revision = "c126467f60eb25f8f27e5a981f32a87e3965053f"
+  revision = "f792edd33d2c59a74c4d81e9b9a536e5301a8b83"
 
 [[projects]]
   branch = "master"
@@ -326,7 +341,7 @@
     "unix",
     "windows"
   ]
-  revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
+  revision = "34b17bdb430002e9db9ae7ddc8480b9fa05edc22"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -361,7 +376,7 @@
     "imports",
     "internal/fastwalk"
   ]
-  revision = "10e39b9b093209d1d6c03acc2252a399ece6b112"
+  revision = "1b5a18146dea803d40d194b191359600da91665a"
   source = "github.com/golangci/tools"
 
 [[projects]]
diff --git a/cloud_env.go b/cloud_env.go
index 63a01f9..2d27425 100644
--- a/cloud_env.go
+++ b/cloud_env.go
@@ -248,7 +248,7 @@ func processJSONPath(jsonString string, jsonPath string) (string, bool) {
 	err := json.Unmarshal([]byte(jsonString), &json_data)
 	if err != nil {
 		return "", false
-	} 
+	}
 	res, err := jsonpath.JsonPathLookup(json_data, jsonPath)
 	_, isMap := res.(map[string]interface{})
 	_, isArr := res.([]interface{})
@@ -282,12 +282,16 @@ func GetCredentialsForService(serviceTag, serviceLabel, credentials string) map[
 
 func GetString(name string) (string, bool) {
 	val, ok := loadedMappings[name]
+	if !ok {
+		return "", false
+	}
+
 	_, isStr := val.(string)
-	if ok && !isStr {
+	if !isStr {
 		bytes, _ := json.Marshal(val)
 		return string(bytes), true
 	}
-	return val.(string), ok
+	return val.(string), true
 }
 
 func GetDictionary(name string) gjson.Result {
diff --git a/mappings_test.go b/mappings_test.go
index bfd7c19..b7e20ad 100644
--- a/mappings_test.go
+++ b/mappings_test.go
@@ -149,3 +149,14 @@ func TestJsonPathFromEnvVar(t *testing.T) {
 		t.Errorf("Got: \t%s\n Wanted: \t%s\n", testString, "env-var-json-username")
 	}
 }
+
+func TestBadVars(t *testing.T) {
+	setEnvVariable()
+
+	for i := 1; i <= 4; i++ {
+		badStr, ok := GetString("bad_var" + string(i))
+		if badStr != "" || ok {
+			t.Errorf("Did not correctly fail bad string\n")
+		}
+	}
+}
