Skip to content

Commit 3d8360b

Browse files
ldezldez
committed
review
1 parent 03f90a6 commit 3d8360b

File tree

4 files changed

+381
-34
lines changed

4 files changed

+381
-34
lines changed

‎pkg/commands/internal/migrate/migrate_linters_settings.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -790,17 +790,13 @@ func toSpancheckSettings(old versionone.SpancheckSettings) versiontwo.SpancheckS
790790

791791
func toStaticCheckSettings(old versionone.LintersSettings) versiontwo.StaticCheckSettings {
792792
checks := Unique(slices.Concat(old.Staticcheck.Checks, old.Stylecheck.Checks, old.Gosimple.Checks))
793-
// If an element is prefixed with `-` it means that we want to disable that check.
794-
// So we have to resort and put everything after the non-minus elements.
795-
slices.SortFunc(checks, func(e1, e2 string) int {
796-
if strings.HasPrefix(e1, "-") && !strings.HasPrefix(e2, "-") {
793+
794+
slices.SortFunc(checks, func(a, b string) int {
795+
if a == "*" || a == "all" {
797796
return 1
798797
}
799798

800-
if !strings.HasPrefix(e1, "-") && strings.HasPrefix(e2, "-") {
801-
return -1
802-
}
803-
return strings.Compare(e1, e2)
799+
return strings.Compare(a, b)
804800
})
805801

806802
return versiontwo.StaticCheckSettings{

‎pkg/commands/internal/migrate/migrate_linters_settings_test.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pkg/commands/internal/migrate/testdata/yaml/linters-settings_staticcheck_merge.golden.yml

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
version: "2"
2+
linters:
3+
settings:
4+
staticcheck:
5+
checks:
6+
- '*'
7+
- -S1000
8+
- -S1001
9+
- -S1002
10+
- -SA1000
11+
- -SA1001
12+
- -SA1002
13+
- -ST1000
14+
- -ST1001
15+
- -ST1003
16+
- S1003
17+
- S1004
18+
- S1005
19+
- S1006
20+
- S1007
21+
- S1008
22+
- S1009
23+
- S1010
24+
- S1011
25+
- S1012
26+
- S1016
27+
- S1017
28+
- S1018
29+
- S1019
30+
- S1020
31+
- S1021
32+
- S1023
33+
- S1024
34+
- S1025
35+
- S1028
36+
- S1029
37+
- S1030
38+
- S1031
39+
- S1032
40+
- S1033
41+
- S1034
42+
- S1035
43+
- S1036
44+
- S1037
45+
- S1038
46+
- S1039
47+
- S1040
48+
- SA1003
49+
- SA1004
50+
- SA1005
51+
- SA1006
52+
- SA1007
53+
- SA1008
54+
- SA1010
55+
- SA1011
56+
- SA1012
57+
- SA1013
58+
- SA1014
59+
- SA1015
60+
- SA1016
61+
- SA1017
62+
- SA1018
63+
- SA1019
64+
- SA1020
65+
- SA1021
66+
- SA1023
67+
- SA1024
68+
- SA1025
69+
- SA1026
70+
- SA1027
71+
- SA1028
72+
- SA1029
73+
- SA1030
74+
- SA1031
75+
- SA1032
76+
- SA2000
77+
- SA2001
78+
- SA2002
79+
- SA2003
80+
- SA3000
81+
- SA3001
82+
- SA4000
83+
- SA4001
84+
- SA4003
85+
- SA4004
86+
- SA4005
87+
- SA4006
88+
- SA4008
89+
- SA4009
90+
- SA4010
91+
- SA4011
92+
- SA4012
93+
- SA4013
94+
- SA4014
95+
- SA4015
96+
- SA4016
97+
- SA4017
98+
- SA4018
99+
- SA4019
100+
- SA4020
101+
- SA4021
102+
- SA4022
103+
- SA4023
104+
- SA4024
105+
- SA4025
106+
- SA4026
107+
- SA4027
108+
- SA4028
109+
- SA4029
110+
- SA4030
111+
- SA4031
112+
- SA4032
113+
- SA5000
114+
- SA5001
115+
- SA5002
116+
- SA5003
117+
- SA5004
118+
- SA5005
119+
- SA5007
120+
- SA5008
121+
- SA5009
122+
- SA5010
123+
- SA5011
124+
- SA5012
125+
- SA6000
126+
- SA6001
127+
- SA6002
128+
- SA6003
129+
- SA6005
130+
- SA6006
131+
- SA9001
132+
- SA9002
133+
- SA9003
134+
- SA9004
135+
- SA9005
136+
- SA9006
137+
- SA9007
138+
- SA9008
139+
- SA9009
140+
- ST1005
141+
- ST1006
142+
- ST1008
143+
- ST1011
144+
- ST1012
145+
- ST1013
146+
- ST1015
147+
- ST1016
148+
- ST1017
149+
- ST1018
150+
- ST1019
151+
- ST1020
152+
- ST1021
153+
- ST1022
154+
- ST1023
155+
- all
156+
initialisms:
157+
- ACL
158+
- API
159+
- ASCII
160+
- CPU
161+
- CSS
162+
- DNS
163+
- EOF
164+
- GUID
165+
- HTML
166+
- HTTP
167+
- HTTPS
168+
- ID
169+
- IP
170+
- JSON
171+
- QPS
172+
- RAM
173+
- RPC
174+
- SLA
175+
- SMTP
176+
- SQL
177+
- SSH
178+
- TCP
179+
- TLS
180+
- TTL
181+
- UDP
182+
- UI
183+
- GID
184+
- UID
185+
- UUID
186+
- URI
187+
- URL
188+
- UTF8
189+
- VM
190+
- XML
191+
- XMPP
192+
- XSRF
193+
- XSS
194+
- SIP
195+
- RTP
196+
- AMQP
197+
- DB
198+
- TS
199+
dot-import-whitelist:
200+
- fmt
201+
http-status-code-whitelist:
202+
- "200"
203+
- "400"
204+
- "404"
205+
- "500"

0 commit comments

Comments
 (0)