Update logic for encryption

Author: akankshamahajan15

e2e/fixtures/fdb_backup.go

@@ -46,6 +46,8 @@ type FdbBackup struct {
 type FdbBackupConfiguration struct {
 	// BackupType defines the backup type that should be used for this backup.
 	BackupType *fdbv1beta2.BackupType
+	// EncryptionEnabled determines whether backup encryption should be used.
+	EncryptionEnabled bool
 }
 
 // CreateBackupForCluster will create a FoundationDBBackup for the provided cluster.
@@ -71,7 +73,6 @@ func (factory *Factory) CreateBackupForCluster(
 			AllowTagOverride: ptr.To(true),
 			ClusterName:      fdbCluster.Name(),
 			Version:          fdbVersion.String(),
-			EncryptionKeyPath: "/tmp/encryption-key/key.bin",
 			BlobStoreConfiguration: &fdbv1beta2.BlobStoreConfiguration{
 				AccountName: "seaweedfs@seaweedfs:8333",
 				URLParameters: []fdbv1beta2.URLParameter{
@@ -162,6 +163,11 @@ func (factory *Factory) CreateBackupForCluster(
 		},
 	}
 
+	// Set encryption key path only if encryption is enabled
+	if config.EncryptionEnabled {
+		backup.Spec.EncryptionKeyPath = "/tmp/encryption-key/key.bin"
+	}
+
 	gomega.Expect(factory.CreateIfAbsent(backup)).NotTo(gomega.HaveOccurred())
 
 	curBackup := &FdbBackup{

e2e/test_operator_backups/operator_backup_test.go

@@ -88,6 +88,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 		// in the backup store.
 		AfterEach(func() {
 			backup.Destroy()
+			Expect(fdbCluster.WaitForReconciliation()).To(Succeed())
 		})
 
 		When("the default backup system is used", func() {
@@ -127,6 +128,29 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 			})
 		})
 
+		When("the default backup system is used with encryption", Serial, func() {
+			BeforeEach(func() {
+				log.Println("creating encrypted backup for cluster")
+				backup = factory.CreateBackupForCluster(
+					fdbCluster,
+					&fixtures.FdbBackupConfiguration{
+						BackupType:        ptr.To(fdbv1beta2.BackupTypeDefault),
+						EncryptionEnabled: true,
+					},
+				)
+				keyValues = fdbCluster.GenerateRandomValues(10, prefix)
+				fdbCluster.WriteKeyValues(keyValues)
+				backup.WaitForRestorableVersion(fdbCluster.GetClusterVersion())
+				backup.Stop()
+			})
+
+			It("should restore the encrypted cluster successfully", func() {
+				fdbCluster.ClearRange([]byte{prefix}, 60)
+				factory.CreateRestoreForCluster(backup)
+				Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+			})
+		})
+
 		PWhen("the partitioned backup system is used", func() {
 			BeforeEach(func() {
 				log.Println("creating backup for cluster with partitioned log system")