Skip to content

Commit c2840f1

Browse files
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 <spampatt@redhat.com>
1 parent 2e9998b commit c2840f1

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

pkg/restore/restore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ func (ctx *restoreContext) processSelectedResource(
741741
namespace: ns.Namespace,
742742
name: ns.Name,
743743
}
744-
ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true}
744+
ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true, createdName: ns.Name}
745745
}
746746

747747
// Keep track of namespaces that we know exist so we don't
@@ -1142,7 +1142,7 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
11421142
namespace: nsToEnsure.Namespace,
11431143
name: nsToEnsure.Name,
11441144
}
1145-
ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true}
1145+
ctx.restoredItems[itemKey] = restoredItemStatus{action: ItemRestoreResultCreated, itemExists: true, createdName: nsToEnsure.Name}
11461146
}
11471147
} else {
11481148
if boolptr.IsSetToFalse(ctx.restore.Spec.IncludeClusterResources) {

pkg/restore/restore_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,8 +1091,8 @@ func TestRestoreItems(t *testing.T) {
10911091
),
10921092
},
10931093
expectedRestoreItems: map[itemKey]restoredItemStatus{
1094-
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true},
1095-
{resource: "v1/Pod", namespace: "ns-1", name: "pod-1"}: {action: "created", itemExists: true},
1094+
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"},
1095+
{resource: "v1/Pod", namespace: "ns-1", name: "pod-1"}: {action: "created", itemExists: true, createdName: "pod-1"},
10961096
},
10971097
},
10981098
{
@@ -1201,7 +1201,7 @@ func TestRestoreItems(t *testing.T) {
12011201
test.ServiceAccounts(builder.ForServiceAccount("ns-1", "sa-1").Result()),
12021202
},
12031203
expectedRestoreItems: map[itemKey]restoredItemStatus{
1204-
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true},
1204+
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"},
12051205
{resource: "v1/ServiceAccount", namespace: "ns-1", name: "sa-1"}: {action: "skipped", itemExists: true},
12061206
},
12071207
},
@@ -1220,7 +1220,7 @@ func TestRestoreItems(t *testing.T) {
12201220
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()),
12211221
},
12221222
expectedRestoreItems: map[itemKey]restoredItemStatus{
1223-
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true},
1223+
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"},
12241224
{resource: "v1/Secret", namespace: "ns-1", name: "sa-1"}: {action: "updated", itemExists: true},
12251225
},
12261226
},
@@ -1239,7 +1239,7 @@ func TestRestoreItems(t *testing.T) {
12391239
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()),
12401240
},
12411241
expectedRestoreItems: map[itemKey]restoredItemStatus{
1242-
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true},
1242+
{resource: "v1/Namespace", namespace: "", name: "ns-1"}: {action: "created", itemExists: true, createdName: "ns-1"},
12431243
{resource: "v1/Secret", namespace: "ns-1", name: "sa-1"}: {action: "updated", itemExists: true},
12441244
},
12451245
},

0 commit comments

Comments
 (0)