fix all lint issues

Author: GustavoCaso

.golangci.yml

@@ -62,7 +62,6 @@ linters:
     - exptostd # detects functions from golang.org/x/exp/ that can be replaced by std functions
     - fatcontext # detects nested contexts in loops
     - forbidigo # forbids identifiers
-    - funcorder # checks the order of functions, methods, and constructors
     - funlen # tool for detection of long functions
     - gocheckcompilerdirectives # validates go compiler directive comments (//go:)
     - gochecknoglobals # checks that no global variables exist
@@ -258,11 +257,6 @@ linters:
         - ^google.golang.org/protobuf/.+Options$
         - ^gopkg.in/yaml.v3.Node$
 
-    funcorder:
-      # Checks if the exported methods of a structure are placed before the non-exported ones.
-      # Default: true
-      struct-method: false
-
     funlen:
       # Checks the number of lines in a function.
       # If lower than 0, disable the check.
@@ -434,14 +428,15 @@ linters:
       - text: 'comment on exported \S+ \S+ should be of the form ".+"'
         source: '// ?(nolint|TODO)'
         linters: [ revive, staticcheck ]
-      - path: '_test\.go'
+      - path: '(_test\.go|test_helpers\.go)'
         linters:
           - bodyclose
           - dupl
           - errcheck
           - funlen
           - goconst
           - gosec
+          - govet
           - noctx
           - wrapcheck
           - gocognit

cmd/meeseeks/exit.go

@@ -41,8 +41,8 @@ func exitCommand(args []string) error {
 	if err != nil {
 		return err
 	}
-
+	//nolint:sloglint //currently working on adding support for custom logger
 	slog.Info("Exiting meeseeks")
 
 	return nil
-}
+}

cmd/meeseeks/logs.go

@@ -42,4 +42,4 @@ func logsCommand(args []string) error {
 	fmt.Fprintln(os.Stdout, string(data))
 
 	return nil
-}
+}

cmd/meeseeks/main_test.go

@@ -7,7 +7,6 @@ import (
 	"time"
 )
 
-
 func TestMainCommands(t *testing.T) {
 	tests := []struct {
 		name string

cmd/meeseeks/run.go

@@ -53,6 +53,7 @@ func runCommand(args []string) error {
 }
 
 func runDetached(pidFile, configFile string, cfg *config.Config) error {
+	//nolint:gosec // the arguments are provided by the user
 	cmd := exec.Command(os.Args[0], "run", "-config", configFile)
 	cmd.Env = os.Environ()
 	cmd.SysProcAttr = &syscall.SysProcAttr{
@@ -62,6 +63,7 @@ func runDetached(pidFile, configFile string, cfg *config.Config) error {
 	cmd.Stdin = nil
 	stdoutFile, stdoutErr := getInternalStdoutFile()
 	if stdoutErr != nil {
+		//nolint:sloglint //currently working on adding support for custom logger
 		slog.Warn("Failed to create log file for meeseeks, using /dev/null", "error", stdoutErr.Error())
 		cmd.Stdout = nil
 		cmd.Stderr = nil
@@ -77,6 +79,7 @@ func runDetached(pidFile, configFile string, cfg *config.Config) error {
 		return fmt.Errorf("failed to write PID file: %w", err)
 	}
 
+	//nolint:sloglint //currently working on adding support for custom logger
 	slog.Info("Started meeseeks (detached)", "pid", cmd.Process.Pid, "program_count", len(cfg.Programs))
 
 	_ = cmd.Process.Release()
@@ -96,18 +99,20 @@ func runForeground(cfg *config.Config, sockPath, pidFile string) error {
 	go func() {
 		slog.Info("Started meeseeks", "program_count", len(cfg.Programs))
 
-		if err := s.Wait(ctx); err != nil {
-			slog.Warn("Wait completed with error", "error", err)
+		if waitErr := s.Wait(ctx); waitErr != nil {
+			slog.Warn("Wait completed with error", "error", waitErr)
 		}
 	}()
 
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
 	<-sigChan
+	//nolint:sloglint //currently working on adding support for custom logger
 	slog.Info("Received signal, shutting down...")
 	err = s.Stop()
 	if err != nil {
+		//nolint:sloglint //currently working on adding support for custom logger
 		slog.Warn("Error stopping the server.", "error", err.Error())
 	}
 	_ = os.Remove(pidFile)

cmd/meeseeks/run_test.go

@@ -242,18 +242,18 @@ func TestRunCommand_Detached(t *testing.T) {
 		t.Error("Socket file still exists. Stoping meeseeks should remove the Socket file")
 	}
 
-	var stdoutBuf_2, stderrBuf_2 bytes.Buffer
+	var stdoutBuf2, stderrBuf2 bytes.Buffer
 	exitCode = runCLICommand(
 		t,
 		[]string{"status"},
-		&stdoutBuf_2,
-		&stderrBuf_2,
+		&stdoutBuf2,
+		&stderrBuf2,
 		5*time.Second,
 	)
 	if exitCode != 1 {
 		t.Errorf("Expected exit code %d, got %d", 1, exitCode)
 	}
-	statusOutput = stdoutBuf_2.String() + stderrBuf_2.String()
+	statusOutput = stdoutBuf2.String() + stderrBuf2.String()
 
 	if !strings.Contains(statusOutput, "meeseeks server not running") {
 		t.Error("Status command should not work after exiting meeseeks")

cmd/meeseeks/status.go

@@ -47,7 +47,7 @@ func statusCommand(args []string) error {
 		data, _ := json.MarshalIndent(resp.Data, "", "  ")
 		fmt.Fprintln(os.Stdout, string(data))
 	} else {
-		if err := formatStatisticsAsTable(resp.Data, programName); err != nil {
+		if err = formatStatisticsAsTable(resp.Data, programName); err != nil {
 			return err
 		}
 	}

cmd/meeseeks/status_test.go

@@ -31,13 +31,13 @@ test-echo-detached  1     0        0       1        no        running`,
 			name:          "status format json",
 			args:          []string{"status", "-f", "json"},
 			expectedExit:  0,
-			shouldContain: `"ProgramName": "test-echo-detached"`,
+			shouldContain: `"program_name": "test-echo-detached"`,
 		},
 		{
 			name:          "status format json single program",
 			args:          []string{"status", "-f", "json", "test-echo-detached"},
 			expectedExit:  0,
-			shouldContain: `"ProgramName": "test-echo-detached"`,
+			shouldContain: `"program_name": "test-echo-detached"`,
 		},
 		{
 			name:          "status non existing program",

cmd/meeseeks/stop.go

@@ -36,4 +36,4 @@ func stopCommand(args []string) error {
 
 	fmt.Fprintln(os.Stdout, "Stop command executed")
 	return nil
-}
+}

cmd/meeseeks/stop_test.go

@@ -26,7 +26,6 @@ func TestStopCommand_Validation(t *testing.T) {
 }
 
 func TestStopCommand(t *testing.T) {
-
 	configContent := `programs:
   - name: "test-stop-program1"
     command: "sleep"