test: migrate generator addon suites to v2 framework

e2e/suites/argocd/argocd.go

@@ -17,13 +17,12 @@ limitations under the License.
 package argocd
 
 import (
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
-
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	"github.com/external-secrets/external-secrets-e2e/suites/provider/cases/common"
 	"github.com/external-secrets/external-secrets-e2e/suites/provider/cases/fake"
+
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("argocd", Label("argocd"), func() {

e2e/suites/argocd/install.go

@@ -20,10 +20,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/external-secrets/external-secrets-e2e/framework/addon"
+
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
-
-	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 )
 
 const (

e2e/suites/argocd/suite_test.go

@@ -19,15 +19,14 @@ package argocd
 import (
 	"testing"
 
+	"github.com/external-secrets/external-secrets-e2e/framework/addon"
+	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
+
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
-
 	// nolint
 	. "github.com/onsi/gomega"
-
-	"github.com/external-secrets/external-secrets-e2e/framework/addon"
-	"github.com/external-secrets/external-secrets-e2e/framework/util"
-	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -45,9 +44,12 @@ var _ = SynchronizedAfterSuite(func() {
 	By("Deleting any pending generator states")
 	generatorStates := &genv1alpha1.GeneratorStateList{}
 	err := cl.List(GinkgoT().Context(), generatorStates)
-	Expect(err).ToNot(HaveOccurred())
-	for _, generatorState := range generatorStates.Items {
-		err = cl.Delete(GinkgoT().Context(), &generatorState)
+	if err == nil {
+		for _, generatorState := range generatorStates.Items {
+			err = cl.Delete(GinkgoT().Context(), &generatorState)
+			Expect(err).ToNot(HaveOccurred())
+		}
+	} else if !util.IsMissingAPIResourceError(err) {
 		Expect(err).ToNot(HaveOccurred())
 	}
 

e2e/suites/flux/flux.go

@@ -17,13 +17,12 @@ limitations under the License.
 package flux
 
 import (
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
-
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	"github.com/external-secrets/external-secrets-e2e/suites/provider/cases/common"
 	"github.com/external-secrets/external-secrets-e2e/suites/provider/cases/fake"
+
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
 )
 
 var _ = Describe("flux", Label("flux"), func() {

e2e/suites/flux/install.go

@@ -22,13 +22,12 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	"github.com/external-secrets/external-secrets-e2e/framework/addon"
+
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
-
 	// nolint
 	. "github.com/onsi/gomega"
-
-	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 )
 
 const (

e2e/suites/flux/suite_test.go

@@ -19,15 +19,14 @@ package flux
 import (
 	"testing"
 
+	"github.com/external-secrets/external-secrets-e2e/framework/addon"
+	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
+
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
-
 	// nolint
 	. "github.com/onsi/gomega"
-
-	"github.com/external-secrets/external-secrets-e2e/framework/addon"
-	"github.com/external-secrets/external-secrets-e2e/framework/util"
-	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -46,9 +45,12 @@ var _ = SynchronizedAfterSuite(func() {
 	By("Deleting any pending generator states")
 	generatorStates := &genv1alpha1.GeneratorStateList{}
 	err := cfg.CRClient.List(GinkgoT().Context(), generatorStates)
-	Expect(err).ToNot(HaveOccurred())
-	for _, generatorState := range generatorStates.Items {
-		err = cfg.CRClient.Delete(GinkgoT().Context(), &generatorState)
+	if err == nil {
+		for _, generatorState := range generatorStates.Items {
+			err = cfg.CRClient.Delete(GinkgoT().Context(), &generatorState)
+			Expect(err).ToNot(HaveOccurred())
+		}
+	} else if !util.IsMissingAPIResourceError(err) {
 		Expect(err).ToNot(HaveOccurred())
 	}
 

e2e/suites/generator/ecr.go

@@ -19,18 +19,18 @@ package generator
 import (
 	"os"
 
-	//nolint
-	. "github.com/onsi/gomega"
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 	esmeta "github.com/external-secrets/external-secrets/apis/meta/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
+	//nolint
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("ecr generator", Label("ecr"), func() {

e2e/suites/generator/fake.go

@@ -17,18 +17,17 @@ limitations under the License.
 package generator
 
 import (
-
-	//nolint
-	. "github.com/onsi/gomega"
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
+	//nolint
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("fake generator", Label("fake"), func() {

e2e/suites/generator/grafana.go

@@ -21,23 +21,22 @@ import (
 	"strings"
 	"time"
 
-	//nolint
-	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
+	grafanaclient "github.com/grafana/grafana-openapi-client-go/client"
+	grafanasearch "github.com/grafana/grafana-openapi-client-go/client/search"
+	grafanasa "github.com/grafana/grafana-openapi-client-go/client/service_accounts"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	grafanaclient "github.com/grafana/grafana-openapi-client-go/client"
-	grafanasearch "github.com/grafana/grafana-openapi-client-go/client/search"
-	grafanasa "github.com/grafana/grafana-openapi-client-go/client/service_accounts"
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
+	//nolint
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("grafana generator", Label("grafana"), func() {

e2e/suites/generator/manifest.go

@@ -19,10 +19,6 @@ package generator
 import (
 	"time"
 
-	//nolint
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
 	// nolint
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +27,10 @@ import (
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
+
+	//nolint
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("manifest target with generator", Label("manifest"), func() {

e2e/suites/generator/password.go

@@ -17,18 +17,17 @@ limitations under the License.
 package generator
 
 import (
-
-	//nolint
-	. "github.com/onsi/gomega"
-
-	// nolint
-	. "github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/external-secrets/external-secrets-e2e/framework"
 	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	// nolint
+	. "github.com/onsi/ginkgo/v2"
+	//nolint
+	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("password generator", Label("password"), func() {

e2e/suites/generator/suite_test.go

@@ -19,14 +19,14 @@ package generator
 import (
 	"testing"
 
+	"github.com/external-secrets/external-secrets-e2e/framework/addon"
+	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
+
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
 	// nolint
 	. "github.com/onsi/gomega"
-
-	"github.com/external-secrets/external-secrets-e2e/framework/addon"
-	"github.com/external-secrets/external-secrets-e2e/framework/util"
-	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -49,9 +49,12 @@ var _ = SynchronizedAfterSuite(func() {
 	By("Deleting any pending generator states")
 	generatorStates := &genv1alpha1.GeneratorStateList{}
 	err := cfg.CRClient.List(GinkgoT().Context(), generatorStates)
-	Expect(err).ToNot(HaveOccurred())
-	for _, generatorState := range generatorStates.Items {
-		err = cfg.CRClient.Delete(GinkgoT().Context(), &generatorState)
+	if err == nil {
+		for _, generatorState := range generatorStates.Items {
+			err = cfg.CRClient.Delete(GinkgoT().Context(), &generatorState)
+			Expect(err).ToNot(HaveOccurred())
+		}
+	} else if !util.IsMissingAPIResourceError(err) {
 		Expect(err).ToNot(HaveOccurred())
 	}
 	By("Cleaning up global addons")

e2e/suites/generator/testcase.go

@@ -19,18 +19,18 @@ package generator
 import (
 	"time"
 
-	//nolint
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
 	// nolint
 	v1 "k8s.io/api/core/v1"
-
-	"github.com/external-secrets/external-secrets-e2e/framework"
-	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/external-secrets/external-secrets-e2e/framework"
+	esv1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1"
+
+	//nolint
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 )
 
 type testCase struct {