Allow target to be left out

fly-apps · Jul 5, 2024 · 0f58fd5 · 0f58fd5
1 parent 6e3aa73
commit 0f58fd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/internal/flypg/barman_restore.go b/internal/flypg/barman_restore.go
@@ -71,10 +71,6 @@ func NewBarmanRestore(configURL string) (*BarmanRestore, error) {
 		restore.recoveryTargetAction = "promote"
 	}
 
-	if restore.recoveryTargetName == "" && restore.recoveryTargetTime == "" && restore.recoveryTarget == "" {
-		return nil, fmt.Errorf("no restore target specified")
-	}
-
 	return restore, nil
 }
 
@@ -171,7 +167,10 @@ func (b *BarmanRestore) restoreFromBackup(ctx context.Context) error {
 			return fmt.Errorf("failed to resolve backup target by id: %s", err)
 		}
 	default:
-		return fmt.Errorf("restore target not specified")
+		backupID, err = b.resolveBackupFromTime(backups, time.Now().Format(time.RFC3339))
+		if err != nil {
+			return fmt.Errorf("failed to resolve backup target by time: %s", err)
+		}
 	}
 
 	if backupID == "" {

diff --git a/internal/flypg/pg.go b/internal/flypg/pg.go
@@ -235,8 +235,6 @@ func (c *PGConfig) setRecoveryTargetConfig(configURL string) error {
 		c.internalConfig["recovery_target_name"] = fmt.Sprintf("barman_%s", barmanRestore.recoveryTargetName)
 	case barmanRestore.recoveryTargetTime != "":
 		c.internalConfig["recovery_target_time"] = fmt.Sprintf("'%s'", barmanRestore.recoveryTargetTime)
-	default:
-		return fmt.Errorf("recovery target name or time must be specified")
 	}
 
 	return nil