From fe7782788ced99d7c4a400dbb0280d40b9647beb Mon Sep 17 00:00:00 2001 From: Shubham Pampattiwar Date: Mon, 27 Oct 2025 12:44:31 -0700 Subject: [PATCH] Fix tests: populate createdName for all created resources Update test expectations to include createdName field for resources with action 'created'. Also ensure namespaces track their created names when created via EnsureNamespaceExistsAndIsReady. Signed-off-by: Shubham Pampattiwar (cherry picked from commit c2840f1c747af5a53e95f048b46ba386dfe00e92) --- pkg/restore/restore.go | 4 ++-- pkg/restore/restore_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 52c947835..c6ad23dd3 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -741,7 +741,7 @@ func (ctx *restoreContext) processSelectedResource( namespace: ns.Namespace, name: ns.Name, } - ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true} + ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true, createdName: ns.Name} } // Keep track of namespaces that we know exist so we don't @@ -1142,7 +1142,7 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso namespace: nsToEnsure.Namespace, name: nsToEnsure.Name, } - ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true} + ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true, createdName: nsToEnsure.Name} } } else { if boolptr.IsSetToFalse(ctx.restore.Spec.IncludeClusterResources) { diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go index 54523731f..95b283cbe 100644 --- a/pkg/restore/restore_test.go +++ b/pkg/restore/restore_test.go @@ -1091,8 +1091,8 @@ func TestRestoreItems(t *testing.T) { ), }, expectedRestoreItems: map[itemKey]restoredItemStatus{ - {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true}, - {resource: "v1/Pod", namespace: "ns-1", name: "pod-1"}: {action: "created", itemExists: true}, + {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"}, + {resource: "v1/Pod", namespace: "ns-1", name: "pod-1"}: {action: "created", itemExists: true, createdName: "pod-1"}, }, }, { @@ -1201,7 +1201,7 @@ func TestRestoreItems(t *testing.T) { test.ServiceAccounts(builder.ForServiceAccount("ns-1", "sa-1").Result()), }, expectedRestoreItems: map[itemKey]restoredItemStatus{ - {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true}, + {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"}, {resource: "v1/ServiceAccount", namespace: "ns-1", name: "sa-1"}: {action: "skipped", itemExists: true}, }, }, @@ -1220,7 +1220,7 @@ func TestRestoreItems(t *testing.T) { test.Secrets(builder.ForSecret("ns-1", "sa-1").ObjectMeta(builder.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1")).Data(map[string][]byte{"key-1": []byte("value-1")}).Result()), }, expectedRestoreItems: map[itemKey]restoredItemStatus{ - {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true}, + {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"}, {resource: "v1/Secret", namespace: "ns-1", name: "sa-1"}: {action: "updated", itemExists: true}, }, }, @@ -1239,7 +1239,7 @@ func TestRestoreItems(t *testing.T) { test.Secrets(builder.ForSecret("ns-1", "sa-1").ObjectMeta(builder.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1")).Data(map[string][]byte{"key-1": []byte("value-1")}).Result()), }, expectedRestoreItems: map[itemKey]restoredItemStatus{ - {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true}, + {resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"}, {resource: "v1/Secret", namespace: "ns-1", name: "sa-1"}: {action: "updated", itemExists: true}, }, },