Move repeated variable content to constants following linter suggestion

This commit is contained in:
Arthur Mello
2019-12-07 18:45:37 -03:00
parent f0779cd02f
commit 0bace652c3
2 changed files with 29 additions and 49 deletions

View File

@@ -18,6 +18,18 @@ import (
"sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/kustomize/kyaml/yaml"
) )
const (
ValueReplacerYAMLData = `apiVersion: v1
kind: ValueReplacer
metadata:
configFn:
container:
image: gcr.io/example.com/image:version
stringMatch: Deployment
replace: StatefulSet
`
)
func TestRunFns_Execute(t *testing.T) { func TestRunFns_Execute(t *testing.T) {
instance := RunFns{} instance := RunFns{}
instance.init() instance.init()
@@ -57,17 +69,8 @@ func TestCmd_Execute(t *testing.T) {
} }
// write a test filter // write a test filter
f := `apiVersion: v1
kind: ValueReplacer
metadata:
configFn:
container:
image: gcr.io/example.com/image:version
stringMatch: Deployment
replace: StatefulSet
`
if !assert.NoError(t, ioutil.WriteFile( if !assert.NoError(t, ioutil.WriteFile(
filepath.Join(dir, "filter.yaml"), []byte(f), 0600)) { filepath.Join(dir, "filter.yaml"), []byte(ValueReplacerYAMLData), 0600)) {
return return
} }
@@ -126,21 +129,12 @@ func TestCmd_Execute_APIs(t *testing.T) {
} }
// write a test filter // write a test filter
f := `apiVersion: v1
kind: ValueReplacer
metadata:
configFn:
container:
image: gcr.io/example.com/image:version
stringMatch: Deployment
replace: StatefulSet
`
tmpF, err := ioutil.TempFile("", "filter*.yaml") tmpF, err := ioutil.TempFile("", "filter*.yaml")
if !assert.NoError(t, err) { if !assert.NoError(t, err) {
return return
} }
os.RemoveAll(tmpF.Name()) os.RemoveAll(tmpF.Name())
if !assert.NoError(t, ioutil.WriteFile(tmpF.Name(), []byte(f), 0600)) { if !assert.NoError(t, ioutil.WriteFile(tmpF.Name(), []byte(ValueReplacerYAMLData), 0600)) {
return return
} }
@@ -201,17 +195,8 @@ func TestCmd_Execute_Stdout(t *testing.T) {
} }
// write a test filter // write a test filter
f := `apiVersion: v1
kind: ValueReplacer
metadata:
configFn:
container:
image: gcr.io/example.com/image:version
stringMatch: Deployment
replace: StatefulSet
`
if !assert.NoError(t, ioutil.WriteFile( if !assert.NoError(t, ioutil.WriteFile(
filepath.Join(dir, "filter.yaml"), []byte(f), 0600)) { filepath.Join(dir, "filter.yaml"), []byte(ValueReplacerYAMLData), 0600)) {
return return
} }

View File

@@ -12,6 +12,13 @@ import (
. "sigs.k8s.io/kustomize/kyaml/yaml" . "sigs.k8s.io/kustomize/kyaml/yaml"
) )
const (
NodeSampleData = `n: o
a: b
c: d
`
)
func TestResourceNode_SetValue(t *testing.T) { func TestResourceNode_SetValue(t *testing.T) {
instance := *NewScalarRNode("foo") instance := *NewScalarRNode("foo")
copy := instance copy := instance
@@ -32,11 +39,7 @@ func TestResourceNode_SetValue(t *testing.T) {
} }
func TestAppend(t *testing.T) { func TestAppend(t *testing.T) {
s := `n: o node, err := Parse(NodeSampleData)
a: b
c: d
`
node, err := Parse(s)
assert.NoError(t, err) assert.NoError(t, err)
rn, err := node.Pipe(Append(NewScalarRNode("").YNode())) rn, err := node.Pipe(Append(NewScalarRNode("").YNode()))
if assert.Error(t, err) { if assert.Error(t, err) {
@@ -44,7 +47,7 @@ c: d
} }
assert.Nil(t, rn) assert.Nil(t, rn)
s = `- a s := `- a
- b - b
` `
node, err = Parse(s) node, err = Parse(s)
@@ -55,36 +58,28 @@ c: d
} }
func TestClearField_Fn(t *testing.T) { func TestClearField_Fn(t *testing.T) {
s := `n: o node, err := Parse(NodeSampleData)
a: b
c: d
`
node, err := Parse(s)
assert.NoError(t, err) assert.NoError(t, err)
rn, err := node.Pipe(FieldClearer{Name: "a"}) rn, err := node.Pipe(FieldClearer{Name: "a"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "n: o\nc: d\n", assertNoErrorString(t)(node.String())) assert.Equal(t, "n: o\nc: d\n", assertNoErrorString(t)(node.String()))
assert.Equal(t, "b\n", assertNoErrorString(t)(rn.String())) assert.Equal(t, "b\n", assertNoErrorString(t)(rn.String()))
s = `n: o node, err = Parse(NodeSampleData)
a: b
c: d
`
node, err = Parse(s)
assert.NoError(t, err) assert.NoError(t, err)
rn, err = node.Pipe(FieldClearer{Name: "n"}) rn, err = node.Pipe(FieldClearer{Name: "n"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "a: b\nc: d\n", assertNoErrorString(t)(node.String())) assert.Equal(t, "a: b\nc: d\n", assertNoErrorString(t)(node.String()))
assert.Equal(t, "o\n", assertNoErrorString(t)(rn.String())) assert.Equal(t, "o\n", assertNoErrorString(t)(rn.String()))
node, err = Parse(s) node, err = Parse(NodeSampleData)
assert.NoError(t, err) assert.NoError(t, err)
rn, err = node.Pipe(FieldClearer{Name: "c"}) rn, err = node.Pipe(FieldClearer{Name: "c"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "n: o\na: b\n", assertNoErrorString(t)(node.String())) assert.Equal(t, "n: o\na: b\n", assertNoErrorString(t)(node.String()))
assert.Equal(t, "d\n", assertNoErrorString(t)(rn.String())) assert.Equal(t, "d\n", assertNoErrorString(t)(rn.String()))
s = `n: o s := `n: o
a: b a: b
` `
node, err = Parse(s) node, err = Parse(s)