Merge pull request #1893 from artmello/enable_linters

kyaml: Enable Go linters (lll, stylecheck, unparam, whitespace)

cmd/config/cmd/cat.go

@@ -126,7 +126,7 @@ func (r *CatRunner) runE(c *cobra.Command, args []string) error {
 		Writer:                out,
 		KeepReaderAnnotations: r.KeepAnnotations,
 		WrappingKind:          r.WrapKind,
-		WrappingApiVersion:    r.WrapApiVersion,
+		WrappingAPIVersion:    r.WrapApiVersion,
 		FunctionConfig:        functionConfig,
 		Style:                 yaml.GetStyle(r.Styles...),
 	})

cmd/config/cmd/cmdwrap.go

@@ -134,7 +134,7 @@ func (r *WrapRunner) runE(c *cobra.Command, args []string) error {
 			KeepReaderAnnotations: true,
 			Writer:                c.OutOrStdout(),
 			WrappingKind:          kio.ResourceListKind,
-			WrappingApiVersion:    kio.ResourceListApiVersion}}}.Execute()
+			WrappingAPIVersion:    kio.ResourceListAPIVersion}}}.Execute()
 	if err != nil {
 		return err
 	}

cmd/config/cmd/cmdxargs.go

@@ -186,7 +186,7 @@ func (r *XArgsRunner) runE(c *cobra.Command, _ []string) error {
 			if version := rw.FunctionConfig.Field("apiVersion"); !yaml.IsFieldEmpty(version) {
 				version.Value.YNode().Value = r.WrapVersion
 			}
-			rw.WrappingApiVersion = r.WrapVersion
+			rw.WrappingAPIVersion = r.WrapVersion
 		}
 		return nil
 	}(); err != nil {

kyaml/.golangci.yml

@@ -16,7 +16,7 @@ linters:
     - dupl
     - errcheck
 #    - funlen
-#    - gochecknoinits
+    - gochecknoinits
 #    - goconst
 #    - gocritic
     - gocyclo
@@ -28,19 +28,19 @@ linters:
     - govet
     - ineffassign
     - interfacer
-#    - lll
+    - lll
     - misspell
     - nakedret
     - scopelint
     - staticcheck
     - structcheck
-#    - stylecheck
+    - stylecheck
     - typecheck
     - unconvert
-#    - unparam
+    - unparam
     - unused
     - varcheck
-#    - whitespace
+    - whitespace
 
 
 linters-settings:

kyaml/copyutil/copyutil_test.go

@@ -79,7 +79,6 @@ func TestDiff_additionalDestFiles(t *testing.T) {
 	diff, err := Diff(s, d)
 	assert.NoError(t, err)
 	assert.ElementsMatch(t, diff.List(), []string{"a2"})
-
 }
 
 // TestDiff_srcDestContentsDiffer verifies if the file contents

kyaml/kio/byteio_reader.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	ResourceListKind       = "ResourceList"
-	ResourceListApiVersion = "config.kubernetes.io/v1alpha1"
+	ResourceListAPIVersion = "config.kubernetes.io/v1alpha1"
 )
 
 // ByteReadWriter reads from an input and writes to an output.
@@ -41,7 +41,7 @@ type ByteReadWriter struct {
 
 	FunctionConfig *yaml.RNode
 
-	WrappingApiVersion string
+	WrappingAPIVersion string
 	WrappingKind       string
 }
 
@@ -52,7 +52,7 @@ func (rw *ByteReadWriter) Read() ([]*yaml.RNode, error) {
 	}
 	val, err := b.Read()
 	rw.FunctionConfig = b.FunctionConfig
-	rw.WrappingApiVersion = b.WrappingApiVersion
+	rw.WrappingAPIVersion = b.WrappingAPIVersion
 	rw.WrappingKind = b.WrappingKind
 	return val, errors.Wrap(err)
 }
@@ -63,7 +63,7 @@ func (rw *ByteReadWriter) Write(nodes []*yaml.RNode) error {
 		KeepReaderAnnotations: rw.KeepReaderAnnotations,
 		Style:                 rw.Style,
 		FunctionConfig:        rw.FunctionConfig,
-		WrappingApiVersion:    rw.WrappingApiVersion,
+		WrappingAPIVersion:    rw.WrappingAPIVersion,
 		WrappingKind:          rw.WrappingKind,
 	}.Write(nodes)
 }
