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

‎cryptorand/strings.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ const (
4444
//
4545
//nolint:varnamelen
4646
funcunbiasedModulo32(vuint32,nint32) (int32,error) {
47-
prod:=uint64(v)*uint64(n)
48-
low:=uint32(prod)
49-
iflow<uint32(n) {
50-
thresh:=uint32(-n)%uint32(n)
47+
prod:=uint64(v)*uint64(n)// #nosec G115 - uint32 to uint64 is safe
48+
low:=uint32(prod)// #nosec G115 - safe truncation, we only want the lower 32 bits
49+
iflow<uint32(n) {// #nosec G115 - int32 to uint32 is safe when n > 0
50+
thresh:=uint32(-n)%uint32(n)// #nosec G115 - int32 to uint32 is safe when n > 0
5151
forlow<thresh {
5252
err:=binary.Read(rand.Reader,binary.BigEndian,&v)
5353
iferr!=nil {
5454
return0,err
5555
}
56-
prod=uint64(v)*uint64(n)
57-
low=uint32(prod)
56+
prod=uint64(v)*uint64(n)// #nosec G115 - uint32 to uint64 is safe
57+
low=uint32(prod)// #nosec G115 - safe truncation for low bits
5858
}
5959
}
60-
returnint32(prod>>32),nil
60+
returnint32(prod>>32),nil// #nosec G115 - safe conversion after right shift
6161
}
6262

6363
// StringCharset generates a random string using the provided charset and size.
@@ -89,7 +89,7 @@ func StringCharset(charSetStr string, size int) (string, error) {
8989

9090
ci,err:=unbiasedModulo32(
9191
r,
92-
int32(len(charSet)),
92+
int32(len(charSet)),// #nosec G115 - safe conversion, len always >= 0
9393
)
9494
iferr!=nil {
9595
return"",err

‎enterprise/coderd/license/license.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func ParseClaimsIgnoreNbf(rawJWT string, keys map[string]ed25519.PublicKey) (*Cl
389389
varvErr*jwt.ValidationError
390390
ifxerrors.As(err,&vErr) {
391391
// zero out the NotValidYet error to check if there were other problems
392-
vErr.Errors=vErr.Errors& (^jwt.ValidationErrorNotValidYet)
392+
vErr.Errors&= (^jwt.ValidationErrorNotValidYet)
393393
ifvErr.Errors!=0 {
394394
// There are other errors besides not being valid yet. We _could_ go
395395
// through all the jwt.ValidationError bits and try to work out the

‎enterprise/dbcrypt/cipher_internal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestCipherAES256(t *testing.T) {
5959

6060
munged:=make([]byte,len(encrypted1))
6161
copy(munged,encrypted1)
62-
munged[0]=munged[0]^0xff
62+
munged[0]^=0xff
6363
_,err=cipher.Decrypt(munged)
6464
vardecryptErr*DecryptFailedError
6565
require.ErrorAs(t,err,&decryptErr,"munging the first byte of the encrypted data should cause decryption to fail")

‎helm/provisioner/tests/chart_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func TestRenderChart(t *testing.T) {
160160
require.NoError(t,err,"failed to read golden file %q",goldenFilePath)
161161

162162
// Remove carriage returns to make tests pass on Windows.
163-
goldenBytes=bytes.Replace(goldenBytes, []byte("\r"), []byte(""),-1)
163+
goldenBytes=bytes.ReplaceAll(goldenBytes, []byte("\r"), []byte(""))
164164
expected:=string(goldenBytes)
165165

166166
require.NoError(t,err,"failed to load golden file %q")

‎provisioner/terraform/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type agentAttributes struct {
4242
IDstring`mapstructure:"id"`
4343
Tokenstring`mapstructure:"token"`
4444
Envmap[string]string`mapstructure:"env"`
45-
// Deprecated, but remains here for backwards compatibility.
45+
// Deprecated: remains here for backwards compatibility.
4646
StartupScriptstring`mapstructure:"startup_script"`
4747
StartupScriptBehaviorstring`mapstructure:"startup_script_behavior"`
4848
StartupScriptTimeoutSecondsint32`mapstructure:"startup_script_timeout"`

‎pty/pty_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build linux
1+
//go:build linux
22

33
package pty
44

‎pty/ptytest/ptytest.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,7 @@ func (e *outExpecter) expectMatchContextFunc(str string, fn func(ctx context.Con
164164

165165
// TODO(mafredri): Rename this to ExpectMatch when refactoring.
166166
func (e*outExpecter)ExpectMatchContext(ctx context.Context,strstring)string {
167-
returne.expectMatcherFunc(ctx,str,func(src,patternstring)bool {
168-
returnstrings.Contains(src,pattern)
169-
})
167+
returne.expectMatcherFunc(ctx,str,strings.Contains)
170168
}
171169

172170
func (e*outExpecter)ExpectRegexMatchContext(ctx context.Context,strstring)string {

‎pty/ssh_other.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func applyTerminalModesToFd(logger *log.Logger, fd uintptr, req ssh.Pty) error {
105105
continue
106106
}
107107
if_,ok:=tios.CC[k];ok {
108-
tios.CC[k]=uint8(v)
108+
tios.CC[k]=uint8(v)// #nosec G115 - terminal control character values are expected to fit in uint8
109109
continue
110110
}
111111
if_,ok:=tios.Opts[k];ok {

‎tailnet/telemetry.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ func (b *TelemetryStore) changedConntype(addr string) bool {
106106
b.mu.Lock()
107107
deferb.mu.Unlock()
108108

109-
ifb.p2p&&addr!="" {
109+
switch {
110+
caseb.p2p&&addr!="":
110111
returnfalse
111-
}elseif!b.p2p&&addr!="" {
112+
case!b.p2p&&addr!="":
112113
b.p2p=true
113114
b.p2pSetupTime=time.Since(b.lastDerpTime)
114115
returntrue
115-
}elseifb.p2p&&addr=="" {
116+
caseb.p2p&&addr=="":
116117
b.p2p=false
117118
b.lastDerpTime=time.Now()
118119
b.p2pSetupTime=0

‎testutil/port.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ func RandomPortNoListen(*testing.T) uint16 {
4141
rndMu.Lock()
4242
x:=rnd.Intn(n)
4343
rndMu.Unlock()
44-
returnuint16(min+x)
44+
returnuint16(min+x)// #nosec G115 - range is safe, min+x is always <= max (60999)
4545
}

‎vpn/router.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,38 @@ func convertRouterConfig(cfg router.Config) *NetworkSettingsRequest {
4040
v6LocalAddrs:=make([]string,0)
4141
v6PrefixLengths:=make([]uint32,0)
4242
for_,addrs:=rangecfg.LocalAddrs {
43-
ifaddrs.Addr().Is4() {
43+
switch {
44+
caseaddrs.Addr().Is4():
4445
v4LocalAddrs=append(v4LocalAddrs,addrs.Addr().String())
4546
v4SubnetMasks=append(v4SubnetMasks,prefixToSubnetMask(addrs))
46-
}elseifaddrs.Addr().Is6() {
47+
caseaddrs.Addr().Is6():
4748
v6LocalAddrs=append(v6LocalAddrs,addrs.Addr().String())
4849
v6PrefixLengths=append(v6PrefixLengths,uint32(addrs.Bits()))
49-
}else {
50+
default:
5051
continue
5152
}
5253
}
5354
v4Routes:=make([]*NetworkSettingsRequest_IPv4Settings_IPv4Route,0)
5455
v6Routes:=make([]*NetworkSettingsRequest_IPv6Settings_IPv6Route,0)
5556
for_,route:=rangecfg.Routes {
56-
ifroute.Addr().Is4() {
57+
switch {
58+
caseroute.Addr().Is4():
5759
v4Routes=append(v4Routes,convertToIPV4Route(route))
58-
}elseifroute.Addr().Is6() {
60+
caseroute.Addr().Is6():
5961
v6Routes=append(v6Routes,convertToIPV6Route(route))
60-
}else {
62+
default:
6163
continue
6264
}
6365
}
6466
v4ExcludedRoutes:=make([]*NetworkSettingsRequest_IPv4Settings_IPv4Route,0)
6567
v6ExcludedRoutes:=make([]*NetworkSettingsRequest_IPv6Settings_IPv6Route,0)
6668
for_,route:=rangecfg.LocalRoutes {
67-
ifroute.Addr().Is4() {
69+
switch {
70+
caseroute.Addr().Is4():
6871
v4ExcludedRoutes=append(v4ExcludedRoutes,convertToIPV4Route(route))
69-
}elseifroute.Addr().Is6() {
72+
caseroute.Addr().Is6():
7073
v6ExcludedRoutes=append(v6ExcludedRoutes,convertToIPV6Route(route))
71-
}else {
74+
default:
7275
continue
7376
}
7477
}

0 commit comments

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