fix go imports lint complain

Signed-off-by: 天元 <jianbo.sjb@alibaba-inc.com>

Makefile

@@ -1,14 +1,14 @@
 # Vela version
 VELA_VERSION ?= 0.1.0
 # Repo info
-GIT_COMMIT ?= git-$(shell git rev-parse --short HEAD)
-VELA_VERSION_VAR := github.com/oam-dev/kubevela/version.VelaVersion
+GIT_COMMIT          ?= git-$(shell git rev-parse --short HEAD)
+VELA_VERSION_VAR    := github.com/oam-dev/kubevela/version.VelaVersion
 VELA_GITVERSION_VAR := github.com/oam-dev/kubevela/version.GitRevision
-LDFLAGS ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
+LDFLAGS             ?= "-X $(VELA_VERSION_VAR)=$(VELA_VERSION) -X $(VELA_GITVERSION_VAR)=$(GIT_COMMIT)"
 
-GOX      = go run github.com/mitchellh/gox
-TARGETS  := darwin/amd64 linux/amd64 windows/amd64
-DIST_DIRS       := find * -type d -exec
+GOX         = go run github.com/mitchellh/gox
+TARGETS     := darwin/amd64 linux/amd64 windows/amd64
+DIST_DIRS   := find * -type d -exec
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -64,8 +64,9 @@ run: fmt vet
 	go run ./cmd/core/main.go
 
 # Run go fmt against code
-fmt:
+fmt: goimports
 	go fmt ./...
+	$(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd
 	./hack/cue-fmt.sh
 
 # Run go vet against code
@@ -185,3 +186,15 @@ GOLANGCILINT=$(GOBIN)/golangci-lint
 else
 GOLANGCILINT=$(shell which golangci-lint)
 endif
+
+.PHONY: goimports
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	set -e ;\
+	GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports ;\
+	}
+GOIMPORTS=$(GOBIN)/goimports
+else
+GOIMPORTS=$(shell which goimports)
+endif

e2e/commonContext.go

