return information about combined backup on backup page

pkg/handlers/backup.go

@@ -131,6 +131,7 @@ func (h *Handler) ListInstanceBackups(w http.ResponseWriter, r *http.Request) {
 
 type GetBackupResponse struct {
 	BackupDetails []snapshottypes.BackupDetail `json:"backupDetails"`
+	Backup        *snapshottypes.Backup        `json:"backup"`
 	Success       bool                         `json:"success"`
 	Error         string                       `json:"error,omitempty"`
 }
@@ -147,6 +148,14 @@ func (h *Handler) GetBackup(w http.ResponseWriter, r *http.Request) {
 	}
 	getBackupResponse.BackupDetails = backups
 
+	thisBackup, err := snapshot.GetInstanceBackup(r.Context(), util.PodNamespace, mux.Vars(r)["snapshotName"])
+	if err != nil {
+		logger.Error(err)
+		getBackupResponse.Error = "failed to get backup"
+		JSON(w, 500, getBackupResponse)
+		return
+	}
+	getBackupResponse.Backup = thisBackup
 	getBackupResponse.Success = true
 
 	JSON(w, http.StatusOK, getBackupResponse)

pkg/kotsadmsnapshot/backup.go

@@ -915,6 +915,22 @@ func getBackupsFromVeleroBackups(ctx context.Context, veleroBackups []velerov1.B
 	return backups, nil
 }
 
+// GetInstanceBackup calls ListInstanceBackups and returns the first backup with the given name.
+// This is done because multiple velero backup objects are combined into a single kots backup object,
+// and the easiest way to do that is to generate the entire set of kots backup objects again.
+func GetInstanceBackup(ctx context.Context, namespace string, backupName string) (*types.Backup, error) {
+	allBackups, err := ListInstanceBackups(ctx, namespace)
+	if err != nil {
+		return nil, err
+	}
+	for _, backup := range allBackups {
+		if backup.Name == backupName {
+			return backup, nil
+		}
+	}
+	return nil, fmt.Errorf("no backup found with name %s", backupName)
+}
+
 // getAppsFromAppSequences returns a list of `App` structs from the backup sequence annotation.
 func getAppsFromAppSequences(veleroBackup velerov1.Backup) ([]types.App, error) {
 	apps := []types.App{}