cloudapi download

internal/cloudapi/v2/errors.go

@@ -76,6 +76,7 @@ const (
 	ErrorGettingJobType                           ServiceErrorCode = 1019
 	ErrorTenantNotInContext                       ServiceErrorCode = 1020
 	ErrorGettingComposeList                       ServiceErrorCode = 1021
+	ErrorArtifactNotFound                         ServiceErrorCode = 1022
 
 	// Errors contained within this file
 	ErrorUnspecified          ServiceErrorCode = 10000
@@ -123,6 +124,7 @@ func getServiceErrors() serviceErrors {
 		serviceError{ErrorInvalidNumberOfImageBuilds, http.StatusBadRequest, "Compose request has unsupported number of image builds"},
 		serviceError{ErrorInvalidOSTreeParams, http.StatusBadRequest, "Invalid OSTree parameters or parameter combination"},
 		serviceError{ErrorTenantNotFound, http.StatusBadRequest, "Tenant not found in JWT claims"},
+		serviceError{ErrorArtifactNotFound, http.StatusBadRequest, "Artifact not found"},
 		serviceError{ErrorNoGPGKey, http.StatusBadRequest, "Invalid repository, when check_gpg is set, gpgkey must be specified"},
 		serviceError{ErrorValidationFailed, http.StatusBadRequest, "Request could not be validated"},
 		serviceError{ErrorComposeBadState, http.StatusBadRequest, "Compose is running or has failed"},

internal/cloudapi/v2/handler.go

@@ -276,7 +276,7 @@ func (h *apiHandlers) targetResultToUploadStatus(jobId uuid.UUID, t *target.Targ
 		workerServerOptions := t.Options.(*target.WorkerServerTargetResultOptions)
 		absPath, err := h.server.workers.JobArtifactLocation(jobId, workerServerOptions.ArtifactRelPath)
 		if err != nil {
-			return nil, fmt.Errorf("unable to find job artefact: %w", err)
+			return nil, fmt.Errorf("unable to find job artifact: %w", err)
 		}
 		uploadOptions = LocalUploadStatus{
 			ArtifactPath: absPath,
@@ -365,7 +365,7 @@ func (h *apiHandlers) getJobIDComposeStatus(jobId uuid.UUID) (ComposeStatus, err
 				tr := result.TargetResults[idx]
 				us, err := h.targetResultToUploadStatus(jobId, tr)
 				if err != nil {
-					return ComposeStatus{}, HTTPError(ErrorUnknownUploadTarget)
+					return ComposeStatus{}, HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
 				}
 				us.Status = uploadStatusFromJobStatus(jobInfo.JobStatus, result.JobError)
 				statuses[idx] = *us
@@ -430,7 +430,7 @@ func (h *apiHandlers) getJobIDComposeStatus(jobId uuid.UUID) (ComposeStatus, err
 					if tr.Name != target.TargetNameKoji {
 						us, err := h.targetResultToUploadStatus(jobId, tr)
 						if err != nil {
-							return ComposeStatus{}, HTTPError(ErrorUnknownUploadTarget)
+							return ComposeStatus{}, HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
 						}
 						us.Status = uploadStatusFromJobStatus(buildInfo.JobStatus, result.JobError)
 						statuses = append(statuses, *us)
@@ -1191,7 +1191,7 @@ func (h *apiHandlers) postCloneComposeImpl(ctx echo.Context, id string) error {
 	var us *UploadStatus
 	us, err = h.targetResultToUploadStatus(jobId, osbuildResult.TargetResults[0])
 	if err != nil {
-		return HTTPError(ErrorUnknownUploadTarget)
+		return HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
 	}
 
 	var osbuildJob worker.OSBuildJob
@@ -1514,3 +1514,54 @@ func (h *apiHandlers) GetDistributionList(ctx echo.Context) error {
 
 	return ctx.JSON(http.StatusOK, distros)
 }
+
+// GetComposeDownload downloads a compose artifact
+func (h *apiHandlers) GetComposeDownload(ctx echo.Context, id string) error {
+	return h.server.EnsureJobChannel(h.getComposeDownloadImpl)(ctx, id)
+}
+
+func (h *apiHandlers) getComposeDownloadImpl(ctx echo.Context, id string) error {
+	jobId, err := uuid.Parse(id)
+	if err != nil {
+		return HTTPError(ErrorInvalidComposeId)
+	}
+
+	jobType, err := h.server.workers.JobType(jobId)
+	if err != nil {
+		return HTTPError(ErrorComposeNotFound)
+	}
+	if jobType != worker.JobTypeOSBuild {
+		return HTTPError(ErrorInvalidJobType)
+	}
+
+	var osbuildResult worker.OSBuildJobResult
+	jobInfo, err := h.server.workers.OSBuildJobInfo(jobId, &osbuildResult)
+	if err != nil {
+		return HTTPErrorWithInternal(ErrorGettingOSBuildJobStatus, err)
+	}
+
+	// Is it finished?
+	if jobInfo.JobStatus.Finished.IsZero() {
+		err := fmt.Errorf("Cannot access artifacts before job is finished: %s", jobId)
+		return HTTPErrorWithInternal(ErrorArtifactNotFound, err)
+	}
+
+	// Building only supports one target, but that may change, so make sure to check.
+	// NOTE: TargetResults isn't populated until it is finished
+	if len(osbuildResult.TargetResults) != 1 {
+		msg := fmt.Errorf("%#v", osbuildResult.TargetResults)
+		//return HTTPError(ErrorSeveralUploadTargets)
+		return HTTPErrorWithInternal(ErrorSeveralUploadTargets, msg)
+	}
+	tr := osbuildResult.TargetResults[0]
+	if tr.OsbuildArtifact == nil {
+		return HTTPError(ErrorArtifactNotFound)
+	}
+
+	// NOTE: This also returns an error if the job isn't finished or it cannot find the file
+	file, err := h.server.workers.JobArtifactLocation(jobId, tr.OsbuildArtifact.ExportFilename)
+	if err != nil {
+		return HTTPErrorWithInternal(ErrorArtifactNotFound, err)
+	}
+	return ctx.Attachment(file, fmt.Sprintf("%s-%s", jobId, tr.OsbuildArtifact.ExportFilename))
+}