CI: enable gci linter

Signed-off-by: Xiang Dai <long0dai@foxmail.com>

32 files changed, 60 insertions, 46 deletions

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 7e18cee3c..da97c5643 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -11,14 +11,19 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     name: Verify vendor, licenses, do lint
+    env:
+      GOPATH: /home/runner/work/${{ github.repository }}
     steps:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
           go-version: 1.14.x
 
-      - name: Check out code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          path: ./src/github.com/${{ github.repository }}
 
       - uses: actions/cache@v2
         with:
@@ -28,13 +33,15 @@ jobs:
       - name: Install dependences
         run: |
           sudo apt-get install -y jq
-          curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | BINARY=golangci-lint sh -s -- -d -b $(go env GOPATH)/bin v1.23.7
+          curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | BINARY=golangci-lint sh -s -- -d -b $(go env GOPATH)/bin v1.30.0
 
       - name: Run verify test
         run: make verify
+        working-directory: ./src/github.com/${{ github.repository }}
 
       - name: Run lint test
         run: make lint
+        working-directory: ./src/github.com/${{ github.repository }}
   build:
     runs-on: ubuntu-latest
     name: Multiple build
@@ -52,7 +59,7 @@ jobs:
       - name: Install dependences
         run: sudo apt-get install -y upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross
 
-      - name: Checkout code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -87,7 +94,7 @@ jobs:
         run: |
           command -v ginkgo || go get github.com/onsi/ginkgo/ginkgo
 
-      - name: Check out code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -118,7 +125,7 @@ jobs:
           command -v kind || go get sigs.k8s.io/kind@v0.9.0
           curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.3/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
 
-      - name: Check out code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -151,7 +158,7 @@ jobs:
           sudo wget -qP /etc/kubeedge https://github.com/kubeedge/kubeedge/releases/download/${RELEASE_VERSION}/kubeedge-${RELEASE_VERSION}-linux-amd64.tar.gz
           echo "$(cat /etc/kubeedge/checksum_kubeedge-${RELEASE_VERSION}-linux-amd64.tar.gz.txt) /etc/kubeedge/kubeedge-${RELEASE_VERSION}-linux-amd64.tar.gz" | sha512sum -c
 
-      - name: Check out code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -172,7 +179,7 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
 
-      - name: Check out code into the Go module directory
+      - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
diff --git a/.golangci.yml b/.golangci.yml
index 8f3115c77..ebc6e5141 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -38,6 +38,8 @@ output:
   uniq-by-line: true
 
 linters-settings:
+  gci:
+    local-prefixes: github.com/kubeedge/kubeedge
   misspell:
     ignore-words:
       - mosquitto
@@ -45,6 +47,7 @@ linters-settings:
 linters:
   disable-all: true
   enable:
+    - gci
     - goconst
     - errcheck
     - gofmt
@@ -60,4 +63,7 @@ issues:
       - path: edge
         linters:
           - errcheck
+      - path: cloud/pkg/client
+        linters:
+          - gci
 
diff --git a/cloud/pkg/cloudstream/apiserverconnection.go b/cloud/pkg/cloudstream/apiserverconnection.go
index d3f379393..21c8f04cc 100644
--- a/cloud/pkg/cloudstream/apiserverconnection.go
+++ b/cloud/pkg/cloudstream/apiserverconnection.go
@@ -2,6 +2,7 @@ package cloudstream
 
 import (
 	"fmt"
+
 	"github.com/kubeedge/kubeedge/pkg/stream"
 )
 
diff --git a/cloud/pkg/cloudstream/containerexec_connection.go b/cloud/pkg/cloudstream/containerexec_connection.go
index bf9de2667..2709a864b 100644
--- a/cloud/pkg/cloudstream/containerexec_connection.go
+++ b/cloud/pkg/cloudstream/containerexec_connection.go
@@ -6,11 +6,11 @@ import (
 	"io"
 	"net"
 
-	"github.com/kubeedge/kubeedge/common/constants"
-	"github.com/kubeedge/kubeedge/pkg/stream"
-
 	"github.com/emicklei/go-restful"
 	"k8s.io/klog/v2"
+
+	"github.com/kubeedge/kubeedge/common/constants"
+	"github.com/kubeedge/kubeedge/pkg/stream"
 )
 
 // ContainerExecConnection indicates the container exec request initiated by kube-apiserver
