Merge pull request #1638 from daixiang0/lint

cleanup all lint issue

35 files changed, 0 insertions, 87 deletions

diff --git a/edge/pkg/devicetwin/dtclient/device_db.go b/edge/pkg/devicetwin/dtclient/device_db.go
index 50aefea47..7fa6be62d 100644
--- a/edge/pkg/devicetwin/dtclient/device_db.go
+++ b/edge/pkg/devicetwin/dtclient/device_db.go
@@ -55,7 +55,6 @@ func QueryDevice(key string, condition string) (*[]Device, error) {
 		return nil, err
 	}
 	return devices, nil
-
 }
 
 // QueryDeviceAll query twin
@@ -66,7 +65,6 @@ func QueryDeviceAll() (*[]Device, error) {
 		return nil, err
 	}
 	return devices, nil
-
 }
 
 //DeviceUpdate the struct for updating device
@@ -142,9 +140,7 @@ func DeleteDeviceTrans(deletes []string) error {
 			obm.Rollback()
 			return err
 		}
-
 	}
 	obm.Commit()
 	return nil
-
 }
diff --git a/edge/pkg/devicetwin/dtclient/deviceattr_db.go b/edge/pkg/devicetwin/dtclient/deviceattr_db.go
index da52135d1..a63abcbb4 100644
--- a/edge/pkg/devicetwin/dtclient/deviceattr_db.go
+++ b/edge/pkg/devicetwin/dtclient/deviceattr_db.go
@@ -69,7 +69,6 @@ func QueryDeviceAttr(key string, condition string) (*[]DeviceAttr, error) {
 		return nil, err
 	}
 	return attrs, nil
-
 }
 
 //DeviceDelete the struct for deleting device
diff --git a/edge/pkg/devicetwin/dtclient/devicetwin_db.go b/edge/pkg/devicetwin/dtclient/devicetwin_db.go
index bc734fbcb..8d2fcb5b3 100644
--- a/edge/pkg/devicetwin/dtclient/devicetwin_db.go
+++ b/edge/pkg/devicetwin/dtclient/devicetwin_db.go
@@ -74,7 +74,6 @@ func QueryDeviceTwin(key string, condition string) (*[]DeviceTwin, error) {
 		return nil, err
 	}
 	return twin, nil
-
 }
 
 //DeviceTwinUpdate the struct for updating device twin
diff --git a/edge/pkg/devicetwin/dtcontext/dtcontext.go b/edge/pkg/devicetwin/dtcontext/dtcontext.go
index 6b94e0d00..8c8f98615 100644
--- a/edge/pkg/devicetwin/dtcontext/dtcontext.go
+++ b/edge/pkg/devicetwin/dtcontext/dtcontext.go
@@ -67,7 +67,6 @@ func (dtc *DTContext) HeartBeat(dtmName string, content interface{}) error {
 	if strings.Compare(content.(string), "ping") == 0 {
 		dtc.ModulesHealth.Store(dtmName, time.Now().Unix())
 		klog.Infof("%s is healthy %v", dtmName, time.Now().Unix())
-
 	} else if strings.Compare(content.(string), "stop") == 0 {
 		klog.Infof("%s stop", dtmName)
 		return errors.New("stop")
diff --git a/edge/pkg/devicetwin/dtmanager/communicate.go b/edge/pkg/devicetwin/dtmanager/communicate.go
index cba7973cb..8af016d7b 100644
--- a/edge/pkg/devicetwin/dtmanager/communicate.go
+++ b/edge/pkg/devicetwin/dtmanager/communicate.go
@@ -161,7 +161,6 @@ func (cw CommWorker) checkConfirm(context *dtcontext.DTContext, msg interface{})
 			} else {
 				klog.Errorf("CommModule deal %s event failed, not found callback", dtmsg.Action)
 			}
-
 		}
 		return true
 	})
diff --git a/edge/pkg/devicetwin/dtmanager/communicate_test.go b/edge/pkg/devicetwin/dtmanager/communicate_test.go
index 0761215c1..220f6cfbd 100644
--- a/edge/pkg/devicetwin/dtmanager/communicate_test.go
+++ b/edge/pkg/devicetwin/dtmanager/communicate_test.go
@@ -158,7 +158,6 @@ func TestStartHeartBeat(t *testing.T) {
 				if retry >= maxRetries {
 					t.Errorf("Start Failed to add module in beehiveContext")
 				}
-
 			}
 		})
 	}
