diff --git a/.golangci.example.yml b/.golangci.example.yml index 3f20bcdaf6c9..c37c3d96dd91 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -410,13 +410,13 @@ linters-settings: # List of aliases alias: # using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package - servingv1: knative.dev/serving/pkg/apis/serving/v1 + knative.dev/serving/pkg/apis/serving/v1: servingv1 # using `autoscalingv1alpha1` alias for `knative.dev/serving/pkg/apis/autoscaling/v1alpha1` package - autoscalingv1alpha1: knative.dev/serving/pkg/apis/autoscaling/v1alpha1 + knative.dev/serving/pkg/apis/autoscaling/v1alpha1: autoscalingv1alpha1 # You can specify the package path by regular expression, # and alias by regular expression expansion syntax like below. # see https://github.com/julz/importas#use-regular-expression for details - "$1$2": 'knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)' + 'knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)': '$1$2' lll: # max line length, lines longer will be reported. Default is 120. diff --git a/pkg/golinters/importas.go b/pkg/golinters/importas.go index 88e34a83bdd9..928b08dee666 100644 --- a/pkg/golinters/importas.go +++ b/pkg/golinters/importas.go @@ -33,7 +33,7 @@ func NewImportAs(settings *config.ImportAsSettings) *goanalysis.Linter { lintCtx.Log.Errorf("failed to parse configuration: %v", err) } - for alias, pkg := range settings.Alias { + for pkg, alias := range settings.Alias { err := analyzer.Flags.Set("alias", fmt.Sprintf("%s:%s", pkg, alias)) if err != nil { lintCtx.Log.Errorf("failed to parse configuration: %v", err) diff --git a/test/testdata/configs/importas.yml b/test/testdata/configs/importas.yml index 5c4620397196..e8cbc6311bd9 100644 --- a/test/testdata/configs/importas.yml +++ b/test/testdata/configs/importas.yml @@ -1,5 +1,5 @@ linters-settings: importas: alias: - fff: fmt - std_os: os + fmt: fff + os: std_os diff --git a/test/testdata/configs/importas_noalias.yml b/test/testdata/configs/importas_noalias.yml index ad94e57ebe6b..3000cba98146 100644 --- a/test/testdata/configs/importas_noalias.yml +++ b/test/testdata/configs/importas_noalias.yml @@ -1,4 +1,4 @@ linters-settings: importas: - fff: fmt - std_os: os + fmt: fff + os: std_os diff --git a/test/testdata/configs/importas_strict.yml b/test/testdata/configs/importas_strict.yml index af813948e34f..f8fcddb6dc32 100644 --- a/test/testdata/configs/importas_strict.yml +++ b/test/testdata/configs/importas_strict.yml @@ -2,5 +2,5 @@ linters-settings: importas: no-unaliased: true alias: - fff: fmt - std_os: os + fmt: fff + os: std_os