@@ -88,9 +88,9 @@ type ByteReader struct {
 	// DisableUnwrapping prevents Resources in Lists and ResourceLists from being unwrapped
 	DisableUnwrapping bool
 
-	// WrappingApiVersion is set by Read(), and is the apiVersion of the object that
+	// WrappingAPIVersion is set by Read(), and is the apiVersion of the object that
 	// the read objects were originally wrapped in.
-	WrappingApiVersion string
+	WrappingAPIVersion string
 
 	// WrappingKind is set by Read(), and is the kind of the object that
 	// the read objects were originally wrapped in.
@@ -138,9 +138,8 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
 			len(values) == 1 && // Only unwrap if there is only 1 value
 			(meta.Kind == ResourceListKind || meta.Kind == "List") &&
 			node.Field("items") != nil {
-
 			r.WrappingKind = meta.Kind
-			r.WrappingApiVersion = meta.ApiVersion
+			r.WrappingAPIVersion = meta.APIVersion
 
 			// unwrap the list
 			fc := node.Field("functionConfig")
@@ -154,7 +153,6 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
 					// add items
 					output = append(output, yaml.NewRNode(items.Value.Content()[i]))
 				}
-
 			}
 			continue
 		}

kyaml/kio/byteio_reader_test.go

@@ -86,8 +86,7 @@ elems:
 `, r.FunctionConfig.MustString())
 
 	assert.Equal(t, ResourceListKind, r.WrappingKind)
-	assert.Equal(t, ResourceListApiVersion, r.WrappingApiVersion)
+	assert.Equal(t, ResourceListAPIVersion, r.WrappingAPIVersion)
-
 }
 
 func TestByteReader_Read_wrappedList(t *testing.T) {
@@ -131,7 +130,7 @@ spec:
 	// verify the function config
 	assert.Nil(t, r.FunctionConfig)
 	assert.Equal(t, "List", r.WrappingKind)
-	assert.Equal(t, "v1", r.WrappingApiVersion)
+	assert.Equal(t, "v1", r.WrappingAPIVersion)
 }
 
 // TestByteReader_Read tests the default Read behavior

kyaml/kio/byteio_writer.go

@@ -35,8 +35,8 @@ type ByteWriter struct {
 	// ByteWriter will wrap the Resources in a List .items field.
 	WrappingKind string
 
-	// WrappingApiVersion is the apiVersion for WrappingKind
+	// WrappingAPIVersion is the apiVersion for WrappingKind
-	WrappingApiVersion string
+	WrappingAPIVersion string
 
 	// Sort if set, will cause ByteWriter to sort the the nodes before writing them.
 	Sort bool
@@ -54,7 +54,6 @@ func (w ByteWriter) Write(nodes []*yaml.RNode) error {
 	encoder := yaml.NewEncoder(w.Writer)
 	defer encoder.Close()
 	for i := range nodes {
-
 		// clean resources by removing annotations set by the Reader
 		if !w.KeepReaderAnnotations {
 			_, err := nodes[i].Pipe(yaml.ClearAnnotation(kioutil.IndexAnnotation))
@@ -102,7 +101,7 @@ func (w ByteWriter) Write(nodes []*yaml.RNode) error {
 		Style: w.Style,
 		Content: []*yaml.Node{
 			{Kind: yaml.ScalarNode, Value: "apiVersion"},
-			{Kind: yaml.ScalarNode, Value: w.WrappingApiVersion},
+			{Kind: yaml.ScalarNode, Value: w.WrappingAPIVersion},
 			{Kind: yaml.ScalarNode, Value: "kind"},
 			{Kind: yaml.ScalarNode, Value: w.WrappingKind},
 			{Kind: yaml.ScalarNode, Value: "items"}, items,

kyaml/kio/byteio_writer_test.go

@@ -40,7 +40,7 @@ g:
 		Writer:             buff,
 		FunctionConfig:     node3,
 		WrappingKind:       ResourceListKind,
-		WrappingApiVersion: ResourceListApiVersion}.
+		WrappingAPIVersion: ResourceListAPIVersion}.
 		Write([]*yaml.RNode{node2, node1})
 	if !assert.NoError(t, err) {
 		return

kyaml/kio/filters/container.go

@@ -78,7 +78,7 @@ func (c *ContainerFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 
 	// write the input
 	err = kio.ByteWriter{
-		WrappingApiVersion: kio.ResourceListApiVersion,
+		WrappingAPIVersion: kio.ResourceListAPIVersion,
 		WrappingKind:       kio.ResourceListKind,
 		Writer:             in, KeepReaderAnnotations: true, FunctionConfig: c.Config}.Write(input)
 	if err != nil {
@@ -133,7 +133,6 @@ func (c *ContainerFilter) getArgs() []string {
 		args = append(args, "-e", strings.Split(pair, "=")[0])
 	}
 	return append(args, c.Image)
-
 }
 
 // getCommand returns a command which will apply the GrepFilter using the container image

kyaml/kio/filters/fmtr_test.go

@@ -145,7 +145,6 @@ spec:
 
 // TestFormatInput_service verifies a Service yaml is formatted correctly
 func TestFormatInput_service(t *testing.T) {
-
 	y := `
 apiVersion: v1
 kind: Service
