Activate more linters

cmd/skaffold/app/cmd/build.go

@@ -22,13 +22,14 @@ import (
 	"io"
 	"io/ioutil"
 
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 var (

cmd/skaffold/app/cmd/commands_test.go

@@ -23,8 +23,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/testutil"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
 func TestNewCmdDescription(t *testing.T) {

cmd/skaffold/app/cmd/config.go

@@ -17,9 +17,10 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/config"
 )
 
 func NewCmdConfig() *cobra.Command {

cmd/skaffold/app/cmd/debug.go

@@ -20,9 +20,10 @@ import (
 	"context"
 	"io"
 
+	"github.com/spf13/cobra"
+
 	debugging "github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy"
-	"github.com/spf13/cobra"
 )
 
 // NewCmdDebug describes the CLI command to run a pipeline in debug mode.

cmd/skaffold/app/cmd/delete.go

@@ -20,9 +20,10 @@ import (
 	"context"
 	"io"
 
+	"github.com/spf13/cobra"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/spf13/cobra"
 )
 
 // NewCmdDelete describes the CLI command to delete deployed resources.

cmd/skaffold/app/cmd/deploy.go

@@ -21,13 +21,14 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 var (

cmd/skaffold/app/cmd/dev.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 )
 
 // NewCmdDev describes the CLI command to run a pipeline in development mode.

cmd/skaffold/app/cmd/find_configs.go

@@ -22,12 +22,13 @@ import (
 	"io"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/karrick/godirwalk"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 )
 
 var (

cmd/skaffold/app/cmd/fix.go

@@ -20,14 +20,15 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	yaml "gopkg.in/yaml.v2"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
 )
 
 func NewCmdFix() *cobra.Command {

cmd/skaffold/app/cmd/flags_test.go

@@ -19,8 +19,9 @@ package cmd
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/testutil"
 	"github.com/spf13/cobra"
+
+	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
 func TestHasCmdAnnotation(t *testing.T) {

cmd/skaffold/app/cmd/init.go

@@ -20,9 +20,10 @@ import (
 	"context"
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer"
 )
 
 var (

cmd/skaffold/app/cmd/render.go

@@ -21,11 +21,12 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 )
 
 var (

cmd/skaffold/app/cmd/run.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 )
 
 // NewCmdRun describes the CLI command to run a pipeline.

cmd/skaffold/app/cmd/runner_test.go

@@ -20,11 +20,12 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/blang/semver"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"
 	"github.com/GoogleContainerTools/skaffold/testutil"
-	"github.com/blang/semver"
 )
 
 func TestCreateNewRunner(t *testing.T) {

cmd/skaffold/app/cmd/version.go

@@ -19,10 +19,11 @@ package cmd
 import (
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
 )
 
 var versionFlag = flags.NewTemplateFlag("{{.Version}}\n", version.Info{})

cmd/skaffold/app/flags/build_output.go

@@ -22,8 +22,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/pkg/errors"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 )
 
 // BuildOutputFileFlag describes a flag which contains a BuildOutput.

cmd/skaffold/man/man.go

@@ -21,9 +21,10 @@ import (
 	"io"
 	"os"
 
-	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
+	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd"
 )
 
 func main() {

hack/golangci.yml

@@ -25,3 +25,10 @@ linters:
     - unparam
     - unused
     - varcheck
+    - dogsled
+    - nakedret
+    - whitespace
+
+linters-settings:
+  goimports:
+    local-prefixes: github.com/GoogleContainerTools/skaffold

hack/schemas/main.go

@@ -30,9 +30,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
 	"github.com/pkg/errors"
 	blackfriday "gopkg.in/russross/blackfriday.v2"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
 )
 
 const (

hack/versions/cmd/new/version.go

@@ -26,10 +26,11 @@ import (
 
 	hackschema "github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/version"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
-	"github.com/sirupsen/logrus"
 )
 
 // Before: prev -> current (latest)
@@ -95,7 +96,6 @@ func main() {
 
 	// Update the docs with the new version
 	sed("docs/config.toml", current, next)
-
 }
 
 func makeSchemaDir(new string) {

hack/versions/cmd/schema_check/check.go

@@ -17,8 +17,9 @@ limitations under the License.
 package main
 
 import (
-	"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
 	"github.com/sirupsen/logrus"
+
+	"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
 )
 
 func main() {

hack/versions/cmd/update_comments/main.go

@@ -41,5 +41,4 @@ func main() {
 	}); err != nil {
 		logrus.Fatalf("%s", err)
 	}
-
 }

hack/versions/pkg/diff/godiff_test.go

@@ -290,5 +290,4 @@ func TestCompareSchemas(t *testing.T) {
 			}
 		})
 	}
-
 }

hack/versions/pkg/schema/check.go

@@ -23,11 +23,12 @@ import (
 	"path"
 	"strings"
 
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+
 	"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/diff"
 	"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/version"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 func RunSchemaCheckOnChangedFiles() error {

hack/versions/pkg/schema/comment.go

@@ -110,7 +110,6 @@ func printAst(fset *token.FileSet, ast *ast.File) ([]byte, error) {
 
 func addFirstCommentOnVersion(astA *ast.File, commentString string) {
 	ast.Inspect(astA, func(node ast.Node) bool {
-
 		if decl, ok := node.(*ast.GenDecl); ok &&
 			decl.Tok.String() == "const" &&
 			len(decl.Specs) == 1 {

hack/versions/pkg/schema/comment_test.go

@@ -59,7 +59,6 @@ var configWithReleasedComment = fmt.Sprintf(configFileTemplate, releasedComment+
 var configWithUnreleasedComment = fmt.Sprintf(configFileTemplate, unreleasedComment+"\n")
 
 func TestUpdateComments(t *testing.T) {
-
 	tcs := []struct {
 		name     string
 		orig     string
@@ -106,13 +105,11 @@ func TestUpdateComments(t *testing.T) {
 
 	for _, tc := range tcs {
 		testutil.Run(t, tc.name, func(t *testutil.T) {
-
 			dir := t.NewTempDir()
 			aFile := dir.Path("a.go")
 			t.CheckNoError(ioutil.WriteFile(aFile, []byte(tc.orig), 0666))
 			modified, err := updateVersionComment(aFile, tc.released)
 			t.CheckErrorAndDeepEqual(false, err, tc.expected, string(modified))
 		})
 	}
-
 }

hack/versions/pkg/schema/git.go

@@ -21,8 +21,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 )
 
 type gitClient interface {

hack/versions/pkg/version/version.go

@@ -25,8 +25,9 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/sirupsen/logrus"
+
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 )
 
 func GetLatestVersion() (string, bool) {

integration/build_test.go

@@ -31,15 +31,16 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"4d63.com/tz"
+	"github.com/docker/docker/api/types"
+	"github.com/sirupsen/logrus"
+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/webhook/kubernetes"
 	"github.com/GoogleContainerTools/skaffold/testutil"
-	"github.com/docker/docker/api/types"
-	"github.com/sirupsen/logrus"
-	corev1 "k8s.io/api/core/v1"
 )
 
 const imageName = "simple-build:"