diff --git a/cloud/pkg/cloudstream/containerlog_connection.go b/cloud/pkg/cloudstream/containerlog_connection.go
index e3a293d1d..5c967dc1d 100644
--- a/cloud/pkg/cloudstream/containerlog_connection.go
+++ b/cloud/pkg/cloudstream/containerlog_connection.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"net"
 
+	"github.com/emicklei/go-restful"
 	"k8s.io/klog/v2"
 
-	"github.com/emicklei/go-restful"
 	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/pkg/stream"
 )
diff --git a/cloud/pkg/cloudstream/containermetrics_connection.go b/cloud/pkg/cloudstream/containermetrics_connection.go
index 26cbe0100..deadee1c8 100644
--- a/cloud/pkg/cloudstream/containermetrics_connection.go
+++ b/cloud/pkg/cloudstream/containermetrics_connection.go
@@ -23,9 +23,9 @@ import (
 	"net"
 	"strings"
 
+	"github.com/emicklei/go-restful"
 	"k8s.io/klog/v2"
 
-	"github.com/emicklei/go-restful"
 	"github.com/kubeedge/kubeedge/pkg/stream"
 )
 
diff --git a/cloud/pkg/cloudstream/session.go b/cloud/pkg/cloudstream/session.go
index abafc1bd9..53b986cbf 100644
--- a/cloud/pkg/cloudstream/session.go
+++ b/cloud/pkg/cloudstream/session.go
@@ -21,9 +21,9 @@ import (
 	"sync"
 	"sync/atomic"
 
+	"github.com/gorilla/websocket"
 	"k8s.io/klog/v2"
 
-	"github.com/gorilla/websocket"
 	"github.com/kubeedge/kubeedge/pkg/stream"
 )
 
diff --git a/cloud/pkg/cloudstream/tunnelserver.go b/cloud/pkg/cloudstream/tunnelserver.go
index 08f245b32..784b1aee1 100644
--- a/cloud/pkg/cloudstream/tunnelserver.go
+++ b/cloud/pkg/cloudstream/tunnelserver.go
@@ -31,7 +31,6 @@ import (
 	"k8s.io/klog/v2"
 
 	hubconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/config"
-	"github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config"
 	streamconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config"
 	"github.com/kubeedge/kubeedge/pkg/stream"
 )