@@ -178,7 +177,6 @@ spec:
 
 // TestFormatInput_service verifies a Service yaml is formatted correctly
 func TestFormatInput_validatingWebhookConfiguration(t *testing.T) {
-
 	y := `
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
@@ -459,7 +457,7 @@ func TestFormatFileOrDirectory_YamlExtFileWithJson(t *testing.T) {
 	f, err := ioutil.TempFile("", "yamlfmt*.yaml")
 	assert.NoError(t, err)
 	defer os.Remove(f.Name())
-	err = ioutil.WriteFile(f.Name(), testyaml.UnformattedJson1, 0600)
+	err = ioutil.WriteFile(f.Name(), testyaml.UnformattedJSON1, 0600)
 	assert.NoError(t, err)
 
 	// format the file

kyaml/kio/filters/merge.go

@@ -44,7 +44,7 @@ func (c MergeFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 			return nil, err
 		}
 		key := mergeKey{
-			apiVersion: meta.ApiVersion,
+			apiVersion: meta.APIVersion,
 			kind:       meta.Kind,
 			namespace:  meta.Namespace,
 			name:       meta.Name,

kyaml/kio/filters/merge3.go

@@ -113,7 +113,7 @@ func (ts *tuples) add(node *yaml.RNode) error {
 	for i := range ts.list {
 		t := ts.list[i]
 		if t.meta.Name == nodeMeta.Name && t.meta.Namespace == nodeMeta.Namespace &&
-			t.meta.ApiVersion == nodeMeta.ApiVersion && t.meta.Kind == nodeMeta.Kind {
+			t.meta.APIVersion == nodeMeta.APIVersion && t.meta.Kind == nodeMeta.Kind {
 			return t.add(node)
 		}
 	}

kyaml/kio/filters/testyaml/testyaml.go

@@ -27,7 +27,7 @@ apiVersion: example.com/v1beta1
 kind: MyType2
 `)
 
