lint by golangci-lint (#3080)

test/e2e/framework/cleanup.go

@@ -6,13 +6,16 @@ import (
 
 // CleanupActionHandle is an integer pointer type for handling cleanup action
 type CleanupActionHandle *int
+
 type cleanupFuncHandle struct {
 	actionHandle CleanupActionHandle
 	actionHook   func()
 }
 
-var cleanupActionsLock sync.Mutex
-var cleanupHookList = []cleanupFuncHandle{}
+var (
+	cleanupActionsLock sync.Mutex
+	cleanupHookList    = []cleanupFuncHandle{}
+)
 
 // AddCleanupAction installs a function that will be called in the event of the
 // whole test being terminated.  This allows arbitrary pieces of the overall

test/e2e/framework/framework.go

@@ -9,12 +9,12 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/config"
+
 	"github.com/fatedier/frp/test/e2e/mock/server"
 	"github.com/fatedier/frp/test/e2e/pkg/port"
 	"github.com/fatedier/frp/test/e2e/pkg/process"
-
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
 )
 
 type Options struct {
@@ -102,7 +102,8 @@ func (f *Framework) BeforeEach() {
 	for k, v := range params {
 		switch t := v.(type) {
 		case int:
-			f.usedPorts[k] = int(t)
+			f.usedPorts[k] = t
+		default:
 		}
 	}
 }
@@ -116,14 +117,14 @@ func (f *Framework) AfterEach() {
 
 	// stop processor
 	for _, p := range f.serverProcesses {
-		p.Stop()
+		_ = p.Stop()
 		if TestContext.Debug {
 			fmt.Println(p.ErrorOutput())
 			fmt.Println(p.StdOutput())
 		}
 	}
 	for _, p := range f.clientProcesses {
-		p.Stop()
+		_ = p.Stop()
 		if TestContext.Debug {
 			fmt.Println(p.ErrorOutput())
 			fmt.Println(p.StdOutput())
@@ -259,7 +260,7 @@ func (f *Framework) SetEnvs(envs []string) {
 
 func (f *Framework) WriteTempFile(name string, content string) string {
 	filePath := filepath.Join(f.TempDirectory, name)
-	err := os.WriteFile(filePath, []byte(content), 0766)
+	err := os.WriteFile(filePath, []byte(content), 0o766)
 	ExpectNoError(err)
 	return filePath
 }

test/e2e/framework/log.go

@@ -58,11 +58,12 @@ var codeFilterRE = regexp.MustCompile(`/github.com/onsi/ginkgo/`)
 // From the remaining entries it automatically filters out useless ones like
 // entries coming from Ginkgo.
 //
-// This is a modified copy of PruneStack in https://github.com/onsi/ginkgo/blob/f90f37d87fa6b1dd9625e2b1e83c23ffae3de228/internal/codelocation/code_location.go#L25:
-// - simplified API and thus renamed (calls debug.Stack() instead of taking a parameter)
-// - source code filtering updated to be specific to Kubernetes
-// - optimized to use bytes and in-place slice filtering from
-//   https://github.com/golang/go/wiki/SliceTricks#filter-in-place
+// This is a modified copy of PruneStack in
+// https://github.com/onsi/ginkgo/blob/f90f37d87fa6b1dd9625e2b1e83c23ffae3de228/internal/codelocation/code_location.go#L25:
+//   - simplified API and thus renamed (calls debug.Stack() instead of taking a parameter)
+//   - source code filtering updated to be specific to Kubernetes
+//   - optimized to use bytes and in-place slice filtering from
+//     https://github.com/golang/go/wiki/SliceTricks#filter-in-place
 func PrunedStack(skip int) []byte {
 	fullStackTrace := debug.Stack()
 	stack := bytes.Split(fullStackTrace, []byte("\n"))
@@ -82,7 +83,7 @@ func PrunedStack(skip int) []byte {
 	n := 0
 	for i := 0; i < len(stack)/2; i++ {
 		// We filter out based on the source code file name.
-		if !codeFilterRE.Match([]byte(stack[i*2+1])) {
+		if !codeFilterRE.Match(stack[i*2+1]) {
 			stack[n] = stack[i*2]
 			stack[n+1] = stack[i*2+1]
 			n += 2

test/e2e/framework/mockservers.go

@@ -33,9 +33,11 @@ func NewMockServers(portAllocator *port.Allocator) *MockServers {
 	httpPort := portAllocator.Get()
 	s.tcpEchoServer = streamserver.New(streamserver.TCP, streamserver.WithBindPort(tcpPort))
 	s.udpEchoServer = streamserver.New(streamserver.UDP, streamserver.WithBindPort(udpPort))
-	s.httpSimpleServer = httpserver.New(httpserver.WithBindPort(httpPort), httpserver.WithHandler(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		w.Write([]byte(consts.TestString))
-	})))
+	s.httpSimpleServer = httpserver.New(httpserver.WithBindPort(httpPort),
+		httpserver.WithHandler(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			_, _ = w.Write([]byte(consts.TestString))
+		})),
+	)
 
 	udsIndex := portAllocator.Get()
 	udsAddr := fmt.Sprintf("%s/frp_echo_server_%d.sock", os.TempDir(), udsIndex)

test/e2e/framework/process.go

@@ -14,12 +14,8 @@ import (
 // The first template should always be frps.
 func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []string) ([]*process.Process, []*process.Process) {
 	templates := make([]string, 0, len(serverTemplates)+len(clientTemplates))
-	for _, t := range serverTemplates {
-		templates = append(templates, t)
-	}
-	for _, t := range clientTemplates {
-		templates = append(templates, t)
-	}
+	templates = append(templates, serverTemplates...)
+	templates = append(templates, clientTemplates...)
 	outs, ports, err := f.RenderTemplates(templates)
 	ExpectNoError(err)
 	ExpectTrue(len(templates) > 0)
@@ -31,7 +27,7 @@ func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []str
 	currentServerProcesses := make([]*process.Process, 0, len(serverTemplates))
 	for i := range serverTemplates {
 		path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-server-%d", i))
-		err = os.WriteFile(path, []byte(outs[i]), 0666)
+		err = os.WriteFile(path, []byte(outs[i]), 0o666)
 		ExpectNoError(err)
 		flog.Trace("[%s] %s", path, outs[i])
 
@@ -48,7 +44,7 @@ func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []str
 	for i := range clientTemplates {
 		index := i + len(serverTemplates)
 		path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-client-%d", i))
-		err = os.WriteFile(path, []byte(outs[index]), 0666)
+		err = os.WriteFile(path, []byte(outs[index]), 0o666)
 		ExpectNoError(err)
 		flog.Trace("[%s] %s", path, outs[index])
 
@@ -91,7 +87,7 @@ func (f *Framework) RunFrpc(args ...string) (*process.Process, string, error) {
 func (f *Framework) GenerateConfigFile(content string) string {
 	f.configFileIndex++
 	path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-config-%d", f.configFileIndex))
-	err := os.WriteFile(path, []byte(content), 0666)
+	err := os.WriteFile(path, []byte(content), 0o666)
 	ExpectNoError(err)
 	return path
 }

test/e2e/framework/request.go

@@ -11,7 +11,7 @@ import (
 
 func SpecifiedHTTPBodyHandler(body []byte) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
-		w.Write(body)
+		_, _ = w.Write(body)
 	}
 }
 

test/e2e/framework/test_context.go

@@ -24,7 +24,6 @@ var TestContext TestContextType
 // The other Register*Flags methods below can be used to add more
 // test-specific flags. However, those settings then get added
 // regardless whether the test is actually in the test suite.
-//
 func RegisterCommonFlags(flags *flag.FlagSet) {
 	// Turn on EmitSpecProgress to get spec progress (especially on interrupt)
 	config.GinkgoConfig.EmitSpecProgress = true