Skip to content

Commit 062d554

Browse files
ti-chi-botcsuzhangxc
ti-chi-bot
and
csuzhangxc
authored
chore: bump some Go mods and the linter (#6677) (#6679)
Co-authored-by: csuzhangxc <csuzhangxc@gmail.com>
1 parent fd9c144 commit 062d554

File tree

130 files changed

+968
-934
lines changed

Some content is hidden

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

130 files changed

+968
-934
lines changed

‎.golangci.yml‎

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,52 @@
1-
run:
2-
timeout: 20m
1+
version: "2"
32

43
linters:
4+
default: none
55
enable:
6-
- typecheck
7-
- goimports
8-
- gosimple
9-
- staticcheck
6+
- staticcheck # includes gosimple
107
- gosec
118
disable:
129
- errcheck
1310

14-
linters-settings:
15-
gosec:
16-
excludes:
17-
- G107 # Rule: Url provided to HTTP request as taint input
18-
- G108 # Rule: Profiling endpoint automatically exposed on /debug/pprof
19-
- G306 # Rule: Poor file permissions used when writing to a new file
20-
- G402 # Rule: Look for bad TLS connection settings
21-
- G404 # Rule: Insecure random number source (rand)
22-
- G201 # Rule: SQL query construction using format string
23-
- G114 # Rule: Use of net/http serve function that has no support for setting timeouts
24-
- G112 # Rule: Potential slowloris attack
25-
- G115 # Rule: integer overflow conversion
26-
27-
govet:
28-
disable:
29-
- printf # non-constant format string in call
11+
settings:
12+
gosec:
13+
excludes:
14+
- G107 # Rule: Url provided to HTTP request as taint input
15+
- G108 # Rule: Profiling endpoint automatically exposed on /debug/pprof
16+
- G306 # Rule: Poor file permissions used when writing to a new file
17+
- G402 # Rule: Look for bad TLS connection settings
18+
- G404 # Rule: Insecure random number source (rand)
19+
- G201 # Rule: SQL query construction using format string
20+
- G114 # Rule: Use of net/http serve function that has no support for setting timeouts
21+
- G112 # Rule: Potential slowloris attack
22+
- G115 # Rule: integer overflow conversion
23+
- G103 # Rule: Use of unsafe calls should be audited
24+
- G104 # Rule: Errors unhandled
25+
- G204 # Rule: Subprocess launched with variable
26+
- G301 # Rule: Expect directory permissions to be 0750 or less
27+
- G302 # Rule: Expect file permissions to be 0600 or less
28+
- G304 # Rule: Potential file inclusion via variable
29+
30+
govet:
31+
disable:
32+
- printf # non-constant format string in call
33+
34+
exclusions:
35+
generated: lax
36+
rules:
37+
- path: tests/
38+
linters:
39+
- gosec
40+
- path: (pkg|tests)/third_party/
41+
linters:
42+
- staticcheck
43+
- typecheck
44+
- gosec
45+
- goimports
46+
- linters:
47+
- staticcheck
48+
text: "SA1019:" # Rule: Using a deprecated function, variable, constant or field
3049

31-
issues:
32-
exclude-rules:
33-
- path: tests
34-
linters:
35-
- gosec
36-
- path: pkg/third_party
37-
linters:
38-
- gosimple
39-
- linters:
40-
- staticcheck
41-
text: "SA1019:" # Rule: Using a deprecated function, variable, constant or field
50+
formatters:
51+
enable:
52+
- goimports

‎cmd/backup-manager/app/backup/backup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (bo *Options) brCommandRunWithLogCallback(ctx context.Context, fullArgs []s
331331
logCallback(line)
332332
}
333333

334-
klog.Info(strings.Replace(line, "\n", "", -1))
334+
klog.Info(strings.ReplaceAll(line, "\n", ""))
335335
if err != nil {
336336
if err != io.EOF {
337337
klog.Errorf("read stdout error: %s", err.Error())

‎cmd/backup-manager/app/backup/manager.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ func NewManager(
6565
}
6666

6767
func (bm *Manager) setFromDBOptions(backup *v1alpha1.Backup) {
68-
bm.Options.Host = backup.Spec.From.Host
68+
bm.Host = backup.Spec.From.Host
6969

7070
if backup.Spec.From.Port != 0 {
71-
bm.Options.Port = backup.Spec.From.Port
71+
bm.Port = backup.Spec.From.Port
7272
} else {
73-
bm.Options.Port = v1alpha1.DefaultTiDBServerPort
73+
bm.Port = v1alpha1.DefaultTiDBServerPort
7474
}
7575

7676
if backup.Spec.From.User != "" {
77-
bm.Options.User = backup.Spec.From.User
77+
bm.User = backup.Spec.From.User
7878
} else {
79-
bm.Options.User = v1alpha1.DefaultTidbUser
79+
bm.User = v1alpha1.DefaultTidbUser
8080
}
8181

82-
bm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
82+
bm.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
8383
}
8484

8585
// ProcessBackup used to process the backup logic

‎cmd/backup-manager/app/clean/clean.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var (
3939
Steps: 8,
4040
Cap: time.Second,
4141
}
42+
timeSleep = time.Sleep
4243
)
4344

4445
const (
@@ -213,7 +214,7 @@ func (bo *Options) cleanBRRemoteBackupDataOnce(ctx context.Context, backend *bku
213214

214215
if opt.BackoffEnabled {
215216
if needBackoff {
216-
time.Sleep(backoff.Step())
217+
timeSleep(backoff.Step())
217218
} else {
218219
backoff = defaultBackoff // reset backoff
219220
}

‎cmd/backup-manager/app/clean/clean_test.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121
"time"
2222

23-
"github.com/agiledragon/gomonkey/v2"
2423
"github.com/aws/aws-sdk-go/service/s3/s3iface"
2524
. "github.com/onsi/gomega"
2625
"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
@@ -282,15 +281,18 @@ func TestCleanBRRemoteBackupDataOnce(t *testing.T) {
282281
}
283282

284283
batchDel := tt.setup(drv, opt)
285-
s3patch := gomonkey.ApplyFunc(util.BatchDeleteObjectsOfS3, func(ctx context.Context, s3cli s3iface.S3API, objs []*blob.ListObject, bucket string, prefix string, concurrency int) *util.BatchDeleteObjectsResult {
284+
origS3 := util.BatchDeleteObjectsOfS3Func
285+
util.BatchDeleteObjectsOfS3Func = func(ctx context.Context, s3cli s3iface.S3API, objs []*blob.ListObject, bucket string, prefix string, concurrency int) *util.BatchDeleteObjectsResult {
286286
return batchDel(objs)
287-
})
288-
defer s3patch.Reset()
287+
}
288+
defer func() { util.BatchDeleteObjectsOfS3Func = origS3 }()
289+
289290
backoff := false
290-
timepatch := gomonkey.ApplyFunc(time.Sleep, func(d time.Duration) {
291+
origSleep := timeSleep
292+
timeSleep = func(d time.Duration) {
291293
backoff = true
292-
})
293-
defer timepatch.Reset()
294+
}
295+
defer func() { timeSleep = origSleep }()
294296

295297
err := bo.cleanBRRemoteBackupDataOnce(context.TODO(), backend, *opt, 1)
296298
tt.expect(err, backoff)

‎cmd/backup-manager/app/compact/options/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func ParseCompactOptions(compact *v1alpha1.CompactBackup, opts *CompactOpts) err
4949
opts.FromTS = startTs
5050
opts.UntilTS = endTs
5151

52-
opts.Name = compact.ObjectMeta.Name
52+
opts.Name = compact.Name
5353
opts.Concurrency = uint64(compact.Spec.Concurrency)
5454

5555
if err := opts.Verify(); err != nil {

‎cmd/backup-manager/app/export/manager.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,26 @@ func NewBackupManager(
5757
}
5858

5959
func (bm *BackupManager) setOptions(backup *v1alpha1.Backup) (string, error) {
60-
bm.Options.Host = backup.Spec.From.Host
60+
bm.Host = backup.Spec.From.Host
6161

6262
if backup.Spec.From.Port != 0 {
63-
bm.Options.Port = backup.Spec.From.Port
63+
bm.Port = backup.Spec.From.Port
6464
} else {
65-
bm.Options.Port = v1alpha1.DefaultTiDBServerPort
65+
bm.Port = v1alpha1.DefaultTiDBServerPort
6666
}
6767

6868
if backup.Spec.From.User != "" {
69-
bm.Options.User = backup.Spec.From.User
69+
bm.User = backup.Spec.From.User
7070
} else {
71-
bm.Options.User = v1alpha1.DefaultTidbUser
71+
bm.User = v1alpha1.DefaultTidbUser
7272
}
73-
bm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
73+
bm.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
7474

7575
prefix, reason, err := backuputil.GetBackupPrefixName(backup)
7676
if err != nil {
7777
return reason, err
7878
}
79-
bm.Options.Prefix = strings.Trim(prefix, "/")
79+
bm.Prefix = strings.Trim(prefix, "/")
8080
return "", nil
8181
}
8282

‎cmd/backup-manager/app/import/manager.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ func NewRestoreManager(
5151
}
5252

5353
func (rm *RestoreManager) setOptions(restore *v1alpha1.Restore) {
54-
rm.Options.Host = restore.Spec.To.Host
54+
rm.Host = restore.Spec.To.Host
5555

5656
if restore.Spec.To.Port != 0 {
57-
rm.Options.Port = restore.Spec.To.Port
57+
rm.Port = restore.Spec.To.Port
5858
} else {
59-
rm.Options.Port = v1alpha1.DefaultTiDBServerPort
59+
rm.Port = v1alpha1.DefaultTiDBServerPort
6060
}
6161

6262
if restore.Spec.To.User != "" {
63-
rm.Options.User = restore.Spec.To.User
63+
rm.User = restore.Spec.To.User
6464
} else {
65-
rm.Options.User = v1alpha1.DefaultTidbUser
65+
rm.User = v1alpha1.DefaultTidbUser
6666
}
6767

68-
rm.Options.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
68+
rm.Password = util.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
6969
}
7070

7171
// ProcessRestore used to process the restore logic

‎cmd/backup-manager/app/restore/manager.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ func NewManager(
6161
}
6262

6363
func (rm *Manager) setOptions(restore *v1alpha1.Restore) {
64-
rm.Options.Host = restore.Spec.To.Host
64+
rm.Host = restore.Spec.To.Host
6565

6666
if restore.Spec.To.Port != 0 {
67-
rm.Options.Port = restore.Spec.To.Port
67+
rm.Port = restore.Spec.To.Port
6868
} else {
69-
rm.Options.Port = v1alpha1.DefaultTiDBServerPort
69+
rm.Port = v1alpha1.DefaultTiDBServerPort
7070
}
7171

7272
if restore.Spec.To.User != "" {
73-
rm.Options.User = restore.Spec.To.User
73+
rm.User = restore.Spec.To.User
7474
} else {
75-
rm.Options.User = v1alpha1.DefaultTidbUser
75+
rm.User = v1alpha1.DefaultTidbUser
7676
}
7777

78-
rm.Options.Password = backuputil.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
78+
rm.Password = backuputil.GetOptionValueFromEnv(bkconstants.TidbPasswordKey, bkconstants.BackupManagerEnvVarPrefix)
7979
}
8080

8181
// ProcessRestore used to process the restore logic

‎cmd/backup-manager/app/restore/restore.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (ro *Options) restoreData(
178178
}
179179
ro.updateResolvedTSForCSB(line, restore, progressStep, statusUpdater)
180180
}
181-
klog.Info(strings.Replace(line, "\n", "", -1))
181+
klog.Info(strings.ReplaceAll(line, "\n", ""))
182182
if err != nil {
183183
if err != io.EOF {
184184
klog.Errorf("read stdout error: %s", err.Error())

0 commit comments

Comments
 (0)