feat(restore): read snapshotURL from HostedCluster status for etcd restore

Simplify the restore flow by reading lastSuccessfulEtcdBackupURL from the
HostedCluster status (persisted by the HCPEtcdBackup controller) instead of
relying on the ephemeral HCPEtcdBackup CR. The snapshotURL travels with the
HC in the Velero backup tarball, eliminating ordering dependencies and
surviving CR retention/deletion.

Uses unstructured access to avoid vendor dependency on the field until
the hypershift API PRs are merged (CNTRLPLANE-3173).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>

Author: jparrill

pkg/core/restore.go

@@ -34,17 +34,6 @@ type RestorePlugin struct {
 	*plugtypes.RestoreOptions
 }
 
-type RestoreOptions struct {
-	// Migration is a flag to indicate if the backup is for migration purposes.
-	migration bool
-	// Readopt Nodes is a flag to indicate if the nodes should be reprovisioned or not during restore.
-	readoptNodes bool
-	// ManagedServices is a flag to indicate if the backup is done for ManagedServices like ROSA, ARO, etc.
-	managedServices bool
-	// AWSRegenPrivateLink is a flag to indicate if the PrivateLink should be regenerated in AWS.
-	awsRegenPrivateLink bool
-}
-
 // NewRestorePlugin instantiates RestorePlugin.
 func NewRestorePlugin(logger logrus.FieldLogger) (*RestorePlugin, error) {
 	var (
@@ -175,6 +164,29 @@ func (p *RestorePlugin) Execute(input *velero.RestoreItemActionExecuteInput) (*v
 			}
 			common.AddAnnotation(metadata, common.HostedClusterRestoredFromBackupAnnotation, "")
 			p.log.Infof("Added restore annotation to HostedCluster %s", metadata.GetName())
+
+			// Inject restoreSnapshotURL from the HC status field that was
+			// persisted by the HCPEtcdBackup controller during backup.
+			// Read the snapshotURL from unstructured status to avoid vendor
+			// dependency on the LastSuccessfulEtcdBackupURL field.
+			snapshotURL := getLastSuccessfulEtcdBackupURL(input.Item.UnstructuredContent())
+
+			if snapshotURL != "" {
+				hc := &hyperv1.HostedCluster{}
+				if err := runtime.DefaultUnstructuredConverter.FromUnstructured(input.Item.UnstructuredContent(), hc); err != nil {
+					return nil, fmt.Errorf("error converting item to HostedCluster: %v", err)
+				}
+				if hc.Spec.Etcd.Managed != nil {
+					hc.Spec.Etcd.Managed.Storage.RestoreSnapshotURL = []string{snapshotURL}
+					p.log.Infof("Injected restoreSnapshotURL into HostedCluster %s: %s", hc.Name, snapshotURL)
+
+					unstructuredHC, err := runtime.DefaultUnstructuredConverter.ToUnstructured(hc)
+					if err != nil {
+						return nil, fmt.Errorf("error converting HostedCluster to unstructured: %v", err)
+					}
+					input.Item.SetUnstructuredContent(unstructuredHC)
+				}
+			}
 		}
 
 	case kind == common.ClusterDeploymentKind:
@@ -194,3 +206,17 @@ func (p *RestorePlugin) Execute(input *velero.RestoreItemActionExecuteInput) (*v
 
 	return velero.NewRestoreItemActionExecuteOutput(input.Item), nil
 }
+
+// getLastSuccessfulEtcdBackupURL reads status.lastSuccessfulEtcdBackupURL from
+// an unstructured HostedCluster object. This avoids a vendor dependency on the
+// field which may not be present in the vendored API yet.
+// TODO(CNTRLPLANE-3173): Replace with hc.Status.LastSuccessfulEtcdBackupURL
+// once the hypershift API vendor includes this field.
+func getLastSuccessfulEtcdBackupURL(obj map[string]interface{}) string {
+	status, ok := obj["status"].(map[string]interface{})
+	if !ok {
+		return ""
+	}
+	url, _ := status["lastSuccessfulEtcdBackupURL"].(string)
+	return url
+}

pkg/core/restore_test.go

@@ -0,0 +1,53 @@
+package core
+
+import (
+	"testing"
+
+	. "github.com/onsi/gomega"
+)
+
+func TestGetLastSuccessfulEtcdBackupURL(t *testing.T) {
+	tests := []struct {
+		name string
+		obj  map[string]interface{}
+		want string
+	}{
+		{
+			name: "When status contains lastSuccessfulEtcdBackupURL, It Should return the URL",
+			obj: map[string]interface{}{
+				"status": map[string]interface{}{
+					"lastSuccessfulEtcdBackupURL": "s3://bucket/backups/test/etcd-backup/123.db",
+				},
+			},
+			want: "s3://bucket/backups/test/etcd-backup/123.db",
+		},
+		{
+			name: "When status has no lastSuccessfulEtcdBackupURL, It Should return empty string",
+			obj: map[string]interface{}{
+				"status": map[string]interface{}{
+					"conditions": []interface{}{},
+				},
+			},
+			want: "",
+		},
+		{
+			name: "When object has no status, It Should return empty string",
+			obj:  map[string]interface{}{},
+			want: "",
+		},
+		{
+			name: "When status is not a map, It Should return empty string",
+			obj: map[string]interface{}{
+				"status": "invalid",
+			},
+			want: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			g := NewWithT(t)
+			g.Expect(getLastSuccessfulEtcdBackupURL(tt.obj)).To(Equal(tt.want))
+		})
+	}
+}