Skip to content

Commit 159c6c9

Browse files
dgageotdgageot
committed
Configure goimports to enforce 3 groups of imports
Signed-off-by: David Gageot <[email protected]>
1 parent 9350d7a commit 159c6c9

File tree

175 files changed

+457
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+457
-279
lines changed

‎cmd/skaffold/app/cmd/build.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ import (
2222
"io"
2323
"io/ioutil"
2424

25+
"github.com/pkg/errors"
26+
"github.com/spf13/cobra"
27+
"github.com/spf13/pflag"
28+
2529
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
2630
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2731
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2832
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
29-
"github.com/pkg/errors"
30-
"github.com/spf13/cobra"
31-
"github.com/spf13/pflag"
3233
)
3334

3435
var (

‎cmd/skaffold/app/cmd/commands_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ import (
2323
"io"
2424
"testing"
2525

26-
"github.com/GoogleContainerTools/skaffold/testutil"
2726
"github.com/spf13/pflag"
27+
28+
"github.com/GoogleContainerTools/skaffold/testutil"
2829
)
2930

3031
func TestNewCmdDescription(t *testing.T) {

‎cmd/skaffold/app/cmd/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ limitations under the License.
1717
package cmd
1818

1919
import (
20-
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/config"
2120
"github.com/spf13/cobra"
2221
"github.com/spf13/pflag"
22+
23+
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/config"
2324
)
2425

2526
func NewCmdConfig() *cobra.Command {

‎cmd/skaffold/app/cmd/debug.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"context"
2121
"io"
2222

23+
"github.com/spf13/cobra"
24+
2325
debugging "github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug"
2426
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy"
25-
"github.com/spf13/cobra"
2627
)
2728

2829
// NewCmdDebug describes the CLI command to run a pipeline in debug mode.

‎cmd/skaffold/app/cmd/delete.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"context"
2121
"io"
2222

23+
"github.com/spf13/cobra"
24+
2325
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2426
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
25-
"github.com/spf13/cobra"
2627
)
2728

2829
// NewCmdDelete describes the CLI command to delete deployed resources.

‎cmd/skaffold/app/cmd/deploy.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ import (
2121
"fmt"
2222
"io"
2323

24+
"github.com/spf13/cobra"
25+
"github.com/spf13/pflag"
26+
2427
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
2528
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
2629
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2730
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2831
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
29-
"github.com/spf13/cobra"
30-
"github.com/spf13/pflag"
3132
)
3233

3334
var (

‎cmd/skaffold/app/cmd/dev.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import (
2020
"context"
2121
"io"
2222

23-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2523
"github.com/pkg/errors"
2624
"github.com/sirupsen/logrus"
2725
"github.com/spf13/cobra"
2826
"github.com/spf13/pflag"
27+
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2930
)
3031

3132
// NewCmdDev describes the CLI command to run a pipeline in development mode.

‎cmd/skaffold/app/cmd/find_configs.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import (
2222
"io"
2323
"strings"
2424

25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
26-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
27-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2825
"github.com/karrick/godirwalk"
2926
"github.com/spf13/cobra"
3027
"github.com/spf13/pflag"
28+
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
30+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
31+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3132
)
3233

3334
var (

‎cmd/skaffold/app/cmd/fix.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ import (
2020
"io"
2121
"io/ioutil"
2222

23-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
26-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
2723
"github.com/pkg/errors"
2824
"github.com/spf13/cobra"
2925
"github.com/spf13/pflag"
3026
yaml "gopkg.in/yaml.v2"
27+
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
30+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
31+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
3132
)
3233

3334
func NewCmdFix() *cobra.Command {

‎cmd/skaffold/app/cmd/flags_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ package cmd
1919
import (
2020
"testing"
2121

22-
"github.com/GoogleContainerTools/skaffold/testutil"
2322
"github.com/spf13/cobra"
23+
24+
"github.com/GoogleContainerTools/skaffold/testutil"
2425
)
2526

2627
func TestHasCmdAnnotation(t *testing.T) {

‎cmd/skaffold/app/cmd/init.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"context"
2121
"io"
2222

23-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer"
2423
"github.com/spf13/cobra"
2524
"github.com/spf13/pflag"
25+
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer"
2627
)
2728

2829
var (

‎cmd/skaffold/app/cmd/render.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"io"
2222
"io/ioutil"
2323

24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2624
"github.com/pkg/errors"
2725
"github.com/spf13/cobra"
2826
"github.com/spf13/pflag"
27+
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2930
)
3031

3132
var (

‎cmd/skaffold/app/cmd/run.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import (
2020
"context"
2121
"io"
2222

23-
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2623
"github.com/pkg/errors"
2724
"github.com/spf13/cobra"
2825
"github.com/spf13/pflag"
26+
27+
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2930
)
3031

3132
// NewCmdRun describes the CLI command to run a pipeline.

‎cmd/skaffold/app/cmd/runner_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import (
2020
"fmt"
2121
"testing"
2222

23+
"github.com/blang/semver"
24+
2325
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2426
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2527
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"
2628
"github.com/GoogleContainerTools/skaffold/testutil"
27-
"github.com/blang/semver"
2829
)
2930

3031
func TestCreateNewRunner(t *testing.T) {

‎cmd/skaffold/app/cmd/version.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ package cmd
1919
import (
2020
"io"
2121

22-
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
23-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
2422
"github.com/spf13/cobra"
2523
"github.com/spf13/pflag"
24+
25+
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
2627
)
2728

2829
var versionFlag = flags.NewTemplateFlag("{{.Version}}\n", version.Info{})

‎cmd/skaffold/app/flags/build_output.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import (
2222
"io/ioutil"
2323
"os"
2424

25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2625
"github.com/pkg/errors"
26+
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2728
)
2829

2930
// BuildOutputFileFlag describes a flag which contains a BuildOutput.

‎cmd/skaffold/man/man.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"io"
2222
"os"
2323

24-
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd"
2524
"github.com/spf13/cobra"
2625
"github.com/spf13/pflag"
26+
27+
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd"
2728
)
2829

2930
func main() {

‎hack/golangci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ linters:
2828
- dogsled
2929
- nakedret
3030
- whitespace
31+
32+
linters-settings:
33+
goimports:
34+
local-prefixes: github.com/GoogleContainerTools/skaffold

‎hack/schemas/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ import (
3030
"regexp"
3131
"strings"
3232

33-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
3433
"github.com/pkg/errors"
3534
blackfriday "gopkg.in/russross/blackfriday.v2"
35+
36+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
3637
)
3738

3839
const (

‎hack/versions/cmd/new/version.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ import (
2626

2727
hackschema "github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
2828

29+
"github.com/sirupsen/logrus"
30+
2931
"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/version"
3032
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
3133
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
32-
"github.com/sirupsen/logrus"
3334
)
3435

3536
// Before: prev -> current (latest)

‎hack/versions/cmd/schema_check/check.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
2120
"github.com/sirupsen/logrus"
21+
22+
"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
2223
)
2324

2425
func main() {

‎hack/versions/pkg/schema/check.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323
"path"
2424
"strings"
2525

26+
"github.com/pkg/errors"
27+
"github.com/sirupsen/logrus"
28+
2629
"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/diff"
2730
"github.com/GoogleContainerTools/skaffold/hack/versions/pkg/version"
2831
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
29-
"github.com/pkg/errors"
30-
"github.com/sirupsen/logrus"
3132
)
3233

3334
func RunSchemaCheckOnChangedFiles() error {

‎hack/versions/pkg/schema/git.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ import (
2121
"os/exec"
2222
"strings"
2323

24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
2524
"github.com/pkg/errors"
25+
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
2627
)
2728

2829
type gitClient interface {

‎hack/versions/pkg/version/version.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import (
2525

2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"
2727

28-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2928
"github.com/sirupsen/logrus"
29+
30+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3031
)
3132

3233
func GetLatestVersion() (string, bool) {

‎integration/build_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ import (
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232

3333
"4d63.com/tz"
34+
"github.com/docker/docker/api/types"
35+
"github.com/sirupsen/logrus"
36+
corev1 "k8s.io/api/core/v1"
37+
3438
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
3539
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
3640
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3741
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
3842
"github.com/GoogleContainerTools/skaffold/pkg/webhook/kubernetes"
3943
"github.com/GoogleContainerTools/skaffold/testutil"
40-
"github.com/docker/docker/api/types"
41-
"github.com/sirupsen/logrus"
42-
corev1 "k8s.io/api/core/v1"
4344
)
4445

4546
const imageName = "simple-build:"

‎integration/cache_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ import (
2020
"testing"
2121
"time"
2222

23+
"k8s.io/apimachinery/pkg/util/wait"
24+
2325
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
2426
"github.com/GoogleContainerTools/skaffold/proto"
2527
"github.com/GoogleContainerTools/skaffold/testutil"
26-
"k8s.io/apimachinery/pkg/util/wait"
2728
)
2829

2930
func TestCacheAPITriggers(t *testing.T) {

‎integration/helm_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import (
2020
"fmt"
2121
"testing"
2222

23-
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
2423
"github.com/google/go-cmp/cmp"
24+
25+
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
2526
)
2627

2728
const (

‎integration/port_forward_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"fmt"
2222
"testing"
2323

24+
"github.com/sirupsen/logrus"
25+
2426
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
2527
"github.com/GoogleContainerTools/skaffold/proto"
26-
"github.com/sirupsen/logrus"
2728

2829
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
2930
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"

‎integration/rpc_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ import (
2727
"testing"
2828
"time"
2929

30+
"github.com/golang/protobuf/jsonpb"
31+
"github.com/golang/protobuf/ptypes/empty"
32+
"google.golang.org/grpc"
33+
3034
"github.com/GoogleContainerTools/skaffold/integration/skaffold"
3135
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
3236
"github.com/GoogleContainerTools/skaffold/proto"
3337
"github.com/GoogleContainerTools/skaffold/testutil"
34-
"github.com/golang/protobuf/jsonpb"
35-
"github.com/golang/protobuf/ptypes/empty"
36-
"google.golang.org/grpc"
3738
)
3839

3940
var (

0 commit comments

Comments
 (0)