Fix all golangci-lint issues (errcheck, gofumpt, gosec, nolintlint)fix error handling

Author: mar0ls

.golangci.yml

@@ -1,29 +1,36 @@
-version: 1
+version: "2"
+run:
+  timeout: 3m
 linters:
   enable:
-    - errcheck
     - govet
-    - ineffassign
     - staticcheck
-    - unused
-    - misspell
+    - errcheck
+    - ineffassign
+    - revive
+    - unconvert
     - gocritic
     - gosec
-    - noctx
-    - bodyclose
-    - prealloc
-    - unconvert
-    - unparam
-    - gofmt
+    - nolintlint
+  settings:
+    gosec:
+      excludes:
+        - G705
+    revive:
+      severity: warning
+    gocritic:
+      enabled-checks:
+        - appendAssign
+        - boolExprSimplify
+  exclusions:
+    rules:
+      - path: "^generated_.*\\.go$"
+        linters:
+          - all
+formatters:
+  enable:
+    - gofumpt
     - goimports
-
-linters-settings:
-  govet:
-    enable-all: true
-
 issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - errcheck
-        - gosec
+  max-issues-per-linter: 0
+  max-same-issues: 0

appconfig.go

@@ -89,7 +89,7 @@ func clearCurlRC() error {
 // ── git (git config --global) ─────────────────────────────────────────────────
 
 func runGit(args ...string) error {
-	return exec.Command("git", args...).Run() //nolint:noctx
+	return exec.Command("git", args...).Run() //nolint:noctx,gosec
 }
 
 func writeGitProxy(proxyURL string) error {
@@ -117,7 +117,7 @@ func clearGitProxy() error {
 // ── npm (npm config set) ──────────────────────────────────────────────────────
 
 func runNPM(args ...string) error {
-	return exec.Command("npm", args...).Run() //nolint:noctx
+	return exec.Command("npm", args...).Run() //nolint:noctx,gosec
 }
 
 func writeNPMProxy(proxyURL string) error {
@@ -149,7 +149,7 @@ func writePipConf(proxyURL string) error {
 	if err != nil {
 		return err
 	}
-	if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
+	if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
 		return err
 	}
 	return editINIFile(path, "global", "proxy", proxyURL)
@@ -322,7 +322,11 @@ func readLines(path string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			logf("appconfig: close error: %v", err)
+		}
+	}()
 	var lines []string
 	sc := bufio.NewScanner(f)
 	for sc.Scan() {
@@ -336,5 +340,5 @@ func writeLines(path string, lines []string) error {
 	if len(lines) > 0 {
 		content += "\n"
 	}
-	return os.WriteFile(path, []byte(content), 0600) //nolint:gosec
+	return os.WriteFile(path, []byte(content), 0o600)
 }

rcfile_unix.go

@@ -56,14 +56,16 @@ func appendToRCFiles(lines ...string) error {
 	}
 	for _, rc := range unixRCFiles {
 		path := home + "/" + rc
-		f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
+		f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o600) //nolint:gosec
 		if err != nil {
 			continue
 		}
 		for _, l := range lines {
 			_, _ = f.WriteString(l + "\n")
 		}
-		f.Close() // explicit close inside loop — deferred would delay until function return
+		if err := f.Close(); err != nil {
+			logf("rcfile_unix: close error: %v", err)
+		}
 	}
 	return nil
 }
@@ -75,7 +77,7 @@ func removeProxyFromRCFiles() error {
 	}
 	for _, rc := range unixRCFiles {
 		path := home + "/" + rc
-		data, err := os.ReadFile(path)
+		data, err := os.ReadFile(path) //nolint:gosec
 		if err != nil {
 			continue
 		}
@@ -87,7 +89,7 @@ func removeProxyFromRCFiles() error {
 			}
 			kept = append(kept, line)
 		}
-		_ = os.WriteFile(path, []byte(strings.Join(kept, "\n")), 0600)
+		_ = os.WriteFile(path, []byte(strings.Join(kept, "\n")), 0o600) //nolint:gosec
 	}
 	return nil
 }

sysproxy_darwin.go

@@ -9,7 +9,7 @@ import (
 )
 
 func runNetworkSetup(args ...string) error {
-	return exec.Command("networksetup", args...).Run() //nolint:noctx
+	return exec.Command("networksetup", args...).Run() //nolint:noctx,gosec
 }
 
 func setGlobal(p *proxy) error {
@@ -52,7 +52,7 @@ func getGlobal() (string, error) {
 	if err != nil || len(services) == 0 {
 		return "", fmt.Errorf("sysproxy: no network services found")
 	}
-	out, err := exec.Command("networksetup", "-getwebproxy", services[0]).Output() //nolint:noctx
+	out, err := exec.Command("networksetup", "-getwebproxy", services[0]).Output() //nolint:noctx,gosec
 	if err != nil {
 		return "", err
 	}

sysproxy_test.go

@@ -201,7 +201,7 @@ func TestWriteAppConfigCurl(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := os.ReadFile(home + "/.curlrc")
+	data, err := os.ReadFile(home + "/.curlrc") //nolint:gosec
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -219,7 +219,7 @@ func TestClearAppConfigCurl(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, _ := os.ReadFile(home + "/.curlrc")
+	data, _ := os.ReadFile(home + "/.curlrc") //nolint:gosec
 	if strings.Contains(string(data), "proxy") {
 		t.Errorf("proxy should be removed, got: %s", data)
 	}
@@ -233,7 +233,7 @@ func TestWriteAppConfigPip(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := os.ReadFile(home + "/.config/pip/pip.conf")
+	data, err := os.ReadFile(home + "/.config/pip/pip.conf") //nolint:gosec
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -250,7 +250,7 @@ func TestWriteAppConfigWget(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, _ := os.ReadFile(home + "/.wgetrc")
+	data, _ := os.ReadFile(home + "/.wgetrc") //nolint:gosec
 	if !strings.Contains(string(data), "http_proxy = http://proxy.example.com:8080") {
 		t.Errorf("unexpected .wgetrc content: %s", data)
 	}