diff --git a/api/internal/accumulator/expansion/expand.go b/api/filters/refvar/expand.go similarity index 99% rename from api/internal/accumulator/expansion/expand.go rename to api/filters/refvar/expand.go index aff2bdd59d..4cf5877bb2 100644 --- a/api/internal/accumulator/expansion/expand.go +++ b/api/filters/refvar/expand.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // Package expansion provides functions find and replace $(FOO) style variables in strings. -package expansion +package refvar import ( "bytes" diff --git a/api/internal/accumulator/expansion/expand_test.go b/api/filters/refvar/expand_test.go similarity index 98% rename from api/internal/accumulator/expansion/expand_test.go rename to api/filters/refvar/expand_test.go index 71eefbb20c..858507f0f3 100644 --- a/api/internal/accumulator/expansion/expand_test.go +++ b/api/filters/refvar/expand_test.go @@ -1,13 +1,13 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package expansion_test +package refvar_test import ( "fmt" "testing" - . "sigs.k8s.io/kustomize/api/internal/accumulator/expansion" + . "sigs.k8s.io/kustomize/api/filters/refvar" ) type expected struct { diff --git a/api/filters/refvar/refvar.go b/api/filters/refvar/refvar.go index 9614c53971..e7dbca22ae 100644 --- a/api/filters/refvar/refvar.go +++ b/api/filters/refvar/refvar.go @@ -8,8 +8,6 @@ import ( "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/yaml" - - expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion" ) // Filter updates $(VAR) style variables with values. @@ -69,7 +67,7 @@ func (f Filter) setScalar(node *yaml.RNode) error { if !yaml.IsYNodeString(node.YNode()) { return nil } - v := expansion2.Expand(node.YNode().Value, f.MappingFunc) + v := Expand(node.YNode().Value, f.MappingFunc) updateNodeValue(node.YNode(), v) return nil } @@ -85,7 +83,7 @@ func (f Filter) setMap(node *yaml.RNode) error { if !yaml.IsYNodeString(contents[i+1]) { continue } - newValue := expansion2.Expand(contents[i+1].Value, f.MappingFunc) + newValue := Expand(contents[i+1].Value, f.MappingFunc) updateNodeValue(contents[i+1], newValue) } return nil @@ -96,7 +94,7 @@ func (f Filter) setSeq(node *yaml.RNode) error { if !yaml.IsYNodeString(item) { return fmt.Errorf("invalid value type expect a string") } - newValue := expansion2.Expand(item.Value, f.MappingFunc) + newValue := Expand(item.Value, f.MappingFunc) updateNodeValue(item, newValue) } return nil diff --git a/api/filters/refvar/refvar_test.go b/api/filters/refvar/refvar_test.go index fdeed09826..120ffab1a7 100644 --- a/api/filters/refvar/refvar_test.go +++ b/api/filters/refvar/refvar_test.go @@ -1,11 +1,11 @@ -package refvar +package refvar_test import ( "strings" "testing" "github.com/stretchr/testify/assert" - expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion" + . "sigs.k8s.io/kustomize/api/filters/refvar" filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/yaml" @@ -35,7 +35,7 @@ metadata: spec: replicas: 5`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5), }), FieldSpec: types.FieldSpec{Path: "spec/replicas"}, @@ -57,7 +57,7 @@ metadata: spec: replicas: 1`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5), }), FieldSpec: types.FieldSpec{Path: "spec/replicas"}, @@ -79,7 +79,7 @@ metadata: spec: replicas: 1`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5), }), FieldSpec: types.FieldSpec{Path: "a/b/c"}, @@ -111,7 +111,7 @@ data: - false - 1.23`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "FOO": "foo", "BAR": "bar", "BOOL": false, @@ -142,7 +142,7 @@ data: BAZ: $(BAZ) PLUS: foo+bar`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "FOO": "foo", "BAR": "bar", }), @@ -181,7 +181,7 @@ data: SLICE: - $(FOO)`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "FOO": "foo", "BAR": "bar", }), @@ -204,7 +204,7 @@ metadata: data: FOO: null`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{}), + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{}), FieldSpec: types.FieldSpec{Path: "data/FOO"}, }, }, @@ -250,7 +250,7 @@ data: - false ' at path 'data/slice': invalid value type expect a string`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5), }), FieldSpec: types.FieldSpec{Path: "data/slice"}, @@ -274,7 +274,7 @@ data: 1: str ' at path 'data': invalid map key: value='1', tag='` + yaml.NodeTagInt + `'`, filter: Filter{ - MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ + MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{ "VAR": int64(5), }), FieldSpec: types.FieldSpec{Path: "data"}, diff --git a/api/go.sum b/api/go.sum index 226e3a721c..094a2fda90 100644 --- a/api/go.sum +++ b/api/go.sum @@ -599,6 +599,8 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= +sigs.k8s.io/kustomize v1.0.11 h1:Yb+6DDt9+aR2AvQApvUaKS/ugteeG4MPyoFeUHiPOjk= +sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= diff --git a/api/internal/accumulator/refvartransformer.go b/api/internal/accumulator/refvartransformer.go index 5a4da71be4..891dc370de 100644 --- a/api/internal/accumulator/refvartransformer.go +++ b/api/internal/accumulator/refvartransformer.go @@ -5,7 +5,6 @@ package accumulator import ( "sigs.k8s.io/kustomize/api/filters/refvar" - expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" ) @@ -44,7 +43,7 @@ func (rv *refVarTransformer) UnusedVars() []string { // Transform replaces $(VAR) style variables with values. func (rv *refVarTransformer) Transform(m resmap.ResMap) error { rv.replacementCounts = make(map[string]int) - rv.mappingFunc = expansion2.MappingFuncFor( + rv.mappingFunc = refvar.MappingFuncFor( rv.replacementCounts, rv.varMap) for _, res := range m.Resources() { for _, fieldSpec := range rv.fieldSpecs {