-var UnformattedJson1 = []byte(`
+var UnformattedJSON1 = []byte(`
 {
   "spec": "a",
   "status": {"conditions": [3, 1, 2]},

kyaml/kio/pkgio_reader.go

@@ -229,7 +229,7 @@ func (r LocalPackageReader) Read() ([]*yaml.RNode, error) {
 }
 
 // readFile reads the ResourceNodes from a file
-func (r *LocalPackageReader) readFile(path string, info os.FileInfo) ([]*yaml.RNode, error) {
+func (r *LocalPackageReader) readFile(path string, _ os.FileInfo) ([]*yaml.RNode, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -258,7 +258,7 @@ func (r *LocalPackageReader) shouldSkipFile(info os.FileInfo) (bool, error) {
 }
 
 // initReaderAnnotations adds the LocalPackageReader Annotations to r.SetAnnotations
-func (r *LocalPackageReader) initReaderAnnotations(path string, info os.FileInfo) {
+func (r *LocalPackageReader) initReaderAnnotations(path string, _ os.FileInfo) {
 	if r.SetAnnotations == nil {
 		r.SetAnnotations = map[string]string{}
 	}

kyaml/kio/pkgio_reader_test.go

@@ -79,7 +79,6 @@ func TestLocalPackageReader_Read_empty(t *testing.T) {
 		assert.Contains(t, err.Error(), "must specify package path")
 	}
 	assert.Nil(t, nodes)
-
 }
 
 func TestLocalPackageReader_Read_pkg(t *testing.T) {
@@ -207,7 +206,6 @@ func TestLocalPackageReader_Read_pkgOmitAnnotations(t *testing.T) {
 		{path: s.root},
 	}
 	for _, p := range paths {
-
 		// empty path
 		rfr := LocalPackageReader{PackagePath: p.path, OmitReaderAnnotations: true}
 		nodes, err := rfr.Read()

kyaml/kio/pkgio_writer.go

@@ -128,7 +128,6 @@ func (r LocalPackageWriter) errorIfMissingRequiredAnnotation(nodes []*yaml.RNode
 }
 
 func (r LocalPackageWriter) indexByFilePath(nodes []*yaml.RNode) (map[string][]*yaml.RNode, error) {
-
 	outputFiles := map[string][]*yaml.RNode{}
 	for i := range nodes {
 		// parse the file write path

kyaml/kio/tree.go

@@ -285,8 +285,8 @@ func compareNodes(i, j *yaml.RNode) bool {
 	}
 
 	// compare apiVersion
-	if metai.ApiVersion != metaj.ApiVersion {
+	if metai.APIVersion != metaj.APIVersion {
-		return metai.ApiVersion < metaj.ApiVersion
+		return metai.APIVersion < metaj.APIVersion
 	}
 	return true
 }

kyaml/yaml/example_test.go

@@ -872,7 +872,6 @@ func ExampleRNode_Elements() {
 	// Element: 2
 	// name: baz
 	// args: ['run.sh']
-
 }
 
 func ExampleRNode_ElementValues() {

kyaml/yaml/fns.go

@@ -129,7 +129,6 @@ func (c FieldClearer) Filter(rn *RNode) (*RNode, error) {
 	}
 
 	for i := 0; i < len(rn.Content()); i += 2 {
-
 		// if name matches, remove these 2 elements from the list because
 		// they are treated as a fieldName/fieldValue pair.
 		if rn.Content()[i].Value == c.Name {

kyaml/yaml/fns_test.go

@@ -143,7 +143,6 @@ r: s
 `
 
 func TestLookup_Fn_create(t *testing.T) {
-
 	// primitive
 	node, err := Parse(s)
 	assert.NoError(t, err)
@@ -167,7 +166,6 @@ r: s
 `, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `h
 `, assertNoErrorString(t)(rn.String()))
-
 }
 
 func TestLookup_Fn_create2(t *testing.T) {
@@ -442,7 +440,6 @@ foo: baz
 	assert.Contains(t, err.Error(), "wrong Node Kind")
 	assert.Equal(t, `foo: baz
 `, assertNoErrorString(t)(node.String()))
-
 }
 
 func TestErrorIfInvalid(t *testing.T) {
@@ -675,7 +672,7 @@ metadata:
 	}
 	assert.Equal(t, ResourceMeta{
 		Kind:       "Deployment",
-		ApiVersion: "v1/apps",
+		APIVersion: "v1/apps",
 		ObjectMeta: ObjectMeta{
 			Name:      "foo",
 			Namespace: "bar",

kyaml/yaml/match.go

@@ -104,7 +104,6 @@ func (p *PathMatcher) doField(rn *RNode) (*RNode, error) {
 
 // doSeq iterates over a sequence and appends elements matching the path regex to p.Val
 func (p *PathMatcher) doSeq(rn *RNode) (*RNode, error) {
-
 	// parse the field + match pair
 	var err error
 	p.field, p.matchRegex, err = SplitIndexNameValue(p.Path[0])

kyaml/yaml/merge3/visitor.go

@@ -135,7 +135,6 @@ func (m Visitor) getStrValues(nodes walk.Sources) (strValues, error) {
 		if err != nil {
 			return strValues{}, err
 		}
-
 	}
 	if nodes.Dest() != nil && nodes.Dest().YNode() != nil {
 		s := nodes.Dest().YNode().Style

kyaml/yaml/order.go

@@ -97,12 +97,11 @@ var WhitelistedListSortFields = map[string]string{
 }
 
 // FieldOrder indexes fields and maps them to relative precedence
-var FieldOrder map[string]int
+var FieldOrder = func() map[string]int {
-
-func init() {
 	// create an index of field orderings
-	FieldOrder = map[string]int{}
+	fo := map[string]int{}
 	for i, f := range fieldSortOrder {
-		FieldOrder[f] = i + 1
+		fo[f] = i + 1
 	}
-}
+	return fo
+}()

kyaml/yaml/types.go

@@ -221,8 +221,8 @@ func (m MapNodeSlice) Values() []*RNode {
 
 // ResourceMeta contains the metadata for a both Resource Type and Resource.
 type ResourceMeta struct {
-	// ApiVersion is the apiVersion field of a Resource
+	// APIVersion is the apiVersion field of a Resource
-	ApiVersion string `yaml:"apiVersion,omitempty"`
+	APIVersion string `yaml:"apiVersion,omitempty"`
 	// Kind is the kind field of a Resource
 	Kind string `yaml:"kind,omitempty"`
 	// ObjectMeta is the metadata field of a Resource

kyaml/yaml/walk/associative_sequence.go

@@ -12,7 +12,6 @@ import (
 )
 
 func (l *Walker) walkAssociativeSequence() (*yaml.RNode, error) {
-
 	// may require initializing the dest node
 	dest, err := l.Sources.setDestNode(l.VisitList(l.Sources, AssociativeList))
 	if dest == nil || err != nil {