Ginkgo v2 (#431)

* ginkgo v2 bump * changelog * ginkgo v2.8.1
solo-io · Mar 10, 2023 · a21bf82 · a21bf82
1 parent b531d07
commit a21bf82
Show file tree

Hide file tree

Showing 42 changed files with 80 additions and 85 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ install-go-tools: mod-download
 	go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
 	go install github.com/solo-io/[email protected]
 	go install github.com/golang/mock/[email protected]
-	go install github.com/onsi/ginkgo/ginkgo@v1.16.4
+	go install github.com/onsi/ginkgo/v2/ginkgo@v2.8.1
 	go install golang.org/x/tools/cmd/goimports
 
 # proto compiler installation

diff --git a/changelog/v0.29.0/ginkgo-v2.yaml b/changelog/v0.29.0/ginkgo-v2.yaml
@@ -0,0 +1,5 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: onsi
+    dependencyRepo: ginkgo
+    dependencyTag: v2.8.1
diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md
@@ -16,7 +16,7 @@ Name|Version|License
 [groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0
 [golang/protobuf](https://github.com/golang/protobuf)|v1.5.2|BSD 3-clause "New" or "Revised" License
 [google/gnostic](https://github.com/google/gnostic)|v0.5.7-v3refs|Apache License 2.0
-[cmp/internal](https://github.com/google/go-cmp)|v0.5.8|BSD 3-clause "New" or "Revised" License
+[cmp/internal](https://github.com/google/go-cmp)|v0.5.9|BSD 3-clause "New" or "Revised" License
 [google/gofuzz](https://github.com/google/gofuzz)|v1.1.0|Apache License 2.0
 [google/uuid](https://github.com/google/uuid)|v1.2.0|BSD 3-clause "New" or "Revised" License
 [josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License
@@ -36,11 +36,10 @@ Name|Version|License
 [go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License
 [go.uber.org/zap](https://go.uber.org/zap)|v1.21.0|MIT License
 [exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License
-[x/net](https://golang.org/x/net)|v0.0.0-20220722155237-a158d28d115b|BSD 3-clause "New" or "Revised" License
+[x/net](https://golang.org/x/net)|v0.6.0|BSD 3-clause "New" or "Revised" License
 [oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20211104180415-d3ed0bb246c8|BSD 3-clause "New" or "Revised" License
-[x/sys](https://golang.org/x/sys)|v0.0.0-20220722155257-8c9f86f7a55f|BSD 3-clause "New" or "Revised" License
-[x/term](https://golang.org/x/term)|v0.0.0-20210927222741-03fcf44c2211|BSD 3-clause "New" or "Revised" License
-[x/text](https://golang.org/x/text)|v0.3.7|BSD 3-clause "New" or "Revised" License
+[x/term](https://golang.org/x/term)|v0.5.0|BSD 3-clause "New" or "Revised" License
+[x/text](https://golang.org/x/text)|v0.7.0|BSD 3-clause "New" or "Revised" License
 [time/rate](https://golang.org/x/time/rate)|v0.0.0-20220609170525-579cf78fd858|BSD 3-clause "New" or "Revised" License
 [jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.2.0|Apache License 2.0
 [google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.0|BSD 3-clause "New" or "Revised" License

diff --git a/codegen/cmd_test.go b/codegen/cmd_test.go
@@ -12,8 +12,7 @@ import (
 	goyaml "gopkg.in/yaml.v3"
 	v12 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/solo-io/skv2/codegen"
 	. "github.com/solo-io/skv2/codegen/model"

diff --git a/codegen/codegen_suite_test.go b/codegen/codegen_suite_test.go
@@ -3,7 +3,7 @@ package codegen_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/codegen/doc/doc_suite_test.go b/codegen/doc/doc_suite_test.go
@@ -3,7 +3,7 @@ package doc_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/codegen/doc/helm_values_test.go b/codegen/doc/helm_values_test.go
@@ -1,7 +1,7 @@
 package doc_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/solo-io/skv2/codegen/doc"
 )

diff --git a/codegen/kuberesource/crd_test.go b/codegen/kuberesource/crd_test.go
@@ -1,7 +1,7 @@
 package kuberesource_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1"

diff --git a/codegen/kuberesource/kuberesource_suite_test.go b/codegen/kuberesource/kuberesource_suite_test.go
@@ -3,7 +3,7 @@ package kuberesource_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/codegen/render/funcs_test.go b/codegen/render/funcs_test.go
@@ -8,7 +8,7 @@ import (
 
 	structpb "github.com/golang/protobuf/ptypes/struct"
 	"github.com/lithammer/dedent"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

diff --git a/codegen/render/kube_crud_test.go b/codegen/render/kube_crud_test.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/solo-io/go-utils/randutils"
 	"github.com/solo-io/k8s-utils/kubeutils"

diff --git a/codegen/render/kube_multicluster_test.go b/codegen/render/kube_multicluster_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/solo-io/skv2/codegen/util"
 	"github.com/solo-io/skv2/test/matchers"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/solo-io/go-utils/randutils"
 	"github.com/solo-io/k8s-utils/kubeutils"

diff --git a/codegen/render/manifests_renderer_test.go b/codegen/render/manifests_renderer_test.go
@@ -1,7 +1,7 @@
 package render_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/codegen/render/render_suite_test.go b/codegen/render/render_suite_test.go
@@ -3,7 +3,7 @@ package render_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/contrib/codegen/funcs/funcs_suite_test.go b/contrib/codegen/funcs/funcs_suite_test.go
@@ -3,7 +3,7 @@ package funcs_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/contrib/codegen/funcs/funcs_test.go b/contrib/codegen/funcs/funcs_test.go
@@ -1,7 +1,7 @@
 package funcs_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/solo-io/skv2/codegen/model"
 	"github.com/solo-io/skv2/contrib/codegen/funcs"

diff --git a/contrib/tests/set_test.go b/contrib/tests/set_test.go
@@ -1,7 +1,7 @@
 package tests_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1"
 	. "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1/sets"

diff --git a/contrib/tests/set_v2_test.go b/contrib/tests/set_v2_test.go
@@ -1,7 +1,7 @@
 package tests_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1"
 	"github.com/solo-io/skv2/contrib/pkg/sets"

diff --git a/contrib/tests/tests_suite_test.go b/contrib/tests/tests_suite_test.go
@@ -3,7 +3,7 @@ package tests_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/go.mod b/go.mod
@@ -23,8 +23,8 @@ require (
 	github.com/lithammer/dedent v1.1.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/hashstructure v1.0.0
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.20.1
+	github.com/onsi/ginkgo/v2 v2.8.1
+	github.com/onsi/gomega v1.26.0
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.12.2
@@ -41,7 +41,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.21.0
 	golang.org/x/exp v0.0.0-20220921164117-439092de6870
-	golang.org/x/tools v0.1.12
+	golang.org/x/tools v0.6.0
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -89,7 +89,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.2.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -113,7 +113,6 @@ require (
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -123,22 +122,21 @@ require (
 	github.com/spf13/cobra v1.4.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.6.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	k8s.io/component-base v0.25.4 // indirect
 	k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect