Regexp Utils

.github/workflows/build-test.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       - name: Check out code
         uses: actions/checkout@v3

.github/workflows/changelog-update.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       - name: Checkout code
         uses: actions/checkout@v3

.github/workflows/lint-test.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Run golangci-lint
         uses: golangci/[email protected]
         with:

auth/pdcp/auth.go

@@ -96,6 +96,8 @@ func readPasswordFromUnix() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer tty.Close()
+	defer func() {
+		_ = tty.Close()
+	}()
 	return term.ReadPassword(int(tty.Fd()))
 }

auth/pdcp/creds.go

@@ -120,7 +120,9 @@ func (p *PDCPCredHandler) ValidateAPIKey(key string, host string, toolName strin
 		_ = resp.Body.Close()
 		return nil, fmt.Errorf("invalid status code: %d", resp.StatusCode)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		_ = resp.Body.Close()
+	}()
 	bin, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err

auth/pdcp/creds_test.go

@@ -21,7 +21,9 @@ func TestLoadCreds(t *testing.T) {
 	f, err := os.CreateTemp("", "creds-test-*")
 	require.Nil(t, err)
 	_, _ = f.WriteString(strings.TrimSpace(exampleCred))
-	defer os.Remove(f.Name())
+	defer func() {
+		_ = os.Remove(f.Name())
+	}()
 	PDCPCredFile = f.Name()
 	PDCPDir = filepath.Dir(f.Name())
 	h := &PDCPCredHandler{}

buffer/disk.go

@@ -47,6 +47,6 @@ func (db *DiskBuffer) Reader() (io.ReadSeekCloser, error) {
 
 func (db *DiskBuffer) Close() {
 	name := db.f.Name()
-	db.f.Close()
-	os.RemoveAll(name)
+	_ = db.f.Close()
+	_ = os.RemoveAll(name)
 }

env/env_test.go

@@ -9,8 +9,10 @@ import (
 func TestExpandWithEnv(t *testing.T) {
 	testEnvVar := "TEST_VAR"
 	testEnvValue := "TestValue"
-	os.Setenv(testEnvVar, testEnvValue)
-	defer os.Unsetenv(testEnvVar)
+	_ = os.Setenv(testEnvVar, testEnvValue)
+	defer func() {
+		_ = os.Unsetenv(testEnvVar)
+	}()
 
 	tests := []struct {
 		input    string
@@ -46,35 +48,35 @@ func TestExpandWithEnvNilInput(t *testing.T) {
 
 func TestGetEnvOrDefault(t *testing.T) {
 	// Test for string
-	os.Setenv("TEST_STRING", "test")
+	_ = os.Setenv("TEST_STRING", "test")
 	resultString := GetEnvOrDefault("TEST_STRING", "default")
 	if resultString != "test" {
 		t.Errorf("Expected 'test', got %s", resultString)
 	}
 
 	// Test for int
-	os.Setenv("TEST_INT", "123")
+	_ = os.Setenv("TEST_INT", "123")
 	resultInt := GetEnvOrDefault("TEST_INT", 0)
 	if resultInt != 123 {
 		t.Errorf("Expected 123, got %d", resultInt)
 	}
 
 	// Test for bool
-	os.Setenv("TEST_BOOL", "true")
+	_ = os.Setenv("TEST_BOOL", "true")
 	resultBool := GetEnvOrDefault("TEST_BOOL", false)
 	if resultBool != true {
 		t.Errorf("Expected true, got %t", resultBool)
 	}
 
 	// Test for float64
-	os.Setenv("TEST_FLOAT", "1.23")
+	_ = os.Setenv("TEST_FLOAT", "1.23")
 	resultFloat := GetEnvOrDefault("TEST_FLOAT", 0.0)
 	if resultFloat != 1.23 {
 		t.Errorf("Expected 1.23, got %f", resultFloat)
 	}
 
 	// Test for time.Duration
-	os.Setenv("TEST_DURATION", "1h")
+	_ = os.Setenv("TEST_DURATION", "1h")
 	resultDuration := GetEnvOrDefault("TEST_DURATION", time.Duration(0))
 	if resultDuration != time.Hour {
 		t.Errorf("Expected 1h, got %s", resultDuration)

errkit/errors.go

@@ -375,7 +375,7 @@ func parseError(to *ErrorX, err error) {
 		}
 	case CauseError:
 		to.append(v.Cause())
-		remaining := strings.Replace(err.Error(), v.Cause().Error(), "", -1)
+		remaining := strings.ReplaceAll(err.Error(), v.Cause().Error(), "")
 		parseError(to, errors.New(remaining))
 	default:
 		errString := err.Error()

exec/executil.go

@@ -157,9 +157,11 @@ func RunSafe(cmd ...string) (string, error) {
 		return "", errkit.WithMessage(err, "failed to create stdout pipe")
 	}
 
-	defer in.Close()
-	defer errorOut.Close()
-	defer out.Close()
+	defer func() {
+		_ = in.Close()
+		_ = errorOut.Close()
+		_ = out.Close()
+	}()
 
 	if err := cmdExec.Start(); err != nil {
 		return "", errkit.Wrap(err, "failed to start command")
@@ -199,9 +201,11 @@ func RunSh(cmd ...string) (string, error) {
 		return "", errkit.WithMessage(err, "failed to create stdout pipe")
 	}
 
-	defer in.Close()
-	defer errorOut.Close()
-	defer out.Close()
+	defer func() {
+		_ = in.Close()
+		_ = errorOut.Close()
+		_ = out.Close()
+	}()
 
 	if err := cmdExec.Start(); err != nil {
 		errorData, _ := io.ReadAll(errorOut)
@@ -257,9 +261,11 @@ func RunPS(cmd string) (string, error) {
 		return "", errkit.WithMessage(err, "failed to create stdout pipe")
 	}
 
-	defer in.Close()
-	defer errorOut.Close()
-	defer out.Close()
+	defer func() {
+		_ = in.Close()
+		_ = errorOut.Close()
+		_ = out.Close()
+	}()
 
 	if err := cmdExec.Start(); err != nil {
 		return "", errkit.WithMessage(err, "start powershell.exe process error")

file/clean_test.go

@@ -51,7 +51,9 @@ func FuzzSafeOpen(f *testing.F) {
 				// Ignore errors
 				return
 			}
-			defer result.Close()
+			defer func() {
+				_ = result.Close()
+			}()
 			bin, _ := io.ReadAll(result)
 			if string(bin) == "pwned!" {
 				t.Fatalf("pwned! cleaned=%s ,input=%s", cleaned, fuzzPath)

file/file.go

@@ -134,7 +134,7 @@ func DeleteFilesOlderThan(folder string, filter FileFilters) error {
 			if filter.Callback != nil {
 				return filter.Callback(osPathname)
 			} else {
-				os.RemoveAll(osPathname)
+				_ = os.RemoveAll(osPathname)
 			}
 		}
 		return nil
@@ -152,12 +152,16 @@ func DownloadFile(filepath string, url string) error {
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func() {
+		_ = resp.Body.Close()
+	}()
 	out, err := os.Create(filepath)
 	if err != nil {
 		return err
 	}
-	defer out.Close()
+	defer func() {
+		_ = out.Close()
+	}()
 	_, err = io.Copy(out, resp.Body)
 	return err
 }
@@ -238,7 +242,9 @@ func ReadFile(filename string) (chan string, error) {
 		if err != nil {
 			return
 		}
-		defer f.Close()
+		defer func() {
+			_ = f.Close()
+		}()
 		scanner := bufio.NewScanner(f)
 		for scanner.Scan() {
 			out <- scanner.Text()
@@ -260,7 +266,9 @@ func ReadFileWithBufferSize(filename string, maxCapacity int) (chan string, erro
 		if err != nil {
 			return
 		}
-		defer f.Close()
+		defer func() {
+			_ = f.Close()
+		}()
 		scanner := bufio.NewScanner(f)
 		buf := make([]byte, maxCapacity)
 		scanner.Buffer(buf, maxCapacity)
@@ -295,13 +303,17 @@ func CopyFile(src, dst string) error {
 	if err != nil {
 		return err
 	}
-	defer srcFile.Close()
+	defer func() {
+		_ = srcFile.Close()
+	}()
 
 	dstFile, err := os.Create(dst)
 	if err != nil {
 		return err
 	}
-	defer dstFile.Close()
+	defer func() {
+		_ = dstFile.Close()
+	}()
 
 	_, err = io.Copy(dstFile, srcFile)
 	if err != nil {
@@ -325,7 +337,9 @@ func Unmarshal(encodeType EncodeType, data []byte, obj interface{}) error {
 		if err != nil {
 			return err
 		}
-		defer dataFile.Close()
+		defer func() {
+			_ = dataFile.Close()
+		}()
 		return UnmarshalFromReader(encodeType, dataFile, obj)
 	default:
 		return UnmarshalFromReader(encodeType, bytes.NewReader(data), obj)
@@ -351,7 +365,9 @@ func Marshal(encodeType EncodeType, data []byte, obj interface{}) error {
 		if err != nil {
 			return err
 		}
-		defer dataFile.Close()
+		defer func() {
+			_ = dataFile.Close()
+		}()
 		return MarshalToWriter(encodeType, dataFile, obj)
 	default:
 		return MarshalToWriter(encodeType, bytes.NewBuffer(data), obj)
@@ -395,7 +411,9 @@ func UseMusl(path string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 	elfFile, err := elf.NewFile(file)
 	if err != nil {
 		return false, err
@@ -431,7 +449,7 @@ func HasPermission(fileName string, permission int) (bool, error) {
 		}
 		return false, err
 	}
-	file.Close()
+	_ = file.Close()
 
 	return true, nil
 }
@@ -454,7 +472,9 @@ func CountLinesWithSeparator(separator []byte, filename string) (uint, error) {
 		return 0, err
 	}
 
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 	if len(separator) == 0 {
 		return 0, ErrInvalidSeparator
 	}
@@ -579,7 +599,9 @@ func DedupeLines(filename string) error {
 	if err != nil {
 		return errors.Wrapf(err, "could not open file: %s", filename)
 	}
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 
 	seenLines := make(map[string]struct{})
 	var deduplicatedLines []string
@@ -622,7 +644,9 @@ func IsEmpty(filename string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 
 	// Read up to 512 bytes to check for non-space characters
 	buffer := make([]byte, 16)