pass entire restore spec

Author: Milla Samuel

controllers/admin_client_test.go

@@ -355,10 +355,10 @@ var _ = Describe("admin_client_test", func() {
 				Expect(
 					mockAdminClient.StartRestore(
 						"blobstore://test@test-service/test-backup",
-						fdbv1beta2.FoundationDBRestoreSpec{
-							DestinationClusterName: cluster.Name},
-					),
-				).To(Succeed())
+						fdbv1beta2.FoundationDBRestore{
+							Spec: fdbv1beta2.FoundationDBRestoreSpec{
+								DestinationClusterName: cluster.Name,
+							}})).To(Succeed())
 
 				restoreStatus, err = mockAdminClient.GetRestoreStatus()
 				Expect(err).NotTo(HaveOccurred())

controllers/start_restore.go

@@ -54,7 +54,7 @@ func (s startRestore) reconcile(
 	if len(strings.TrimSpace(status)) == 0 {
 		err = adminClient.StartRestore(
 			restore.BackupURL(),
-			restore.Spec,
+			*restore,
 		)
 		if err != nil {
 			return &requeue{curError: err}

fdbclient/admin_client.go

@@ -916,7 +916,7 @@ func (client *cliAdminClient) GetBackupStatus() (*fdbv1beta2.FoundationDBLiveBac
 // StartRestore starts a new restore.
 func (client *cliAdminClient) StartRestore(
 	url string,
-	fdbRestoreSpec fdbv1beta2.FoundationDBRestoreSpec,
+	restore fdbv1beta2.FoundationDBRestore,
 ) error {
 	args := []string{
 		"start",
@@ -929,17 +929,17 @@ func (client *cliAdminClient) StartRestore(
 		return verErr
 	}
 
-	if fdbRestoreSpec.EncryptionKeyPath != "" && fdbVersion.SupportsBackupEncryption() {
-		args = append(args, "--encryption-key-file", fdbRestoreSpec.EncryptionKeyPath)
+	if restore.Spec.EncryptionKeyPath != "" && fdbVersion.SupportsBackupEncryption() {
+		args = append(args, "--encryption-key-file", restore.Spec.EncryptionKeyPath)
 	}
 
-	if fdbRestoreSpec.BackupVersion != nil {
-		args = append(args, "-v", strconv.FormatUint(*fdbRestoreSpec.BackupVersion, 10))
+	if restore.Spec.BackupVersion != nil {
+		args = append(args, "-v", strconv.FormatUint(*restore.Spec.BackupVersion, 10))
 	}
 
-	if fdbRestoreSpec.KeyRanges != nil {
+	if restore.Spec.KeyRanges != nil {
 		keyRangeString := ""
-		for _, keyRange := range fdbRestoreSpec.KeyRanges {
+		for _, keyRange := range restore.Spec.KeyRanges {
 			if keyRangeString != "" {
 				keyRangeString += ";"
 			}

fdbclient/admin_client_test.go

@@ -1047,10 +1047,11 @@ protocol fdb00b071010000`,
 
 			url := "blobstore://test@test-service/test-backup"
 
-			err := client.StartRestore(url, fdbv1beta2.FoundationDBRestoreSpec{
-				KeyRanges:         keyRanges,
-				EncryptionKeyPath: encryptionKeyPath,
-			})
+			err := client.StartRestore(url, fdbv1beta2.FoundationDBRestore{
+				Spec: fdbv1beta2.FoundationDBRestoreSpec{
+					KeyRanges:         keyRanges,
+					EncryptionKeyPath: encryptionKeyPath,
+				}})
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(mockRunner.receivedArgs[0]).To(ContainElements(
@@ -1129,8 +1130,10 @@ protocol fdb00b071010000`,
 
 			url := "blobstore://test@test-service/test-backup"
 
-			err := client.StartRestore(url, fdbv1beta2.FoundationDBRestoreSpec{
-				BackupVersion: actualBackupVersion,
+			err := client.StartRestore(url, fdbv1beta2.FoundationDBRestore{
+				Spec: fdbv1beta2.FoundationDBRestoreSpec{
+					BackupVersion: actualBackupVersion,
+				},
 			})
 			Expect(err).NotTo(HaveOccurred())
 

pkg/fdbadminclient/admin_client.go

@@ -90,7 +90,7 @@ type AdminClient interface {
 	// StartRestore starts a new restore.
 	StartRestore(
 		url string,
-		fdbRestoreSpec fdbv1beta2.FoundationDBRestoreSpec,
+		fdbRestore fdbv1beta2.FoundationDBRestore,
 	) error
 
 	// GetRestoreStatus gets the status of the current restore.

pkg/fdbadminclient/mock/admin_client_mock.go

@@ -967,7 +967,7 @@ func (client *AdminClient) GetBackupStatus() (*fdbv1beta2.FoundationDBLiveBackup
 // StartRestore starts a new restore.
 func (client *AdminClient) StartRestore(
 	url string,
-	_ fdbv1beta2.FoundationDBRestoreSpec,
+	_ fdbv1beta2.FoundationDBRestore,
 ) error {
 	adminClientMutex.Lock()
 	defer adminClientMutex.Unlock()