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

Merge expansion package into refvar package.

Browse Source
This commit is contained in:
monopole
2021-01-16 13:50:07 -08:00
parent 62c5e424a6
commit 561cef1d5c
6 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/internal/accumulator/expansion/expand.go → api/filters/refvar/expand.go
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// Package expansion provides functions find and replace $(FOO) style variables in strings. // Package expansion provides functions find and replace $(FOO) style variables in strings.
package expansion package refvar
import ( import (
"bytes" "bytes"

4
api/internal/accumulator/expansion/expand_test.go → api/filters/refvar/expand_test.go
View File

@@ -1,13 +1,13 @@
// Copyright 2019 The Kubernetes Authors. // Copyright 2019 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
package expansion_test package refvar_test
import ( import (
"fmt" "fmt"
"testing" "testing"
. "sigs.k8s.io/kustomize/api/internal/accumulator/expansion" . "sigs.k8s.io/kustomize/api/filters/refvar"
) )
type expected struct { type expected struct {

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

@@ -8,8 +8,6 @@ import (
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/kustomize/kyaml/yaml"
expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
) )
// Filter updates $(VAR) style variables with values. // Filter updates $(VAR) style variables with values.
@@ -69,7 +67,7 @@ func (f Filter) setScalar(node *yaml.RNode) error {
if !yaml.IsYNodeString(node.YNode()) { if !yaml.IsYNodeString(node.YNode()) {
return nil return nil
} }
v := expansion2.Expand(node.YNode().Value, f.MappingFunc) v := Expand(node.YNode().Value, f.MappingFunc)
updateNodeValue(node.YNode(), v) updateNodeValue(node.YNode(), v)
return nil return nil
} }
@@ -85,7 +83,7 @@ func (f Filter) setMap(node *yaml.RNode) error {
if !yaml.IsYNodeString(contents[i+1]) { if !yaml.IsYNodeString(contents[i+1]) {
continue continue
} }
newValue := expansion2.Expand(contents[i+1].Value, f.MappingFunc) newValue := Expand(contents[i+1].Value, f.MappingFunc)
updateNodeValue(contents[i+1], newValue) updateNodeValue(contents[i+1], newValue)
} }
return nil return nil
@@ -96,7 +94,7 @@ func (f Filter) setSeq(node *yaml.RNode) error {
if !yaml.IsYNodeString(item) { if !yaml.IsYNodeString(item) {
return fmt.Errorf("invalid value type expect a string") 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) updateNodeValue(item, newValue)
} }
return nil return nil

22
api/filters/refvar/refvar_test.go
View File

@@ -1,11 +1,11 @@
package refvar package refvar_test
import ( import (
"strings" "strings"
"testing" "testing"
"github.com/stretchr/testify/assert" "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" filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/kustomize/kyaml/yaml"
@@ -35,7 +35,7 @@ metadata:
spec: spec:
replicas: 5`, replicas: 5`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"VAR": int64(5), "VAR": int64(5),
}), }),
FieldSpec: types.FieldSpec{Path: "spec/replicas"}, FieldSpec: types.FieldSpec{Path: "spec/replicas"},
@@ -57,7 +57,7 @@ metadata:
spec: spec:
replicas: 1`, replicas: 1`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"VAR": int64(5), "VAR": int64(5),
}), }),
FieldSpec: types.FieldSpec{Path: "spec/replicas"}, FieldSpec: types.FieldSpec{Path: "spec/replicas"},
@@ -79,7 +79,7 @@ metadata:
spec: spec:
replicas: 1`, replicas: 1`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"VAR": int64(5), "VAR": int64(5),
}), }),
FieldSpec: types.FieldSpec{Path: "a/b/c"}, FieldSpec: types.FieldSpec{Path: "a/b/c"},
@@ -111,7 +111,7 @@ data:
- false - false
- 1.23`, - 1.23`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"FOO": "foo", "FOO": "foo",
"BAR": "bar", "BAR": "bar",
"BOOL": false, "BOOL": false,
@@ -142,7 +142,7 @@ data:
BAZ: $(BAZ) BAZ: $(BAZ)
PLUS: foo+bar`, PLUS: foo+bar`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"FOO": "foo", "FOO": "foo",
"BAR": "bar", "BAR": "bar",
}), }),
@@ -181,7 +181,7 @@ data:
SLICE: SLICE:
- $(FOO)`, - $(FOO)`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"FOO": "foo", "FOO": "foo",
"BAR": "bar", "BAR": "bar",
}), }),
@@ -204,7 +204,7 @@ metadata:
data: data:
FOO: null`, FOO: null`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{}), MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{}),
FieldSpec: types.FieldSpec{Path: "data/FOO"}, FieldSpec: types.FieldSpec{Path: "data/FOO"},
}, },
}, },
@@ -250,7 +250,7 @@ data:
- false - false
' at path 'data/slice': invalid value type expect a string`, ' at path 'data/slice': invalid value type expect a string`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"VAR": int64(5), "VAR": int64(5),
}), }),
FieldSpec: types.FieldSpec{Path: "data/slice"}, FieldSpec: types.FieldSpec{Path: "data/slice"},
@@ -274,7 +274,7 @@ data:
1: str 1: str
' at path 'data': invalid map key: value='1', tag='` + yaml.NodeTagInt + `'`, ' at path 'data': invalid map key: value='1', tag='` + yaml.NodeTagInt + `'`,
filter: Filter{ filter: Filter{
MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{ MappingFunc: MappingFuncFor(replacementCounts, map[string]interface{}{
"VAR": int64(5), "VAR": int64(5),
}), }),
FieldSpec: types.FieldSpec{Path: "data"}, FieldSpec: types.FieldSpec{Path: "data"},

2
api/go.sum
View File

@@ -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/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 h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4=
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 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/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.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=

3
api/internal/accumulator/refvartransformer.go
View File

@@ -5,7 +5,6 @@ package accumulator
import ( import (
"sigs.k8s.io/kustomize/api/filters/refvar" "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/resmap"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
) )
@@ -44,7 +43,7 @@ func (rv *refVarTransformer) UnusedVars() []string {
// Transform replaces $(VAR) style variables with values. // Transform replaces $(VAR) style variables with values.
func (rv *refVarTransformer) Transform(m resmap.ResMap) error { func (rv *refVarTransformer) Transform(m resmap.ResMap) error {
rv.replacementCounts = make(map[string]int) rv.replacementCounts = make(map[string]int)
rv.mappingFunc = expansion2.MappingFuncFor( rv.mappingFunc = refvar.MappingFuncFor(
rv.replacementCounts, rv.varMap) rv.replacementCounts, rv.varMap)
for _, res := range m.Resources() { for _, res := range m.Resources() {
for _, fieldSpec := range rv.fieldSpecs { for _, fieldSpec := range rv.fieldSpecs {