Skip to content

JSON type can be bound to a package #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AkimitsuTosha wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JSON type can be bound to a package #1150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4838a2d
can safely compare
AkimitsuTosha May 7, 2022
fe3804d
Merge branch 'master' into can-safety-compare
May 10, 2022
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
10 changes: 8 additions & 2 deletions parsers/manifest_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,13 @@ func (dm *YAMLParser) composePackageInputs(projectInputs map[string]Parameter, r
}
// if value is set to default value for its type,
// check for input key being an env. variable itself
if value == getTypeDefaultValue(i.Type) {
if safeCompare(value, getTypeDefaultValue(i.Type)) {
value = wskenv.InterpolateStringWithEnvVar("${" + name + "}")
}

// if at this point, still value is set to default value of its type
// check if input key is defined under Project Inputs
if value == getTypeDefaultValue(i.Type) {
if safeCompare(value, getTypeDefaultValue(i.Type)) {
if i.Type == STRING && i.Value != nil {
n := wskenv.GetEnvVarName(i.Value.(string))
if v, ok := projectInputs[n]; ok {
Expand Down Expand Up @@ -1504,3 +1504,9 @@ func isGatewayBasePathValid(basePath string) bool {
}
return true
}

func safeCompare(a interface{}, b interface{}) bool {
aa, _ := json.Marshal(a)
bb, _ := json.Marshal(b)
return (string(aa) == string(bb))
}