Skip to content

Commit 7372f97

Browse files
authored
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
2 parents dd08aec + e3f0349 commit 7372f97

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

api/internal/builtins/ReplacementTransformer.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/builtin/replacementtransformer/ReplacementTransformer.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
// Replace values in targets with values from a source
1818
type plugin struct {
1919
ReplacementList []types.ReplacementField `json:"replacements,omitempty" yaml:"replacements,omitempty"`
20-
Replacements []types.Replacement `json:"omitempty" yaml:"omitempty"`
20+
replacements []types.Replacement
2121
}
2222

2323
var KustomizePlugin plugin //nolint:gochecknoglobals
@@ -52,26 +52,26 @@ func (p *plugin) Config(
5252
if err := yaml.Unmarshal(content, &repl); err != nil {
5353
return err
5454
}
55-
p.Replacements = append(p.Replacements, repl...)
55+
p.replacements = append(p.replacements, repl...)
5656
case reflect.Map:
5757
repl := types.Replacement{}
5858
if err := yaml.Unmarshal(content, &repl); err != nil {
5959
return err
6060
}
61-
p.Replacements = append(p.Replacements, repl)
61+
p.replacements = append(p.replacements, repl)
6262
default:
6363
return fmt.Errorf("unsupported replacement type encountered within replacement path: %v", items.Kind())
6464
}
6565
} else {
6666
// replacement information is already loaded
67-
p.Replacements = append(p.Replacements, r.Replacement)
67+
p.replacements = append(p.replacements, r.Replacement)
6868
}
6969
}
7070
return nil
7171
}
7272

7373
func (p *plugin) Transform(m resmap.ResMap) (err error) {
7474
return m.ApplyFilter(replacement.Filter{
75-
Replacements: p.Replacements,
75+
Replacements: p.replacements,
7676
})
7777
}

0 commit comments

Comments
 (0)