573b349f16
The usual convention to create new object is to prefix `New*` so this commit renames the `WorkerClientError`. Initially I thought it would be `NewWorkerClientError()` but looking at the package prefix it seems unneeded, i.e. `clienterrors.New()` already provides enough context it seems and it's the only error we construct. We could consider renaming it to `clienterror` (singular) too but that could be a followup. I would also like to make `clienterror.Error` implement the `error` interface but that should be a followup to make this (mechanical) rename trivial to review.
81 lines
2 KiB
Go
81 lines
2 KiB
Go
package main
|
|
|
|
import (
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/remotefile"
|
|
"github.com/osbuild/osbuild-composer/internal/worker"
|
|
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
|
|
)
|
|
|
|
type FileResolveJobImpl struct{}
|
|
|
|
func (impl *FileResolveJobImpl) Run(job worker.Job) error {
|
|
logWithId := logrus.WithField("jobId", job.Id())
|
|
|
|
var err error
|
|
result := worker.FileResolveJobResult{
|
|
Success: false,
|
|
Results: []worker.FileResolveJobResultItem{},
|
|
}
|
|
|
|
defer func() {
|
|
logWithId := logrus.WithField("jobId", job.Id().String())
|
|
if result.JobError != nil {
|
|
logWithId.Errorf("file content resolve job failed: %s", result.JobError.Reason)
|
|
if result.JobError.Details != nil {
|
|
logWithId.Errorf("failure details: %v", result.JobError.Details)
|
|
}
|
|
}
|
|
|
|
if result.Results == nil || len(result.Results) == 0 {
|
|
logWithId.Infof("Resolving file contents failed: %v", err)
|
|
result.JobError = clienterrors.New(
|
|
clienterrors.ErrorRemoteFileResolution,
|
|
"Error resolving file contents",
|
|
"All remote file contents returned empty",
|
|
)
|
|
}
|
|
|
|
err := job.Update(result)
|
|
if err != nil {
|
|
logWithId.Errorf("Error reporting job result: %v", err)
|
|
}
|
|
}()
|
|
|
|
var args worker.FileResolveJob
|
|
err = job.Args(&args)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
logWithId.Infof("Resolving file contents (%d)", len(args.URLs))
|
|
|
|
resolver := remotefile.NewResolver()
|
|
for _, url := range args.URLs {
|
|
resolver.Add(url)
|
|
}
|
|
|
|
resultItems := resolver.Finish()
|
|
|
|
for idx := range resultItems {
|
|
result.Results = append(result.Results, worker.FileResolveJobResultItem{
|
|
URL: resultItems[idx].URL,
|
|
Content: resultItems[idx].Content,
|
|
ResolutionError: resultItems[idx].ResolutionError,
|
|
})
|
|
}
|
|
|
|
resolutionErrors := result.ResolutionErrors()
|
|
if len(resolutionErrors) == 0 {
|
|
result.Success = true
|
|
} else {
|
|
result.JobError = clienterrors.New(
|
|
clienterrors.ErrorRemoteFileResolution,
|
|
"at least one file resolution failed",
|
|
resolutionErrors,
|
|
)
|
|
}
|
|
|
|
return nil
|
|
}
|