cleanup all lint issue

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

4 files changed, 26 insertions, 27 deletions

diff --git a/edgemesh/pkg/dns/dns.go b/edgemesh/pkg/dns/dns.go
index 3905f9bc0..2b77e0236 100644
--- a/edgemesh/pkg/dns/dns.go
+++ b/edgemesh/pkg/dns/dns.go
@@ -279,16 +279,16 @@ func (q *dnsQuestion) getQName(req []byte, offset uint16) uint16 {
 }
 
 // lookupFromMetaManager confirms if the service exists
-func lookupFromMetaManager(serviceUrl string) (exist bool, ip string) {
-	name, namespace := common.SplitServiceKey(serviceUrl)
+func lookupFromMetaManager(serviceURL string) (exist bool, ip string) {
+	name, namespace := common.SplitServiceKey(serviceURL)
 	s, _ := metaClient.Services(namespace).Get(name)
 	if s != nil {
 		svcName := namespace + "." + name
 		ip := listener.GetServiceServer(svcName)
-		klog.Infof("[EdgeMesh] dns server parse %s ip %s", serviceUrl, ip)
+		klog.Infof("[EdgeMesh] dns server parse %s ip %s", serviceURL, ip)
 		return true, ip
 	}
-	klog.Errorf("[EdgeMesh] service %s is not found in this cluster", serviceUrl)
+	klog.Errorf("[EdgeMesh] service %s is not found in this cluster", serviceURL)
 	return false, ""
 }
 
diff --git a/edgemesh/pkg/listener/listener.go b/edgemesh/pkg/listener/listener.go
index e837296a7..14c589c57 100644
--- a/edgemesh/pkg/listener/listener.go
+++ b/edgemesh/pkg/listener/listener.go
@@ -37,7 +37,7 @@ const (
 	defaultNetworkPrefix = "9.251."
 	maxPoolSize          = 65534
 
-	SO_ORIGINAL_DST = 80
+	SoOriginalDst = 80
 )
 
 var (
@@ -242,7 +242,7 @@ func realServerAddress(conn *net.Conn) (string, int, error) {
 
 	var addr sockAddr
 	size := uint32(unsafe.Sizeof(addr))
-	err = getSockOpt(int(fd), syscall.SOL_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&addr)), &size)
+	err = getSockOpt(int(fd), syscall.SOL_IP, SoOriginalDst, uintptr(unsafe.Pointer(&addr)), &size)
 	if err != nil {
 		return "", -1, err
 	}
@@ -369,18 +369,18 @@ func addServer(svcName, svcPorts string) {
 	if ip != "" {
 		svcDesc.set(svcName, ip, svcPorts)
 		return
-	} else {
+	}
+	if len(unused) == 0 {
+		// try to expand
+		expandPool()
 		if len(unused) == 0 {
-			// try to expand
-			expandPool()
-			if len(unused) == 0 {
-				klog.Warningf("[EdgeMesh] insufficient fake IP !!")
-				return
-			}
+			klog.Warningf("[EdgeMesh] insufficient fake IP !!")
+			return
 		}
-		ip = unused[0]
-		unused = unused[1:]
 	}
+	ip = unused[0]
+	unused = unused[1:]
+
 	svcDesc.set(svcName, ip, svcPorts)
 	err := metaClient.Listener().Add(svcName, ip)
 	if err != nil {
diff --git a/edgemesh/pkg/plugin/plugin.go b/edgemesh/pkg/plugin/plugin.go
index f6e01240d..231bc15c6 100644
--- a/edgemesh/pkg/plugin/plugin.go
+++ b/edgemesh/pkg/plugin/plugin.go
@@ -9,7 +9,6 @@ import (
 	"github.com/go-chassis/go-chassis/core/registry"
 
 	meshConfig "github.com/kubeedge/kubeedge/edgemesh/pkg/config"
-	_ "github.com/kubeedge/kubeedge/edgemesh/pkg/plugin/panel"
 	meshRegistry "github.com/kubeedge/kubeedge/edgemesh/pkg/plugin/registry"
 )
 
diff --git a/edgemesh/pkg/plugin/registry/registry.go b/edgemesh/pkg/plugin/registry/registry.go
index 77c70bbb6..66a75bd20 100644
--- a/edgemesh/pkg/plugin/registry/registry.go
+++ b/edgemesh/pkg/plugin/registry/registry.go
@@ -45,7 +45,7 @@ func (esd *EdgeServiceDiscovery) GetAllMicroServices() ([]*registry.MicroService
 // FindMicroServiceInstances find micro-service instances (subnets)
 func (esd *EdgeServiceDiscovery) FindMicroServiceInstances(consumerID, microServiceName string, tags utiltags.Tags) ([]*registry.MicroServiceInstance, error) {
 	// parse microServiceName
-	name, namespace, port, err := parseServiceUrl(microServiceName)
+	name, namespace, port, err := parseServiceURL(microServiceName)
 	if err != nil {
 		return nil, err
 	}
@@ -125,22 +125,22 @@ func (esd *EdgeServiceDiscovery) AutoSync() {}
 // Close close all websocket connection
 func (esd *EdgeServiceDiscovery) Close() error { return nil }
 
-// parseServiceUrl parses serviceUrl to ${service_name}.${namespace}.svc.${cluster}:${port}, keeps with k8s service
-func parseServiceUrl(serviceUrl string) (name, namespace string, port int, err error) {
-	name, namespace = common.SplitServiceKey(serviceUrl)
-	serviceUrlSplit := strings.Split(serviceUrl, ":")
-	if len(serviceUrlSplit) == 1 {
+// parseServiceURL parses serviceURL to ${service_name}.${namespace}.svc.${cluster}:${port}, keeps with k8s service
+func parseServiceURL(serviceURL string) (name, namespace string, port int, err error) {
+	name, namespace = common.SplitServiceKey(serviceURL)
+	serviceURLSplit := strings.Split(serviceURL, ":")
+	if len(serviceURLSplit) == 1 {
 		// default
 		port = 80
-	} else if len(serviceUrlSplit) == 2 {
-		port, err = strconv.Atoi(serviceUrlSplit[1])
+	} else if len(serviceURLSplit) == 2 {
+		port, err = strconv.Atoi(serviceURLSplit[1])
 		if err != nil {
-			klog.Errorf("[EdgeMesh] service url %s invalid", serviceUrl)
+			klog.Errorf("[EdgeMesh] service url %s invalid", serviceURL)
 			return
 		}
 	} else {
-		klog.Errorf("[EdgeMesh] service url %s invalid", serviceUrl)
-		err = fmt.Errorf("service url %s invalid", serviceUrl)
+		klog.Errorf("[EdgeMesh] service url %s invalid", serviceURL)
+		err = fmt.Errorf("service url %s invalid", serviceURL)
 	}
 	return
 }