@@ -11,9 +11,10 @@ import (
 
 	"github.com/Netflix/go-expect"
 	corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/oam-dev/kubevela/pkg/server/apis"
 	"github.com/oam-dev/kubevela/pkg/server/util"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"

e2e/workload/workload_test.go

@@ -3,9 +3,10 @@ package e2e
 import (
 	"fmt"
 
-	"github.com/oam-dev/kubevela/e2e"
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
+
+	"github.com/oam-dev/kubevela/e2e"
 )
 
 var (

pkg/commands/cli.go

@@ -9,14 +9,15 @@ import (
 	"github.com/oam-dev/kubevela/pkg/utils/common"
 
 	"github.com/gosuri/uitable"
+	"github.com/spf13/cobra"
+	"k8s.io/klog"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
+
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/cmd/vela/fake"
 	"github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/utils/system"
 	"github.com/oam-dev/kubevela/version"
-	"github.com/spf13/cobra"
-	"k8s.io/klog"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 func NewCommand() *cobra.Command {

pkg/commands/completion.go

@@ -6,8 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/oam-dev/kubevela/api/types"
 	"github.com/spf13/cobra"
+
+	"github.com/oam-dev/kubevela/api/types"
 )
 
 const completionDesc = `Output shell completion code for the specified shell (bash or zsh). 

pkg/commands/config_test.go

@@ -6,9 +6,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/utils/system"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestConfigCommand(t *testing.T) {

pkg/commands/exec.go

@@ -7,18 +7,18 @@ import (
 	"time"
 
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/types"
 	"github.com/spf13/cobra"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"
+	cmdexec "k8s.io/kubectl/pkg/cmd/exec"
+	k8scmdutil "k8s.io/kubectl/pkg/cmd/util"
 
+	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/application"
 	"github.com/oam-dev/kubevela/pkg/commands/util"
 	velacmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
-	cmdexec "k8s.io/kubectl/pkg/cmd/exec"
-	k8scmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
 
 const (

pkg/commands/exec_test.go

@@ -6,16 +6,17 @@ import (
 	"testing"
 
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/types"
-	"github.com/oam-dev/kubevela/pkg/appfile"
-	"github.com/oam-dev/kubevela/pkg/application"
-	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubectl/pkg/cmd/exec"
 	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
+
+	"github.com/oam-dev/kubevela/api/types"
+	"github.com/oam-dev/kubevela/pkg/appfile"
+	"github.com/oam-dev/kubevela/pkg/application"
+	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 )
 
 func TestExecCommand(t *testing.T) {

pkg/commands/ls.go

@@ -5,13 +5,12 @@ import (
 	"strings"
 
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
-
+	runtimeoam "github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
 	gocmp "github.com/google/go-cmp/cmp"
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	runtimeoam "github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/application"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"

pkg/commands/portforward.go

@@ -9,28 +9,26 @@ import (
 	"strconv"
 	"strings"
 
-	corev1 "k8s.io/api/core/v1"
-	types2 "k8s.io/apimachinery/pkg/types"
-
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
-
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/types"
 	"github.com/spf13/cobra"
+	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	types2 "k8s.io/apimachinery/pkg/types"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/transport/spdy"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	cmdpf "k8s.io/kubectl/pkg/cmd/portforward"
+	k8scmdutil "k8s.io/kubectl/pkg/cmd/util"
+
+	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/application"
 	"github.com/oam-dev/kubevela/pkg/commands/util"
 	velacmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
-	cmdpf "k8s.io/kubectl/pkg/cmd/portforward"
-	k8scmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
 
 type VelaPortForwardOptions struct {

pkg/commands/portforward_test.go

@@ -6,14 +6,15 @@ import (
 	"testing"
 
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/types"
-	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8sfake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubectl/pkg/cmd/portforward"
 	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
+
+	"github.com/oam-dev/kubevela/api/types"
+	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 )
 
 func TestPortForwardCommand(t *testing.T) {

pkg/commands/refresh.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/gosuri/uitable"
+
 	"github.com/oam-dev/kubevela/api/types"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/plugins"

pkg/commands/show.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/oam-dev/kubevela/pkg/oam"
-
 	"github.com/gosuri/uitable"
+	"github.com/spf13/cobra"
+
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/application"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
-	"github.com/spf13/cobra"
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 func NewAppShowCommand(ioStreams cmdutil.IOStreams) *cobra.Command {

pkg/commands/traits.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"strings"
 
-	"github.com/oam-dev/kubevela/api/types"
-	"github.com/oam-dev/kubevela/pkg/oam"
-
 	"github.com/gosuri/uitable"
-	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/spf13/cobra"
+
+	"github.com/oam-dev/kubevela/api/types"
+	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
+	"github.com/oam-dev/kubevela/pkg/oam"
 )
 
 func NewTraitsCommand(c types.Args, ioStreams cmdutil.IOStreams) *cobra.Command {

pkg/commands/up_test.go

@@ -5,17 +5,14 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
-	"github.com/oam-dev/kubevela/api/types"
-
-	"github.com/oam-dev/kubevela/pkg/commands/util"
-
+	"github.com/stretchr/testify/assert"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	"github.com/oam-dev/kubevela/api/types"
+	"github.com/oam-dev/kubevela/pkg/commands/util"
 )
 
 func TestUp(t *testing.T) {

pkg/controller/core.oam.dev/applicationdeployment/applicationdeployment_controller.go

@@ -11,6 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
+
 	"github.com/oam-dev/kubevela/api/core.oam.dev/v1alpha2"
 )
 

pkg/controller/utils/utils.go

@@ -8,10 +8,11 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/types"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/oam-dev/kubevela/api/types"
 )
 
 func GetPodSpecPath(workloadDef *v1alpha2.WorkloadDefinition) (string, bool) {

pkg/controller/v1alpha1/autoscaler/autoscaler_controller.go

@@ -27,13 +27,14 @@ import (
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
 	oamutil "github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
 	"github.com/go-logr/logr"
-	"github.com/oam-dev/kubevela/api/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/controller/common"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/oam-dev/kubevela/api/v1alpha1"
+	"github.com/oam-dev/kubevela/pkg/controller/common"
 )
 
 const (

pkg/cue/convert.go

@@ -9,8 +9,9 @@ import (
 
 	"cuelang.org/go/cue"
 	cueJson "cuelang.org/go/pkg/encoding/json"
-	"github.com/oam-dev/kubevela/api/types"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/oam-dev/kubevela/api/types"
 )
 
 // OutputFieldName is the name of the struct contains the CR data

pkg/oam/application.go

@@ -7,16 +7,16 @@ import (
 	"sort"
 
 	"github.com/AlecAivazis/survey/v2"
+	corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
+	"github.com/spf13/cobra"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/appfile"
 	"github.com/oam-dev/kubevela/pkg/application"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/server/apis"
-	"github.com/spf13/cobra"
-
-	corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (

pkg/oam/component.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/oam-dev/kubevela/pkg/server/apis"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

pkg/oam/trait_checker.go

@@ -8,14 +8,15 @@ import (
 	runtimev1alpha1 "github.com/crossplane/crossplane-runtime/apis/core/v1alpha1"
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
 	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam"
-	"github.com/oam-dev/kubevela/api/v1alpha1"
-	"github.com/oam-dev/kubevela/pkg/application"
-	autoscalers "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/autoscaler"
 	v12 "k8s.io/api/autoscaling/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/oam-dev/kubevela/api/v1alpha1"
+	"github.com/oam-dev/kubevela/pkg/application"
+	autoscalers "github.com/oam-dev/kubevela/pkg/controller/v1alpha1/autoscaler"
 )
 
 type CheckStatus string

pkg/oam/workload.go

@@ -7,13 +7,14 @@ import (
 	"strings"
 
 	"cuelang.org/go/cue"
+	"github.com/spf13/pflag"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/pkg/application"
 	"github.com/oam-dev/kubevela/pkg/commands/util"
 	cmdutil "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/plugins"
-	"github.com/spf13/pflag"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type RunOptions struct {

pkg/plugins/cluster.go

@@ -8,23 +8,19 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/oam-dev/kubevela/pkg/utils/helm"
-
-	util2 "github.com/oam-dev/kubevela/pkg/commands/util"
-
-	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
-
-	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/discoverymapper"
-
-	"github.com/oam-dev/kubevela/api/types"
-	"github.com/oam-dev/kubevela/pkg/cue"
-	"github.com/oam-dev/kubevela/pkg/utils/system"
-	"github.com/pkg/errors"
-
 	corev1alpha2 "github.com/crossplane/oam-kubernetes-runtime/apis/core/v1alpha2"
+	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/discoverymapper"
+	"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
+	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/oam-dev/kubevela/api/types"
+	util2 "github.com/oam-dev/kubevela/pkg/commands/util"
+	"github.com/oam-dev/kubevela/pkg/cue"
+	"github.com/oam-dev/kubevela/pkg/utils/helm"
+	"github.com/oam-dev/kubevela/pkg/utils/system"
 )
 
 const DescriptionUndefined = "description not defined"

pkg/server/traitHandler.go

@@ -4,19 +4,18 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/oam-dev/kubevela/pkg/application"
-	util2 "github.com/oam-dev/kubevela/pkg/commands/util"
-	"github.com/oam-dev/kubevela/pkg/plugins"
-	env2 "github.com/oam-dev/kubevela/pkg/utils/env"
-	"github.com/spf13/pflag"
-
 	"github.com/gin-gonic/gin"
+	"github.com/spf13/pflag"
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	"github.com/oam-dev/kubevela/api/types"
+	"github.com/oam-dev/kubevela/pkg/application"
+	util2 "github.com/oam-dev/kubevela/pkg/commands/util"
 	"github.com/oam-dev/kubevela/pkg/oam"
+	"github.com/oam-dev/kubevela/pkg/plugins"
 	"github.com/oam-dev/kubevela/pkg/server/apis"
 	"github.com/oam-dev/kubevela/pkg/server/util"
+	env2 "github.com/oam-dev/kubevela/pkg/utils/env"
 )
 
 // Trait related handlers

pkg/utils/common/common.go

@@ -6,12 +6,12 @@ import (
 
 	"github.com/crossplane/oam-kubernetes-runtime/apis/core"
 	certmanager "github.com/wonderflow/cert-manager-api/pkg/apis/certmanager/v1"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
 	"github.com/oam-dev/kubevela/api/types"
 	"github.com/oam-dev/kubevela/api/v1alpha1"
-	k8sruntime "k8s.io/apimachinery/pkg/runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 var (