cloudapi: Add artifact cleanup to delete handler

osbuild · May 23, 2024 · 6974088 · 6974088
1 parent 1be77d9
commit 6974088
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/internal/cloudapi/v2/errors.go b/internal/cloudapi/v2/errors.go
@@ -76,6 +76,7 @@ const (
 	ErrorTenantNotInContext                       ServiceErrorCode = 1020
 	ErrorGettingComposeList                       ServiceErrorCode = 1021
 	ErrorRemovingJob                              ServiceErrorCode = 1022
+	ErrorRemovingArtifacts                        ServiceErrorCode = 1023
 
 	// Errors contained within this file
 	ErrorUnspecified          ServiceErrorCode = 10000
@@ -159,6 +160,7 @@ func getServiceErrors() serviceErrors {
 		serviceError{ErrorTenantNotInContext, http.StatusInternalServerError, "Unable to retrieve tenant from request context"},
 		serviceError{ErrorGettingComposeList, http.StatusInternalServerError, "Unable to get list of composes"},
 		serviceError{ErrorRemovingJob, http.StatusInternalServerError, "Unable to remove job"},
+		serviceError{ErrorRemovingArtifacts, http.StatusInternalServerError, "Unable to remove job artifacts"},
 
 		serviceError{ErrorUnspecified, http.StatusInternalServerError, "Unspecified internal error "},
 		serviceError{ErrorNotHTTPError, http.StatusInternalServerError, "Error is not an instance of HTTPError"},

diff --git a/internal/cloudapi/v2/handler.go b/internal/cloudapi/v2/handler.go
@@ -351,6 +351,11 @@ func (h *apiHandlers) deleteComposeImpl(ctx echo.Context, id string) error {
 		return HTTPErrorWithInternal(ErrorRemovingJob, err)
 	}
 
+	err = h.server.workers.CleanupArtifacts()
+	if err != nil {
+		return HTTPErrorWithInternal(ErrorRemovingArtifacts, err)
+	}
+
 	return ctx.JSON(http.StatusOK, ComposeDeleteStatus{
 		Href: fmt.Sprintf("/api/image-builder-composer/v2/composes/delete/%v", jobId),
 		Id:   jobId.String(),