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

cloudapi: remove arch from imageRequest

Browse source 
You can absolutely just get it from imageType, let's not duplicate
information, that's error-prone.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2024-02-16 14:07:43 +01:00 • committed by Tomáš Hozza
parent 08aabe1bef
commit c48bf0a143
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/cloudapi/v2/handler.go
View file

@ -136,7 +136,6 @@ func isLocalSave(options *UploadOptions) (bool, error) {
type imageRequest struct { type imageRequest struct {
imageType distro.ImageType imageType distro.ImageType
arch distro.Arch
repositories []rpmmd.RepoConfig repositories []rpmmd.RepoConfig
imageOptions distro.ImageOptions imageOptions distro.ImageOptions
targets []*target.Target targets []*target.Target
@ -266,7 +265,6 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
irs = append(irs, imageRequest{ irs = append(irs, imageRequest{
imageType: imageType, imageType: imageType,
arch: arch,
repositories: repos, repositories: repos,
imageOptions: imageOptions, imageOptions: imageOptions,
targets: irTargets, targets: irTargets,

21
internal/cloudapi/v2/server.go
View file

@ -126,6 +126,9 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri
ir := irs[0] ir := irs[0]
ibp := blueprint.Convert(bp) ibp := blueprint.Convert(bp)
// shortcut
arch := ir.imageType.Arch()
manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed) manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed)
if err != nil { if err != nil {
logrus.Warningf("ErrorEnqueueingJob, failed generating manifest: %v", err) logrus.Warningf("ErrorEnqueueingJob, failed generating manifest: %v", err)
@ -135,7 +138,7 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri
depsolveJobID, err := s.workers.EnqueueDepsolve(&worker.DepsolveJob{ depsolveJobID, err := s.workers.EnqueueDepsolve(&worker.DepsolveJob{
PackageSets: manifestSource.GetPackageSetChains(), PackageSets: manifestSource.GetPackageSetChains(),
ModulePlatformID: distribution.ModulePlatformID(), ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(), Arch: arch.Name(),
Releasever: distribution.Releasever(), Releasever: distribution.Releasever(),
}, channel) }, channel)
if err != nil { if err != nil {
@ -165,7 +168,7 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri
} }
job := worker.ContainerResolveJob{ job := worker.ContainerResolveJob{
Arch: ir.arch.Name(), Arch: arch.Name(),
Specs: workerResolveSpecs, Specs: workerResolveSpecs,
} }
@ -210,7 +213,7 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri
return id, HTTPErrorWithInternal(ErrorEnqueueingJob, err) return id, HTTPErrorWithInternal(ErrorEnqueueingJob, err)
} }
id, err = s.workers.EnqueueOSBuildAsDependency(ir.arch.Name(), &worker.OSBuildJob{ id, err = s.workers.EnqueueOSBuildAsDependency(arch.Name(), &worker.OSBuildJob{
Targets: ir.targets, Targets: ir.targets,
PipelineNames: &worker.PipelineNames{ PipelineNames: &worker.PipelineNames{
Build: ir.imageType.BuildPipelines(), Build: ir.imageType.BuildPipelines(),
@ -248,6 +251,10 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas
var buildIDs []uuid.UUID var buildIDs []uuid.UUID
for _, ir := range irs { for _, ir := range irs {
ibp := blueprint.Convert(bp) ibp := blueprint.Convert(bp)
// shortcut
arch := ir.imageType.Arch()
manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed) manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed)
if err != nil { if err != nil {
logrus.Errorf("ErrorEnqueueingJob, failed generating manifest: %v", err) logrus.Errorf("ErrorEnqueueingJob, failed generating manifest: %v", err)
@ -257,7 +264,7 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas
depsolveJobID, err := s.workers.EnqueueDepsolve(&worker.DepsolveJob{ depsolveJobID, err := s.workers.EnqueueDepsolve(&worker.DepsolveJob{
PackageSets: manifestSource.GetPackageSetChains(), PackageSets: manifestSource.GetPackageSetChains(),
ModulePlatformID: distribution.ModulePlatformID(), ModulePlatformID: distribution.ModulePlatformID(),
Arch: ir.arch.Name(), Arch: arch.Name(),
Releasever: distribution.Releasever(), Releasever: distribution.Releasever(),
}, channel) }, channel)
if err != nil { if err != nil {
@ -287,7 +294,7 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas
} }
job := worker.ContainerResolveJob{ job := worker.ContainerResolveJob{
Arch: ir.arch.Name(), Arch: arch.Name(),
Specs: make([]worker.ContainerSpec, len(bp.Containers)), Specs: make([]worker.ContainerSpec, len(bp.Containers)),
} }
@ -336,7 +343,7 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas
name, name,
version, version,
release, release,
ir.arch.Name(), arch.Name(),
splitExtension(ir.imageType.Filename()), splitExtension(ir.imageType.Filename()),
) )
@ -354,7 +361,7 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas
targets = append(targets, ir.targets...) targets = append(targets, ir.targets...)
} }
buildID, err := s.workers.EnqueueOSBuildAsDependency(ir.arch.Name(), &worker.OSBuildJob{ buildID, err := s.workers.EnqueueOSBuildAsDependency(arch.Name(), &worker.OSBuildJob{
PipelineNames: &worker.PipelineNames{ PipelineNames: &worker.PipelineNames{
Build: ir.imageType.BuildPipelines(), Build: ir.imageType.BuildPipelines(),
Payload: ir.imageType.PayloadPipelines(), Payload: ir.imageType.PayloadPipelines(),