kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2811 from monopole/moveToNewConstants

Browse Source 
Move to new constants.
This commit is contained in:
Jeff Regan
2020-08-07 12:21:02 -07:00
committed by jregan
parent 686e97f2fe 873c8c1d17
commit f211841035
11 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/filters/annotations/annotations.go
View File

@@ -30,9 +30,10 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
for _, k := range keys { for _, k := range keys {
if err := node.PipeE(fsslice.Filter{ if err := node.PipeE(fsslice.Filter{
FsSlice: f.FsSlice, FsSlice: f.FsSlice,
SetValue: filtersutil.SetEntry(k, f.Annotations[k], yaml.StringTag), SetValue: filtersutil.SetEntry(
k, f.Annotations[k], yaml.NodeTagString),
CreateKind: yaml.MappingNode, // Annotations are MappingNodes. CreateKind: yaml.MappingNode, // Annotations are MappingNodes.
CreateTag: "!!map", // TODO: change to yaml.NodeTagMap CreateTag: yaml.NodeTagMap,
}); err != nil { }); err != nil {
return nil, err return nil, err
} }

2
api/filters/filtersutil/setters.go
View File

@@ -21,7 +21,7 @@ func SetEntry(key, value, tag string) SetFn {
Value: value, Value: value,
Tag: tag, Tag: tag,
} }
if tag == yaml.StringTag && yaml.IsYaml1_1NonString(n) { if tag == yaml.NodeTagString && yaml.IsYaml1_1NonString(n) {
n.Style = yaml.DoubleQuotedStyle n.Style = yaml.DoubleQuotedStyle
} }
return func(node *yaml.RNode) error { return func(node *yaml.RNode) error {

5
api/filters/labels/labels.go
View File

@@ -31,9 +31,10 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
for _, k := range keys { for _, k := range keys {
if err := node.PipeE(fsslice.Filter{ if err := node.PipeE(fsslice.Filter{
FsSlice: f.FsSlice, FsSlice: f.FsSlice,
SetValue: filtersutil.SetEntry(k, f.Labels[k], yaml.StringTag), SetValue: filtersutil.SetEntry(
k, f.Labels[k], yaml.NodeTagString),
CreateKind: yaml.MappingNode, // Labels are MappingNodes. CreateKind: yaml.MappingNode, // Labels are MappingNodes.
CreateTag: "!!map", // TODO: change to yaml.NodeTagMap CreateTag: yaml.NodeTagMap,
}); err != nil { }); err != nil {
return nil, err return nil, err
} }

2
api/filters/namespace/namespace.go
View File

@@ -46,7 +46,7 @@ func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
FsSlice: ns.FsSlice, FsSlice: ns.FsSlice,
SetValue: filtersutil.SetScalar(ns.Namespace), SetValue: filtersutil.SetScalar(ns.Namespace),
CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
CreateTag: yaml.StringTag, CreateTag: yaml.NodeTagString,
}) })
return node, err return node, err
} }

2
api/filters/prefixsuffix/prefixsuffix.go
View File

@@ -32,7 +32,7 @@ func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
FieldSpec: f.FieldSpec, FieldSpec: f.FieldSpec,
SetValue: f.evaluateField, SetValue: f.evaluateField,
CreateKind: yaml.ScalarNode, // Name is a ScalarNode CreateKind: yaml.ScalarNode, // Name is a ScalarNode
CreateTag: yaml.StringTag, CreateTag: yaml.NodeTagString,
}) })
return node, err return node, err
} }

8
api/filters/refvar/refvar.go
View File

@@ -66,7 +66,7 @@ func updateNodeValue(node *yaml.Node, newValue interface{}) {
} }
func (f Filter) setScalar(node *yaml.RNode) error { 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 // Only process string values
return nil return nil
} }
@@ -78,10 +78,10 @@ func (f Filter) setScalar(node *yaml.RNode) error {
func (f Filter) setMap(node *yaml.RNode) error { func (f Filter) setMap(node *yaml.RNode) error {
contents := node.YNode().Content contents := node.YNode().Content
for i := 0; i < len(contents); i += 2 { 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) 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 // value is not a string
continue continue
} }
@@ -93,7 +93,7 @@ func (f Filter) setMap(node *yaml.RNode) error {
func (f Filter) setSeq(node *yaml.RNode) error { func (f Filter) setSeq(node *yaml.RNode) error {
for _, item := range node.YNode().Content { 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 // value is not a string
return fmt.Errorf("invalid value type expect a string") return fmt.Errorf("invalid value type expect a string")
} }

2
api/filters/replicacount/replicacount.go
View File

@@ -27,7 +27,7 @@ func (rc Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
FieldSpec: rc.FieldSpec, FieldSpec: rc.FieldSpec,
SetValue: rc.set, SetValue: rc.set,
CreateKind: yaml.ScalarNode, // replicas is a ScalarNode CreateKind: yaml.ScalarNode, // replicas is a ScalarNode
CreateTag: yaml.IntTag, // yaml.NodeTagInt CreateTag: yaml.NodeTagInt,
}) })
return node, err return node, err
} }

