From 873c8c1d1780960b18907c09b5f374d700fda126 Mon Sep 17 00:00:00 2001 From: jregan Date: Fri, 7 Aug 2020 12:17:03 -0700 Subject: [PATCH] Move to new constants. --- api/filters/annotations/annotations.go | 7 ++++--- api/filters/filtersutil/setters.go | 2 +- api/filters/labels/labels.go | 7 ++++--- api/filters/namespace/namespace.go | 2 +- api/filters/prefixsuffix/prefixsuffix.go | 2 +- api/filters/refvar/refvar.go | 8 ++++---- api/filters/replicacount/replicacount.go | 2 +- plugin/builtin/patchstrategicmergetransformer/go.sum | 8 ++------ 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/api/filters/annotations/annotations.go b/api/filters/annotations/annotations.go index efa31419d..d54a8f41d 100644 --- a/api/filters/annotations/annotations.go +++ b/api/filters/annotations/annotations.go @@ -29,10 +29,11 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) { func(node *yaml.RNode) (*yaml.RNode, error) { for _, k := range keys { if err := node.PipeE(fsslice.Filter{ - FsSlice: f.FsSlice, - SetValue: filtersutil.SetEntry(k, f.Annotations[k], yaml.StringTag), + FsSlice: f.FsSlice, + SetValue: filtersutil.SetEntry( + k, f.Annotations[k], yaml.NodeTagString), CreateKind: yaml.MappingNode, // Annotations are MappingNodes. - CreateTag: "!!map", // TODO: change to yaml.NodeTagMap + CreateTag: yaml.NodeTagMap, }); err != nil { return nil, err } diff --git a/api/filters/filtersutil/setters.go b/api/filters/filtersutil/setters.go index 1785218b5..cc04afe89 100644 --- a/api/filters/filtersutil/setters.go +++ b/api/filters/filtersutil/setters.go @@ -21,7 +21,7 @@ func SetEntry(key, value, tag string) SetFn { Value: value, Tag: tag, } - if tag == yaml.StringTag && yaml.IsYaml1_1NonString(n) { + if tag == yaml.NodeTagString && yaml.IsYaml1_1NonString(n) { n.Style = yaml.DoubleQuotedStyle } return func(node *yaml.RNode) error { diff --git a/api/filters/labels/labels.go b/api/filters/labels/labels.go index 502f06e9e..802d966db 100644 --- a/api/filters/labels/labels.go +++ b/api/filters/labels/labels.go @@ -30,10 +30,11 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) { func(node *yaml.RNode) (*yaml.RNode, error) { for _, k := range keys { if err := node.PipeE(fsslice.Filter{ - FsSlice: f.FsSlice, - SetValue: filtersutil.SetEntry(k, f.Labels[k], yaml.StringTag), + FsSlice: f.FsSlice, + SetValue: filtersutil.SetEntry( + k, f.Labels[k], yaml.NodeTagString), CreateKind: yaml.MappingNode, // Labels are MappingNodes. - CreateTag: "!!map", // TODO: change to yaml.NodeTagMap + CreateTag: yaml.NodeTagMap, }); err != nil { return nil, err } diff --git a/api/filters/namespace/namespace.go b/api/filters/namespace/namespace.go index 6189529c1..259977e72 100644 --- a/api/filters/namespace/namespace.go +++ b/api/filters/namespace/namespace.go @@ -46,7 +46,7 @@ func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) { FsSlice: ns.FsSlice, SetValue: filtersutil.SetScalar(ns.Namespace), CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode - CreateTag: yaml.StringTag, + CreateTag: yaml.NodeTagString, }) return node, err } diff --git a/api/filters/prefixsuffix/prefixsuffix.go b/api/filters/prefixsuffix/prefixsuffix.go index 66fead2ba..4b4247d41 100644 --- a/api/filters/prefixsuffix/prefixsuffix.go +++ b/api/filters/prefixsuffix/prefixsuffix.go @@ -32,7 +32,7 @@ func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) { FieldSpec: f.FieldSpec, SetValue: f.evaluateField, CreateKind: yaml.ScalarNode, // Name is a ScalarNode - CreateTag: yaml.StringTag, + CreateTag: yaml.NodeTagString, }) return node, err } diff --git a/api/filters/refvar/refvar.go b/api/filters/refvar/refvar.go index 560fe77e0..516058b05 100644 --- a/api/filters/refvar/refvar.go +++ b/api/filters/refvar/refvar.go @@ -66,7 +66,7 @@ func updateNodeValue(node *yaml.Node, newValue interface{}) { } func (f Filter) setScalar(node *yaml.RNode) error { - if node.YNode().Kind != yaml.ScalarNode || node.YNode().Tag != yaml.StringTag { + if node.YNode().Kind != yaml.ScalarNode || node.YNode().Tag != yaml.NodeTagString { // Only process string values return nil } @@ -78,10 +78,10 @@ func (f Filter) setScalar(node *yaml.RNode) error { func (f Filter) setMap(node *yaml.RNode) error { contents := node.YNode().Content for i := 0; i < len(contents); i += 2 { - if contents[i].Kind != yaml.ScalarNode || contents[i].Tag != yaml.StringTag { + if contents[i].Kind != yaml.ScalarNode || contents[i].Tag != yaml.NodeTagString { return fmt.Errorf("invalid map key: %s, type: %s", contents[i].Value, contents[i].Tag) } - if contents[i+1].Kind != yaml.ScalarNode || contents[i+1].Tag != yaml.StringTag { + if contents[i+1].Kind != yaml.ScalarNode || contents[i+1].Tag != yaml.NodeTagString { // value is not a string continue } @@ -93,7 +93,7 @@ func (f Filter) setMap(node *yaml.RNode) error { func (f Filter) setSeq(node *yaml.RNode) error { for _, item := range node.YNode().Content { - if item.Kind != yaml.ScalarNode || item.Tag != yaml.StringTag { + if item.Kind != yaml.ScalarNode || item.Tag != yaml.NodeTagString { // value is not a string return fmt.Errorf("invalid value type expect a string") } diff --git a/api/filters/replicacount/replicacount.go b/api/filters/replicacount/replicacount.go index 31cba7be0..8a503966a 100644 --- a/api/filters/replicacount/replicacount.go +++ b/api/filters/replicacount/replicacount.go @@ -27,7 +27,7 @@ func (rc Filter) run(node *yaml.RNode) (*yaml.RNode, error) { FieldSpec: rc.FieldSpec, SetValue: rc.set, CreateKind: yaml.ScalarNode, // replicas is a ScalarNode - CreateTag: yaml.IntTag, // yaml.NodeTagInt + CreateTag: yaml.NodeTagInt, }) return node, err } diff --git a/plugin/builtin/patchstrategicmergetransformer/go.sum b/plugin/builtin/patchstrategicmergetransformer/go.sum index 277b5507c..a3f4c9b1d 100644 --- a/plugin/builtin/patchstrategicmergetransformer/go.sum +++ b/plugin/builtin/patchstrategicmergetransformer/go.sum @@ -411,8 +411,6 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -501,8 +499,8 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 h1:XZx7nhd5GMaZpmDaEHFVafUZC7ya0fuo7cSJ3UCKYmM= -gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo= +gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= @@ -523,8 +521,6 @@ k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= -sigs.k8s.io/kustomize/kyaml v0.4.2 h1:9/Tb90gnThv4vgUldZOLnrT+9Esdh7+Og2UIq024Ykg= -sigs.k8s.io/kustomize/kyaml v0.4.2/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=