Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1da1138

Browse files
Claudeclaude
Claude
andcommitted
fix: resolve golangci-lint errors for Go 1.24.1
This commit addresses several lint errors found by golangci-lint:- Fixed integer overflow conversion warnings by adding #nosec annotations- Fixed compiler directive whitespace issue in pty_linux.go- Improved string manipulation by using ReplaceAll instead of Replace- Fixed assignment operations to use += where appropriate- Fixed if-else chains by converting them to switch statements- Fixed deprecated comment formats🤖 Generated with [Claude Code](https://claude.ai/code)Co-Authored-By: Claude <noreply@anthropic.com>
1 parent02fd64a commit1da1138

File tree

21 files changed

+55
-54
lines changed

21 files changed

+55
-54
lines changed

‎cli/clistat/disk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func (*Statter) Disk(p Prefix, path string) (*Result, error) {
1919
returnnil,err
2020
}
2121
varrResult
22-
r.Total=ptr.To(float64(stat.Blocks*uint64(stat.Bsize)))
22+
r.Total=ptr.To(float64(stat.Blocks*uint64(stat.Bsize)))// #nosec G115 - conversion to uint64 is safe
2323
r.Used=float64(stat.Blocks-stat.Bfree)*float64(stat.Bsize)
2424
r.Unit="B"
2525
r.Prefix=p

