CLOUDP-153756: Fixed BackupSchedule reconciliation (#854)

Fixed BackupSchedule reconciliation

Author: igor-karpukhin

.golangci.yml

@@ -22,7 +22,6 @@ linters:
     - gofmt
     - ineffassign
     - misspell
-    - nolintlint
     - noctx
     - prealloc
     - rowserrcheck

config/crd/bases/atlas.mongodb.com_atlasbackupschedules.yaml

@@ -37,7 +37,7 @@ spec:
             description: AtlasBackupScheduleSpec defines the desired state of AtlasBackupSchedule
             properties:
               autoExportEnabled:
-                default: true
+                default: false
                 description: Specify true to enable automatic export of cloud backup
                   snapshots to the AWS bucket. You must also define the export policy
                   using export. If omitted, defaults to false.

pkg/api/v1/atlasbackupschedule_types.go

@@ -20,7 +20,7 @@ import (
 type AtlasBackupScheduleSpec struct {
 	// Specify true to enable automatic export of cloud backup snapshots to the AWS bucket. You must also define the export policy using export. If omitted, defaults to false.
 	// +optional
-	// +kubebuilder:default:=true
+	// +kubebuilder:default:=false
 	AutoExportEnabled bool `json:"autoExportEnabled,omitempty"`
 
 	// Export policy for automatically exporting cloud backup snapshots to AWS bucket.

pkg/controller/atlasdeployment/backup.go

@@ -6,10 +6,14 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow"
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat"
 
 	"go.mongodb.org/atlas/mongodbatlas"
 	"golang.org/x/sync/errgroup"
@@ -189,31 +193,43 @@ func (r *AtlasDeploymentReconciler) updateBackupScheduleAndPolicy(
 
 	r.Log.Debugf("updating backup configuration for the atlas deployment: %v", clusterName)
 	apiScheduleReq := &mongodbatlas.CloudProviderSnapshotBackupPolicy{
-		ClusterName:           clusterName,
-		ReferenceHourOfDay:    &bSchedule.Spec.ReferenceHourOfDay,
-		ReferenceMinuteOfHour: &bSchedule.Spec.ReferenceMinuteOfHour,
-		RestoreWindowDays:     &bSchedule.Spec.RestoreWindowDays,
-		UpdateSnapshots:       &bSchedule.Spec.UpdateSnapshots,
-		Policies:              []mongodbatlas.Policy{apiPolicy},
+		ClusterName:                       clusterName,
+		ReferenceHourOfDay:                &bSchedule.Spec.ReferenceHourOfDay,
+		ReferenceMinuteOfHour:             &bSchedule.Spec.ReferenceMinuteOfHour,
+		RestoreWindowDays:                 &bSchedule.Spec.RestoreWindowDays,
+		UpdateSnapshots:                   &bSchedule.Spec.UpdateSnapshots,
+		Policies:                          []mongodbatlas.Policy{apiPolicy},
+		AutoExportEnabled:                 &bSchedule.Spec.AutoExportEnabled,
+		UseOrgAndGroupNamesInExportPrefix: &bSchedule.Spec.UseOrgAndGroupNamesInExportPrefix,
 	}
 
-	currentSchedule, response, err := service.Client.CloudProviderSnapshotBackupPolicies.Delete(ctx, projectID, clusterName)
+	currentSchedule, response, err := service.Client.CloudProviderSnapshotBackupPolicies.Get(ctx, projectID, clusterName)
 	if err != nil {
-		errMessage := "unable to delete current backup configuration for project"
+		errMessage := "unable to get current backup configuration for project"
 		r.Log.Debugf("%s: %s:%s, %v", errMessage, projectID, clusterName, err)
 		return fmt.Errorf("%s: %s:%s, %w", errMessage, projectID, clusterName, err)
 	}
 
 	if currentSchedule == nil && response != nil {
-		return fmt.Errorf("can't delete сurrent backup configuration. response status: %s", response.Status)
+		return fmt.Errorf("can not get сurrent backup configuration. response status: %s", response.Status)
 	}
 
-	r.Log.Debugf("successfully deleted backup configuration. Default schedule received: %v", currentSchedule)
+	r.Log.Debugf("successfully received backup configuration: %v", currentSchedule)
 
 	apiScheduleReq.ClusterID = currentSchedule.ClusterID
 	// There is only one policy, always
 	apiScheduleReq.Policies[0].ID = currentSchedule.Policies[0].ID
 
+	equal, err := backupSchedulesAreEqual(currentSchedule, apiScheduleReq)
+	if err != nil {
+		return fmt.Errorf("can not compare BackupSchedule resources: %w", err)
+	}
+
+	if equal {
+		r.Log.Debug("backupschedules are equal, nothing to change")
+		return nil
+	}
+
 	r.Log.Debugf("applying backup configuration: %v", *bSchedule)
 	if _, _, err := service.Client.CloudProviderSnapshotBackupPolicies.Update(ctx, projectID, clusterName, apiScheduleReq); err != nil {
 		return fmt.Errorf("unable to create backupschedule %s. e: %w", client.ObjectKeyFromObject(bSchedule).String(), err)
@@ -222,6 +238,38 @@ func (r *AtlasDeploymentReconciler) updateBackupScheduleAndPolicy(
 	return nil
 }
 
+func backupSchedulesAreEqual(currentSchedule *mongodbatlas.CloudProviderSnapshotBackupPolicy, newSchedule *mongodbatlas.CloudProviderSnapshotBackupPolicy) (bool, error) {
+	currentCopy := mongodbatlas.CloudProviderSnapshotBackupPolicy{}
+	err := compat.JSONCopy(&currentCopy, currentSchedule)
+	if err != nil {
+		return false, err
+	}
+
+	newCopy := mongodbatlas.CloudProviderSnapshotBackupPolicy{}
+	err = compat.JSONCopy(&newCopy, newSchedule)
+	if err != nil {
+		return false, err
+	}
+
+	normalizeBackupSchedule(&currentCopy)
+	normalizeBackupSchedule(&newCopy)
+	d := cmp.Diff(&currentCopy, &newCopy, cmpopts.EquateEmpty())
+	if d != "" {
+		return false, nil
+	}
+	return true, nil
+}
+
+func normalizeBackupSchedule(s *mongodbatlas.CloudProviderSnapshotBackupPolicy) {
+	s.CopySettings = nil
+	s.Links = nil
+	s.NextSnapshot = ""
+	if len(s.Policies) > 0 && len(s.Policies[0].PolicyItems) > 0 {
+		s.Policies[0].PolicyItems[0].ID = ""
+	}
+	s.UpdateSnapshots = nil
+}
+
 func (r *AtlasDeploymentReconciler) garbageCollectBackupResource(ctx context.Context, clusterName string) error {
 	schedules := &mdbv1.AtlasBackupScheduleList{}
 

test/int/dbuser_test.go

@@ -827,7 +827,7 @@ func validateDatabaseUserUpdatingFunc(g Gomega) func(a mdbv1.AtlasCustomResource
 	}
 }
 
-//nolint
+// nolint
 func validateDatabaseUserWaitingForCluster() func(a mdbv1.AtlasCustomResource) {
 	return func(a mdbv1.AtlasCustomResource) {
 		d := a.(*mdbv1.AtlasDatabaseUser)