Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Fix YTT processing for passwords with yaml special chars #4548

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix YTT processing for passwords with yaml special chars #4548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions tkg/yamlprocessor/ytt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"regexp"
"sort"
"strconv"
"strings"

"github.com/pkg/errors"
"gopkg.in/yaml.v3"
Expand Down Expand Up @@ -166,6 +167,7 @@ func (p *YTTProcessor) Process(rawArtifact []byte, variablesClient func(string)

// build out the data values for ytt
dataValues := make([]string, 0, len(variables))
stringValues := make([]string, 0, len(variables))
for _, vName := range variables {
vValue, err := variablesClient(vName)
if err != nil {
Expand All @@ -189,14 +191,17 @@ func (p *YTTProcessor) Process(rawArtifact []byte, variablesClient func(string)
}
}

if convertable {
if strings.Contains(strings.ToUpper(vName), "PASSWORD") {
stringValues = append(stringValues, fmt.Sprintf("%s=%s", vName, vValue))
} else if convertable {
dataValues = append(dataValues, fmt.Sprintf("%s=%s", vName, vValue))
} else {
dataValues = append(dataValues, fmt.Sprintf("%s=%q", vName, vValue))
}
}
dvf := template.DataValuesFlags{
KVsFromYAML: dataValues,
KVsFromStrings: stringValues,
KVsFromYAML: dataValues,
}

// add the data values as overlays to the ytt templates
Expand Down