Skip to content

Commit 356be9e

Browse files
chore: upgrade golanci-lint to 2.6.1 (#808)
This change updates the golanci-lint tool to version 2.6.1 and addresses new linting issues raised by updated linters.
1 parent aa28bdf commit 356be9e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
apko = "0.30.13"
1414
flyctl = "0.3.189"
1515
go = "1.25.3"
16-
golangci-lint = "2.4.0"
16+
golangci-lint = "2.6.1"
1717
gum = "0.16.0"
1818
jq = "1.7.1"
1919
melange = "0.30.6"

server/internal/urn/resources.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,19 +281,19 @@ func (u *Resource) validate() error {
281281
}
282282

283283
for _, part := range parts {
284-
v := part[1]
284+
segment, v := part[0], part[1]
285285
if v == "" {
286-
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, part[0])
286+
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, segment)
287287
return u.err
288288
}
289289

290-
if len(part[1]) > maxSegmentLength {
291-
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, part[0], maxSegmentLength, len(part[1]))
290+
if len(v) > maxSegmentLength {
291+
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, segment, maxSegmentLength, len(v))
292292
return u.err
293293
}
294294

295295
if !constants.SlugPatternRE.MatchString(v) {
296-
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, part[0], part[1])
296+
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, segment, v)
297297
return u.err
298298
}
299299
}

server/internal/urn/runners.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,19 @@ func (u *FunctionRunner) validate() error {
173173
}
174174

175175
for _, part := range parts {
176-
v := part[1]
176+
segment, v := part[0], part[1]
177177
if v == "" {
178-
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, part[0])
178+
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, segment)
179179
return u.err
180180
}
181181

182-
if len(part[1]) > maxSegmentLength {
183-
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, part[0], maxSegmentLength, len(part[1]))
182+
if len(v) > maxSegmentLength {
183+
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, segment, maxSegmentLength, len(v))
184184
return u.err
185185
}
186186

187187
if !constants.SlugPatternRE.MatchString(v) {
188-
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, part[0], part[1])
188+
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, segment, v)
189189
return u.err
190190
}
191191
}

server/internal/urn/tools.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,19 @@ func (u *Tool) validate() error {
167167
}
168168

169169
for _, part := range parts {
170-
v := part[1]
170+
segment, v := part[0], part[1]
171171
if v == "" {
172-
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, part[0])
172+
u.err = fmt.Errorf("%w: empty %s", ErrInvalid, segment)
173173
return u.err
174174
}
175175

176-
if len(part[1]) > maxSegmentLength {
177-
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, part[0], maxSegmentLength, len(part[1]))
176+
if len(v) > maxSegmentLength {
177+
u.err = fmt.Errorf("%w: %s segment is too long (max %d, got %d)", ErrInvalid, segment, maxSegmentLength, len(v))
178178
return u.err
179179
}
180180

181181
if !constants.SlugPatternRE.MatchString(v) {
182-
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, part[0], part[1])
182+
u.err = fmt.Errorf("%w: disallowed characters in %s: %q", ErrInvalid, segment, v)
183183
return u.err
184184
}
185185
}

0 commit comments

Comments
 (0)