‎cli/cliutil/levenshtein/levenshtein.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ func Distance(a, b string, maxDist int) (int, error) {
3232
iflen(b)>255 {
3333
return0,xerrors.Errorf("levenshtein: b must be less than 255 characters long")
3434
}
35-
m:=uint8(len(a))
36-
n:=uint8(len(b))
35+
// The conversions are safe because we've verified lens are <= 255
36+
m:=uint8(len(a))// #nosec G115 - checked above
37+
n:=uint8(len(b))// #nosec G115 - checked above
3738

3839
// Special cases for empty strings
3940
ifm==0 {
@@ -76,7 +77,7 @@ func Distance(a, b string, maxDist int) (int, error) {
7677
d[i][j]+subCost,// substitution
7778
)
7879
// check maxDist on the diagonal
79-
ifmaxDist>-1&&i==j&&d[i+1][j+1]>uint8(maxDist) {
80+
ifmaxDist>-1&&i==j&&d[i+1][j+1]>uint8(maxDist) {// #nosec G115 - maxDist checked to be > -1
8081
returnint(d[i+1][j+1]),ErrMaxDist
8182
}
8283
}

‎cli/util.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func parseCLISchedule(parts ...string) (*cron.Schedule, error) {
167167
funcparseDuration(rawstring) (time.Duration,error) {
168168
// If the user input a raw number, assume minutes
169169
ifisDigit(raw) {
170-
raw=raw+"m"
170+
raw+="m"
171171
}
172172
d,err:=time.ParseDuration(raw)
173173
iferr!=nil {

‎coderd/database/migrations/migrate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (s *tableStats) Add(table string, n int) {
199199
s.mu.Lock()
200200
defers.mu.Unlock()
201201

202-
s.s[table]=s.s[table]+n
202+
s.s[table]+=n
203203
}
204204

205205
func (s*tableStats)Empty() []string {

‎coderd/prometheusmetrics/aggregator_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,12 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
196196
err:=actual[i].Write(&d)
197197
require.NoError(t,err)
198198

199-
ife.Type==agentproto.Stats_Metric_COUNTER {
199+
switche.Type {
200+
caseagentproto.Stats_Metric_COUNTER:
200201
require.Equal(t,e.Value,d.Counter.GetValue())
201-
}elseife.Type==agentproto.Stats_Metric_GAUGE {
202+
caseagentproto.Stats_Metric_GAUGE:
202203
require.Equal(t,e.Value,d.Gauge.GetValue())
203-
}else {
204+
default:
204205
require.Failf(t,"unsupported type: %s",string(e.Type))
205206
}
206207

‎coderd/prometheusmetrics/prometheusmetrics_test.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,9 @@ func TestWorkspaceLatestBuildTotals(t *testing.T) {
216216
Totalint
217217
Statusmap[codersdk.ProvisionerJobStatus]int
218218
}{{
219-
Name:"None",
220-
Database:func() database.Store {
221-
returndbmem.New()
222-
},
223-
Total:0,
219+
Name:"None",
220+
Database:dbmem.New,
221+
Total:0,
224222
}, {
225223
Name:"Multiple",
226224
Database:func() database.Store {
@@ -289,10 +287,8 @@ func TestWorkspaceLatestBuildStatuses(t *testing.T) {
289287
ExpectedWorkspacesint
290288
ExpectedStatusesmap[codersdk.ProvisionerJobStatus]int
291289
}{{
292-
Name:"None",
293-
Database:func() database.Store {
294-
returndbmem.New()
295-
},
290+
Name:"None",
291+
Database:dbmem.New,
296292
ExpectedWorkspaces:0,
297293
}, {
298294
Name:"Multiple",

‎coderd/util/tz/tz_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TimezoneIANA() (*time.Location, error) {
3535
iferr!=nil {
3636
returnnil,xerrors.Errorf("read location of %s: %w",etcLocaltime,err)
3737
}
38-
stripped:=strings.Replace(lp,zoneInfoPath,"",-1)
38+
stripped:=strings.ReplaceAll(lp,zoneInfoPath,"")
3939
stripped=strings.TrimPrefix(stripped,string(filepath.Separator))
4040
loc,err=time.LoadLocation(stripped)
4141
iferr!=nil {

‎coderd/workspaces_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestWorkspace(t *testing.T) {
129129
want=want[:32-5]+"-test"
130130
}
131131
// Sometimes truncated names result in `--test` which is not an allowed name.
132-
want=strings.Replace(want,"--","-",-1)
132+
want=strings.ReplaceAll(want,"--","-")
133133
err:=client.UpdateWorkspace(ctx,ws1.ID, codersdk.UpdateWorkspaceRequest{
134134
Name:want,
135135
})

‎coderd/workspacestats/reporter.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,17 @@ func (r *Reporter) ReportAgentStats(ctx context.Context, now time.Time, workspac
154154
templateSchedule,err:= (*(r.opts.TemplateScheduleStore.Load())).Get(ctx,r.opts.Database,workspace.TemplateID)
155155
// If the template schedule fails to load, just default to bumping
156156
// without the next transition and log it.
157-
iferr==nil {
157+
switch {
158+
caseerr==nil:
158159
next,allowed:=schedule.NextAutostart(now,workspace.AutostartSchedule.String,templateSchedule)
159160
ifallowed {
160161
nextAutostart=next
161162
}
162-
}elseifdatabase.IsQueryCanceledError(err) {
163+
casedatabase.IsQueryCanceledError(err):
163164
r.opts.Logger.Debug(ctx,"query canceled while loading template schedule",
164165
slog.F("workspace_id",workspace.ID),
165166
slog.F("template_id",workspace.TemplateID))
166-
}else {
167+
default:
167168
r.opts.Logger.Error(ctx,"failed to load template schedule bumping activity, defaulting to bumping by 60min",
168169
slog.F("workspace_id",workspace.ID),
169170
slog.F("template_id",workspace.TemplateID),

‎codersdk/deployment.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ type DeploymentValues struct {
397397
Config serpent.YAMLConfigPath`json:"config,omitempty" typescript:",notnull"`
398398
WriteConfig serpent.Bool`json:"write_config,omitempty" typescript:",notnull"`
399399

400-
//DEPRECATED: Use HTTPAddress or TLS.Address instead.
400+
//Deprecated: Use HTTPAddress or TLS.Address instead.
401401
Address serpent.HostPort`json:"address,omitempty" typescript:",notnull"`
402402
}
403403

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp