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

osbuild-worker: handle error wrapping from dnfjson package

Browse source 
osbuild/images#751 wrapped the errors in the images/dnfjson package to
provide more details, the depsolve job should take this into account to
map the dnfjson error to the correct worker client error.

This caused user input errors errors to be misclassified as internal
errors, triggering depsolve job failure alerts.
This commit is contained in:
Sanne Raymaekers 2024-09-02 12:30:52 +02:00
parent 6bb45ef9d1
commit 22a0452ea9
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -1,6 +1,7 @@
package main package main
import ( import (
"errors"
"fmt" "fmt"
"net/url" "net/url"
"strings" "strings"
@ -78,12 +79,12 @@ func workerClientErrorFrom(err error, logWithId *logrus.Entry) *clienterrors.Err
logWithId.Errorf("workerClientErrorFrom expected an error to be processed. Not nil") logWithId.Errorf("workerClientErrorFrom expected an error to be processed. Not nil")
} }
switch e := err.(type) { var dnfjsonErr dnfjson.Error
case dnfjson.Error: if errors.As(err, &dnfjsonErr) {
// Error originates from dnf-json // Error originates from dnf-json
reason := fmt.Sprintf("DNF error occurred: %s", e.Kind) reason := fmt.Sprintf("DNF error occurred: %s", dnfjsonErr.Kind)
details := e.Reason details := dnfjsonErr.Reason
switch e.Kind { switch dnfjsonErr.Kind {
case "DepsolveError": case "DepsolveError":
return clienterrors.New(clienterrors.ErrorDNFDepsolveError, reason, details) return clienterrors.New(clienterrors.ErrorDNFDepsolveError, reason, details)
case "MarkingErrors": case "MarkingErrors":
@ -96,7 +97,7 @@ func workerClientErrorFrom(err error, logWithId *logrus.Entry) *clienterrors.Err
// by dnf-json and not explicitly handled here. // by dnf-json and not explicitly handled here.
return clienterrors.New(clienterrors.ErrorDNFOtherError, reason, details) return clienterrors.New(clienterrors.ErrorDNFOtherError, reason, details)
} }
default: } else {
reason := "rpmmd error in depsolve job" reason := "rpmmd error in depsolve job"
details := fmt.Sprintf("%v", err) details := fmt.Sprintf("%v", err)
// Error originates from internal/rpmmd, not from dnf-json // Error originates from internal/rpmmd, not from dnf-json

5
cmd/osbuild-worker/jobimpl-depsolve_test.go
View file

@ -26,6 +26,11 @@ func TestWorkerClientErrorFromDnfJson(t *testing.T) {
entry, hook := makeMockEntry() entry, hook := makeMockEntry()
clientErr := worker.WorkerClientErrorFrom(dnfJsonErr, entry) clientErr := worker.WorkerClientErrorFrom(dnfJsonErr, entry)
assert.Equal(t, `Code: 20, Reason: DNF error occurred: DepsolveError, Details: something is terribly wrong`, clientErr.String()) assert.Equal(t, `Code: 20, Reason: DNF error occurred: DepsolveError, Details: something is terribly wrong`, clientErr.String())
wrappedErr := fmt.Errorf("Wrap the error: %w", dnfJsonErr)
clientErr = worker.WorkerClientErrorFrom(wrappedErr, entry)
assert.Equal(t, `Code: 20, Reason: DNF error occurred: DepsolveError, Details: something is terribly wrong`, clientErr.String())
assert.Equal(t, 0, len(hook.AllEntries())) assert.Equal(t, 0, len(hook.AllEntries()))
} }