From e3f03493193e8e047dd94f02ab833d74d7bc4acf Mon Sep 17 00:00:00 2001 From: Tsuzu <8574909+tsuzu@users.noreply.github.com> Date: Wed, 19 Mar 2025 04:23:13 +0900 Subject: [PATCH] Make replacements private --- api/internal/builtins/ReplacementTransformer.go | 10 +++++----- .../replacementtransformer/ReplacementTransformer.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/internal/builtins/ReplacementTransformer.go b/api/internal/builtins/ReplacementTransformer.go index 02cb1927a..ef0c93212 100644 --- a/api/internal/builtins/ReplacementTransformer.go +++ b/api/internal/builtins/ReplacementTransformer.go @@ -16,7 +16,7 @@ import ( // Replace values in targets with values from a source type ReplacementTransformerPlugin struct { ReplacementList []types.ReplacementField `json:"replacements,omitempty" yaml:"replacements,omitempty"` - Replacements []types.Replacement `json:"omitempty" yaml:"omitempty"` + replacements []types.Replacement } func (p *ReplacementTransformerPlugin) Config( @@ -49,19 +49,19 @@ func (p *ReplacementTransformerPlugin) 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 @@ -69,7 +69,7 @@ func (p *ReplacementTransformerPlugin) Config( func (p *ReplacementTransformerPlugin) Transform(m resmap.ResMap) (err error) { return m.ApplyFilter(replacement.Filter{ - Replacements: p.Replacements, + Replacements: p.replacements, }) } diff --git a/plugin/builtin/replacementtransformer/ReplacementTransformer.go b/plugin/builtin/replacementtransformer/ReplacementTransformer.go index 90db9590f..34831cd56 100644 --- a/plugin/builtin/replacementtransformer/ReplacementTransformer.go +++ b/plugin/builtin/replacementtransformer/ReplacementTransformer.go @@ -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, }) }