chore: use only one version of gopkg.in/yaml

ldez · ldez · commit a0e90bb5ccc9 · 2021-05-17T23:38:22.000+02:00
diff --git a/go.mod b/go.mod
@@ -83,7 +83,6 @@ require (
 	github.com/valyala/quicktemplate v1.6.3
 	github.com/yeya24/promlinter v0.1.0
 	golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 	honnef.co/go/tools v0.1.4
 	mvdan.cc/gofumpt v0.1.1
diff --git a/test/fix_test.go b/test/fix_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/test/testshared"
 )
diff --git a/test/linters_test.go b/test/linters_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
diff --git a/test/testdata/configs/gomodguard.yml b/test/testdata/configs/gomodguard.yml
@@ -5,7 +5,7 @@ linters-settings:
         - golang.org/x/mod/modfile
     blocked:
       modules:                                                      # List of blocked modules
-        - gopkg.in/yaml.v2:                                         # Blocked module
+        - gopkg.in/yaml.v3:                                         # Blocked module
             recommendations:                                        # Recommended modules that should be used instead (Optional)
               - github.com/kylelemons/go-gypsy                           
             reason: "This is an example of recommendations."        # Reason why the recommended module should be used (Optional)
diff --git a/test/testdata/gomodguard.go b/test/testdata/gomodguard.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"golang.org/x/mod/modfile"
-	"gopkg.in/yaml.v2" // ERROR "import of package `gopkg.in/yaml.v2` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
+	"gopkg.in/yaml.v3" // ERROR "import of package `gopkg.in/yaml.v3` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
 )
 
 // Something just some struct

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`		`- yaml "gopkg.in/yaml.v2"`
	`11`	`+ "gopkg.in/yaml.v3"`
`12`	`12`
`13`	`13`	`"github.com/golangci/golangci-lint/test/testshared"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"log"`
`7`	`7`
`8`	`8`	`"golang.org/x/mod/modfile"`
`9`		- "gopkg.in/yaml.v2" // ERROR "import of package `gopkg.in/yaml.v2` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
	`9`	+ "gopkg.in/yaml.v3" // ERROR "import of package `gopkg.in/yaml.v3` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// Something just some struct`