particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cloudapi: Add error information to ErrorUnknownUploadTarget

Browse source 
It can include useful extra details, whether or not the artifacts
directory is setup, whether the file is missing, etc.

Related: RHEL-60142
This commit is contained in:
Brian C. Lane 2025-01-31 13:39:44 -08:00 • committed by Sanne Raymaekers
parent 3781820b45
commit a6f48bcd2f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/cloudapi/v2/handler.go
View file

@ -365,7 +365,7 @@ func (h *apiHandlers) getJobIDComposeStatus(jobId uuid.UUID) (ComposeStatus, err
tr := result.TargetResults[idx] tr := result.TargetResults[idx]
us, err := h.targetResultToUploadStatus(jobId, tr) us, err := h.targetResultToUploadStatus(jobId, tr)
if err != nil { if err != nil {
return ComposeStatus{}, HTTPError(ErrorUnknownUploadTarget) return ComposeStatus{}, HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
} }
us.Status = uploadStatusFromJobStatus(jobInfo.JobStatus, result.JobError) us.Status = uploadStatusFromJobStatus(jobInfo.JobStatus, result.JobError)
statuses[idx] = *us statuses[idx] = *us
@ -430,7 +430,7 @@ func (h *apiHandlers) getJobIDComposeStatus(jobId uuid.UUID) (ComposeStatus, err
if tr.Name != target.TargetNameKoji { if tr.Name != target.TargetNameKoji {
us, err := h.targetResultToUploadStatus(jobId, tr) us, err := h.targetResultToUploadStatus(jobId, tr)
if err != nil { if err != nil {
return ComposeStatus{}, HTTPError(ErrorUnknownUploadTarget) return ComposeStatus{}, HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
} }
us.Status = uploadStatusFromJobStatus(buildInfo.JobStatus, result.JobError) us.Status = uploadStatusFromJobStatus(buildInfo.JobStatus, result.JobError)
statuses = append(statuses, *us) statuses = append(statuses, *us)
@ -1191,7 +1191,7 @@ func (h *apiHandlers) postCloneComposeImpl(ctx echo.Context, id string) error {
var us *UploadStatus var us *UploadStatus
us, err = h.targetResultToUploadStatus(jobId, osbuildResult.TargetResults[0]) us, err = h.targetResultToUploadStatus(jobId, osbuildResult.TargetResults[0])
if err != nil { if err != nil {
return HTTPError(ErrorUnknownUploadTarget) return HTTPErrorWithInternal(ErrorUnknownUploadTarget, err)
} }
var osbuildJob worker.OSBuildJob var osbuildJob worker.OSBuildJob