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

osbuild-worker: implement structured errors

Browse source 
Implement the structured errors as defined by the worker client.
Every error for each of the job types now returns a structured
error with a reason and a specific error code.  This will make
it possible to differentiate between 4xx errors and 5xx errors.

This commit refactors the way errors are implemented in the workers,
but maintains backwards compatability in composer by checking for
both kinds of errors.
This commit is contained in:
Gianluca Zuccarelli 2021-12-23 13:45:30 +00:00 • committed by Sanne Raymaekers
parent daf24f8db3
commit cc981b887a
8 changed files with 142 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

41
internal/worker/server.go
View file

@ -22,6 +22,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/jobqueue"
"github.com/osbuild/osbuild-composer/internal/worker/api"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
)
type Server struct {
@ -131,11 +132,43 @@ func (s *Server) JobStatus(id uuid.UUID, result interface{}) (*JobStatus, []uuid
}
}
// For backwards compatibility: OSBuildJobResult didn't use to have a
// top-level `Success` flag. Override it here by looking into the job.
if r, ok := result.(*OSBuildJobResult); ok {
switch r := result.(type) {
case *KojiInitJobResult:
if r.JobError == nil && r.KojiError != "" {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, r.KojiError)
}
case *KojiFinalizeJobResult:
if r.JobError == nil && r.KojiError != "" {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, r.KojiError)
}
case *OSBuildKojiJobResult:
if r.JobError == nil && r.KojiError != "" {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, r.KojiError)
}
case *ManifestJobByIDResult:
if r.JobError == nil && r.Error != "" {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, r.Error)
}
case *DepsolveJobResult:
if r.JobError == nil && r.Error != "" {
if r.ErrorType == DepsolveErrorType {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFDepsolveError, r.Error)
} else {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorRPMMDError, r.Error)
}
}
case *OSBuildJobResult:
if r.JobError == nil && len(r.TargetErrors) > 0 || (r.OSBuildOutput != nil && len(r.OSBuildOutput.Error) > 0) {
if r.OSBuildOutput != nil && len(r.OSBuildOutput.Error) > 0 {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, string(r.OSBuildOutput.Error))
} else if len(r.TargetErrors) > 0 {
r.JobError = clienterrors.WorkerClientError(clienterrors.ErrorOldResultCompatible, r.TargetErrors[0])
}
}
// For backwards compatibility: OSBuildJobResult didn't use to have a
// top-level `Success` flag. Override it here by looking into the job.
if !r.Success && r.OSBuildOutput != nil {
r.Success = r.OSBuildOutput.Success && len(r.TargetErrors) == 0
r.Success = r.OSBuildOutput.Success && r.JobError == nil
}
}