Skip to content

Commit 1ab0066

Browse files
committed
review
1 parent 345e674 commit 1ab0066

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

pkg/commands/internal/migrate/migrate_linters_settings.go

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,27 @@ func toGoCriticSettings(old versionone.GoCriticSettings) versiontwo.GoCriticSett
351351
settings.SettingsPerCheck = make(map[string]versiontwo.GoCriticCheckSettings)
352352
}
353353

354-
settings.SettingsPerCheck[k] = versiontwo.GoCriticCheckSettings(checkSettings)
354+
if k != "ruleguard" {
355+
settings.SettingsPerCheck[k] = versiontwo.GoCriticCheckSettings(checkSettings)
356+
357+
continue
358+
}
359+
360+
gccs := versiontwo.GoCriticCheckSettings{}
361+
362+
for sk, value := range checkSettings {
363+
if sk != "rules" {
364+
gccs[sk] = value
365+
366+
continue
367+
}
368+
369+
if rules, ok := value.(string); ok {
370+
gccs[sk] = strings.ReplaceAll(rules, "${configDir}", "${base-path}")
371+
}
372+
}
373+
374+
settings.SettingsPerCheck[k] = gccs
355375
}
356376

357377
return settings

pkg/commands/internal/migrate/testdata/linters-settings_gocritic.golden.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ linters:
254254
disable: myGroupName,#myTagName
255255
enable: myGroupName,#myTagName
256256
failon: dsl,import
257-
rules: ${configDir}/ruleguard/rules-*.go,${configDir}/myrule1.go
257+
rules: ${base-path}/ruleguard/rules-*.go,${base-path}/myrule1.go
258258
toomanyresultschecker:
259259
maxresults: 10
260260
truncatecmp:

0 commit comments

Comments
 (0)