Skip to content

Commit 91461fd

Browse files
Regexp Utils (#652)
* regexp util * lint * adding .string() * fix * hiding warnings * typo + tests * bump go --------- Co-authored-by: Doğan Can Bakır <dogancanbakir@protonmail.com>
1 parent 1551b28 commit 91461fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1033
-136
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: 1.21.x
18+
go-version: 1.24.x
1919

2020
- name: Check out code
2121
uses: actions/checkout@v3

.github/workflows/changelog-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@v4
1515
with:
16-
go-version: 1.21.x
16+
go-version: 1.24.x
1717

1818
- name: Checkout code
1919
uses: actions/checkout@v3

.github/workflows/lint-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: 1.21.x
18+
go-version: 1.24.x
1919
- name: Run golangci-lint
2020
uses: golangci/golangci-lint-action@v3.7.0
2121
with:

auth/pdcp/auth.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ func readPasswordFromUnix() ([]byte, error) {
9696
if err != nil {
9797
return nil, err
9898
}
99-
defer tty.Close()
99+
defer func() {
100+
_ = tty.Close()
101+
}()
100102
return term.ReadPassword(int(tty.Fd()))
101103
}

auth/pdcp/creds.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ func (p *PDCPCredHandler) ValidateAPIKey(key string, host string, toolName strin
120120
_ = resp.Body.Close()
121121
return nil, fmt.Errorf("invalid status code: %d", resp.StatusCode)
122122
}
123-
defer resp.Body.Close()
123+
defer func() {
124+
_ = resp.Body.Close()
125+
}()
124126
bin, err := io.ReadAll(resp.Body)
125127
if err != nil {
126128
return nil, err

auth/pdcp/creds_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ func TestLoadCreds(t *testing.T) {
2121
f, err := os.CreateTemp("", "creds-test-*")
2222
require.Nil(t, err)
2323
_, _ = f.WriteString(strings.TrimSpace(exampleCred))
24-
defer os.Remove(f.Name())
24+
defer func() {
25+
_ = os.Remove(f.Name())
26+
}()
2527
PDCPCredFile = f.Name()
2628
PDCPDir = filepath.Dir(f.Name())
2729
h := &PDCPCredHandler{}

buffer/disk.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ func (db *DiskBuffer) Reader() (io.ReadSeekCloser, error) {
4747

4848
func (db *DiskBuffer) Close() {
4949
name := db.f.Name()
50-
db.f.Close()
51-
os.RemoveAll(name)
50+
_ = db.f.Close()
51+
_ = os.RemoveAll(name)
5252
}

env/env_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
func TestExpandWithEnv(t *testing.T) {
1010
testEnvVar := "TEST_VAR"
1111
testEnvValue := "TestValue"
12-
os.Setenv(testEnvVar, testEnvValue)
13-
defer os.Unsetenv(testEnvVar)
12+
_ = os.Setenv(testEnvVar, testEnvValue)
13+
defer func() {
14+
_ = os.Unsetenv(testEnvVar)
15+
}()
1416

1517
tests := []struct {
1618
input string
@@ -46,35 +48,35 @@ func TestExpandWithEnvNilInput(t *testing.T) {
4648

4749
func TestGetEnvOrDefault(t *testing.T) {
4850
// Test for string
49-
os.Setenv("TEST_STRING", "test")
51+
_ = os.Setenv("TEST_STRING", "test")
5052
resultString := GetEnvOrDefault("TEST_STRING", "default")
5153
if resultString != "test" {
5254
t.Errorf("Expected 'test', got %s", resultString)
5355
}
5456

5557
// Test for int
56-
os.Setenv("TEST_INT", "123")
58+
_ = os.Setenv("TEST_INT", "123")
5759
resultInt := GetEnvOrDefault("TEST_INT", 0)
5860
if resultInt != 123 {
5961
t.Errorf("Expected 123, got %d", resultInt)
6062
}
6163

6264
// Test for bool
63-
os.Setenv("TEST_BOOL", "true")
65+
_ = os.Setenv("TEST_BOOL", "true")
6466
resultBool := GetEnvOrDefault("TEST_BOOL", false)
6567
if resultBool != true {
6668
t.Errorf("Expected true, got %t", resultBool)
6769
}
6870

6971
// Test for float64
70-
os.Setenv("TEST_FLOAT", "1.23")
72+
_ = os.Setenv("TEST_FLOAT", "1.23")
7173
resultFloat := GetEnvOrDefault("TEST_FLOAT", 0.0)
7274
if resultFloat != 1.23 {
7375
t.Errorf("Expected 1.23, got %f", resultFloat)
7476
}
7577

7678
// Test for time.Duration
77-
os.Setenv("TEST_DURATION", "1h")
79+
_ = os.Setenv("TEST_DURATION", "1h")
7880
resultDuration := GetEnvOrDefault("TEST_DURATION", time.Duration(0))
7981
if resultDuration != time.Hour {
8082
t.Errorf("Expected 1h, got %s", resultDuration)

errkit/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func parseError(to *ErrorX, err error) {
375375
}
376376
case CauseError:
377377
to.append(v.Cause())
378-
remaining := strings.Replace(err.Error(), v.Cause().Error(), "", -1)
378+
remaining := strings.ReplaceAll(err.Error(), v.Cause().Error(), "")
379379
parseError(to, errors.New(remaining))
380380
default:
381381
errString := err.Error()

exec/executil.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,11 @@ func RunSafe(cmd ...string) (string, error) {
157157
return "", errkit.WithMessage(err, "failed to create stdout pipe")
158158
}
159159

160-
defer in.Close()
161-
defer errorOut.Close()
162-
defer out.Close()
160+
defer func() {
161+
_ = in.Close()
162+
_ = errorOut.Close()
163+
_ = out.Close()
164+
}()
163165

164166
if err := cmdExec.Start(); err != nil {
165167
return "", errkit.Wrap(err, "failed to start command")
@@ -199,9 +201,11 @@ func RunSh(cmd ...string) (string, error) {
199201
return "", errkit.WithMessage(err, "failed to create stdout pipe")
200202
}
201203

202-
defer in.Close()
203-
defer errorOut.Close()
204-
defer out.Close()
204+
defer func() {
205+
_ = in.Close()
206+
_ = errorOut.Close()
207+
_ = out.Close()
208+
}()
205209

206210
if err := cmdExec.Start(); err != nil {
207211
errorData, _ := io.ReadAll(errorOut)
@@ -257,9 +261,11 @@ func RunPS(cmd string) (string, error) {
257261
return "", errkit.WithMessage(err, "failed to create stdout pipe")
258262
}
259263

260-
defer in.Close()
261-
defer errorOut.Close()
262-
defer out.Close()
264+
defer func() {
265+
_ = in.Close()
266+
_ = errorOut.Close()
267+
_ = out.Close()
268+
}()
263269

264270
if err := cmdExec.Start(); err != nil {
265271
return "", errkit.WithMessage(err, "start powershell.exe process error")

0 commit comments

Comments
 (0)