Refactor and simplify e2e2

Signed-off-by: jose.vazquez <[email protected]>

Author: josvazg

test/e2e2/flexcluster_test.go

@@ -23,18 +23,18 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	nextapiv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/generated/v1"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/version"
-	"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/state"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e2/flexsamples"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/control"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e/utils"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/kube"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/operator"
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/resources"
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/testparams"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/yml"
 )
 
@@ -43,15 +43,6 @@ const (
 	GroupCRDName       = "groups.atlas.generated.mongodb.com"
 )
 
-// yamlPlaceholders holds all placeholder values for YAML template replacement.
-type yamlPlaceholders struct {
-	GroupID               string
-	OrgID                 string
-	GroupName             string
-	OperatorNamespace     string
-	CredentialsSecretName string
-}
-
 var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func() {
 	var ctx context.Context
 	var kubeClient client.Client
@@ -61,7 +52,7 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 	var testGroup *nextapiv1.Group
 	var groupID string
 	var orgID string
-	var sharedPlaceholders yamlPlaceholders
+	var sharedTestParams *testparams.TestParams
 
 	_ = BeforeAll(func() {
 		if !version.IsExperimental() {
@@ -86,34 +77,32 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 				Name: utils.RandomName("flex-shared-grp-ns"),
 			}}
 			Expect(kubeClient.Create(ctx, sharedGroupNamespace)).To(Succeed())
-			copyCredentialsToNamespace(ctx, kubeClient, sharedGroupNamespace.Name)
+			Expect(resources.CopyCredentialsToNamespace(ctx, kubeClient, DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), sharedGroupNamespace.Name, GinkGoFieldOwner)).To(Succeed())
 		})
 
 		By("Create test Group", func() {
 			groupName := utils.RandomName("flexcluster-test-group")
-			// Set up shared placeholders for Group YAML template
-			sharedPlaceholders = yamlPlaceholders{
-				GroupName:             groupName,
-				OperatorNamespace:     sharedGroupNamespace.Name,
-				CredentialsSecretName: DefaultGlobalCredentials,
-				OrgID:                 orgID,
-			}
+			// Set up shared test params for Group YAML template
+			sharedTestParams = testparams.New(orgID, sharedGroupNamespace.Name, DefaultGlobalCredentials).
+				WithGroupName(groupName)
 			// Replace placeholders in the Group YAML template
-			groupYAML := replaceYAMLPlaceholders(string(flexsamples.TestGroup), sharedPlaceholders)
+			groupYAML := sharedTestParams.ReplaceYAML(string(flexsamples.TestGroup))
 			objs := yml.MustParseObjects(strings.NewReader(groupYAML))
 			Expect(len(objs)).To(Equal(1))
 			testGroup = objs[0].(*nextapiv1.Group)
 			Expect(kubeClient.Create(ctx, testGroup)).To(Succeed())
 		})
 
 		By("Wait for Group to be Ready and get its ID", func() {
-			waitForResourceReady(ctx, kubeClient, testGroup)
+			Eventually(func(g Gomega) {
+				g.Expect(resources.CheckResourceReady(ctx, kubeClient, testGroup)).To(Succeed())
+			}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 			Expect(testGroup.Status.V20250312).NotTo(BeNil())
 			Expect(testGroup.Status.V20250312.Id).NotTo(BeNil())
 			groupID = *testGroup.Status.V20250312.Id
 			Expect(groupID).NotTo(BeEmpty())
-			// Update shared placeholders with groupID now that it's available
-			sharedPlaceholders.GroupID = groupID
+			// Update shared test params with groupID now that it's available
+			sharedTestParams = sharedTestParams.WithGroupID(groupID)
 		})
 	})
 
@@ -165,30 +154,33 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 			// Generate randomized group name for this test run (cluster names are unique per group)
 			groupName := utils.RandomName("flex-grp")
 