@@ -138,7 +137,7 @@ func (s *TunnelServer) Start() {
 	}
 
 	tunnelServer := &http.Server{
-		Addr:    fmt.Sprintf(":%d", config.Config.TunnelPort),
+		Addr:    fmt.Sprintf(":%d", streamconfig.Config.TunnelPort),
 		Handler: s.container,
 		TLSConfig: &tls.Config{
 			ClientCAs:    pool,
diff --git a/cloud/pkg/edgecontroller/controller/upstream.go b/cloud/pkg/edgecontroller/controller/upstream.go
index 4fa239758..91bd16e6c 100644
--- a/cloud/pkg/edgecontroller/controller/upstream.go
+++ b/cloud/pkg/edgecontroller/controller/upstream.go
@@ -28,7 +28,6 @@ import (
 	"encoding/json"
 	stderrors "errors"
 	"fmt"
-	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"sort"
 	"time"
 
@@ -40,6 +39,7 @@ import (
 
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
+	"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/config"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/constants"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
diff --git a/cloud/pkg/leaderelection/leaderelection.go b/cloud/pkg/leaderelection/leaderelection.go
index 281f331ad..a194d6650 100755
--- a/cloud/pkg/leaderelection/leaderelection.go
+++ b/cloud/pkg/leaderelection/leaderelection.go
@@ -2,7 +2,6 @@ package leaderelection
 
 import (
 	"context"
-	gocontext "context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -58,7 +57,7 @@ func Run(cfg *config.CloudCoreConfig, readyzAdaptor *ReadyzAdaptor) {
 		return
 	}
 	leaderElectionConfig.Callbacks = leaderelection.LeaderCallbacks{
-		OnStartedLeading: func(ctx gocontext.Context) {
+		OnStartedLeading: func(ctx context.Context) {
 			// Start all modules,
 			core.StartModules()
 			// Patch PodReadinessGate if program run in pod
@@ -144,7 +143,7 @@ func TryToPatchPodReadinessGate(status corev1.ConditionStatus) error {
 		}
 
 		//Creat patchBytes
-		getPod, err := cli.CoreV1().Pods(namespace).Get(gocontext.Background(), podname, metav1.GetOptions{})
+		getPod, err := cli.CoreV1().Pods(namespace).Get(context.Background(), podname, metav1.GetOptions{})
 		originalJSON, err := json.Marshal(getPod)
 		if err != nil {
 			return fmt.Errorf("failed to marshal modified pod %q into JSON: %v", podname, err)
@@ -161,7 +160,7 @@ func TryToPatchPodReadinessGate(status corev1.ConditionStatus) error {
 		var maxRetries = 3
 		var isPatchSuccess = false
 		for i := 1; i <= maxRetries; i++ {
-			_, err = cli.CoreV1().Pods(namespace).Patch(gocontext.Background(), podname, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}, "status")
+			_, err = cli.CoreV1().Pods(namespace).Patch(context.Background(), podname, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}, "status")
 			if err == nil {
 				isPatchSuccess = true
 				klog.Infof("Successfully patching podReadinessGate: kubeedge.io/CloudCoreIsLeader to pod %q through apiserver", podname)
@@ -204,7 +203,7 @@ func TriggerGracefulShutdown() {
 
 func CreateNamespaceIfNeeded(cli *kubernetes.Clientset, ns string) error {
 	c := cli.CoreV1()
-	if _, err := c.Namespaces().Get(gocontext.Background(), ns, metav1.GetOptions{}); err == nil {
+	if _, err := c.Namespaces().Get(context.Background(), ns, metav1.GetOptions{}); err == nil {
 		// the namespace already exists
 		return nil
 	}
diff --git a/cloud/test/integration/fixtures/devicemodel.go b/cloud/test/integration/fixtures/devicemodel.go
index 00a52f4e1..783cdf753 100644
--- a/cloud/test/integration/fixtures/devicemodel.go
+++ b/cloud/test/integration/fixtures/devicemodel.go
@@ -17,8 +17,9 @@ limitations under the License.
 package fixtures
 
 import (
-	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
 )
 
 type DevicePropertyOp struct {
diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go
index d87727363..479851dae 100644
--- a/edge/cmd/edgecore/app/server.go
+++ b/edge/cmd/edgecore/app/server.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kubeedge/kubeedge/edge/pkg/edgestream"
-
 	"github.com/mitchellh/go-ps"
 	"github.com/spf13/cobra"
 	cliflag "k8s.io/component-base/cli/flag"
@@ -20,6 +18,7 @@ import (
 	"github.com/kubeedge/kubeedge/edge/pkg/devicetwin"
 	"github.com/kubeedge/kubeedge/edge/pkg/edged"
 	"github.com/kubeedge/kubeedge/edge/pkg/edgehub"
+	"github.com/kubeedge/kubeedge/edge/pkg/edgestream"
 	"github.com/kubeedge/kubeedge/edge/pkg/eventbus"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager"
 	"github.com/kubeedge/kubeedge/edge/pkg/servicebus"
diff --git a/edge/mocks/beego/fake_rawseter.go b/edge/mocks/beego/fake_rawseter.go
index 290fd3c6d..7c4581eaf 100644
--- a/edge/mocks/beego/fake_rawseter.go
+++ b/edge/mocks/beego/fake_rawseter.go
@@ -6,9 +6,10 @@ package beego
 
 import (
 	sql "database/sql"
+	reflect "reflect"
+
 	orm "github.com/astaxie/beego/orm"
 	gomock "github.com/golang/mock/gomock"
-	reflect "reflect"
 )
 
 // MockRawSeter is a mock of RawSeter interface
diff --git a/edge/mocks/edgehub/fake_adapter.go b/edge/mocks/edgehub/fake_adapter.go
index d5e511d08..5a8a37275 100644
--- a/edge/mocks/edgehub/fake_adapter.go
+++ b/edge/mocks/edgehub/fake_adapter.go
@@ -8,6 +8,7 @@ import (
 	"reflect"
 
 	"github.com/golang/mock/gomock"
+
 	"github.com/kubeedge/beehive/pkg/core/model"
 )
 
diff --git a/edge/pkg/devicetwin/dtclient/devicetwin_db_test.go b/edge/pkg/devicetwin/dtclient/devicetwin_db_test.go
index ffedbbf3e..d4bf762de 100644
--- a/edge/pkg/devicetwin/dtclient/devicetwin_db_test.go
+++ b/edge/pkg/devicetwin/dtclient/devicetwin_db_test.go
@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/astaxie/beego/orm"
-
 	"github.com/golang/mock/gomock"
 
 	"github.com/kubeedge/kubeedge/edge/mocks/beego"
diff --git a/edge/pkg/edged/edged_getters.go b/edge/pkg/edged/edged_getters.go
index c91f36bea..35c35bff6 100644
--- a/edge/pkg/edged/edged_getters.go
+++ b/edge/pkg/edged/edged_getters.go
@@ -32,7 +32,6 @@ import (
 	"time"
 
 	cadvisorapiv1 "github.com/google/cadvisor/info/v1"
-
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
diff --git a/edge/pkg/edged/fake/typed/core/v1/fake_configmap.go b/edge/pkg/edged/fake/typed/core/v1/fake_configmap.go
index 13302223e..7b6182736 100644
--- a/edge/pkg/edged/fake/typed/core/v1/fake_configmap.go
+++ b/edge/pkg/edged/fake/typed/core/v1/fake_configmap.go
@@ -3,10 +3,11 @@ package v1
 import (
 	"context"
 
-	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake"
+
+	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 )
 
 // FakePersistentVolumeClaims implements PersistentVolumeClaimInterface
diff --git a/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolume.go b/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolume.go
index 68fd62568..6e58075fc 100644
--- a/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolume.go
+++ b/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolume.go
@@ -3,10 +3,11 @@ package v1
 import (
 	"context"
 
-	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake"
+
+	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 )
 
 // FakePersistentVolumes implements PersistentVolumeInterface
diff --git a/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolumeclaim.go b/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolumeclaim.go
index b876ec1b3..4b91f90c6 100644
--- a/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolumeclaim.go
+++ b/edge/pkg/edged/fake/typed/core/v1/fake_persistentvolumeclaim.go
@@ -3,10 +3,11 @@ package v1
 import (
 	"context"
 
-	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake"
+
+	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 )
 
 // FakePersistentVolumeClaims implements PersistentVolumeClaimInterface
diff --git a/edge/pkg/edged/fake/typed/storage/v1/fake_volumeattachment.go b/edge/pkg/edged/fake/typed/storage/v1/fake_volumeattachment.go
index abcec0b87..d855d2be9 100644
--- a/edge/pkg/edged/fake/typed/storage/v1/fake_volumeattachment.go
+++ b/edge/pkg/edged/fake/typed/storage/v1/fake_volumeattachment.go
@@ -3,10 +3,11 @@ package v1
 import (
 	"context"
 
-	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	storagev1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	fakestoragev1 "k8s.io/client-go/kubernetes/typed/storage/v1/fake"
+
+	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 )
 
 // FakeVolumeAttachments implements PersistentVolumeInterface
diff --git a/edge/pkg/edgehub/common/certutil/certfile.go b/edge/pkg/edgehub/common/certutil/certfile.go
index eb23d626c..794757892 100644
--- a/edge/pkg/edgehub/common/certutil/certfile.go
+++ b/edge/pkg/edgehub/common/certutil/certfile.go
@@ -4,6 +4,7 @@ import (
 	"crypto"
 	"crypto/x509"
 	"encoding/pem"
+
 	"github.com/pkg/errors"
 	certutil "k8s.io/client-go/util/cert"
 	"k8s.io/client-go/util/keyutil"
diff --git a/edge/pkg/metamanager/client/listener.go b/edge/pkg/metamanager/client/listener.go
index 046df3c59..eed153672 100644
--- a/edge/pkg/metamanager/client/listener.go
+++ b/edge/pkg/metamanager/client/listener.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
-
 	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/message"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
diff --git a/edge/pkg/metamanager/client/nodestatus.go b/edge/pkg/metamanager/client/nodestatus.go
index f5ebf4b8f..66db02a61 100644
--- a/edge/pkg/metamanager/client/nodestatus.go
+++ b/edge/pkg/metamanager/client/nodestatus.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
-
 	edgeapi "github.com/kubeedge/kubeedge/common/types"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/message"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
diff --git a/edge/pkg/metamanager/client/podstatus.go b/edge/pkg/metamanager/client/podstatus.go
index dc50f8137..50afbc1b1 100644
--- a/edge/pkg/metamanager/client/podstatus.go
+++ b/edge/pkg/metamanager/client/podstatus.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/kubeedge/beehive/pkg/core/model"
-
 	edgeapi "github.com/kubeedge/kubeedge/common/types"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/message"
 	commodule "github.com/kubeedge/kubeedge/edge/pkg/common/modules"
diff --git a/edge/pkg/metamanager/client/service.go b/edge/pkg/metamanager/client/service.go
index edfb16f56..0e43bd079 100644
--- a/edge/pkg/metamanager/client/service.go
+++ b/edge/pkg/metamanager/client/service.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/kubeedge/beehive/pkg/core/model"
 	v1 "k8s.io/api/core/v1"
 
+	"github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/message"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
diff --git a/edge/pkg/metamanager/metamanager_test.go b/edge/pkg/metamanager/metamanager_test.go
index e37e2defd..8d76bce67 100644
--- a/edge/pkg/metamanager/metamanager_test.go
+++ b/edge/pkg/metamanager/metamanager_test.go
@@ -19,10 +19,9 @@ package metamanager
 import (
 	"testing"
 
-	"github.com/kubeedge/beehive/pkg/core/model"
-
 	"github.com/kubeedge/beehive/pkg/core"
 	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
+	"github.com/kubeedge/beehive/pkg/core/model"
 	commodule "github.com/kubeedge/kubeedge/edge/pkg/common/modules"
 )
 
diff --git a/edge/test/integration/appdeployment/application_suite_test.go b/edge/test/integration/appdeployment/application_suite_test.go
index 1322a8b6c..dadd24a3c 100644
--- a/edge/test/integration/appdeployment/application_suite_test.go
+++ b/edge/test/integration/appdeployment/application_suite_test.go
@@ -19,11 +19,10 @@ package application_test
 import (
 	"testing"
 
-	"github.com/kubeedge/kubeedge/edge/test/integration/utils"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	"github.com/kubeedge/kubeedge/edge/test/integration/utils"
 	"github.com/kubeedge/kubeedge/edge/test/integration/utils/common"
 	"github.com/kubeedge/kubeedge/edge/test/integration/utils/edge"
 )
diff --git a/edgemesh/cmd/edgemesh.go b/edgemesh/cmd/edgemesh.go
index 396f131c5..e45cf49a8 100644
--- a/edgemesh/cmd/edgemesh.go
+++ b/edgemesh/cmd/edgemesh.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+
 	"github.com/spf13/pflag"
 	"k8s.io/klog/v2"
 )
diff --git a/edgemesh/pkg/listener/listener.go b/edgemesh/pkg/listener/listener.go
index dbb91d822..ac6438a17 100644
--- a/edgemesh/pkg/listener/listener.go
+++ b/edgemesh/pkg/listener/listener.go
@@ -10,10 +10,10 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/kubeedge/beehive/pkg/core/model"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/cache"
diff --git a/edgemesh/pkg/module.go b/edgemesh/pkg/module.go
index 5c45cedc2..b53f412a8 100644
--- a/edgemesh/pkg/module.go
+++ b/edgemesh/pkg/module.go
@@ -1,10 +1,10 @@
 package pkg
 
 import (
-	"github.com/kubeedge/beehive/pkg/core"
-	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"k8s.io/klog/v2"
 
+	"github.com/kubeedge/beehive/pkg/core"
+	beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/common/modules"
 	meshconfig "github.com/kubeedge/kubeedge/edgemesh/pkg/config"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/constant"
diff --git a/pkg/stream/edgedexecconnection.go b/pkg/stream/edgedexecconnection.go
index 307070b9c..e80e73a96 100644
--- a/pkg/stream/edgedexecconnection.go
+++ b/pkg/stream/edgedexecconnection.go
@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"k8s.io/apimachinery/pkg/util/httpstream/spdy"
-	"k8s.io/klog/v2"
 	"net/http"
 	"net/url"
+
+	"k8s.io/apimachinery/pkg/util/httpstream/spdy"
+	"k8s.io/klog/v2"
 )
 
 type EdgedExecConnection struct {
diff --git a/pkg/version/verflag/verflag.go b/pkg/version/verflag/verflag.go
index 14fcfd62d..824123f42 100644
--- a/pkg/version/verflag/verflag.go
+++ b/pkg/version/verflag/verflag.go
@@ -23,9 +23,9 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/kubeedge/kubeedge/pkg/version"
-
 	flag "github.com/spf13/pflag"
+
+	"github.com/kubeedge/kubeedge/pkg/version"
 )
 
 type VersionValue int