111feda1f5
The ellipsis operator was used as a hack to not need to pass any details as an argument, but it makes what the end object will actually look like less obvious. It also makes it impossible to pass an array to details without getting a nested array. Fixes #2874
60 lines
1.4 KiB
Go
60 lines
1.4 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/container"
|
|
"github.com/osbuild/osbuild-composer/internal/worker"
|
|
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
|
|
)
|
|
|
|
type ContainerResolveJobImpl struct {
|
|
AuthFilePath string
|
|
}
|
|
|
|
func (impl *ContainerResolveJobImpl) Run(job worker.Job) error {
|
|
logWithId := logrus.WithField("jobId", job.Id())
|
|
var args worker.ContainerResolveJob
|
|
err := job.Args(&args)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
result := worker.ContainerResolveJobResult{
|
|
Specs: make([]worker.ContainerSpec, len(args.Specs)),
|
|
}
|
|
|
|
logWithId.Infof("Resolving containers (%d)", len(args.Specs))
|
|
|
|
resolver := container.NewResolver(args.Arch)
|
|
resolver.AuthFilePath = impl.AuthFilePath
|
|
|
|
for _, s := range args.Specs {
|
|
resolver.Add(s.Source, s.Name, s.TLSVerify)
|
|
}
|
|
|
|
specs, err := resolver.Finish()
|
|
|
|
if err != nil {
|
|
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorContainerResolution, err.Error(), nil)
|
|
} else {
|
|
for i, spec := range specs {
|
|
result.Specs[i] = worker.ContainerSpec{
|
|
Source: spec.Source,
|
|
Name: spec.LocalName,
|
|
TLSVerify: spec.TLSVerify,
|
|
ImageID: spec.ImageID,
|
|
Digest: spec.Digest,
|
|
}
|
|
}
|
|
}
|
|
|
|
err = job.Update(&result)
|
|
if err != nil {
|
|
return fmt.Errorf("Error reporting job result: %v", err)
|
|
}
|
|
|
|
return nil
|
|
}
|