From e568609d220e2b090c74adbd7b9e84777ac2fc95 Mon Sep 17 00:00:00 2001
From: Ken Sipe <kensipe@gmail.com>
Date: Wed, 4 Nov 2020 16:05:03 -0600
Subject: [PATCH] lint bump 1.32.2 (#1731)

Signed-off-by: Ken Sipe <kensipe@gmail.com>
---
 .golangci.yml                                 | 44 ++++++++++++-------
 Makefile                                      |  2 +-
 pkg/engine/renderer/enhancer_test.go          |  4 +-
 pkg/kudoctl/cmd/plan/plan_status_test.go      |  8 ++--
 .../verifier/template/verify_render_test.go   |  4 +-
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 5f1bcf059..93aad452d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,22 +1,30 @@
 linters:
   auto-fix: false
   enable:
-    - errcheck
-    - goimports
-    - golint
-    - gosec
-    - misspell
-    - scopelint
-    - unconvert
-    - unparam
-    - interfacer
-    - nakedret
-    - gocyclo
-    - dupl
-    - goconst
-    - lll
-    - stylecheck
+  - deadcode
+  - dupl
+  - errcheck
+  - goconst
+  - gocyclo
+  - gofmt
+  - goimports
+  - golint
+  - gosec
+  - gosimple
+  - ineffassign
+  - lll
+  - misspell
+  - nakedret
+  - scopelint
+  - staticcheck
+  - structcheck
+  - stylecheck
+  - unconvert
+  - unparam
+  - unused
+  - varcheck
 run:
+  timeout: 3m
   build-tags:
     - integration
   skip-dirs:
@@ -31,3 +39,9 @@ linters-settings:
     threshold: 400
   goimports:
     local-prefixes: github.com/kudobuilder/kudo
+issues:
+  # ignore gosec for test files
+  exclude-rules:
+  - path: _test\.go
+    linters:
+    - gosec
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2b84ce6bc..bf1edfd6a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BUILD_DATE_PATH := github.com/kudobuilder/kudo/pkg/version.buildDate
 DATE_FMT := "%Y-%m-%dT%H:%M:%SZ"
 BUILD_DATE := $(shell date -u -d "@$SOURCE_DATE_EPOCH" "+${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${DATE_FMT}" 2>/dev/null || date -u "+${DATE_FMT}")
 LDFLAGS := -X ${GIT_VERSION_PATH}=${GIT_VERSION:v%=%} -X ${GIT_COMMIT_PATH}=${GIT_COMMIT} -X ${BUILD_DATE_PATH}=${BUILD_DATE}
-GOLANGCI_LINT_VER = "v1.31.0"
+GOLANGCI_LINT_VER = "v1.32.2"
 SUPPORTED_PLATFORMS = amd64 arm64
 
 export GO111MODULE=on
diff --git a/pkg/engine/renderer/enhancer_test.go b/pkg/engine/renderer/enhancer_test.go
index 2e117c26d..dc3cada7f 100644
--- a/pkg/engine/renderer/enhancer_test.go
+++ b/pkg/engine/renderer/enhancer_test.go
@@ -405,7 +405,7 @@ func statefulSet(name string, namespace string) *appsv1.StatefulSet {
 				Spec: corev1.PodSpec{},
 			},
 			VolumeClaimTemplates: []corev1.PersistentVolumeClaim{
-				corev1.PersistentVolumeClaim{
+				{
 					ObjectMeta: metav1.ObjectMeta{
 						Labels: map[string]string{
 							"vct1": "vct1label",
@@ -413,7 +413,7 @@ func statefulSet(name string, namespace string) *appsv1.StatefulSet {
 					},
 					Spec: corev1.PersistentVolumeClaimSpec{},
 				},
-				corev1.PersistentVolumeClaim{
+				{
 					ObjectMeta: metav1.ObjectMeta{
 						Labels: map[string]string{
 							"vct2": "vct2label",
diff --git a/pkg/kudoctl/cmd/plan/plan_status_test.go b/pkg/kudoctl/cmd/plan/plan_status_test.go
index 3c07cfae8..d58d959be 100644
--- a/pkg/kudoctl/cmd/plan/plan_status_test.go
+++ b/pkg/kudoctl/cmd/plan/plan_status_test.go
@@ -38,10 +38,10 @@ func TestStatus(t *testing.T) {
 			Plans: map[string]kudoapi.Plan{
 				"zzzinvalid": {
 					Phases: []kudoapi.Phase{
-						kudoapi.Phase{
+						{
 							Name: "zzzinvalid",
 							Steps: []kudoapi.Step{
-								kudoapi.Step{
+								{
 									Name: "zzzinvalid",
 								},
 							},
@@ -50,10 +50,10 @@ func TestStatus(t *testing.T) {
 				},
 				"validate": {
 					Phases: []kudoapi.Phase{
-						kudoapi.Phase{
+						{
 							Name: "validate",
 							Steps: []kudoapi.Step{
-								kudoapi.Step{
+								{
 									Name: "validate",
 								},
 							},
diff --git a/pkg/kudoctl/packages/verifier/template/verify_render_test.go b/pkg/kudoctl/packages/verifier/template/verify_render_test.go
index cd1cf2366..07c4743d1 100644
--- a/pkg/kudoctl/packages/verifier/template/verify_render_test.go
+++ b/pkg/kudoctl/packages/verifier/template/verify_render_test.go
@@ -115,12 +115,12 @@ spec:
 
 func TestTemplateRenderVerifierParameterTypes(t *testing.T) {
 	params := []packages.Parameter{
-		packages.Parameter{
+		{
 			Name:    "labels",
 			Default: map[string]string{"a": "a", "b": "b"},
 			Type:    kudoapi.MapValueType,
 		},
-		packages.Parameter{
+		{
 			Name:    "containers",
 			Default: []string{"a", "b"},
 			Type:    kudoapi.ArrayValueType,