Merge pull request #1910 from artmello/enable_goconst

kyaml: Enable goconst Go Linter

kyaml/.golangci.yml

@@ -17,7 +17,7 @@ linters:
     - errcheck
 #    - funlen
     - gochecknoinits
-#    - goconst
+    - goconst
 #    - gocritic
     - gocyclo
     - gofmt

kyaml/runfn/runfn_test.go

@@ -18,6 +18,18 @@ import (
 	"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) {
 	instance := RunFns{}
 	instance.init()
@@ -28,7 +40,7 @@ kind:
 		return
 	}
 	filter := instance.containerFilterProvider("example.com:version", "", api)
-	defaultMount:= filters.StorageMount{}
+	defaultMount := filters.StorageMount{}
 	mounts := []filters.StorageMount{}
 	mounts = append(mounts, defaultMount)
 	assert.Equal(t, &filters.ContainerFilter{Image: "example.com:version", Config: api, StorageMounts: mounts}, filter)
@@ -57,17 +69,8 @@ func TestCmd_Execute(t *testing.T) {
 	}
 
 	// 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(
-		filepath.Join(dir, "filter.yaml"), []byte(f), 0600)) {
+		filepath.Join(dir, "filter.yaml"), []byte(ValueReplacerYAMLData), 0600)) {
 		return
 	}
 
@@ -126,21 +129,12 @@ func TestCmd_Execute_APIs(t *testing.T) {
 	}
 
 	// 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")
 	if !assert.NoError(t, err) {
 		return
 	}
 	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
 	}
 
@@ -201,17 +195,8 @@ func TestCmd_Execute_Stdout(t *testing.T) {
 	}
 
 	// 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(
-		filepath.Join(dir, "filter.yaml"), []byte(f), 0600)) {
+		filepath.Join(dir, "filter.yaml"), []byte(ValueReplacerYAMLData), 0600)) {
 		return
 	}
 

kyaml/yaml/fns_test.go

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