2
kyaml/kio/byteio_reader.go
View File

@@ -179,7 +179,7 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
func isEmptyDocument(node *yaml.Node) bool { func isEmptyDocument(node *yaml.Node) bool {
// node is a Document with no content -- e.g. "---\n---" // node is a Document with no content -- e.g. "---\n---"
return node.Kind == yaml.DocumentNode && return node.Kind == yaml.DocumentNode &&
node.Content[0].Tag == yaml.NullNodeTag node.Content[0].Tag == yaml.NodeTagNull
} }
func (r *ByteReader) decode(index int, decoder *yaml.Decoder) (*yaml.RNode, error) { func (r *ByteReader) decode(index int, decoder *yaml.Decoder) (*yaml.RNode, error) {

20
kyaml/yaml/types.go
View File

@@ -26,22 +26,16 @@ const (
NodeTagMap = "!!map" NodeTagMap = "!!map"
NodeTagSeq = "!!seq" NodeTagSeq = "!!seq"
NodeTagEmpty = "" NodeTagEmpty = ""
// TODO: deprecate these
NullNodeTag = NodeTagNull
StringTag = NodeTagString
BoolTag = NodeTagBool
IntTag = NodeTagInt
) )
// NullNode returns a RNode point represents a null; value // MakeNullNode returns an RNode that represents an empty document.
func NullNode() *RNode { func MakeNullNode() *RNode {
return NewRNode(&Node{Tag: NullNodeTag}) return NewRNode(&Node{Tag: NodeTagNull})
} }
// IsMissingOrNull returns true if the RNode is nil or contains and explicitly null value. // IsMissingOrNull returns true if the RNode is nil or contains and explicitly null value.
func IsMissingOrNull(node *RNode) bool { func IsMissingOrNull(node *RNode) bool {
return node == nil || node.YNode() == nil || node.YNode().Tag == NullNodeTag return node == nil || node.YNode() == nil || node.YNode().Tag == NodeTagNull
} }
// IsEmpty returns true if the RNode is MissingOrNull // IsEmpty returns true if the RNode is MissingOrNull
@@ -59,12 +53,12 @@ func IsEmptyMap(node *RNode) bool {
} }
func IsNull(node *RNode) bool { func IsNull(node *RNode) bool {
return node != nil && node.YNode() != nil && node.YNode().Tag == NullNodeTag return node != nil && node.YNode() != nil && node.YNode().Tag == NodeTagNull
} }
func IsFieldEmpty(node *MapNode) bool { func IsFieldEmpty(node *MapNode) bool {
if node == nil || node.Value == nil || node.Value.YNode() == nil || if node == nil || node.Value == nil || node.Value.YNode() == nil ||
node.Value.YNode().Tag == NullNodeTag { node.Value.YNode().Tag == NodeTagNull {
return true return true
} }
@@ -88,7 +82,7 @@ func GetValue(node *RNode) string {
func IsFieldNull(node *MapNode) bool { func IsFieldNull(node *MapNode) bool {
return node != nil && node.Value != nil && node.Value.YNode() != nil && return node != nil && node.Value != nil && node.Value.YNode() != nil &&
node.Value.YNode().Tag == NullNodeTag node.Value.YNode().Tag == NodeTagNull
} }
// Parser parses values into configuration. // Parser parses values into configuration.

2
kyaml/yaml/types_test.go
View File

@@ -180,7 +180,7 @@ func TestIsMissingOrNull(t *testing.T) {
t.Fatalf("input: valid node") t.Fatalf("input: valid node")
} }
// node with NullNodeTag // node with NullNodeTag
if !IsMissingOrNull(NullNode()) { if !IsMissingOrNull(MakeNullNode()) {
t.Fatalf("input: with NullNodeTag") t.Fatalf("input: with NullNodeTag")
} }
} }

8
plugin/builtin/patchstrategicmergetransformer/go.sum
View File

@@ -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-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 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-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-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-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/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.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= 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.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-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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-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.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 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/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/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= 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/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 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=