-			// Set up placeholders for this test case (reuse shared values, override groupName)
-			testPlaceholders := sharedPlaceholders
-			testPlaceholders.GroupName = groupName
+			// Set up test params for this test case (reuse shared values, override groupName)
+			testParams := sharedTestParams.WithGroupName(groupName)
 
 			// Track created objects for cleanup
 			var createdObjects []client.Object
 
 			By("Copy credentials secret to test namespace", func() {
-				copyCredentialsToNamespace(ctx, kubeClient, testNamespace.Name)
+				Expect(resources.CopyCredentialsToNamespace(ctx, kubeClient, DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), testNamespace.Name, GinkGoFieldOwner)).To(Succeed())
 			})
 
 			By("Create resources from YAML", func() {
-				objs := applyYAMLToNamespace(ctx, kubeClient, createYAML, testPlaceholders, testNamespace.Name)
+				objs, err := resources.ApplyYAMLToNamespace(ctx, kubeClient, createYAML, testParams, testNamespace.Name, GinkGoFieldOwner)
+				Expect(err).NotTo(HaveOccurred())
 				createdObjects = append(createdObjects, objs...)
 			})
 
 			By("Wait for Group to be Ready (if using groupRef)", func() {
-				createYAMLStr := replaceYAMLPlaceholders(string(createYAML), testPlaceholders)
+				createYAMLStr := testParams.ReplaceYAML(string(createYAML))
 				objs := yml.MustParseObjects(strings.NewReader(createYAMLStr))
 				for _, obj := range objs {
 					if group, ok := obj.(*nextapiv1.Group); ok {
-						waitForResourceReady(ctx, kubeClient, &nextapiv1.Group{
+						groupObj := &nextapiv1.Group{
 							ObjectMeta: metav1.ObjectMeta{Name: group.Name, Namespace: testNamespace.Name},
-						})
+						}
+						Eventually(func(g Gomega) {
+							g.Expect(resources.CheckResourceReady(ctx, kubeClient, groupObj)).To(Succeed())
+						}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 					}
 				}
 			})
@@ -198,7 +190,9 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 			}
 
 			By("Wait for FlexCluster to be Ready", func() {
-				waitForResourceReady(ctx, kubeClient, &cluster)
+				Eventually(func(g Gomega) {
+					g.Expect(resources.CheckResourceReady(ctx, kubeClient, &cluster)).To(Succeed())
+				}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 			})
 
 			By("Verify cluster was created", func() {
@@ -209,13 +203,16 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 
 			By("Update FlexCluster", func() {
 				if len(updateYAML) > 0 {
-					applyYAMLToNamespace(ctx, kubeClient, updateYAML, testPlaceholders, testNamespace.Name)
+					_, err := resources.ApplyYAMLToNamespace(ctx, kubeClient, updateYAML, testParams, testNamespace.Name, GinkGoFieldOwner)
+					Expect(err).NotTo(HaveOccurred())
 				}
 			})
 
 			By("Wait for FlexCluster to be Ready & updated", func() {
 				if len(updateYAML) > 0 {
-					waitForResourceUpdated(ctx, kubeClient, &cluster)
+					Eventually(func(g Gomega) {
+						g.Expect(resources.CheckResourceUpdated(ctx, kubeClient, &cluster)).To(Succeed())
+					}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 				}
 			})
 
@@ -227,7 +224,9 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 
 			By("Wait for all resources to be deleted", func() {
 				for _, obj := range createdObjects {
-					waitForResourceDeleted(ctx, kubeClient, obj)
+					Eventually(func(g Gomega) {
+						g.Expect(resources.CheckResourceDeleted(ctx, kubeClient, obj)).To(Succeed())
+					}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 				}
 			})
 		},
@@ -243,80 +242,3 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 		),
 	)
 })
