Upgrade golangci-lint to v1.16.0 (#1898)

...and fix some old style issues. Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
GoogleContainerTools · Apr 1, 2019 · c855d78 · c855d78
1 parent 6ea8c06
commit c855d78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/hack/linter.sh b/hack/linter.sh
@@ -20,7 +20,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if ! [ -x "$(command -v golangci-lint)" ]; then
 	echo "Installing GolangCI-Lint"
-	${DIR}/install_golint.sh -b $GOPATH/bin v1.15.0
+	${DIR}/install_golint.sh -b $GOPATH/bin v1.16.0
 fi
 
 golangci-lint run \
@@ -36,4 +36,4 @@ golangci-lint run \
 	-E unconvert \
 	-E unparam \
 	-D errcheck \
-  --skip-dirs vendor
+  --skip-dirs vendor
diff --git a/pkg/skaffold/deploy/helm_test.go b/pkg/skaffold/deploy/helm_test.go
@@ -60,7 +60,7 @@ var testDeployConfig = &latest.HelmDeploy{
 			Values: map[string]string{
 				"image": "skaffold-helm",
 			},
-			Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+			Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 			SetValues: map[string]string{
 				"some.key": "somevalue",
 			},
@@ -76,7 +76,7 @@ var testDeployRecreatePodsConfig = &latest.HelmDeploy{
 			Values: map[string]string{
 				"image": "skaffold-helm",
 			},
-			Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+			Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 			SetValues: map[string]string{
 				"some.key": "somevalue",
 			},
@@ -93,7 +93,7 @@ var testDeploySkipBuildDependenciesConfig = &latest.HelmDeploy{
 			Values: map[string]string{
 				"image": "skaffold-helm",
 			},
-			Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+			Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 			SetValues: map[string]string{
 				"some.key": "somevalue",
 			},
@@ -110,7 +110,7 @@ var testDeployHelmStyleConfig = &latest.HelmDeploy{
 			Values: map[string]string{
 				"image": "skaffold-helm",
 			},
-			Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+			Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 			SetValues: map[string]string{
 				"some.key": "somevalue",
 			},
@@ -159,7 +159,7 @@ var testDeployWithTemplatedName = &latest.HelmDeploy{
 			Values: map[string]string{
 				"image.tag": "skaffold-helm",
 			},
-			Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+			Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 			SetValues: map[string]string{
 				"some.key": "somevalue",
 			},
@@ -595,7 +595,7 @@ func TestHelmDependencies(t *testing.T) {
 						ChartPath:   folder.Root(),
 						ValuesFiles: tt.valuesFiles,
 						Values:      map[string]string{"image": "skaffold-helm"},
-						Overrides:   schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}},
+						Overrides:   schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}},
 						SetValues:   map[string]string{"some.key": "somevalue"},
 					},
 				},