Merge pull request #8831 from bblenard/issue-8658-system-prune-reclaimed-space

Rework pruning to report reclaimed space

1 files changed, 6 insertions, 13 deletions

diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index b157dfc7b..130e563ae 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -38,35 +38,28 @@ func SystemPrune(w http.ResponseWriter, r *http.Request) {
 	systemPruneReport.PodPruneReport = podPruneReport
 
 	// We could parallelize this, should we?
-	containerPruneReport, err := compat.PruneContainersHelper(w, r, nil)
+	containerPruneReports, err := compat.PruneContainersHelper(w, r, nil)
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}
-	systemPruneReport.ContainerPruneReport = containerPruneReport
+	systemPruneReport.ContainerPruneReports = containerPruneReports
 
-	results, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, nil)
+	imagePruneReports, err := runtime.ImageRuntime().PruneImages(r.Context(), query.All, nil)
 	if err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}
 
-	report := entities.ImagePruneReport{
-		Report: entities.Report{
-			Id:  results,
-			Err: nil,
-		},
-	}
-
-	systemPruneReport.ImagePruneReport = &report
+	systemPruneReport.ImagePruneReports = imagePruneReports
 
 	if query.Volumes {
-		volumePruneReport, err := pruneVolumesHelper(r)
+		volumePruneReports, err := pruneVolumesHelper(r)
 		if err != nil {
 			utils.InternalServerError(w, err)
 			return
 		}
-		systemPruneReport.VolumePruneReport = volumePruneReport
+		systemPruneReport.VolumePruneReports = volumePruneReports
 	}
 	utils.WriteResponse(w, http.StatusOK, systemPruneReport)
 }