fixup! Handle recovery target when recovering from backup

Author: l00ptr

internal/pgbackrest/api/stanza.go

@@ -32,14 +32,19 @@ type Archive struct {
 	Start string `json:"start"`
 	Stop  string `json:"stop"`
 }
+type DatabaseInfo struct {
+	Id      int64 `json:"id"`
+	RepoKey int64 `json:"repo-key"`
+}
 
 type BackupInfo struct {
-	Archive   Archive   `json:"archive"`
-	Label     string    `json:"label"`
-	Lsn       Lsn       `json:"lsn"`
-	Prior     string    `json:"prior"`
-	Timestamp Timestamp `json:"timestamp"`
-	Type      string    `json:"type"`
+	Archive   Archive      `json:"archive"`
+	Database  DatabaseInfo `json:"database"`
+	Label     string       `json:"label"`
+	Lsn       Lsn          `json:"lsn"`
+	Prior     string       `json:"prior"`
+	Timestamp Timestamp    `json:"timestamp"`
+	Type      string       `json:"type"`
 }
 
 type RecoveryWindow struct {

internal/restore/restore.go

@@ -41,11 +41,11 @@ func (impl JobHookImpl) GetCapabilities(
 
 func recoveryTargetToRestoreOptions(
 	cluster *cnpgv1.Cluster,
-) ([]string, error) {
+) (pgbackrest.RestoreOptions, error) {
 	// empty slice if no bootstrap or recovery target
 	b := cluster.Spec.Bootstrap
 	if b == nil || b.Recovery == nil || b.Recovery.RecoveryTarget == nil {
-		return []string{}, nil
+		return pgbackrest.RestoreOptions{}, nil
 	}
 
 	// otherwise try to converrt the RecoveryTarget to
@@ -79,7 +79,7 @@ func recoveryTargetToRestoreOptions(
 
 	// then convert it to list of envvar
 	// (should be done by the caller ?)
-	return res.ToEnv()
+	return res, nil
 }
 
 func (impl JobHookImpl) Restore(
@@ -104,12 +104,15 @@ func (impl JobHookImpl) Restore(
 	if err != nil {
 		return nil, err
 	}
-	recoveryOption, err := recoveryTargetToRestoreOptions(cConfig.Cluster)
+	recovOption, err := recoveryTargetToRestoreOptions(cConfig.Cluster)
 	if err != nil {
 		return nil, err
 	}
-	env = append(env, recoveryOption...)
-	contextLogger.Info("recoveryOption are", "recov", env)
+	recovEnv, err := recovOption.ToEnv()
+	if err != nil {
+		return nil, err
+	}
+	env = append(env, recovEnv...)
 	pgb := pgbackrest.NewPgBackrest(env)
 	errCh := pgb.Restore(ctx)
 	if err := <-errCh; err != nil {