625b1578fa
Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
61 lines
1.4 KiB
Go
61 lines
1.4 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/osbuild/images/pkg/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(container.SourceSpec{s.Source, s.Name, nil, s.TLSVerify, nil, nil})
|
|
}
|
|
|
|
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,
|
|
ListDigest: spec.ListDigest,
|
|
}
|
|
}
|
|
}
|
|
|
|
err = job.Update(&result)
|
|
if err != nil {
|
|
return fmt.Errorf("Error reporting job result: %v", err)
|
|
}
|
|
|
|
return nil
|
|
}
|