Wait for additional items to be ready before restoring current item

Signed-off-by: Scott Seago <sseago@redhat.com>

changelogs/unreleased/5933-sseago

@@ -0,0 +1 @@
+Wait for additional items to be ready before restoring current item

pkg/restore/request.go

@@ -54,19 +54,24 @@ type Request struct {
 	PodVolumeBackups []*velerov1api.PodVolumeBackup
 	VolumeSnapshots  []*volume.Snapshot
 	BackupReader     io.Reader
-	RestoredItems    map[itemKey]string
+	RestoredItems    map[itemKey]restoredItemStatus
+}
+
+type restoredItemStatus struct {
+	action     string
+	itemExists bool
 }
 
 // RestoredResourceList returns the list of restored resources grouped by the API
 // Version and Kind
 func (r *Request) RestoredResourceList() map[string][]string {
 	resources := map[string][]string{}
-	for i, action := range r.RestoredItems {
+	for i, item := range r.RestoredItems {
 		entry := i.name
 		if i.namespace != "" {
 			entry = fmt.Sprintf("%s/%s", i.namespace, i.name)
 		}
-		entry = fmt.Sprintf("%s(%s)", entry, action)
+		entry = fmt.Sprintf("%s(%s)", entry, item.action)
 		resources[i.resource] = append(resources[i.resource], entry)
 	}
 

pkg/restore/request_test.go

@@ -44,17 +44,17 @@ func TestResourceKey(t *testing.T) {
 
 func TestRestoredResourceList(t *testing.T) {
 	request := &Request{
-		RestoredItems: map[itemKey]string{
+		RestoredItems: map[itemKey]restoredItemStatus{
 			{
 				resource:  "v1/Namespace",
 				namespace: "",
 				name:      "default",
-			}: "created",
+			}: {action: "created"},
 			{
 				resource:  "v1/ConfigMap",
 				namespace: "default",
 				name:      "cm",
-			}: "skipped",
+			}: {action: "skipped"},
 		},
 	}