Address some golangci-lint issues

andy-tier1app · andy-tier1app · commit f916ab8080e9 · 2025-09-13T08:50:02.000+07:00
diff --git a/internal/agent/api/server_test.go b/internal/agent/api/server_test.go
@@ -27,32 +27,41 @@ func TestServer(t *testing.T) {
 		close(errCh)
 	}()
 
+	testErrCh := make(chan error, 1)
 	go func() {
 		defer s.Close()
 		config.GlobalConfig.ApiKey = "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc"
 		buf := bytes.NewBufferString(`{"key": "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc", "actions":[ "capture 12321", "capture 2341", "capture findmydeviced"] }`)
 		resp, err := http.Post(fmt.Sprintf("http://%s/action", s.Addr()), "text", buf)
 		if err != nil {
-			t.Fatal(err)
+			testErrCh <- err
+			return
 		}
 
 		if resp.Body != nil {
 			all, err := io.ReadAll(resp.Body)
 			if err != nil {
-				t.Fatal(err)
+				testErrCh <- err
+				return
 			}
 			all = bytes.TrimSpace(all)
 			if string(all) != `{"Code":0,"Msg":""}` {
-				t.Fatal(string(all), all)
+				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+				return
 			}
 		}
+		testErrCh <- nil
 	}()
 
 	select {
 	case err, ok := <-errCh:
 		if ok {
 			t.Fatal(err)
 		}
+	case err := <-testErrCh:
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }
 
@@ -72,32 +81,41 @@ func TestServerCmdActions(t *testing.T) {
 		close(errCh)
 	}()
 
+	testErrCh := make(chan error, 1)
 	go func() {
 		defer s.Close()
 		config.GlobalConfig.ApiKey = "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc"
 		buf := bytes.NewBufferString(`{"key": "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc", "actions":[ "date", "capture 2341", "echo $pid"] }`)
 		resp, err := http.Post(fmt.Sprintf("http://%s/action", s.Addr()), "text", buf)
 		if err != nil {
-			t.Fatal(err)
+			testErrCh <- err
+			return
 		}
 
 		if resp.Body != nil {
 			all, err := io.ReadAll(resp.Body)
 			if err != nil {
-				t.Fatal(err)
+				testErrCh <- err
+				return
 			}
 			all = bytes.TrimSpace(all)
 			if !bytes.HasPrefix(all, []byte(`{"Code":0`)) {
-				t.Fatalf("%s, %x", string(all), all)
+				testErrCh <- fmt.Errorf("unexpected response: %s, %x", string(all), all)
+				return
 			}
 		}
+		testErrCh <- nil
 	}()
 
 	select {
 	case err, ok := <-errCh:
 		if ok {
 			t.Fatal(err)
 		}
+	case err := <-testErrCh:
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }
 
@@ -132,32 +150,38 @@ func TestServerForward(t *testing.T) {
 		close(rerrCh)
 	}()
 
+	testErrCh := make(chan error, 1)
 	go func() {
 		defer s.Close()
 		defer rs.Close()
 		config.GlobalConfig.ApiKey = "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc"
 		buf := bytes.NewBufferString(`{"key": "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc", "actions":[ "capture 12321", "capture 2341", "capture findmydeviced"] }`)
 		req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("http://%s/action", s.Addr()), buf)
 		if err != nil {
-			t.Fatal(err)
+			testErrCh <- err
+			return
 		}
 		req.Close = true
 		req.Header.Add("ycrash-forward", fmt.Sprintf("http://%s/action", rs.Addr()))
 		resp, err := http.DefaultClient.Do(req)
 		if err != nil {
-			t.Fatal(err)
+			testErrCh <- err
+			return
 		}
 
 		if resp.Body != nil {
 			all, err := io.ReadAll(resp.Body)
 			if err != nil {
-				t.Fatal(err)
+				testErrCh <- err
+				return
 			}
 			all = bytes.TrimSpace(all)
 			if string(all) != `{"Code":0,"Msg":""}` {
-				t.Fatal(string(all), all)
+				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+				return
 			}
 		}
+		testErrCh <- nil
 	}()
 
 	select {
@@ -169,6 +193,10 @@ func TestServerForward(t *testing.T) {
 		if ok {
 			t.Fatal(err)
 		}
+	case err := <-testErrCh:
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }
 
@@ -188,33 +216,42 @@ func TestAttendanceAPI(t *testing.T) {
 		close(errCh)
 	}()
 
+	testErrCh := make(chan error, 1)
 	go func() {
 		defer s.Close()
 		config.GlobalConfig.Server = "https://test.gceasy.io"
 		config.GlobalConfig.ApiKey = "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc"
 		buf := bytes.NewBufferString(`{"key": "buggycompany@e094aasdsa-c3eb-4c9a-8254-f0dd107245cc", "actions":[ "attendance"] }`)
 		resp, err := http.Post(fmt.Sprintf("http://%s/action", s.Addr()), "text", buf)
 		if err != nil {
-			t.Fatal(err)
+			testErrCh <- err
+			return
 		}
 
 		if resp.Body != nil {
 			all, err := io.ReadAll(resp.Body)
 			if err != nil {
-				t.Fatal(err)
+				testErrCh <- err
+				return
 			}
 			all = bytes.TrimSpace(all)
 			if string(all) != `{"Code":0,"Msg":""}` {
-				t.Fatal(all)
+				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+				return
 			}
 		}
+		testErrCh <- nil
 	}()
 
 	select {
 	case err, ok := <-errCh:
 		if ok {
 			t.Fatal(err)
 		}
+	case err := <-testErrCh:
+		if err != nil {
+			t.Fatal(err)
+		}
 	}
 }
 
