From ab8c1ae4f7ba24dba32181443276bdbf64f5d9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Fri, 16 Feb 2024 14:10:02 +0100 Subject: [PATCH] clouadpi: remove distribution from enqueue methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They can just find it from the image type. Signed-off-by: Ondřej Budai --- internal/cloudapi/v2/handler.go | 4 ++-- internal/cloudapi/v2/server.go | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/cloudapi/v2/handler.go b/internal/cloudapi/v2/handler.go index 6ef6e8cf9..90c91de79 100644 --- a/internal/cloudapi/v2/handler.go +++ b/internal/cloudapi/v2/handler.go @@ -273,12 +273,12 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error { var id uuid.UUID if request.Koji != nil { - id, err = h.server.enqueueKojiCompose(uint64(request.Koji.TaskId), request.Koji.Server, request.Koji.Name, request.Koji.Version, request.Koji.Release, distribution, bp, manifestSeed, irs, channel) + id, err = h.server.enqueueKojiCompose(uint64(request.Koji.TaskId), request.Koji.Server, request.Koji.Name, request.Koji.Version, request.Koji.Release, bp, manifestSeed, irs, channel) if err != nil { return err } } else { - id, err = h.server.enqueueCompose(distribution, bp, manifestSeed, irs, channel) + id, err = h.server.enqueueCompose(bp, manifestSeed, irs, channel) if err != nil { return err } diff --git a/internal/cloudapi/v2/server.go b/internal/cloudapi/v2/server.go index b20dc97e7..53b798bcb 100644 --- a/internal/cloudapi/v2/server.go +++ b/internal/cloudapi/v2/server.go @@ -22,7 +22,6 @@ import ( "github.com/osbuild/osbuild-composer/pkg/jobqueue" "github.com/osbuild/images/pkg/container" - "github.com/osbuild/images/pkg/distro" "github.com/osbuild/images/pkg/distrofactory" "github.com/osbuild/images/pkg/manifest" "github.com/osbuild/images/pkg/ostree" @@ -118,7 +117,7 @@ func (s *Server) Shutdown() { s.goroutinesGroup.Wait() } -func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Blueprint, manifestSeed int64, irs []imageRequest, channel string) (uuid.UUID, error) { +func (s *Server) enqueueCompose(bp blueprint.Blueprint, manifestSeed int64, irs []imageRequest, channel string) (uuid.UUID, error) { var id uuid.UUID if len(irs) != 1 { return id, HTTPError(ErrorInvalidNumberOfImageBuilds) @@ -126,8 +125,9 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri ir := irs[0] ibp := blueprint.Convert(bp) - // shortcut + // shortcuts arch := ir.imageType.Arch() + distribution := arch.Distro() manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed) if err != nil { @@ -233,7 +233,7 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri return id, nil } -func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, release string, distribution distro.Distro, bp blueprint.Blueprint, manifestSeed int64, irs []imageRequest, channel string) (uuid.UUID, error) { +func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, release string, bp blueprint.Blueprint, manifestSeed int64, irs []imageRequest, channel string) (uuid.UUID, error) { var id uuid.UUID kojiDirectory := "osbuild-cg/osbuild-composer-koji-" + uuid.New().String() @@ -252,8 +252,9 @@ func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, releas for _, ir := range irs { ibp := blueprint.Convert(bp) - // shortcut + // shortcuts arch := ir.imageType.Arch() + distribution := arch.Distro() manifestSource, _, err := ir.imageType.Manifest(&ibp, ir.imageOptions, ir.repositories, manifestSeed) if err != nil {