Make restore fail messages more user-facing (#1705)

ajp-io · web-flow · commit a690847c5abe · 2025-01-15T15:39:06.000-06:00
diff --git a/cmd/installer/cli/restore.go b/cmd/installer/cli/restore.go
@@ -1311,11 +1311,11 @@ func restoreFromReplicatedBackup(ctx context.Context, backup disasterrecovery.Re
 		if isImprovedDR {
 			r, err := backup.GetRestore()
 			if err != nil {
-				return fmt.Errorf("failed to get restore cr from backup: %w", err)
+				return fmt.Errorf("failed to get restore resource from backup: %w", err)
 			}
 			err = restoreAppFromBackup(ctx, b, r)
 			if err != nil {
-				return fmt.Errorf("failed to restore app from backup using improved dr: %w", err)
+				return fmt.Errorf("failed to restore app from backup: %w", err)
 			}
 		} else {
 			err = restoreFromBackup(ctx, b, drComponent)

Original file line number	Diff line number	Diff line change
`@@ -1311,11 +1311,11 @@ func restoreFromReplicatedBackup(ctx context.Context, backup disasterrecovery.Re`
`1311`	`1311`	`if isImprovedDR {`
`1312`	`1312`	`r, err := backup.GetRestore()`
`1313`	`1313`	`if err != nil {`
`1314`		`- return fmt.Errorf("failed to get restore cr from backup: %w", err)`
	`1314`	`+ return fmt.Errorf("failed to get restore resource from backup: %w", err)`
`1315`	`1315`	`}`
`1316`	`1316`	`err = restoreAppFromBackup(ctx, b, r)`
`1317`	`1317`	`if err != nil {`
`1318`		`- return fmt.Errorf("failed to restore app from backup using improved dr: %w", err)`
	`1318`	`+ return fmt.Errorf("failed to restore app from backup: %w", err)`
`1319`	`1319`	`}`
`1320`	`1320`	`} else {`
`1321`	`1321`	`err = restoreFromBackup(ctx, b, drComponent)`