Skip to content

Commit dbf4179

Browse files
committed
Upgrade golangci-lint to v2 and apply go fix for Go 1.26
- Migrate .golangci.yml to v2 format (gofmt moved to formatters section) - Upgrade golangci-lint from v1.64.5 to v2.10.1 - Apply go fix: strings.Split -> strings.SplitSeq (Go 1.26 iterators)
1 parent dcb25f7 commit dbf4179

4 files changed

Lines changed: 31 additions & 27 deletions

File tree

.github/workflows/quality-assurance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
go-version: "1.26"
1717
- uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
1818
with:
19-
version: v1.64.5
19+
version: v2.10.1
2020

2121
tidy:
2222
runs-on: ubuntu-24.04

.golangci.yml

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
version: "2"
2+
3+
formatters:
4+
enable:
5+
- gofmt
6+
17
linters:
28
enable:
39
- bodyclose
@@ -6,7 +12,6 @@ linters:
612
- errorlint
713
- gocognit
814
- gocritic
9-
- gofmt
1015
- gosec
1116
- govet
1217
- ineffassign
@@ -19,25 +24,24 @@ linters:
1924
- unparam
2025
- unused
2126
- wastedassign
22-
23-
linters-settings:
24-
gocognit:
25-
min-complexity: 30
26-
revive:
27-
rules:
28-
- name: blank-imports
29-
- name: context-as-argument
30-
- name: dot-imports
31-
- name: error-return
32-
- name: error-strings
33-
- name: exported
34-
disabled: true
35-
- name: increment-decrement
36-
- name: indent-error-flow
37-
- name: range
38-
- name: receiver-naming
39-
- name: redefines-builtin-id
40-
- name: time-naming
41-
- name: unexported-return
42-
- name: var-declaration
43-
- name: var-naming
27+
settings:
28+
gocognit:
29+
min-complexity: 30
30+
revive:
31+
rules:
32+
- name: blank-imports
33+
- name: context-as-argument
34+
- name: dot-imports
35+
- name: error-return
36+
- name: error-strings
37+
- name: exported
38+
disabled: true
39+
- name: increment-decrement
40+
- name: indent-error-flow
41+
- name: range
42+
- name: receiver-naming
43+
- name: redefines-builtin-id
44+
- name: time-naming
45+
- name: unexported-return
46+
- name: var-declaration
47+
- name: var-naming

internal/king/king.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func parseTunnelArgs(args []string) ([]tunnelConfig, error) {
6161
configs := make([]tunnelConfig, 0, len(args))
6262
for _, arg := range args {
6363
pairs := make(map[string]string)
64-
for _, pair := range strings.Split(arg, " ") {
64+
for pair := range strings.SplitSeq(arg, " ") {
6565
parts := strings.SplitN(pair, "=", 2)
6666
if len(parts) == 2 {
6767
pairs[parts[0]] = parts[1]

internal/ling/ling.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func parseTunnelArgs(args []string) ([]tunnelConfig, error) {
6969
configs := make([]tunnelConfig, 0, len(args))
7070
for _, arg := range args {
7171
pairs := make(map[string]string)
72-
for _, pair := range strings.Split(arg, " ") {
72+
for pair := range strings.SplitSeq(arg, " ") {
7373
parts := strings.SplitN(pair, "=", 2)
7474
if len(parts) == 2 {
7575
pairs[parts[0]] = parts[1]
@@ -97,7 +97,7 @@ func parseProxyArgs(args []string) ([]proxyConfig, error) {
9797
configs := make([]proxyConfig, 0, len(args))
9898
for _, arg := range args {
9999
pairs := make(map[string]string)
100-
for _, pair := range strings.Split(arg, " ") {
100+
for pair := range strings.SplitSeq(arg, " ") {
101101
parts := strings.SplitN(pair, "=", 2)
102102
if len(parts) == 2 {
103103
pairs[parts[0]] = parts[1]

0 commit comments

Comments
 (0)