chore(ci): golint issues

swarit-stepsecurity · swarit-stepsecurity · commit f8a456c465eb · 2026-04-13T23:00:54.000+05:30
Signed-off-by: Swarit Pandey &lt;swarit@stepsecurity.io&gt;

chore: more golint issues - rebase this

Signed-off-by: Swarit Pandey &lt;swarit@stepsecurity.io&gt;
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,9 @@
 !docs/**/*.html
 !images/**/*.html
 
-# Go build artifacts
-/stepsecurity-dev-machine-guard
+# Go build artifacts — never commit compiled binaries
+**/stepsecurity-dev-machine-guard
+*.exe
 dist/
 
 # Temporary files
diff --git a/cmd/stepsecurity-dev-machine-guard/main.go b/cmd/stepsecurity-dev-machine-guard/main.go
@@ -84,7 +84,7 @@ func main() {
 		}
 
 	case "install":
-		fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n\n", buildinfo.Version)
+		_, _ = fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n\n", buildinfo.Version)
 		if runtime.GOOS == "windows" {
 			log.Error("Scheduled scanning is not yet supported on Windows. Use the scan command directly.")
 			os.Exit(1)
@@ -105,7 +105,7 @@ func main() {
 		}
 
 	case "uninstall":
-		fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n\n", buildinfo.Version)
+		_, _ = fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n\n", buildinfo.Version)
 		if runtime.GOOS == "windows" {
 			log.Error("Scheduled scanning is not yet supported on Windows. Use the scan command directly.")
 			os.Exit(1)
diff --git a/cmd/stepsecurity-dev-machine-guard/stepsecurity-dev-machine-guard b/cmd/stepsecurity-dev-machine-guard/stepsecurity-dev-machine-guard
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -93,13 +93,13 @@ func Parse(args []string) (*Config, error) {
 		case arg == "--verbose":
 			cfg.Verbose = true
 		case arg == "-v" || arg == "--version" || arg == "version":
-			fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n", buildinfo.VersionString())
+			_, _ = fmt.Fprintf(os.Stdout, "StepSecurity Dev Machine Guard v%s\n", buildinfo.VersionString())
 			os.Exit(0)
 		case arg == "-h" || arg == "--help" || arg == "help":
 			printHelp()
 			os.Exit(0)
 		default:
-			return nil, fmt.Errorf("Unknown option: %s\nRun '%s --help' for usage information.", arg, filepath.Base(os.Args[0]))
+			return nil, fmt.Errorf("unknown option: %s, run '%s --help' for usage information", arg, filepath.Base(os.Args[0]))
 		}
 		i++
 	}
@@ -109,7 +109,7 @@ func Parse(args []string) (*Config, error) {
 
 func printHelp() {
 	name := filepath.Base(os.Args[0])
-	fmt.Fprintf(os.Stdout, `StepSecurity Dev Machine Guard v%s
+	_, _ = fmt.Fprintf(os.Stdout, `StepSecurity Dev Machine Guard v%s
 
 Usage: %s [COMMAND] [OPTIONS]
 
diff --git a/internal/detector/ide.go b/internal/detector/ide.go
@@ -177,14 +177,6 @@ func readPlistVersion(ctx context.Context, exec executor.Executor, plistPath str
 	return "unknown"
 }
 
-// readAppVersion reads app version using platform-appropriate method.
-func readAppVersion(ctx context.Context, exec executor.Executor, darwinPlistPath, winAppName string) string {
-	if exec.GOOS() == "windows" {
-		return readRegistryVersion(ctx, exec, winAppName)
-	}
-	return readPlistVersion(ctx, exec, darwinPlistPath)
-}
-
 // readRegistryVersion searches Windows Uninstall registry keys for DisplayVersion.
 func readRegistryVersion(ctx context.Context, exec executor.Executor, appName string) string {
 	for _, root := range []string{
diff --git a/internal/detector/mcp.go b/internal/detector/mcp.go
@@ -192,7 +192,7 @@ func stripJSONCComments(input []byte) []byte {
 		// Block comment
 		if i+1 < len(input) && input[i] == '/' && input[i+1] == '*' {
 			i += 2
-			for i+1 < len(input) && !(input[i] == '*' && input[i+1] == '/') {
+			for i+1 < len(input) && (input[i] != '*' || input[i+1] != '/') {
 				i++
 			}
 			i += 2 // skip */
diff --git a/internal/launchd/launchd.go b/internal/launchd/launchd.go
@@ -80,7 +80,7 @@ func Install(exec executor.Executor, log *progress.Logger) error {
 	if err != nil {
 		return fmt.Errorf("creating plist file: %w", err)
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	tmpl, err := template.New("plist").Parse(plistTmpl)
 	if err != nil {
@@ -136,7 +136,7 @@ func doUninstall(ctx context.Context, exec executor.Executor, log *progress.Logg
 
 	// Remove plist
 	if exec.FileExists(plistPath) {
-		os.Remove(plistPath)
+		_ = os.Remove(plistPath)
 		log.Progress("Removed plist file: %s", plistPath)
 	}
 
diff --git a/internal/lock/lock.go b/internal/lock/lock.go
@@ -42,7 +42,7 @@ func Acquire(_ executor.Executor) (*Lock, error) {
 	}
 
 	_, err = fmt.Fprintf(f, "%d", os.Getpid())
-	f.Close()
+	_ = f.Close()
 	if err != nil {
 		_ = os.Remove(lockFilePath)
 		return nil, fmt.Errorf("writing PID to lock file: %w", err)
diff --git a/internal/output/html.go b/internal/output/html.go
@@ -41,7 +41,7 @@ func HTML(outputFile string, result *model.ScanResult) error {
 	if err != nil {
 		return fmt.Errorf("creating HTML file: %w", err)
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	scanTime := time.Unix(result.ScanTimestamp, 0).Format("2006-01-02 15:04:05")
 
diff --git a/internal/output/html_test.go b/internal/output/html_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestHTML_GeneratesFile(t *testing.T) {
 	tmpFile := os.TempDir() + "/test-dmg-report.html"
-	defer os.Remove(tmpFile)
+	defer func() { _ = os.Remove(tmpFile) }()
 
 	result := &model.ScanResult{
 		AgentVersion:     "1.9.0",
@@ -55,7 +55,7 @@ func TestHTML_GeneratesFile(t *testing.T) {
 
 func TestHTML_ContainsData(t *testing.T) {
 	tmpFile := os.TempDir() + "/test-dmg-data.html"
-	defer os.Remove(tmpFile)
+	defer func() { _ = os.Remove(tmpFile) }()
 
 	result := &model.ScanResult{
 		ScanTimestamp: 1700000000,
diff --git a/internal/output/pretty.go b/internal/output/pretty.go
@@ -11,6 +11,7 @@ import (
 	"github.com/step-security/dev-machine-guard/internal/model"
 )
 
+//nolint:errcheck // fmt.Fprint* to io.Writer; errors surface through the writer
 // Pretty writes human-readable formatted output.
 func Pretty(w io.Writer, result *model.ScanResult, colorMode string) error {
 	c := setupColors(colorMode)
@@ -143,6 +144,7 @@ func Pretty(w io.Writer, result *model.ScanResult, colorMode string) error {
 	return nil
 }
 
+//nolint:errcheck // terminal output
 func printSectionHeader(w io.Writer, c *colors, title string, count int) {
 	padding := 35 - len(title)
 	if padding < 1 {
diff --git a/internal/telemetry/logcapture.go b/internal/telemetry/logcapture.go
@@ -71,15 +71,15 @@ func (lc *LogCapture) Finalize() string {
 	}
 
 	// Close write end so the reader goroutine exits
-	lc.pipeWrite.Close()
+	_ = lc.pipeWrite.Close()
 	lc.pipeWrite = nil
 	lc.mu.Unlock()
 	<-lc.done
 	lc.mu.Lock()
 
 	// Restore stderr
 	os.Stderr = lc.origErr
-	lc.pipeRead.Close()
+	_ = lc.pipeRead.Close()
 
 	return base64.StdEncoding.EncodeToString(lc.buf.Bytes())
 }
diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go
@@ -304,7 +304,7 @@ func uploadToS3(ctx context.Context, log *progress.Logger, payload *Payload) err
 	if err != nil {
 		return fmt.Errorf("requesting upload URL: %w", err)
 	}
-	defer resp.Body.Close()
+	defer func() { _ = resp.Body.Close() }()
 
 	var urlResp struct {
 		UploadURL string `json:"upload_url"`
@@ -330,7 +330,7 @@ func uploadToS3(ctx context.Context, log *progress.Logger, payload *Payload) err
 	if err != nil {
 		return fmt.Errorf("uploading to S3: %w", err)
 	}
-	defer putResp.Body.Close()
+	defer func() { _ = putResp.Body.Close() }()
 	_, _ = io.Copy(io.Discard, putResp.Body)
 
 	if putResp.StatusCode != http.StatusOK {
@@ -360,7 +360,7 @@ func uploadToS3(ctx context.Context, log *progress.Logger, payload *Payload) err
 	if err != nil {
 		return fmt.Errorf("notifying backend: %w", err)
 	}
-	defer notifyResp.Body.Close()
+	defer func() { _ = notifyResp.Body.Close() }()
 	_, _ = io.Copy(io.Discard, notifyResp.Body)
 
 	if notifyResp.StatusCode != http.StatusOK && notifyResp.StatusCode != http.StatusCreated {
diff --git a/stepsecurity-dev-machine-guard.exe b/stepsecurity-dev-machine-guard.exe

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func stripJSONCComments(input []byte) []byte {`
`192`	`192`	`// Block comment`
`193`	`193`	`if i+1 < len(input) && input[i] == '/' && input[i+1] == '*' {`
`194`	`194`	`i += 2`
`195`		`- for i+1 < len(input) && !(input[i] == '*' && input[i+1] == '/') {`
	`195`	`+ for i+1 < len(input) && (input[i] != '*' \|\| input[i+1] != '/') {`
`196`	`196`	`i++`
`197`	`197`	`}`
`198`	`198`	`i += 2 // skip */`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func Install(exec executor.Executor, log *progress.Logger) error {`
`80`	`80`	`if err != nil {`
`81`	`81`	`return fmt.Errorf("creating plist file: %w", err)`
`82`	`82`	`}`
`83`		`- defer f.Close()`
	`83`	`+ defer func() { _ = f.Close() }()`
`84`	`84`
`85`	`85`	`tmpl, err := template.New("plist").Parse(plistTmpl)`
`86`	`86`	`if err != nil {`
`@@ -136,7 +136,7 @@ func doUninstall(ctx context.Context, exec executor.Executor, log *progress.Logg`
`136`	`136`
`137`	`137`	`// Remove plist`
`138`	`138`	`if exec.FileExists(plistPath) {`
`139`		`- os.Remove(plistPath)`
	`139`	`+ _ = os.Remove(plistPath)`
`140`	`140`	`log.Progress("Removed plist file: %s", plistPath)`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func Acquire(_ executor.Executor) (*Lock, error) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`_, err = fmt.Fprintf(f, "%d", os.Getpid())`
`45`		`- f.Close()`
	`45`	`+ _ = f.Close()`
`46`	`46`	`if err != nil {`
`47`	`47`	`_ = os.Remove(lockFilePath)`
`48`	`48`	`return nil, fmt.Errorf("writing PID to lock file: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func HTML(outputFile string, result *model.ScanResult) error {`
`41`	`41`	`if err != nil {`
`42`	`42`	`return fmt.Errorf("creating HTML file: %w", err)`
`43`	`43`	`}`
`44`		`- defer f.Close()`
	`44`	`+ defer func() { _ = f.Close() }()`
`45`	`45`
`46`	`46`	`scanTime := time.Unix(result.ScanTimestamp, 0).Format("2006-01-02 15:04:05")`
`47`	`47`