-
-// replaceYAMLPlaceholders replaces placeholders in YAML templates with actual values from the struct.
-func replaceYAMLPlaceholders(yaml string, p yamlPlaceholders) string {
-	result := yaml
-	result = strings.ReplaceAll(result, "__GROUP_ID__", p.GroupID)
-	result = strings.ReplaceAll(result, "__ORG_ID__", p.OrgID)
-	result = strings.ReplaceAll(result, "__GROUP_NAME__", p.GroupName)
-	result = strings.ReplaceAll(result, "__OPERATOR_NAMESPACE__", p.OperatorNamespace)
-	result = strings.ReplaceAll(result, "__CREDENTIALS_SECRET_NAME__", p.CredentialsSecretName)
-	return result
-}
-
-// copyCredentialsToNamespace copies the default global credentials secret to the specified namespace.
-func copyCredentialsToNamespace(ctx context.Context, kubeClient client.Client, namespace string) {
-	globalCredsKey := client.ObjectKey{
-		Name:      DefaultGlobalCredentials,
-		Namespace: control.MustEnvVar("OPERATOR_NAMESPACE"),
-	}
-	credentialsSecret, err := copySecretToNamespace(ctx, kubeClient, globalCredsKey, namespace)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(
-		kubeClient.Patch(ctx, credentialsSecret, client.Apply, client.ForceOwnership, GinkGoFieldOwner),
-	).To(Succeed())
-}
-
-// applyYAMLToNamespace applies YAML objects to a namespace after replacing placeholders.
-// Returns the list of applied objects.
-func applyYAMLToNamespace(ctx context.Context, kubeClient client.Client, yaml []byte, placeholders yamlPlaceholders, namespace string) []client.Object {
-	yamlStr := replaceYAMLPlaceholders(string(yaml), placeholders)
-	objs := yml.MustParseObjects(strings.NewReader(yamlStr))
-	for _, obj := range objs {
-		obj.SetNamespace(namespace)
-		Expect(
-			kubeClient.Patch(ctx, obj, client.Apply, client.ForceOwnership, GinkGoFieldOwner),
-		).To(Succeed())
-	}
-	return objs
-}
-
-// waitForResourceReady waits for a resource to have Ready condition set to True.
-func waitForResourceReady(ctx context.Context, kubeClient client.Client, obj kube.ObjectWithStatus) {
-	Eventually(func(g Gomega) bool {
-		g.Expect(
-			kubeClient.Get(ctx, client.ObjectKeyFromObject(obj), obj),
-		).To(Succeed())
-		if condition := meta.FindStatusCondition(obj.GetConditions(), "Ready"); condition != nil {
-			return condition.Status == metav1.ConditionTrue
-		}
-		return false
-	}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).To(BeTrue())
-}
-
-// waitForResourceUpdated waits for a resource to be Ready and in Updated state.
-func waitForResourceUpdated(ctx context.Context, kubeClient client.Client, obj kube.ObjectWithStatus) {
-	Eventually(func(g Gomega) bool {
-		g.Expect(
-			kubeClient.Get(ctx, client.ObjectKeyFromObject(obj), obj),
-		).To(Succeed())
-		ready := false
-		if condition := meta.FindStatusCondition(obj.GetConditions(), "Ready"); condition != nil {
-			ready = (condition.Status == metav1.ConditionTrue)
-		}
-		if ready {
-			if condition := meta.FindStatusCondition(obj.GetConditions(), "State"); condition != nil {
-				return state.ResourceState(condition.Reason) == state.StateUpdated
-			}
-		}
-		return false
-	}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).To(BeTrue())
-}
-
-// waitForResourceDeleted waits for a resource to be deleted from the cluster.
-func waitForResourceDeleted(ctx context.Context, kubeClient client.Client, obj client.Object) {
-	Eventually(func(g Gomega) error {
-		return kubeClient.Get(ctx, client.ObjectKeyFromObject(obj), obj)
-	}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).ShouldNot(Succeed())
-}

test/helper/e2e2/kube/kube.go

@@ -43,7 +43,7 @@ type ObjectWithStatus interface {
 }
 
 // AssertCRDNames check that the given names are CRDs installed in the accesible cluster
-func AssertCRDNames(ctx context.Context, kubeClient client.Client, crdNames ... string) error {
+func AssertCRDNames(ctx context.Context, kubeClient client.Client, crdNames ...string) error {
 	crds := make([]*apiextensionsv1.CustomResourceDefinition, 0, len(crdNames))
 	for _, crdName := range crdNames {
 		crd := &apiextensionsv1.CustomResourceDefinition{