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

cloudapi: drop unused rpmmdMetadata parameter & struct member

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

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2022-03-01 23:25:28 +01:00 • committed by Ondřej Budai
parent 0f26672e45
commit c29a1fa9da
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/cloudapi/server.go
View file

@ -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
}

16
internal/cloudapi/v2/v2.go
View file

@ -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
}

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

@ -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