Fix linter issues (#2527)

* Fix lint errors to fix master

Travis is currently failing on master due to these linting errors:

https://travis-ci.org/GoogleContainerTools/skaffold/jobs/562352608

* Use less memory on Travis CI

+ Also print more logs
+ Also fails in case of an OOM or deadline exceeded

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

hack/linter.sh

@@ -23,19 +23,36 @@ if ! [ -x "$(command -v golangci-lint)" ]; then
 	${DIR}/install_golint.sh -b $GOPATH/bin v1.17.1
 fi
 
-golangci-lint run \
-	--deadline=2m \
+VERBOSE=""
+if [[ "${TRAVIS}" == "true" ]]; then
+    # Use less memory on Travis
+    # See https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
+    export GOGC=10
+    VERBOSE="-v --print-resources-usage"
+fi
+
+golangci-lint run ${VERBOSE} \
+	--deadline=4m \
 	--no-config \
-	-E bodyclose \
-	-E goconst \
-	-E goimports \
-	-E gocritic \
-	-E golint \
-	-E interfacer \
-	-E maligned \
-	-E misspell \
-	-E stylecheck \
-	-E unconvert \
-	-E unparam \
-	-D errcheck \
-	--skip-dirs vendor
+    --disable-all \
+    -E bodyclose \
+    -E deadcode \
+    -E goconst \
+    -E gocritic \
+    -E goimports \
+    -E golint \
+    -E gosimple \
+    -E govet \
+    -E ineffassign \
+    -E interfacer \
+    -E maligned \
+    -E misspell \
+    -E staticcheck \
+    -E structcheck \
+    -E stylecheck \
+    -E typecheck \
+    -E unconvert \
+    -E unparam \
+    -E unused \
+    -E varcheck \
+	--skip-dirs vendor | awk '/out of memory/ || /Deadline exceeded/ {failed = 1}; {print}; END {exit failed}'

pkg/skaffold/build/tag/date_time_test.go

@@ -33,8 +33,6 @@ func TestDateTime_GenerateFullyQualifiedImageName(t *testing.T) {
 		buildTime   time.Time
 		timezone    string
 		imageName   string
-		digest      string
-		image       string
 		want        string
 	}{
 		{

pkg/skaffold/deploy/kubectl_test.go

@@ -63,7 +63,6 @@ func TestKubectlDeploy(t *testing.T) {
 		shouldErr            bool
 		forceDeploy          bool
 		expectedDependencies []string
-		warnings             []string
 	}{
 		{
 			description: "no manifest",

pkg/skaffold/docker/client_test.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/testutil"
-	"github.com/docker/docker/client"
 )
 
 func TestNewEnvClient(t *testing.T) {
@@ -60,7 +59,6 @@ func TestNewMinikubeImageAPIClient(t *testing.T) {
 	tests := []struct {
 		description string
 		env         string
-		expected    client.CommonAPIClient
 		expectedEnv []string
 		shouldErr   bool
 	}{

pkg/skaffold/docker/docker_init_test.go

@@ -92,7 +92,6 @@ func TestCreateArtifact(t *testing.T) {
 		dockerfile       Docker
 		manifestImage    string
 		expectedArtifact latest.Artifact
-		expectedImage    string
 	}{
 		{
 			description:   "default filename",

pkg/skaffold/kubernetes/log_test.go

@@ -54,7 +54,6 @@ func TestSinceSeconds(t *testing.T) {
 func TestSelect(t *testing.T) {
 	tests := []struct {
 		description   string
-		images        []string
 		podSpec       v1.PodSpec
 		expectedMatch bool
 	}{

pkg/skaffold/runner/intent.go

@@ -30,7 +30,7 @@ type intents struct {
 	lock *gosync.Mutex
 }
 
-func NewIntents(autoBuild, autoSync, autoDeploy bool) *intents {
+func newIntents(autoBuild, autoSync, autoDeploy bool) *intents {
 	i := &intents{
 		lock:        &gosync.Mutex{},
 		resetBuild:  func() {},

pkg/skaffold/runner/runner.go

@@ -167,7 +167,7 @@ func NewForConfig(opts *config.SkaffoldOptions, cfg *latest.SkaffoldConfig) (*Sk
 		imageList:            kubernetes.NewImageList(),
 		cache:                artifactCache,
 		runCtx:               runCtx,
-		intents:              NewIntents(opts.AutoBuild, opts.AutoSync, opts.AutoDeploy),
+		intents:              newIntents(opts.AutoBuild, opts.AutoSync, opts.AutoDeploy),
 	}
 
 	if err := r.setupTriggerCallbacks(intentChan); err != nil {

pkg/skaffold/schema/versions_test.go

@@ -109,7 +109,6 @@ func TestParseConfig(t *testing.T) {
 		description string
 		config      string
 		expected    util.VersionedConfig
-		badReader   bool
 		shouldErr   bool
 	}{
 		{