jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2026-06-19 22:58:55 +02:00
Code Issues Releases Activity

fix replacement of credentials placeholders in extension files for cf-deploy (#3532)

Browse Source 
fix replacement of credentials placeholders in extension files for cf-deploy
This commit is contained in:
Marcus Holl
2022-02-11 09:36:19 +01:00
committed by GitHub
parent c888e21e6c
commit be10e14c88
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cloudFoundryDeploy.go
+1 -1
View File
@@ -739,7 +739,7 @@ func handleMtaExtensionCredentials(extFile string, credentials map[string]interf
missingCredentials = append(missingCredentials, credKey) missingCredentials = append(missingCredentials, credKey)
continue continue
} }
content = pattern.ReplaceAllString(content, cred) content = pattern.ReplaceAllLiteralString(content, cred)
updated = true updated = true
log.Entry().Debugf("Mta extension credentials handling: Placeholder '%s' has been replaced by credential denoted by '%s'/'%s' in file '%s'", name, credKey, toEnvVarKey(credKey), extFile) log.Entry().Debugf("Mta extension credentials handling: Placeholder '%s' has been replaced by credential denoted by '%s'/'%s' in file '%s'", name, credKey, toEnvVarKey(credKey), extFile)
} else { } else {
cmd/cloudFoundryDeploy_test.go
+7 -7
View File
@@ -1302,8 +1302,8 @@ func TestMtaExtensionCredentials(t *testing.T) {
_environ = func() []string { _environ = func() []string {
return []string{ return []string{
"MY_CRED_ENV_VAR1=******", "MY_CRED_ENV_VAR1=**$0****",
"MY_CRED_ENV_VAR2=++++++", "MY_CRED_ENV_VAR2=++$1++++",
} }
} }
@@ -1406,11 +1406,11 @@ func TestMtaExtensionCredentials(t *testing.T) {
assert.Fail(t, "Cannot read mta extension file: %v", e) assert.Fail(t, "Cannot read mta extension file: %v", e)
} }
content := string(b) content := string(b)
assert.Contains(t, content, "test-credentials1: \"******\"") assert.Contains(t, content, "test-credentials1: \"**$0****\"")
assert.Contains(t, content, "test-credentials2: \"++++++\"") assert.Contains(t, content, "test-credentials2: \"++$1++++\"")
assert.Contains(t, content, "test-credentials3: \"++++++\"") assert.Contains(t, content, "test-credentials3: \"++$1++++\"")
assert.Contains(t, content, "test-credentials4: \"++++++\"") assert.Contains(t, content, "test-credentials4: \"++$1++++\"")
assert.Contains(t, content, "test-credentials5: \"++++++\"") assert.Contains(t, content, "test-credentials5: \"++$1++++\"")
assert.True(t, updated) assert.True(t, updated)
assert.False(t, containsUnresolved) assert.False(t, containsUnresolved)