diff --git a/cmd/osbuild-worker/jobimpl-depsolve.go b/cmd/osbuild-worker/jobimpl-depsolve.go index f50bd209a3..4dbc5495e8 100644 --- a/cmd/osbuild-worker/jobimpl-depsolve.go +++ b/cmd/osbuild-worker/jobimpl-depsolve.go @@ -90,7 +90,7 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error { for _, baseurlstr := range repo.BaseURLs { match, err := impl.RepositoryMTLSConfig.CompareBaseURL(baseurlstr) if err != nil { - result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidRepositoryURL, "Repository URL is malformed", err) + result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidRepositoryURL, "Repository URL is malformed", err.Error()) return err } if match { diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index 4dde72ce0b..6f3930cbb3 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -401,7 +401,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { osbuildVersion, err := osbuild.OSBuildVersion() if err != nil { - osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorBuildJob, "Error getting osbuild binary version", err) + osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorBuildJob, "Error getting osbuild binary version", err.Error()) return err } osbuildJobResult.OSBuildVersion = osbuildVersion @@ -516,7 +516,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { osbuildJobResult.OSBuildOutput, err = executor.RunOSBuild(jobArgs.Manifest, impl.Store, outputDirectory, exports, exportPaths, nil, extraEnv, true, os.Stderr) // First handle the case when "running" osbuild failed if err != nil { - osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorBuildJob, "osbuild build failed", err) + osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorBuildJob, "osbuild build failed", err.Error()) return err } @@ -544,13 +544,13 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { // Second handle the case when the build failed, but osbuild finished successfully if !osbuildJobResult.OSBuildOutput.Success { - var osbErrors []error + var osbErrors []string if osbuildJobResult.OSBuildOutput.Error != nil { - osbErrors = append(osbErrors, fmt.Errorf("osbuild error: %s", string(osbuildJobResult.OSBuildOutput.Error))) + osbErrors = append(osbErrors, fmt.Sprintf("osbuild error: %s", string(osbuildJobResult.OSBuildOutput.Error))) } if osbuildJobResult.OSBuildOutput.Errors != nil { for _, err := range osbuildJobResult.OSBuildOutput.Errors { - osbErrors = append(osbErrors, fmt.Errorf("manifest validation error: %v", err)) + osbErrors = append(osbErrors, fmt.Sprintf("manifest validation error: %v", err)) } } osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorBuildJob, "osbuild build failed", osbErrors)