diff --git a/internal/capture/extended_data_test.go b/internal/capture/extended_data_test.go
@@ -33,7 +33,7 @@ func TestExtendedData_Run_Success(t *testing.T) {
 	scriptFile := ""
 
 	// Step 3: Create a simple .bat script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 		scriptFile = filepath.Join(scriptDir, "test-script.bat")
@@ -108,7 +108,7 @@ func TestExtendedData_Run_ScriptTimeout(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 3: Create a simple .bat script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
@@ -177,7 +177,7 @@ func TestExtendedData_Run_FolderDeleting(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 4: Create a simple .bat or shell script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
@@ -211,7 +211,7 @@ func TestExtendedData_Run_FolderDeleting(t *testing.T) {
 	ed.SetEndpoint("http://localhost:8080/ycrash-receiver?de=localhost")
 
 	// // Step 8: Run the script
-	_, err = ed.Run()
+	ed.Run()
 
 	// Step 9: Assert hello.txt still exists
 	if _, err := os.Stat(helloFilePath); os.IsNotExist(err) {
@@ -240,7 +240,7 @@ func TestExtendedData_Run_ScriptFolderSameAsDataFolder(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 4: Create a simple .bat or shell script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
@@ -274,7 +274,7 @@ func TestExtendedData_Run_ScriptFolderSameAsDataFolder(t *testing.T) {
 	ed.SetEndpoint("http://localhost:8080/ycrash-receiver?de=localhost")
 
 	// // Step 8: Run the script
-	result, err := ed.Run()
+	result, _ := ed.Run()
 	if !result.Ok {
 		t.Fatalf("Run not OK: %s", result.Msg)
 	}
@@ -303,7 +303,7 @@ func TestExtendedData_Run_EmptyDataFolder(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 4: Create a simple .bat or shell script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
@@ -371,7 +371,7 @@ func TestExtendedData_Run_EmptyScript(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 4: Create a simple .bat or shell script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
@@ -437,7 +437,7 @@ func TestExtendedData_Run_RelativePath(t *testing.T) {
 	scriptFile := filepath.Join(scriptDir, "test-script.bat")
 
 	// Step 3: Create a simple .bat script
-	var scriptContent = ""
+	var scriptContent string
 	if runtime.GOOS == "windows" {
 		scriptContent = "@echo off\r\necho test-data > \"" + outputFile + "\"\r\n"
 	} else {
diff --git a/internal/capture/gc_test.go b/internal/capture/gc_test.go
@@ -2,7 +2,6 @@ package capture
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -35,7 +34,7 @@ func TestProcessLogFile(t *testing.T) {
 			t.Fatal(err)
 		}
 		s := string(all)
-		if s != fmt.Sprintf("test\ntest") {
+		if s != "test\ntest" {
 			t.Fatal(s)
 		}
 	}
diff --git a/internal/capture/healthcheck.go b/internal/capture/healthcheck.go
@@ -138,7 +138,7 @@ func sanitizeAppNameForFileName(name string) string {
 // This ensures consistent logging across multiple outputs.
 func logToFileAndLogger(file *os.File, format string, values ...interface{}) {
 	logger.Log(format, values...)
-	file.WriteString(fmt.Sprintf(format+"\n", values...))
+	fmt.Fprintf(file, format+"\n", values...)
 }
 
 func newHTTPClient() *http.Client {
diff --git a/internal/capture/heap.go b/internal/capture/heap.go
@@ -330,8 +330,8 @@ func (t *HeapDump) heapDump(requestedFilePath string) (actualDumpPath string, er
 	output, err = executils.CommandCombinedOutput(executils.Command{path.Join(t.JavaHome, "/bin/jcmd"), strconv.Itoa(t.Pid), "GC.heap_dump", requestedFilePath}, executils.SudoHooker{PID: t.Pid})
 	logger.Log("heap dump output from jcmd: %s, %v", output, err)
 	if err != nil ||
-		bytes.Index(output, []byte("No such file")) >= 0 ||
-		bytes.Index(output, []byte("Permission denied")) >= 0 {
+		bytes.Contains(output, []byte("No such file")) ||
+		bytes.Contains(output, []byte("Permission denied")) {
 		if len(output) > 1 {
 			err = fmt.Errorf("%w because %s", err, output)
 		}
@@ -342,8 +342,8 @@ func (t *HeapDump) heapDump(requestedFilePath string) (actualDumpPath string, er
 			executils.SudoHooker{PID: t.Pid})
 		logger.Log("heap dump output from jattach: %s, %v", output, e2)
 		if e2 != nil ||
-			bytes.Index(output, []byte("No such file")) >= 0 ||
-			bytes.Index(output, []byte("Permission denied")) >= 0 {
+			bytes.Contains(output, []byte("No such file")) ||
+			bytes.Contains(output, []byte("Permission denied")) {
 			if len(output) > 1 {
 				e2 = fmt.Errorf("%w because %s", e2, output)
 			}
@@ -360,8 +360,8 @@ func (t *HeapDump) heapDump(requestedFilePath string) (actualDumpPath string, er
 				executils.SudoHooker{PID: t.Pid})
 			logger.Log("heap dump output from tmp jattach: %s, %v", output, e3)
 			if e3 != nil ||
-				bytes.Index(output, []byte("No such file")) >= 0 ||
-				bytes.Index(output, []byte("Permission denied")) >= 0 {
+				bytes.Contains(output, []byte("No such file")) ||
+				bytes.Contains(output, []byte("Permission denied")) {
 				if len(output) > 1 {
 					e3 = fmt.Errorf("%w because %s", e3, output)
 				}
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -236,19 +236,19 @@ func ParseFlags(args []string) error {
 		return err
 	}
 
-	if GlobalConfig.Options.ConfigPath == "" {
+	if GlobalConfig.ConfigPath == "" {
 		return nil
 	}
 
-	file, err := os.Open(GlobalConfig.Options.ConfigPath)
+	file, err := os.Open(GlobalConfig.ConfigPath)
 	if err != nil {
 		dir, _ := os.Getwd()
-		return fmt.Errorf("workdir %s read config file path %s failed: %w", dir, GlobalConfig.Options.ConfigPath, err)
+		return fmt.Errorf("workdir %s read config file path %s failed: %w", dir, GlobalConfig.ConfigPath, err)
 	}
 	decoder := yaml.NewDecoder(file)
 	err = decoder.Decode(&GlobalConfig)
 	if err != nil {
-		return fmt.Errorf("decode config file path %s failed: %w", GlobalConfig.Options.ConfigPath, err)
+		return fmt.Errorf("decode config file path %s failed: %w", GlobalConfig.ConfigPath, err)
 	}
 
 	return copyFlagsValue(&GlobalConfig.Options, result)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package capture`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`		`- "fmt"`
`6`	`5`	`"io"`
`7`	`6`	`"os"`
`8`	`7`	`"path/filepath"`
`@@ -35,7 +34,7 @@ func TestProcessLogFile(t *testing.T) {`
`35`	`34`	`t.Fatal(err)`
`36`	`35`	`}`
`37`	`36`	`s := string(all)`
`38`		`- if s != fmt.Sprintf("test\ntest") {`
	`37`	`+ if s != "test\ntest" {`
`39`	`38`	`t.Fatal(s)`
`40`	`39`	`}`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func sanitizeAppNameForFileName(name string) string {`
`138`	`138`	`// This ensures consistent logging across multiple outputs.`
`139`	`139`	`func logToFileAndLogger(file *os.File, format string, values ...interface{}) {`
`140`	`140`	`logger.Log(format, values...)`
`141`		`- file.WriteString(fmt.Sprintf(format+"\n", values...))`
	`141`	`+ fmt.Fprintf(file, format+"\n", values...)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`func newHTTPClient() *http.Client {`
Original file line number	Diff line number	Diff line change
`@@ -236,19 +236,19 @@ func ParseFlags(args []string) error {`
`236`	`236`	`return err`
`237`	`237`	`}`
`238`	`238`
`239`		`- if GlobalConfig.Options.ConfigPath == "" {`
	`239`	`+ if GlobalConfig.ConfigPath == "" {`
`240`	`240`	`return nil`
`241`	`241`	`}`
`242`	`242`
`243`		`- file, err := os.Open(GlobalConfig.Options.ConfigPath)`
	`243`	`+ file, err := os.Open(GlobalConfig.ConfigPath)`
`244`	`244`	`if err != nil {`
`245`	`245`	`dir, _ := os.Getwd()`
`246`		`- return fmt.Errorf("workdir %s read config file path %s failed: %w", dir, GlobalConfig.Options.ConfigPath, err)`
	`246`	`+ return fmt.Errorf("workdir %s read config file path %s failed: %w", dir, GlobalConfig.ConfigPath, err)`
`247`	`247`	`}`
`248`	`248`	`decoder := yaml.NewDecoder(file)`
`249`	`249`	`err = decoder.Decode(&GlobalConfig)`
`250`	`250`	`if err != nil {`
`251`		`- return fmt.Errorf("decode config file path %s failed: %w", GlobalConfig.Options.ConfigPath, err)`
	`251`	`+ return fmt.Errorf("decode config file path %s failed: %w", GlobalConfig.ConfigPath, err)`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`return copyFlagsValue(&GlobalConfig.Options, result)`