Refactor YAML test sourcing

Author: josvazg

…2e2/flexsamples/with_groupid_create.yaml …ples/atlas_generated_v1_flexcluster.yamltest/e2e2/flexsamples/with_groupid_create.yaml renamed to config/samples/atlas_generated_v1_flexcluster.yaml test/e2e2/flexsamples/with_groupid_create.yaml renamed to config/samples/atlas_generated_v1_flexcluster.yaml

@@ -6,10 +6,11 @@ spec:
   connectionSecretRef:
     name: mongodb-atlas-operator-api-key
   v20250312:
-    groupId: __GROUP_ID__
+    groupId: "60f1b3c4e4b0e8b8c8b8c8b"
     entry:
       name: flexy
       terminationProtectionEnabled: true
       providerSettings:
         backingProviderName: GCP
         regionName: CENTRAL_US
+

…e2/flexsamples/with_groupref_create.yaml …erated_v1_flexcluster_with_groupref.yamltest/e2e2/flexsamples/with_groupref_create.yaml renamed to config/samples/atlas_generated_v1_flexcluster_with_groupref.yaml test/e2e2/flexsamples/with_groupref_create.yaml renamed to config/samples/atlas_generated_v1_flexcluster_with_groupref.yaml

@@ -1,14 +1,14 @@
 apiVersion: atlas.generated.mongodb.com/v1
 kind: Group
 metadata:
-  name: __GROUP_NAME__
+  name: my-group
 spec:
   connectionSecretRef:
     name: mongodb-atlas-operator-api-key
   v20250312:
     entry:
-      orgId: __ORG_ID__
-      name: __GROUP_NAME__
+      orgId: "60f1b3c4e4b0e8b8c8b8c8b"
+      name: my-group
 ---
 apiVersion: atlas.generated.mongodb.com/v1
 kind: FlexCluster
@@ -19,10 +19,11 @@ metadata:
 spec:
   v20250312:
     groupRef:
-      name: __GROUP_NAME__
+      name: my-group
     entry:
       name: flexy
       terminationProtectionEnabled: true
       providerSettings:
         backingProviderName: GCP
         regionName: CENTRAL_US
+

config/samples/atlas_generated_v1_group.yaml

@@ -0,0 +1,12 @@
+apiVersion: atlas.generated.mongodb.com/v1
+kind: Group
+metadata:
+  name: my-group
+spec:
+  connectionSecretRef:
+    name: mongodb-atlas-operator-api-key
+  v20250312:
+    entry:
+      orgId: "60f1b3c4e4b0e8b8c8b8c8b"
+      name: my-group
+

config/samples/kustomization.yaml

@@ -20,4 +20,7 @@ resources:
   - atlas_v1_atlasbackupcompliancepolicy.yaml
   - atlas_v1_atlascustomrole.yaml
   - atlas_v1_atlasthirdpartyintegration.yaml
+  - atlas_generated_v1_group.yaml
+  - atlas_generated_v1_flexcluster.yaml
+  - atlas_generated_v1_flexcluster_with_groupref.yaml
 # +kubebuilder:scaffold:manifestskustomizesamples

test/e2e2/flexcluster_test.go

@@ -17,7 +17,6 @@ package e2e2_test
 import (
 	"context"
 	"os"
-	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -26,23 +25,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	k8s "github.com/crd2go/crd2go/k8s"
 	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/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/samples"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/testparams"
-	"github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e2/yml"
 )
 
 const (
 	FlexClusterCRDName = "flexclusters.atlas.generated.mongodb.com"
 	GroupCRDName       = "groups.atlas.generated.mongodb.com"
 )
 
