Merge pull request #5877 from tsuzu/fix-replacements-plugin-omitempty-field

fix: make private one field in replacements transformer struct that had a missing JSON tag
This commit is contained in:
Kubernetes Prow Robot
2025-04-03 01:50:37 -07:00
committed by GitHub
2 changed files with 10 additions and 10 deletions

View File

@@ -17,7 +17,7 @@ import (
// Replace values in targets with values from a source
type plugin struct {
ReplacementList []types.ReplacementField `json:"replacements,omitempty" yaml:"replacements,omitempty"`
Replacements []types.Replacement `json:"omitempty" yaml:"omitempty"`
replacements []types.Replacement
}
var KustomizePlugin plugin //nolint:gochecknoglobals
@@ -52,19 +52,19 @@ func (p *plugin) Config(
if err := yaml.Unmarshal(content, &repl); err != nil {
return err
}
p.Replacements = append(p.Replacements, repl...)
p.replacements = append(p.replacements, repl...)
case reflect.Map:
repl := types.Replacement{}
if err := yaml.Unmarshal(content, &repl); err != nil {
return err
}
p.Replacements = append(p.Replacements, repl)
p.replacements = append(p.replacements, repl)
default:
return fmt.Errorf("unsupported replacement type encountered within replacement path: %v", items.Kind())
}
} else {
// replacement information is already loaded
p.Replacements = append(p.Replacements, r.Replacement)
p.replacements = append(p.replacements, r.Replacement)
}
}
return nil
@@ -72,6 +72,6 @@ func (p *plugin) Config(
func (p *plugin) Transform(m resmap.ResMap) (err error) {
return m.ApplyFilter(replacement.Filter{
Replacements: p.Replacements,
Replacements: p.replacements,
})
}