Merge pull request #583 from karlkfi/karl-ginkgo-v2

k8s-ci-robot · web-flow · commit 1fead05e8cf8 · 2022-04-22T10:56:12.000-07:00
chore: Upgrade to Ginkgo v2
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ all: generate license fix vet fmt test lint tidy
 	go install k8s.io/code-generator/cmd/deepcopy-gen@v0.23.6
 
 "$(MYGOBIN)/ginkgo":
-	go install github.com/onsi/ginkgo/ginkgo@v1.16.5
+	go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.3
 
 "$(MYGOBIN)/mdrip":
 	go install github.com/monopole/mdrip@v1.0.2
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/google/go-cmp v0.5.6
 	github.com/google/uuid v1.3.0
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.1.3
 	github.com/onsi/gomega v1.17.0
 	github.com/spf13/cobra v1.3.0
 	github.com/spyzhov/ajson v0.4.2
@@ -73,7 +73,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -97,7 +96,6 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
diff --git a/go.sum b/go.sum
@@ -300,6 +300,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -481,6 +482,8 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
diff --git a/test/e2e/apply_and_destroy_test.go b/test/e2e/apply_and_destroy_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/continue_on_error_test.go b/test/e2e/continue_on_error_test.go
@@ -6,7 +6,7 @@ package e2e
 import (
 	"context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
diff --git a/test/e2e/crd_test.go b/test/e2e/crd_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/deletion_prevention_test.go b/test/e2e/deletion_prevention_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/dependency_filter_test.go b/test/e2e/dependency_filter_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apis/actuation"
diff --git a/test/e2e/depends_on_test.go b/test/e2e/depends_on_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/dry_run_test.go b/test/e2e/dry_run_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -6,7 +6,7 @@ package e2e
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
 	v1 "k8s.io/api/core/v1"
@@ -46,47 +46,46 @@ var defaultTestTimeout = 5 * time.Minute
 var defaultBeforeTestTimeout = 30 * time.Second
 var defaultAfterTestTimeout = 30 * time.Second
 
-var _ = Describe("Applier", func() {
+var c client.Client
 
-	var c client.Client
+var _ = BeforeSuite(func() {
+	// increase from 4000 to handle long event lists
+	format.MaxLength = 10000
 
-	BeforeSuite(func() {
-		// increase from 4000 to handle long event lists
-		format.MaxLength = 10000
+	cfg, err := ctrl.GetConfig()
+	Expect(err).NotTo(HaveOccurred())
 
-		cfg, err := ctrl.GetConfig()
-		Expect(err).NotTo(HaveOccurred())
+	// Disable client-side throttling.
+	// Recent versions of kind support server-side throttling.
+	cfg.QPS = -1
+	cfg.Burst = -1
 
-		// Disable client-side throttling.
-		// Recent versions of kind support server-side throttling.
-		cfg.QPS = -1
-		cfg.Burst = -1
+	inventoryConfigs[ConfigMapTypeInvConfig] = invconfig.NewConfigMapTypeInvConfig(cfg)
+	inventoryConfigs[CustomTypeInvConfig] = invconfig.NewCustomTypeInvConfig(cfg)
 
-		inventoryConfigs[ConfigMapTypeInvConfig] = invconfig.NewConfigMapTypeInvConfig(cfg)
-		inventoryConfigs[CustomTypeInvConfig] = invconfig.NewCustomTypeInvConfig(cfg)
+	mapper, err := apiutil.NewDynamicRESTMapper(cfg)
+	Expect(err).NotTo(HaveOccurred())
 
-		mapper, err := apiutil.NewDynamicRESTMapper(cfg)
-		Expect(err).NotTo(HaveOccurred())
-
-		c, err = client.New(cfg, client.Options{
-			Scheme: scheme.Scheme,
-			Mapper: mapper,
-		})
-		Expect(err).NotTo(HaveOccurred())
-
-		ctx, cancel := context.WithTimeout(context.Background(), defaultBeforeTestTimeout)
-		defer cancel()
-		e2eutil.CreateInventoryCRD(ctx, c)
-		Expect(ctx.Err()).To(BeNil(), "BeforeSuite context cancelled or timed out")
+	c, err = client.New(cfg, client.Options{
+		Scheme: scheme.Scheme,
+		Mapper: mapper,
 	})
+	Expect(err).NotTo(HaveOccurred())
 
-	AfterSuite(func() {
-		ctx, cancel := context.WithTimeout(context.Background(), defaultAfterTestTimeout)
-		defer cancel()
-		e2eutil.DeleteInventoryCRD(ctx, c)
-		Expect(ctx.Err()).To(BeNil(), "AfterSuite context cancelled or timed out")
-	})
+	ctx, cancel := context.WithTimeout(context.Background(), defaultBeforeTestTimeout)
+	defer cancel()
+	e2eutil.CreateInventoryCRD(ctx, c)
+	Expect(ctx.Err()).To(BeNil(), "BeforeSuite context cancelled or timed out")
+})
+
+var _ = AfterSuite(func() {
+	ctx, cancel := context.WithTimeout(context.Background(), defaultAfterTestTimeout)
+	defer cancel()
+	e2eutil.DeleteInventoryCRD(ctx, c)
+	Expect(ctx.Err()).To(BeNil(), "AfterSuite context cancelled or timed out")
+})
 
+var _ = Describe("E2E", func() {
 	for i := range inventoryConfigTypes {
 		invType := inventoryConfigTypes[i]
 		Context(fmt.Sprintf("Inventory%s", invType), func() {
diff --git a/test/e2e/e2eutil/common.go b/test/e2e/e2eutil/common.go
@@ -10,7 +10,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/test/e2e/empty_set_test.go b/test/e2e/empty_set_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/exit_early_test.go b/test/e2e/exit_early_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/validation/field"
diff --git a/test/e2e/inventory_policy_test.go b/test/e2e/inventory_policy_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apis/actuation"
diff --git a/test/e2e/mutation_test.go b/test/e2e/mutation_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/name_inv_strategy_test.go b/test/e2e/name_inv_strategy_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/namespace_filter_test.go b/test/e2e/namespace_filter_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apis/actuation"
diff --git a/test/e2e/prune_retrieve_error_test.go b/test/e2e/prune_retrieve_error_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/reconcile_failed_timeout_test.go b/test/e2e/reconcile_failed_timeout_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/apply"
diff --git a/test/e2e/serverside_apply_test.go b/test/e2e/serverside_apply_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/test/e2e/skip_invalid_test.go b/test/e2e/skip_invalid_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/test/stress/stress_suite_test.go b/test/stress/stress_suite_test.go
@@ -6,7 +6,7 @@ package stress
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/stress/stress_test.go b/test/stress/stress_test.go
diff --git a/test/stress/thousand_namespaces_test.go b/test/stress/thousand_namespaces_test.go