+// mutationFunc is a function type for mutating objects during test setup.
+type mutationFunc func(objs []client.Object, params *testparams.TestParams) *nextapiv1.FlexCluster
+
+// updateMutationFunc is a function type for mutating objects during test updates.
+type updateMutationFunc func(cluster *nextapiv1.FlexCluster)
+
 var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func() {
 	var ctx context.Context
 	var kubeClient client.Client
@@ -82,14 +87,15 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 
 		By("Create test Group", func() {
 			groupName := utils.RandomName("flexcluster-test-group")
-			// Set up shared test params for Group YAML template
+			// Set up shared test params
 			sharedTestParams = testparams.New(orgID, sharedGroupNamespace.Name, DefaultGlobalCredentials).
 				WithGroupName(groupName)
-			// Replace placeholders in the Group YAML template
-			groupYAML := sharedTestParams.ReplaceYAML(string(flexsamples.TestGroup))
-			objs := yml.MustParseObjects(strings.NewReader(groupYAML))
+
+			// Load sample Group YAML and apply mutations
+			objs := samples.MustLoadSampleObjects("atlas_generated_v1_group.yaml")
 			Expect(len(objs)).To(Equal(1))
 			testGroup = objs[0].(*nextapiv1.Group)
+			sharedTestParams.WithNamespace(sharedGroupNamespace.Name).ApplyToGroup(testGroup)
 			Expect(kubeClient.Create(ctx, testGroup)).To(Succeed())
 		})
 
@@ -150,30 +156,45 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 	})
 
 	DescribeTable("FlexCluster CRUD lifecycle",
-		func(createYAML, updateYAML []byte, clusterName string) {
+		func(sampleFile string, createMutation mutationFunc, updateMutation updateMutationFunc, clusterName string) {
 			// Generate randomized group name for this test run (cluster names are unique per group)
 			groupName := utils.RandomName("flex-grp")
 
-			// Set up test params for this test case (reuse shared values, override groupName)
-			testParams := sharedTestParams.WithGroupName(groupName)
+			// Set up test params for this test case (reuse shared values, override groupName and namespace)
+			testParams := sharedTestParams.WithGroupName(groupName).WithNamespace(testNamespace.Name)
 
 			// Track created objects for cleanup
 			var createdObjects []client.Object
+			var cluster *nextapiv1.FlexCluster
 
 			By("Copy credentials secret to test namespace", func() {
 				Expect(resources.CopyCredentialsToNamespace(ctx, kubeClient, DefaultGlobalCredentials, control.MustEnvVar("OPERATOR_NAMESPACE"), testNamespace.Name, GinkGoFieldOwner)).To(Succeed())
 			})
 
-			By("Create resources from YAML", func() {
-				objs, err := resources.ApplyYAMLToNamespace(ctx, kubeClient, createYAML, testParams, testNamespace.Name, GinkGoFieldOwner)
+			By("Load sample YAML and apply mutations for create", func() {
+				objs := samples.MustLoadSampleObjects(sampleFile)
+
+				// Apply create mutation function
+				cluster = createMutation(objs, testParams)
+
+				// Apply all objects to namespace
+				createdObjects, err := resources.ApplyObjectsToNamespace(ctx, kubeClient, objs, testNamespace.Name, GinkGoFieldOwner)
 				Expect(err).NotTo(HaveOccurred())
-				createdObjects = append(createdObjects, objs...)
+
+				// Find cluster object for later use if not returned by mutation
+				if cluster == nil {
+					for _, obj := range createdObjects {
+						if fc, ok := obj.(*nextapiv1.FlexCluster); ok {
+							cluster = fc
+							break
+						}
+					}
+				}
 			})
 
 			By("Wait for Group to be Ready (if using groupRef)", func() {
-				createYAMLStr := testParams.ReplaceYAML(string(createYAML))
-				objs := yml.MustParseObjects(strings.NewReader(createYAMLStr))
-				for _, obj := range objs {
+				// Check if any Group objects were created
+				for _, obj := range createdObjects {
 					if group, ok := obj.(*nextapiv1.Group); ok {
 						groupObj := &nextapiv1.Group{
 							ObjectMeta: metav1.ObjectMeta{Name: group.Name, Namespace: testNamespace.Name},
@@ -185,13 +206,9 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 				}
 			})
 
-			cluster := nextapiv1.FlexCluster{
-				ObjectMeta: metav1.ObjectMeta{Name: clusterName, Namespace: testNamespace.Name},
-			}
-
 			By("Wait for FlexCluster to be Ready", func() {
 				Eventually(func(g Gomega) {
-					g.Expect(resources.CheckResourceReady(ctx, kubeClient, &cluster)).To(Succeed())
+					g.Expect(resources.CheckResourceReady(ctx, kubeClient, cluster)).To(Succeed())
 				}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 			})
 
@@ -202,18 +219,15 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 			})
 
 			By("Update FlexCluster", func() {
-				if len(updateYAML) > 0 {
-					_, err := resources.ApplyYAMLToNamespace(ctx, kubeClient, updateYAML, testParams, testNamespace.Name, GinkGoFieldOwner)
-					Expect(err).NotTo(HaveOccurred())
-				}
+				// Apply update mutation to the same cluster object
+				updateMutation(cluster)
+				Expect(kubeClient.Patch(ctx, cluster, client.Apply, client.ForceOwnership, GinkGoFieldOwner)).To(Succeed())
 			})
 
 			By("Wait for FlexCluster to be Ready & updated", func() {
-				if len(updateYAML) > 0 {
-					Eventually(func(g Gomega) {
-						g.Expect(resources.CheckResourceUpdated(ctx, kubeClient, &cluster)).To(Succeed())
-					}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
-				}
+				Eventually(func(g Gomega) {
+					g.Expect(resources.CheckResourceUpdated(ctx, kubeClient, cluster)).To(Succeed())
+				}).WithTimeout(5 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
 			})
 
 			By("Delete all created resources", func() {
@@ -231,14 +245,87 @@ var _ = Describe("FlexCluster CRUD", Ordered, Label("flexcluster-ctlr"), func()
 			})
 		},
 		Entry("With direct groupId",
-			flexsamples.WithGroupIdCreate,
-			flexsamples.WithGroupIdUpdate,
+			"atlas_generated_v1_flexcluster.yaml",
+			mutateFlexClusterWithGroupId,
+			updateFlexClusterTerminationProtection,
 			"flexy",
 		),
 		Entry("With groupRef",
-			flexsamples.WithGroupRefCreate,
-			flexsamples.WithGroupRefUpdate,
+			"atlas_generated_v1_flexcluster_with_groupref.yaml",
+			mutateFlexClusterWithGroupRef,
+			updateFlexClusterTerminationProtection,
 			"flexy",
 		),
 	)
 })
+
+// mutateFlexClusterWithGroupId mutates a FlexCluster object to use direct groupId.
+// Returns the mutated FlexCluster if found, nil otherwise.
+func mutateFlexClusterWithGroupId(objs []client.Object, params *testparams.TestParams) *nextapiv1.FlexCluster {
+	for _, obj := range objs {
+		if cluster, ok := obj.(*nextapiv1.FlexCluster); ok {
+			cluster.SetNamespace(params.Namespace)
+
+			if cluster.Spec.ConnectionSecretRef == nil {
+				cluster.Spec.ConnectionSecretRef = &k8s.LocalReference{}
+			}
+			cluster.Spec.ConnectionSecretRef.Name = params.CredentialsSecretName
+
+			if cluster.Spec.V20250312 == nil {
+				cluster.Spec.V20250312 = &nextapiv1.FlexClusterSpecV20250312{}
+			}
+			if params.GroupID != "" {
+				cluster.Spec.V20250312.GroupId = &params.GroupID
+				// Clear groupRef if groupId is set
+				cluster.Spec.V20250312.GroupRef = nil
+			}
+			return cluster
+		}
+	}
+	return nil
+}
+
+// mutateFlexClusterWithGroupRef mutates a FlexCluster object to use groupRef.
+// This also mutates any Group objects in the same list to use test params.
+// Returns the mutated FlexCluster if found, nil otherwise.
+func mutateFlexClusterWithGroupRef(objs []client.Object, params *testparams.TestParams) *nextapiv1.FlexCluster {
+	var cluster *nextapiv1.FlexCluster
+	for _, obj := range objs {
+		switch o := obj.(type) {
+		case *nextapiv1.Group:
+			params.ApplyToGroup(o)
+		case *nextapiv1.FlexCluster:
+			o.SetNamespace(params.Namespace)
+
+			if o.Spec.ConnectionSecretRef == nil {
+				o.Spec.ConnectionSecretRef = &k8s.LocalReference{}
+			}
+			o.Spec.ConnectionSecretRef.Name = params.CredentialsSecretName
+
+			if o.Spec.V20250312 == nil {
+				o.Spec.V20250312 = &nextapiv1.FlexClusterSpecV20250312{}
+			}
+			if o.Spec.V20250312.GroupRef == nil {
+				o.Spec.V20250312.GroupRef = &k8s.LocalReference{}
+			}
+			o.Spec.V20250312.GroupRef.Name = params.GroupName
+			// Clear groupId if groupRef is set
+			o.Spec.V20250312.GroupId = nil
+			cluster = o
+		}
+	}
+	return cluster
+}
+
+// updateFlexClusterTerminationProtection mutates a FlexCluster for the update scenario.
+// This changes terminationProtectionEnabled from true to false.
+func updateFlexClusterTerminationProtection(cluster *nextapiv1.FlexCluster) {
+	if cluster.Spec.V20250312 == nil {
+		cluster.Spec.V20250312 = &nextapiv1.FlexClusterSpecV20250312{}
+	}
+	if cluster.Spec.V20250312.Entry == nil {
+		cluster.Spec.V20250312.Entry = &nextapiv1.FlexClusterSpecV20250312Entry{}
+	}
+	terminationProtectionEnabled := false
+	cluster.Spec.V20250312.Entry.TerminationProtectionEnabled = &terminationProtectionEnabled
+}