Skip to content

Commit

Permalink
don't change example tests
Browse files Browse the repository at this point in the history
  • Loading branch information
shanalily committed Jan 31, 2022
1 parent 500c00d commit ff186e7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
17 changes: 5 additions & 12 deletions api/filters/filtersutil/setters.go
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions api/filters/labels/example_test.go
Expand Up @@ -29,7 +29,6 @@ metadata:
Filters: []kio.Filter{Filter{
Labels: map[string]string{
"foo": "bar",
"baz": "01234",
},
FsSlice: fss,
}},
Expand All @@ -45,14 +44,12 @@ metadata:
// metadata:
// name: instance
// labels:
// baz: "01234"
// foo: bar
// ---
// apiVersion: example.com/v1
// kind: Bar
// metadata:
// name: instance
// labels:
// baz: "01234"
// foo: bar
}
6 changes: 3 additions & 3 deletions api/filters/namespace/example_test.go
Expand Up @@ -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 {
Expand All @@ -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
}

0 comments on commit ff186e7

Please sign in to comment.