diff --git a/edge/pkg/devicetwin/dtmanager/device.go b/edge/pkg/devicetwin/dtmanager/device.go
index 812e48c95..d884776f6 100644
--- a/edge/pkg/devicetwin/dtmanager/device.go
+++ b/edge/pkg/devicetwin/dtmanager/device.go
@@ -168,7 +168,6 @@ func DeviceUpdated(context *dtcontext.DTContext, deviceID string, attributes map
 		if err != nil {
 			SyncDeviceFromSqlite(context, deviceID)
 			klog.Errorf("Update device failed due to writing sql error: %v", err)
-
 		} else {
 			klog.Infof("Send update attributes of device %s event to edge app", deviceID)
 			payload, err := dttype.BuildDeviceAttrUpdate(baseMessage, result)
@@ -202,7 +201,6 @@ func DealMsgAttr(context *dtcontext.DTContext, deviceID string, msgAttrs map[str
 	result := make(map[string]*dttype.MsgAttr)
 
 	for key, msgAttr := range msgAttrs {
-
 		if attr, exist := attrs[key]; exist {
 			if msgAttr == nil && dealType == 0 {
 				if *attr.Optional {
@@ -252,9 +250,7 @@ func DealMsgAttr(context *dtcontext.DTContext, deviceID string, msgAttrs map[str
 			} else {
 				delete(result, key)
 			}
-
 		} else {
-
 			deviceAttr := dttype.MsgAttrToDeviceAttr(key, msgAttr)
 			deviceAttr.DeviceID = deviceID
 			deviceAttr.Value = msgAttr.Value
diff --git a/edge/pkg/devicetwin/dtmanager/membership.go b/edge/pkg/devicetwin/dtmanager/membership.go
index 3c43561b7..dc9ce3788 100644
--- a/edge/pkg/devicetwin/dtmanager/membership.go
+++ b/edge/pkg/devicetwin/dtmanager/membership.go
@@ -340,7 +340,6 @@ func DealGetMembership(context *dtcontext.DTContext, payload []byte) error {
 		} else {
 			result = payload
 		}
-
 	}
 	topic := dtcommon.MemETPrefix + context.NodeName + dtcommon.MemETGetResultSuffix
 	klog.Infof("Deal getting membership successful and send the result")
@@ -351,7 +350,6 @@ func DealGetMembership(context *dtcontext.DTContext, payload []byte) error {
 		context.BuildModelMessage(modules.BusGroup, "", topic, "publish", result))
 
 	return nil
-
 }
 
 //SyncDeviceFromSqlite sync device from sqlite
diff --git a/edge/pkg/devicetwin/dtmanager/membership_test.go b/edge/pkg/devicetwin/dtmanager/membership_test.go
index 15564e6be..d52bb1b84 100644
--- a/edge/pkg/devicetwin/dtmanager/membership_test.go
+++ b/edge/pkg/devicetwin/dtmanager/membership_test.go
@@ -94,7 +94,6 @@ func TestDealMembershipDetailInvalidMsg(t *testing.T) {
 }
 
 func TestDealMembershipDetailInvalidContent(t *testing.T) {
-
 	dtc := &dtcontext.DTContext{
 		DeviceList: &sync.Map{},
 		GroupID:    "1",
@@ -140,7 +139,6 @@ func TestDealMembershipUpdatedEmptyMessage(t *testing.T) {
 }
 
 func TestDealMembershipUpdatedInvalidMsg(t *testing.T) {
-
 	dtc := &dtcontext.DTContext{
 		DeviceList: &sync.Map{},
 		GroupID:    "1",
@@ -156,7 +154,6 @@ func TestDealMembershipUpdatedInvalidMsg(t *testing.T) {
 	assert.Equal(t, nil, value)
 }
 func TestDealMembershipUpdatedInvalidContent(t *testing.T) {
-
 	dtc := &dtcontext.DTContext{
 		DeviceList: &sync.Map{},
 		GroupID:    "1",
@@ -254,7 +251,6 @@ func TestDealMerbershipGetEmptyMsg(t *testing.T) {
 }
 
 func TestDealMerbershipGetInvalidMsg(t *testing.T) {
-
 	dtc := &dtcontext.DTContext{
 		DeviceList: &sync.Map{},
 		GroupID:    "1",
diff --git a/edge/pkg/devicetwin/dtmanager/twin.go b/edge/pkg/devicetwin/dtmanager/twin.go
index 3eb8afbec..b3c9d536c 100644
--- a/edge/pkg/devicetwin/dtmanager/twin.go
+++ b/edge/pkg/devicetwin/dtmanager/twin.go
@@ -269,7 +269,6 @@ func dealDelta(context *dtcontext.DTContext, deviceID string, payload []byte) er
 
 // dealSyncResult build and send sync result, is delta update
 func dealSyncResult(context *dtcontext.DTContext, deviceID string, baseMessage dttype.BaseMessage, twin map[string]*dttype.MsgTwin) error {
-
 	klog.Infof("Deal sync result of device %s: sync with cloud", deviceID)
 	resource := "device/" + deviceID + "/twin/edge_updated"
 	return context.Send("",
@@ -280,7 +279,6 @@ func dealSyncResult(context *dtcontext.DTContext, deviceID string, baseMessage d
 
 //dealDocument build document and save current state as last state, update sqlite
 func dealDocument(context *dtcontext.DTContext, deviceID string, baseMessage dttype.BaseMessage, twinDocument map[string]*dttype.TwinDoc) error {
-
 	klog.Infof("Deal document of device %s: build and send document", deviceID)
 	payload, _ := dttype.BuildDeviceTwinDocument(baseMessage, twinDocument)
 	topic := dtcommon.DeviceETPrefix + deviceID + dtcommon.TwinETDocumentSuffix
@@ -293,7 +291,6 @@ func dealDocument(context *dtcontext.DTContext, deviceID string, baseMessage dtt
 
 // DealGetTwin deal get twin event
 func DealGetTwin(context *dtcontext.DTContext, deviceID string, payload []byte) error {
-
 	klog.Info("Deal the event of getting twin")
 	msg := []byte("")
 	para := dttype.Parameter{}
@@ -486,7 +483,6 @@ func dealTwinDelete(returnResult *dttype.DealTwinResult, deviceID string, key st
 	} else {
 		delete(document, key)
 		delete(syncResult, key)
-
 	}
 
 	return nil
@@ -519,7 +515,6 @@ func isTwinValueDiff(twin *dttype.MsgTwin, msgTwin *dttype.MsgTwin, dealType int
 	}
 	if hasMsgTwin {
 		if hasTwin {
-
 			err := dtcommon.ValidateValue(valueType, *msgTwinValue.Value)
 			if err != nil {
 				return false, err
@@ -712,7 +707,6 @@ func dealTwinCompare(returnResult *dttype.DealTwinResult, deviceID string, key s
 				isChange = true
 			}
 		}
-
 	}
 	if isChange {
 		update = append(update, dtclient.DeviceTwinUpdate{DeviceID: deviceID, Name: key, Cols: cols})
@@ -732,7 +726,6 @@ func dealTwinCompare(returnResult *dttype.DealTwinResult, deviceID string, key s
 				delete(syncResult, key)
 			}
 		}
-
 	} else {
 		if dealType == RestDealType {
 			delete(document, key)
@@ -745,7 +738,6 @@ func dealTwinCompare(returnResult *dttype.DealTwinResult, deviceID string, key s
 				delete(syncResult, key)
 			}
 		}
-
 	}
 	return nil
 }
@@ -903,14 +895,12 @@ func dealTwinAdd(returnResult *dttype.DealTwinResult, deviceID string, key strin
 		} else {
 			delete(syncResult, key)
 		}
-
 	} else {
 		delete(document, key)
 		delete(syncResult, key)
 	}
 
 	return nil
-
 }
 
 //DealMsgTwin get diff while updating twin
@@ -969,9 +959,7 @@ func DealMsgTwin(context *dtcontext.DTContext, deviceID string, msgTwins map[str
 			if err != nil {
 				return returnResult
 			}
-
 		}
-
 	}
 	context.DeviceList.Store(deviceID, deviceModel)
 	return returnResult
diff --git a/edge/pkg/devicetwin/dttype/types_helper.go b/edge/pkg/devicetwin/dttype/types_helper.go
index 711bfb03e..2377f11ee 100644
--- a/edge/pkg/devicetwin/dttype/types_helper.go
+++ b/edge/pkg/devicetwin/dttype/types_helper.go
@@ -209,7 +209,6 @@ func BuildMembershipGetResult(baseMessage BaseMessage, devices []*Device) ([]byt
 		return []byte(""), err
 	}
 	return payload, nil
-
 }
 
 //DeviceTwinResult device get result
@@ -235,7 +234,6 @@ func BuildDeviceTwinResult(baseMessage BaseMessage, twins map[string]*MsgTwin, d
 			twin.ActualVersion = nil
 			twin.ExpectedVersion = nil
 			result[k] = &twin
-
 		}
 	} else {
 		result = twins
@@ -246,7 +244,6 @@ func BuildDeviceTwinResult(baseMessage BaseMessage, twins map[string]*MsgTwin, d
 		return []byte(""), err
 	}
 	return payload, nil
-
 }
 
 // BuildErrorResult build error result
@@ -260,7 +257,6 @@ func BuildErrorResult(para Parameter) ([]byte, error) {
 		return []byte(""), err
 	}
 	return errorResult, nil
-
 }
 
 //DeviceUpdate device update
@@ -316,7 +312,6 @@ func BuildDeviceTwinDelta(baseMessage BaseMessage, twins map[string]*MsgTwin) ([
 					value := expectedValue
 					delta[k] = value
 				}
-
 			}
 		} else {
 			continue
@@ -340,7 +335,6 @@ func BuildDeviceTwinDelta(baseMessage BaseMessage, twins map[string]*MsgTwin) ([
 
 //BuildDeviceTwinDocument  build device twin document
 func BuildDeviceTwinDocument(baseMessage BaseMessage, twins map[string]*TwinDoc) ([]byte, bool) {
-
 	payload, err := json.Marshal(DeviceTwinDocument{BaseMessage: baseMessage, Twin: twins})
 	if err != nil {
 		return []byte(""), false
diff --git a/edge/pkg/devicetwin/process.go b/edge/pkg/devicetwin/process.go
index f8ac919f3..57ce1845c 100644
--- a/edge/pkg/devicetwin/process.go
+++ b/edge/pkg/devicetwin/process.go
@@ -37,7 +37,6 @@ func (dt *DeviceTwin) RegisterDTModule(name string) {
 	module.InitWorker(dt.DTContexts.CommChan[name], dt.DTContexts.ConfirmChan,
 		dt.HeartBeatToModule[name], dt.DTContexts)
 	dt.DTModules[name] = module
-
 }
 
 //distributeMsg distribute message to diff module
@@ -128,7 +127,6 @@ func SyncSqlite(context *dtcontext.DTContext) error {
 		}
 	}
 	return nil
-
 }
 
 //SyncDeviceFromSqlite sync device from sqlite
@@ -260,7 +258,6 @@ func classifyMsg(message *dttype.DTMessage) bool {
 			return true
 		}
 		return false
-
 	} else if strings.Compare(msgSource, "edgehub") == 0 {
 		if strings.Compare(message.Msg.Router.Resource, "node/connection") == 0 {
 			message.Action = dtcommon.LifeCycle
@@ -272,7 +269,6 @@ func classifyMsg(message *dttype.DTMessage) bool {
 }
 
 func (dt *DeviceTwin) runDeviceTwin() {
-
 	moduleNames := []string{dtcommon.MemModule, dtcommon.TwinModule, dtcommon.DeviceModule, dtcommon.CommModule}
 	for _, v := range moduleNames {
 		dt.RegisterDTModule(v)
@@ -285,7 +281,6 @@ func (dt *DeviceTwin) runDeviceTwin() {
 				klog.Warning("Stop DeviceTwin ModulesContext Receive loop")
 				return
 			default:
-
 			}
 			if msg, ok := beehiveContext.Receive("twin"); ok == nil {
 				klog.Info("DeviceTwin receive msg")
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go
index 278b23480..141959ed6 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -712,7 +712,6 @@ func (e *edged) StartGarbageCollection() {
 }
 
 func (e *edged) syncLoopIteration(plegCh <-chan *pleg.PodLifecycleEvent, housekeepingCh <-chan time.Time, syncWorkQueueCh <-chan time.Time) {
-
 	for {
 		select {
 		case update := <-e.livenessManager.Updates():
@@ -885,7 +884,6 @@ func (e *edged) podRemoveWorkerRun(consumers int) {
 							e.podDeletionQueue.Add(item)
 						}(item)
 					}
-
 				}
 				e.podDeletionQueue.Done(item)
 			}
diff --git a/edge/pkg/edged/edged_pods.go b/edge/pkg/edged/edged_pods.go
index 3dde4f56a..073f0d1d9 100644
--- a/edge/pkg/edged/edged_pods.go
+++ b/edge/pkg/edged/edged_pods.go
@@ -623,7 +623,6 @@ func (e *edged) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) {
 
 // Make the environment variables for a pod in the given namespace.
 func (e *edged) makeEnvironmentVariables(pod *v1.Pod, container *v1.Container, podIP string, podIPs []string) ([]kubecontainer.EnvVar, error) {
-
 	var result []kubecontainer.EnvVar
 
 	var err error
@@ -955,7 +954,6 @@ func (e *edged) updatePodStatus(pod *v1.Pod) error {
 					Reason: "Completed"}
 				kubeStatus := toKubeContainerStatus(v1.PodSucceeded, containerStatus)
 				podStatus = &v1.PodStatus{Phase: v1.PodSucceeded, ContainerStatuses: []v1.ContainerStatus{kubeStatus}}
-
 			} else {
 				podStatus = e.convertStatusToAPIStatus(pod, podStatusRemote)
 				// Assume info is ready to process
diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go
index 6910e99fa..cf7d50132 100644
--- a/edge/pkg/edged/edged_status.go
+++ b/edge/pkg/edged/edged_status.go
@@ -243,7 +243,6 @@ func (e *edged) setNodeReadyCondition(node *edgeapi.NodeStatusRequest) {
 		newNodeReadyCondition.LastTransitionTime = currentTime
 		node.Status.Conditions = append(node.Status.Conditions, newNodeReadyCondition)
 	}
-
 }
 
 func (e *edged) getNodeInfo() (v1.NodeSystemInfo, error) {
@@ -272,7 +271,6 @@ func (e *edged) getNodeInfo() (v1.NodeSystemInfo, error) {
 	//nodeInfo.ContainerRuntimeVersion = fmt.Sprintf("docker://%s", runtimeVersion.String())
 
 	return nodeInfo, nil
-
 }
 
 func (e *edged) setGPUInfo(nodeStatus *edgeapi.NodeStatusRequest) error {
diff --git a/edge/pkg/edged/edged_volumes.go b/edge/pkg/edged/edged_volumes.go
index 6efc5b5d7..f15e3d773 100644
--- a/edge/pkg/edged/edged_volumes.go
+++ b/edge/pkg/edged/edged_volumes.go
@@ -58,7 +58,6 @@ func (e *edged) newVolumeMounterFromPlugins(spec *volume.Spec, pod *api.Pod, opt
 // cleanupOrphanedPodDirs removes the volumes of pods that should not be
 // running and that have no containers running.
 func (e *edged) cleanupOrphanedPodDirs(pods []*api.Pod, containerRunningPods []*container.Pod) error {
-
 	allPods := sets.NewString()
 	for _, pod := range pods {
 		allPods.Insert(string(pod.UID))
diff --git a/edge/pkg/edged/volume/csi/csi_client.go b/edge/pkg/edged/volume/csi/csi_client.go
index 30edb1d46..ee2502f88 100644
--- a/edge/pkg/edged/volume/csi/csi_client.go
+++ b/edge/pkg/edged/volume/csi/csi_client.go
@@ -240,7 +240,6 @@ func (c *csiDriverClient) nodeGetInfoV1(ctx context.Context) (
 	maxVolumePerNode int64,
 	accessibleTopology map[string]string,
 	err error) {
-
 	nodeClient, closer, err := c.nodeV1ClientCreator(c.addr)
 	if err != nil {
 		return "", 0, nil, err
@@ -264,7 +263,6 @@ func (c *csiDriverClient) nodeGetInfoV0(ctx context.Context) (
 	maxVolumePerNode int64,
 	accessibleTopology map[string]string,
 	err error) {
-
 	nodeClient, closer, err := c.nodeV1ClientCreator(c.addr)
 	if err != nil {
 		return "", 0, nil, err
@@ -320,7 +318,6 @@ func (c *csiDriverClient) NodePublishVolume(
 	}
 
 	return fmt.Errorf("failed to call NodePublishVolume. Both nodeV1ClientCreator and nodeV0ClientCreator are nil")
-
 }
 
 func (c *csiDriverClient) NodeExpandVolume(ctx context.Context, volumeID, volumePath string, newSize resource.Quantity) (resource.Quantity, error) {
@@ -589,7 +586,6 @@ func (c *csiDriverClient) NodeSupportsNodeExpand(ctx context.Context) (bool, err
 	}
 
 	return false, fmt.Errorf("failed to call NodeSupportsNodeExpand. Both nodeV1ClientCreator and nodeV0ClientCreator are nil")
-
 }
 
 func (c *csiDriverClient) NodeSupportsStageUnstage(ctx context.Context) (bool, error) {
@@ -827,7 +823,6 @@ func (c *csiDriverClient) nodeGetVolumeStatsV1(
 		default:
 			klog.Errorf("unknown key %s in usage", unit.String())
 		}
-
 	}
 	return metrics, nil
 }
diff --git a/edge/pkg/edged/volume/csi/csi_mounter.go b/edge/pkg/edged/volume/csi/csi_mounter.go
index 2e45d0e32..527375222 100644
--- a/edge/pkg/edged/volume/csi/csi_mounter.go
+++ b/edge/pkg/edged/volume/csi/csi_mounter.go
@@ -230,7 +230,6 @@ func (c *csiMountMgr) SetUpAt(dir string, mounterArgs volume.MounterArgs) error
 			return fmt.Errorf("fetching NodePublishSecretRef %s/%s failed: %v",
 				secretRef.Namespace, secretRef.Name, err)
 		}
-
 	}
 
 	err = csi.NodePublishVolume(
diff --git a/edge/pkg/edged/volume/csi/csi_plugin.go b/edge/pkg/edged/volume/csi/csi_plugin.go
index 6bc1c0032..247371dc3 100644
--- a/edge/pkg/edged/volume/csi/csi_plugin.go
+++ b/edge/pkg/edged/volume/csi/csi_plugin.go
@@ -353,7 +353,6 @@ func (p *csiPlugin) NewMounter(
 	spec *volume.Spec,
 	pod *api.Pod,
 	_ volume.VolumeOptions) (volume.Mounter, error) {
-
 	volSrc, pvSrc, err := getSourceFromSpec(spec)
 	if err != nil {
 		return nil, err
diff --git a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
index 6b62a7273..6755dd2ac 100644
--- a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
+++ b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
@@ -348,7 +348,6 @@ func (nim *nodeInfoManager) updateCSINode(
 	driverName string,
 	driverNodeID string,
 	topology map[string]string) error {
-
 	csiKubeClient := nim.volumeHost.GetKubeClient()
 	if csiKubeClient == nil {
 		return fmt.Errorf("error getting CSI client")
@@ -373,7 +372,6 @@ func (nim *nodeInfoManager) tryUpdateCSINode(
 	driverName string,
 	driverNodeID string,
 	topology map[string]string) error {
-
 	nodeInfo, err := csiKubeClient.StorageV1beta1().CSINodes().Get(string(nim.nodeName), metav1.GetOptions{})
 	if nodeInfo == nil || errors.IsNotFound(err) {
 		nodeInfo, err = nim.CreateCSINode()
@@ -423,11 +421,9 @@ func (nim *nodeInfoManager) tryInitializeCSINodeWithAnnotation(csiKubeClient cli
 		return err
 	}
 	return nil
-
 }
 
 func (nim *nodeInfoManager) CreateCSINode() (*storagev1beta1.CSINode, error) {
-
 	kubeClient := nim.volumeHost.GetKubeClient()
 	if kubeClient == nil {
 		return nil, fmt.Errorf("error getting kube client")
@@ -511,7 +507,6 @@ func (nim *nodeInfoManager) installDriverToCSINode(
 	driverName string,
 	driverNodeID string,
 	topology map[string]string) error {
-
 	csiKubeClient := nim.volumeHost.GetKubeClient()
 	if csiKubeClient == nil {
 		return fmt.Errorf("error getting CSI client")
@@ -559,7 +554,6 @@ func (nim *nodeInfoManager) installDriverToCSINode(
 
 func (nim *nodeInfoManager) uninstallDriverFromCSINode(
 	csiDriverName string) error {
-
 	csiKubeClient := nim.volumeHost.GetKubeClient()
 	if csiKubeClient == nil {
 		return fmt.Errorf("error getting CSI client")
@@ -582,7 +576,6 @@ func (nim *nodeInfoManager) uninstallDriverFromCSINode(
 func (nim *nodeInfoManager) tryUninstallDriverFromCSINode(
 	csiKubeClient clientset.Interface,
 	csiDriverName string) error {
-
 	nodeInfoClient := csiKubeClient.StorageV1beta1().CSINodes()
 	nodeInfo, err := nodeInfoClient.Get(string(nim.nodeName), metav1.GetOptions{})
 	if err != nil && errors.IsNotFound(err) {
@@ -613,7 +606,6 @@ func (nim *nodeInfoManager) tryUninstallDriverFromCSINode(
 	_, err = nodeInfoClient.Update(nodeInfo)
 
 	return err // do not wrap error
-
 }
 
 func updateMaxAttachLimit(driverName string, maxLimit int64) nodeUpdateFunc {
diff --git a/edge/pkg/edgehub/clients/wsclient/websocket_test.go b/edge/pkg/edgehub/clients/wsclient/websocket_test.go
index b15afffc2..b04a122dd 100644
--- a/edge/pkg/edgehub/clients/wsclient/websocket_test.go
+++ b/edge/pkg/edgehub/clients/wsclient/websocket_test.go
@@ -60,7 +60,6 @@ func newTestWebSocketClient(api string, certPath string, keyPath string) *WebSoc
 func handleServer(container *mux.MessageContainer, writer mux.ResponseWriter) {
 	klog.Infof("receive message: %s", container.Message.GetContent())
 	writer.WriteResponse(&model.Message{}, container.Message.GetContent())
-
 }
 
 func initServerEntries() {
diff --git a/edge/pkg/edgehub/edgehub.go b/edge/pkg/edgehub/edgehub.go
index d91b196b9..f05c7f09c 100644
--- a/edge/pkg/edgehub/edgehub.go
+++ b/edge/pkg/edgehub/edgehub.go
@@ -84,7 +84,6 @@ func (eh *EdgeHub) Start() {
 			klog.Warning("EdgeHub stop")
 			return
 		default:
-
 		}
 		err := eh.initial()
 		if err != nil {
diff --git a/edge/pkg/edgehub/process.go b/edge/pkg/edgehub/process.go
index 8e3c29490..d8df380d5 100644
--- a/edge/pkg/edgehub/process.go
+++ b/edge/pkg/edgehub/process.go
@@ -75,7 +75,6 @@ func (eh *EdgeHub) applyCerts() error {
 }
 
 func (eh *EdgeHub) initial() (err error) {
-
 	cloudHubClient, err := clients.GetClient()
 	if err != nil {
 		return err
@@ -152,7 +151,6 @@ func (eh *EdgeHub) routeToEdge() {
 			klog.Warning("EdgeHub RouteToEdge stop")
 			return
 		default:
-
 		}
 		message, err := eh.chClient.Receive()
 		if err != nil {
@@ -231,7 +229,6 @@ func (eh *EdgeHub) keepalive() {
 			klog.Warning("EdgeHub KeepAlive stop")
 			return
 		default:
-
 		}
 		msg := model.NewMessage("").
 			BuildRouter(ModuleNameEdgeHub, "resource", "node", "keepalive").
diff --git a/edge/pkg/edgestream/edgestream.go b/edge/pkg/edgestream/edgestream.go
index 0602de68e..03b7505df 100644
--- a/edge/pkg/edgestream/edgestream.go
+++ b/edge/pkg/edgestream/edgestream.go
@@ -71,7 +71,6 @@ func (e *edgestream) Enable() bool {
 }
 
 func (e *edgestream) Start() {
-
 	serverURL := url.URL{
 		Scheme: "wss",
 		Host:   config.Config.TunnelServer,
diff --git a/edge/pkg/eventbus/common/util/common_test.go b/edge/pkg/eventbus/common/util/common_test.go
index 9c2b74173..367f152e1 100644
--- a/edge/pkg/eventbus/common/util/common_test.go
+++ b/edge/pkg/eventbus/common/util/common_test.go
@@ -33,7 +33,6 @@ var clientOptions = MQTT.NewClientOptions()
 
 //TestCheckKeyExist checks the functionality of CheckKeyExist function
 func TestCheckKeyExist(t *testing.T) {
-
 	tests := []struct {
 		name          string
 		keys          []string
diff --git a/edge/pkg/eventbus/eventbus.go b/edge/pkg/eventbus/eventbus.go
index 98c878b57..41fe6e480 100644
--- a/edge/pkg/eventbus/eventbus.go
+++ b/edge/pkg/eventbus/eventbus.go
@@ -49,9 +49,7 @@ func (eb *eventbus) Enable() bool {
 }
 
 func (eb *eventbus) Start() {
-
 	if eventconfig.Config.MqttMode >= v1alpha1.MqttModeBoth {
-
 		hub := &mqttBus.Client{
 			MQTTUrl: eventconfig.Config.MqttServerExternal,
 		}
diff --git a/edge/pkg/metamanager/client/configmap.go b/edge/pkg/metamanager/client/configmap.go
index 84ab87217..32c3f6ed6 100644
--- a/edge/pkg/metamanager/client/configmap.go
+++ b/edge/pkg/metamanager/client/configmap.go
@@ -51,7 +51,6 @@ func (c *configMaps) Delete(name string) error {
 }
 
 func (c *configMaps) Get(name string) (*api.ConfigMap, error) {
-
 	resource := fmt.Sprintf("%s/%s/%s", c.namespace, model.ResourceTypeConfigmap, name)
 	configMapMsg := message.BuildMsg(modules.MetaGroup, "", modules.EdgedModuleName, resource, model.QueryOperation, nil)
 	msg, err := c.send.SendSync(configMapMsg)
@@ -74,7 +73,6 @@ func (c *configMaps) Get(name string) (*api.ConfigMap, error) {
 		return handleConfigMapFromMetaDB(content)
 	}
 	return handleConfigMapFromMetaManager(content)
-
 }
 
 func handleConfigMapFromMetaDB(content []byte) (*api.ConfigMap, error) {
diff --git a/edge/pkg/metamanager/client/metaclient.go b/edge/pkg/metamanager/client/metaclient.go
index b413b5004..941e41a8b 100644
--- a/edge/pkg/metamanager/client/metaclient.go
+++ b/edge/pkg/metamanager/client/metaclient.go
@@ -126,7 +126,6 @@ func (s *send) SendSync(message *model.Message) (*model.Message, error) {
 			return false, nil
 		}
 		return true, err
-
 	})
 	return &resp, err
 }
diff --git a/edge/pkg/metamanager/client/secret.go b/edge/pkg/metamanager/client/secret.go
index 336618bf7..89b08cece 100644
--- a/edge/pkg/metamanager/client/secret.go
+++ b/edge/pkg/metamanager/client/secret.go
@@ -50,7 +50,6 @@ func (c *secrets) Delete(name string) error {
 }
 
 func (c *secrets) Get(name string) (*api.Secret, error) {
-
 	resource := fmt.Sprintf("%s/%s/%s", c.namespace, model.ResourceTypeSecret, name)
 	secretMsg := message.BuildMsg(modules.MetaGroup, "", modules.EdgedModuleName, resource, model.QueryOperation, nil)
 	msg, err := c.send.SendSync(secretMsg)
@@ -75,7 +74,6 @@ func (c *secrets) Get(name string) (*api.Secret, error) {
 	}
 	//else
 	return handleSecretFromMetaManager(content)
-
 }
 
 func handleSecretFromMetaDB(content []byte) (*api.Secret, error) {
diff --git a/edge/pkg/metamanager/metamanager.go b/edge/pkg/metamanager/metamanager.go
index d6c007ce4..babef78dc 100644
--- a/edge/pkg/metamanager/metamanager.go
+++ b/edge/pkg/metamanager/metamanager.go
@@ -59,7 +59,6 @@ func (m *metaManager) Enable() bool {
 }
 
 func (m *metaManager) Start() {
-
 	go func() {
 		period := getSyncInterval()
 		timer := time.NewTimer(period)
diff --git a/edge/pkg/metamanager/process.go b/edge/pkg/metamanager/process.go
index cd8b303b8..17bcb7b8c 100644
--- a/edge/pkg/metamanager/process.go
+++ b/edge/pkg/metamanager/process.go
@@ -558,7 +558,6 @@ func (m *metaManager) syncPodStatus() {
 }
 
 func (m *metaManager) processFunctionAction(message model.Message) {
-
 	var err error
 	var content []byte
 	switch message.GetContent().(type) {
@@ -616,7 +615,6 @@ func (m *metaManager) processFunctionActionResult(message model.Message) {
 	}
 
 	sendToCloud(&message)
-
 }
 
 func (m *metaManager) processVolume(message model.Message) {
@@ -669,7 +667,6 @@ func (m *metaManager) runMetaManager() {
 				klog.Warning("MetaManager mainloop stop")
 				return
 			default:
-
 			}
 			if msg, err := beehiveContext.Receive(m.Name()); err == nil {
 				klog.Infof("get a message %+v", msg)
diff --git a/edge/pkg/servicebus/servicebus.go b/edge/pkg/servicebus/servicebus.go
index 90b60caa5..8a8c3e1a5 100644
--- a/edge/pkg/servicebus/servicebus.go
+++ b/edge/pkg/servicebus/servicebus.go
@@ -66,7 +66,6 @@ func (sb *servicebus) Start() {
 			klog.Warning("ServiceBus stop")
 			return
 		default:
-
 		}
 		msg, err := beehiveContext.Receive("servicebus")
 		if err != nil {
diff --git a/edge/test/cloudhub/stub.go b/edge/test/cloudhub/stub.go
index 85c49806f..0db1042ed 100644
--- a/edge/test/cloudhub/stub.go
+++ b/edge/test/cloudhub/stub.go
@@ -130,7 +130,6 @@ func (tm *stubCloudHub) Start() {
 	if err != nil {
 		klog.Errorf("ListenAndServe: %v", err)
 	}
-
 }
 
 func (tm *stubCloudHub) Cleanup() {
diff --git a/edge/test/integration/device/device_suite_test.go b/edge/test/integration/device/device_suite_test.go
index b6e336803..69598d3e6 100755..100644
--- a/edge/test/integration/device/device_suite_test.go
+++ b/edge/test/integration/device/device_suite_test.go
@@ -64,10 +64,8 @@ var (
 
 //Function to run the Ginkgo Test
 func TestEdgecoreEventBus(t *testing.T) {
-
 	RegisterFailHandler(Fail)
 	var _ = BeforeSuite(func() {
-
 		MemDeviceUpdate = &MembershipUpdate{}
 		common.Infof("Before Suite execution")
 
diff --git a/edge/test/test.go b/edge/test/test.go
index 8473993db..dfff3cb20 100644
--- a/edge/test/test.go
+++ b/edge/test/test.go
@@ -220,7 +220,6 @@ func (tm *testManager) configmapHandler(w http.ResponseWriter, req *http.Request
 }
 
 func (tm *testManager) Start() {
-
 	http.HandleFunc("/pods", tm.podHandler)
 	http.HandleFunc("/configmap", tm.configmapHandler)
 	http.HandleFunc("/secret", tm.secretHandler)