Merge pull request #921 from aquaproj/chore/downgrade-go-yaml

chore: revert #918
aquaproj · Jun 24, 2022 · 7828808 · 7828808
2 parents 7795d6c + 584bd19
commit 7828808
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -27,5 +27,5 @@ require (
 	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
 	golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664
-	gopkg.in/yaml.v3 v3.0.1
+	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
@@ -623,8 +623,9 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

diff --git a/pkg/config-reader/reader.go b/pkg/config-reader/reader.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/aquaproj/aqua/pkg/config/aqua"
 	"github.com/spf13/afero"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 type ConfigReader interface {

diff --git a/pkg/config/aqua/config_test.go b/pkg/config/aqua/config_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aquaproj/aqua/pkg/config/aqua"
 	"github.com/google/go-cmp/cmp"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 func TestConfig_UnmarshalYAML(t *testing.T) { //nolint:funlen

diff --git a/pkg/config/registry/registry_test.go b/pkg/config/registry/registry_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/aquaproj/aqua/pkg/config/registry"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 func downloadTestFile(uri, tempDir string) (string, error) {

diff --git a/pkg/controller/generate/generate.go b/pkg/controller/generate/generate.go
@@ -22,7 +22,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	"github.com/suzuki-shunsuke/logrus-error/logerr"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 type Controller struct {

diff --git a/pkg/install-registry/install.go b/pkg/install-registry/install.go
@@ -16,7 +16,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	"github.com/suzuki-shunsuke/logrus-error/logerr"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 type installer struct {

diff --git a/tests/aqua.yaml b/tests/aqua.yaml
@@ -1,8 +1,10 @@
 registries:
 - type: standard
+  type: standard # duplicated keys
   ref: v3.0.0 # renovate: depName=aquaproj/aqua-registry
 
 packages:
 - name: kubernetes-sigs/kind # http package, raw format
-  registry: standard # standard registry
+  registry: standard
+  registry: standard # duplicated keys
   version: v0.14.0 # renovate: depName=kubernetes-sigs/kind
diff --git a/tests/registry.yaml b/tests/registry.yaml
@@ -125,3 +125,4 @@ packages:
 # unknown package type
 - type: foo
   name: foo
+  name: foo # duplicated key