From c29a1fa9da1c7a9332b8a14ece02735410c0664c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 1 Mar 2022 23:25:28 +0100
Subject: [PATCH] cloudapi: drop unused rpmmdMetadata parameter & struct member
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cloudapi no longer calls dnf-json directly so we can clean some code, yay!

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 cmd/osbuild-composer/composer.go |  2 +-
 internal/cloudapi/server.go      |  5 ++---
 internal/cloudapi/v2/v2.go       | 16 +++++++---------
 internal/cloudapi/v2/v2_test.go  |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/cmd/osbuild-composer/composer.go b/cmd/osbuild-composer/composer.go
index 21568c3a0..ba82c79aa 100644
--- a/cmd/osbuild-composer/composer.go
+++ b/cmd/osbuild-composer/composer.go
@@ -119,7 +119,7 @@ func (c *Composer) InitWeldr(repoPaths []string, weldrListener net.Listener,
 }
 
 func (c *Composer) InitAPI(cert, key string, enableTLS bool, enableMTLS bool, enableJWT bool, l net.Listener) error {
-	c.api = cloudapi.NewServer(c.workers, c.rpm, c.distros, c.config.Koji.AWS.Bucket)
+	c.api = cloudapi.NewServer(c.workers, c.distros, c.config.Koji.AWS.Bucket)
 	c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros)
 
 	if !enableTLS {
diff --git a/internal/cloudapi/server.go b/internal/cloudapi/server.go
index 9135c2a41..cea9c499d 100644
--- a/internal/cloudapi/server.go
+++ b/internal/cloudapi/server.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"github.com/osbuild/osbuild-composer/internal/distroregistry"
-	"github.com/osbuild/osbuild-composer/internal/rpmmd"
 	"github.com/osbuild/osbuild-composer/internal/worker"
 
 	v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
@@ -14,9 +13,9 @@ type Server struct {
 	v2 *v2.Server
 }
 
-func NewServer(workers *worker.Server, rpmMetadata rpmmd.RPMMD, distros *distroregistry.Registry, awsBucket string) *Server {
+func NewServer(workers *worker.Server, distros *distroregistry.Registry, awsBucket string) *Server {
 	server := &Server{
-		v2: v2.NewServer(workers, rpmMetadata, distros, awsBucket),
+		v2: v2.NewServer(workers, distros, awsBucket),
 	}
 	return server
 }
diff --git a/internal/cloudapi/v2/v2.go b/internal/cloudapi/v2/v2.go
index 330bac36f..b653a6ae5 100644
--- a/internal/cloudapi/v2/v2.go
+++ b/internal/cloudapi/v2/v2.go
@@ -34,10 +34,9 @@ import (
 
 // Server represents the state of the cloud Server
 type Server struct {
-	workers     *worker.Server
-	rpmMetadata rpmmd.RPMMD
-	distros     *distroregistry.Registry
-	awsBucket   string
+	workers   *worker.Server
+	distros   *distroregistry.Registry
+	awsBucket string
 }
 
 type apiHandlers struct {
@@ -46,12 +45,11 @@ type apiHandlers struct {
 
 type binder struct{}
 
-func NewServer(workers *worker.Server, rpmMetadata rpmmd.RPMMD, distros *distroregistry.Registry, bucket string) *Server {
+func NewServer(workers *worker.Server, distros *distroregistry.Registry, bucket string) *Server {
 	server := &Server{
-		workers:     workers,
-		rpmMetadata: rpmMetadata,
-		distros:     distros,
-		awsBucket:   bucket,
+		workers:   workers,
+		distros:   distros,
+		awsBucket: bucket,
 	}
 	return server
 }
diff --git a/internal/cloudapi/v2/v2_test.go b/internal/cloudapi/v2/v2_test.go
index 7b206d7f1..9d722e29b 100644
--- a/internal/cloudapi/v2/v2_test.go
+++ b/internal/cloudapi/v2/v2_test.go
@@ -31,7 +31,7 @@ func newV2Server(t *testing.T, dir string) (*v2.Server, *worker.Server, context.
 	require.NoError(t, err)
 	require.NotNil(t, distros)
 
-	v2Server := v2.NewServer(rpmFixture.Workers, rpm, distros, "image-builder.service")
+	v2Server := v2.NewServer(rpmFixture.Workers, distros, "image-builder.service")
 	require.NotNil(t, v2Server)
 
 	// start a routine which just completes depsolve jobs