chore: fix golang ci lint error (#2311)

Signed-off-by: yuxing.lyx <[email protected]>

Author: starnop

.golangci.yml

@@ -25,7 +25,7 @@ linters:
   enable:
     - gofmt
     - goimports
-    - golint
+    - revive
     - stylecheck
     - goconst
     - gosimple
@@ -34,23 +34,25 @@ linters:
     - ineffassign
     - vet
     - typecheck
-    - deadcode
     - errcheck
     - govet
     - staticcheck
-    - structcheck
     - unused
-    - varcheck
     - nilerr
     - unparam
-    - ifshort
     - unconvert
 
 issues:
   exclude-rules:
     - linters:
         - golint
       text: "AccessKeyId"
+    - linters:
+        - typecheck
+      text: "has no field or method"
+    - linters:
+        - revive
+      text: "just return error instead"
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration

pkg/checker/node_checker.go

@@ -58,9 +58,9 @@ func (n *NodeChecker) Check(cluster *v2.Cluster, phase string) error {
 		return err
 	}
 	var notReadyNodeList []string
-	var readyCount uint32 = 0
+	var readyCount uint32
 	var nodeCount uint32
-	var notReadyCount uint32 = 0
+	var notReadyCount uint32
 	for _, node := range nodes.Items {
 		nodeIP, nodePhase := getNodeStatus(node)
 		if nodePhase != ReadyNodeStatus {

pkg/checker/pod_checker.go

@@ -55,8 +55,8 @@ func (n *PodChecker) Check(cluster *v2.Cluster, phase string) error {
 		return err
 	}
 	for _, podNamespace := range namespacePodList {
-		var runningCount uint32 = 0
-		var notRunningCount uint32 = 0
+		var runningCount uint32
+		var notRunningCount uint32
 		var podCount uint32
 		var notRunningPodList []*corev1.Pod
 		for _, pod := range podNamespace.PodList.Items {

pkg/infra/aliyun/ali_ecs.go

@@ -52,10 +52,7 @@ func (a *AliProvider) RetryEcsRequest(request requests.AcsRequest, response resp
 
 func (a *AliProvider) RetryEcsAction(request requests.AcsRequest, response responses.AcsResponse, tryTimes int) error {
 	return utils.Retry(tryTimes, TrySleepTime, func() error {
-		if err := a.EcsClient.DoAction(request, response); err != nil {
-			return err
-		}
-		return nil
+		return a.EcsClient.DoAction(request, response)
 	})
 }
 

pkg/infra/container/container.go

@@ -146,10 +146,7 @@ func (a *ApplyProvider) ReconcileContainer() error {
 	if err := a.applyResult(masterApplyResult); err != nil {
 		return err
 	}
-	if err := a.applyResult(nodeApplyResult); err != nil {
-		return err
-	}
-	return nil
+	return a.applyResult(nodeApplyResult)
 }
 
 func (a *ApplyProvider) applyResult(result *ApplyResult) error {

pkg/infradriver/ssh_infradriver.go

@@ -94,12 +94,12 @@ func NewInfraDriver(cluster *v2.Cluster) (InfraDriver, error) {
 	}
 
 	// initialize sshConfigs field
-	for _, host := range cluster.Spec.Hosts {
-		if err = mergo.Merge(&host.SSH, &cluster.Spec.SSH); err != nil {
+	for i := range cluster.Spec.Hosts {
+		if err = mergo.Merge(&cluster.Spec.Hosts[i].SSH, &cluster.Spec.SSH); err != nil {
 			return nil, err
 		}
-		for _, ip := range host.IPS {
-			ret.sshConfigs[ip.String()] = ssh.NewSSHClient(&host.SSH, true)
+		for _, ip := range cluster.Spec.Hosts[i].IPS {
+			ret.sshConfigs[ip.String()] = ssh.NewSSHClient(&cluster.Spec.Hosts[i].SSH, true)
 		}
 	}
 

test/testhelper/utils.go

@@ -73,10 +73,7 @@ func WriteFile(fileName string, content []byte) error {
 		}
 	}
 
-	if err := os.WriteFile(fileName, content, settings.FileMode0644); err != nil {
-		return err
-	}
-	return nil
+	return os.WriteFile(fileName, content, settings.FileMode0644)
 }
 
 type SSHClient struct {
@@ -148,10 +145,7 @@ func MarshalYamlToFile(file string, obj interface{}) error {
 	if err != nil {
 		return err
 	}
-	if err = WriteFile(file, data); err != nil {
-		return err
-	}
-	return nil
+	return WriteFile(file, data)
 }
 
 // GetLocalFileData get file data from local

utils/archive/compress.go

@@ -327,7 +327,7 @@ func Decompress(src io.Reader, dst string, options Options) (int64, error) {
 	}
 
 	var (
-		size int64 = 0
+		size int64
 		dirs []*tar.Header
 		tr   = tar.NewReader(reader)
 	)

utils/ssh/ssh.go

@@ -88,13 +88,13 @@ func NewSSHClient(ssh *v1.SSH, alsoToStdout bool) Interface {
 
 // GetHostSSHClient is used to executed bash command and no std out to be printed.
 func GetHostSSHClient(hostIP net.IP, cluster *v2.Cluster) (Interface, error) {
-	for _, host := range cluster.Spec.Hosts {
-		for _, ip := range host.IPS {
+	for i := range cluster.Spec.Hosts {
+		for _, ip := range cluster.Spec.Hosts[i].IPS {
 			if hostIP.Equal(ip) {
-				if err := mergo.Merge(&host.SSH, &cluster.Spec.SSH); err != nil {
+				if err := mergo.Merge(&cluster.Spec.Hosts[i].SSH, &cluster.Spec.SSH); err != nil {
 					return nil, err
 				}
-				return NewSSHClient(&host.SSH, false), nil
+				return NewSSHClient(&cluster.Spec.Hosts[i].SSH, false), nil
 			}
 		}
 	}
@@ -103,13 +103,13 @@ func GetHostSSHClient(hostIP net.IP, cluster *v2.Cluster) (Interface, error) {
 
 // NewStdoutSSHClient is used to show std out when execute bash command.
 func NewStdoutSSHClient(hostIP net.IP, cluster *v2.Cluster) (Interface, error) {
-	for _, host := range cluster.Spec.Hosts {
-		for _, ip := range host.IPS {
+	for i := range cluster.Spec.Hosts {
+		for _, ip := range cluster.Spec.Hosts[i].IPS {
 			if hostIP.Equal(ip) {
-				if err := mergo.Merge(&host.SSH, &cluster.Spec.SSH); err != nil {
+				if err := mergo.Merge(&cluster.Spec.Hosts[i].SSH, &cluster.Spec.SSH); err != nil {
 					return nil, err
 				}
-				return NewSSHClient(&host.SSH, true), nil
+				return NewSSHClient(&cluster.Spec.Hosts[i].SSH, true), nil
 			}
 		}
 	}

utils/yaml/yaml.go

@@ -46,11 +46,7 @@ func MarshalToFile(file string, obj interface{}) error {
 		return err
 	}
 
-	if err = osi.NewAtomicWriter(file).WriteFile(data); err != nil {
-		return err
-	}
-
-	return nil
+	return osi.NewAtomicWriter(file).WriteFile(data)
 }
 
 func MarshalWithDelimiter(configs ...interface{}) ([]byte, error) {