From ff186e79c47f3077c461173fa3187fdcc803231a Mon Sep 17 00:00:00 2001 From: Shoshana Malfatto Date: Mon, 31 Jan 2022 08:51:09 -0800 Subject: [PATCH] don't change example tests --- api/filters/filtersutil/setters.go | 17 +++++------------ api/filters/labels/example_test.go | 3 --- api/filters/namespace/example_test.go | 6 +++--- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/api/filters/filtersutil/setters.go b/api/filters/filtersutil/setters.go index 7015a0cb7fd..a209f8d5984 100644 --- a/api/filters/filtersutil/setters.go +++ b/api/filters/filtersutil/setters.go @@ -8,20 +8,13 @@ import ( type SetFn func(*yaml.RNode) error // SetScalar returns a SetFn to set a scalar value -func SetScalar(value string) SetFn { - return func(node *yaml.RNode) error { - return node.PipeE(yaml.FieldSetter{StringValue: value}) - } -} - -// SetString returns a SetFn to set a string value -func SetString(value string) SetFn { +func SetScalar(value, tag string) SetFn { n := &yaml.Node{ Kind: yaml.ScalarNode, Value: value, - Tag: yaml.NodeTagString, + Tag: tag, } - if yaml.IsYaml1_1NonString(n) { + if tag == yaml.NodeTagString && yaml.IsYaml1_1NonString(n) { n.Style = yaml.DoubleQuotedStyle } return func(node *yaml.RNode) error { @@ -62,8 +55,8 @@ func (s *TrackableSetter) WithMutationTracker(callback func(key, value, tag stri // SetScalar returns a SetFn to set a scalar value // if a mutation tracker has been registered, the tracker will be invoked each // time a scalar is set -func (s TrackableSetter) SetScalar(value string) SetFn { - origSetScalar := SetScalar(value) +func (s TrackableSetter) SetScalar(value, tag string) SetFn { + origSetScalar := SetScalar(value, tag) return func(node *yaml.RNode) error { if s.setValueCallback != nil { s.setValueCallback("", value, "", node) diff --git a/api/filters/labels/example_test.go b/api/filters/labels/example_test.go index e9522e187d9..b419b281069 100644 --- a/api/filters/labels/example_test.go +++ b/api/filters/labels/example_test.go @@ -29,7 +29,6 @@ metadata: Filters: []kio.Filter{Filter{ Labels: map[string]string{ "foo": "bar", - "baz": "01234", }, FsSlice: fss, }}, @@ -45,7 +44,6 @@ metadata: // metadata: // name: instance // labels: - // baz: "01234" // foo: bar // --- // apiVersion: example.com/v1 @@ -53,6 +51,5 @@ metadata: // metadata: // name: instance // labels: - // baz: "01234" // foo: bar } diff --git a/api/filters/namespace/example_test.go b/api/filters/namespace/example_test.go index cf8019cba63..04afc314e29 100644 --- a/api/filters/namespace/example_test.go +++ b/api/filters/namespace/example_test.go @@ -28,7 +28,7 @@ metadata: name: instance namespace: bar `)}}, - Filters: []kio.Filter{namespace.Filter{Namespace: "01234", FsSlice: fss}}, + Filters: []kio.Filter{namespace.Filter{Namespace: "app", FsSlice: fss}}, Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}}, }.Execute() if err != nil { @@ -40,11 +40,11 @@ metadata: // kind: Foo // metadata: // name: instance - // namespace: "01234" + // namespace: app // --- // apiVersion: example.com/v1 // kind: Bar // metadata: // name: instance - // namespace: "01234" + // namespace: app }