Skip to content
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

Fixed detecting full syntax variable override which includes type field #1775

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Fixed detecting full syntax variable override which includes type field #1775

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3e29ea
Fixed detecting full syntax variable override which includes type field
andrewnester Sep 17, 2024
0521385
add test
andrewnester Sep 18, 2024
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
21 changes: 18 additions & 3 deletions bundle/config/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,18 +409,33 @@ func (r *Root) MergeTargetOverrides(name string) error {
var variableKeywords = []string{"default", "lookup"}

// isFullVariableOverrideDef checks if the given value is a full syntax varaible override.
// A full syntax variable override is a map with only one of the following
// keys: "default", "lookup".
// A full syntax variable override is a map with either 1 of 2 keys.
// If it's 2 keys, the keys should be "default" and "type".
// If it's 1 key, the key should be one of the following keys: "default", "lookup".
func isFullVariableOverrideDef(v dyn.Value) bool {
mv, ok := v.AsMap()
if !ok {
return false
}

if mv.Len() != 1 {
// If the map has more than 2 keys, it is not a full variable override.
if mv.Len() > 2 {
return false
}

// If the map has 2 keys, one of them should be "default" and the other is "type"
if mv.Len() == 2 {
if _, ok := mv.GetByString("type"); !ok {
return false
}

if _, ok := mv.GetByString("default"); !ok {
return false
}

return true
}

for _, keyword := range variableKeywords {
if _, ok := mv.GetByString(keyword); ok {
return true
Expand Down
Loading