diff --git a/pkg/commands/internal/migrate/migrate_linters_settings.go b/pkg/commands/internal/migrate/migrate_linters_settings.go index 2566a671ad77..a0559388d403 100644 --- a/pkg/commands/internal/migrate/migrate_linters_settings.go +++ b/pkg/commands/internal/migrate/migrate_linters_settings.go @@ -260,7 +260,7 @@ func toForbidigoSettings(old versionone.ForbidigoSettings) versiontwo.ForbidigoS } for _, pattern := range old.Forbid { - if pattern.Pattern == nil { + if pattern.Pattern == nil && pattern.Msg == nil && pattern.Package == nil { buffer, err := pattern.MarshalString() if err != nil { // impossible case diff --git a/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.golden.yml b/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.golden.yml index 24813752807b..958547a9554c 100644 --- a/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.golden.yml +++ b/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.golden.yml @@ -10,5 +10,7 @@ linters: - pattern: ^spew\.(ConfigState\.)?Dump$ - pattern: ^v1.Dump$ pkg: ^example.com/pkg/api/v1$ + - pkg: ^github.com/howeyc/gopass$ + msg: github.com/howeyc/gopass is archived, use golang.org/x/term instead exclude-godoc-examples: false analyze-types: true diff --git a/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.yml b/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.yml index ee612a2e9928..b943f8e07dba 100644 --- a/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.yml +++ b/pkg/commands/internal/migrate/testdata/yaml/linters-settings_forbidigo.yml @@ -16,5 +16,7 @@ linters-settings: - ^spew\.(ConfigState\.)?Dump$ - p: ^v1.Dump$ pkg: ^example.com/pkg/api/v1$ + - pkg: ^github.com/howeyc/gopass$ + msg: "github.com/howeyc/gopass is archived, use golang.org/x/term instead" exclude-godoc-examples: false analyze-types: true