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

clouadpi: NewServer: move awsBucket parameter to a new ServerConfig struct

Browse source 
We will have more parameters soon so let's make this prettier sooner rather
than later.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2022-03-03 14:22:52 +01:00 • committed by Ondřej Budai
parent 2765d2d9a8
commit 9feb7b59d6
4 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/osbuild-composer/composer.go
View file

@ -19,6 +19,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/auth" "github.com/osbuild/osbuild-composer/internal/auth"
"github.com/osbuild/osbuild-composer/internal/cloudapi" "github.com/osbuild/osbuild-composer/internal/cloudapi"
v2 "github.com/osbuild/osbuild-composer/internal/cloudapi/v2"
"github.com/osbuild/osbuild-composer/internal/distroregistry" "github.com/osbuild/osbuild-composer/internal/distroregistry"
"github.com/osbuild/osbuild-composer/internal/jobqueue" "github.com/osbuild/osbuild-composer/internal/jobqueue"
"github.com/osbuild/osbuild-composer/internal/jobqueue/dbjobqueue" "github.com/osbuild/osbuild-composer/internal/jobqueue/dbjobqueue"
@ -119,7 +120,10 @@ 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 { func (c *Composer) InitAPI(cert, key string, enableTLS bool, enableMTLS bool, enableJWT bool, l net.Listener) error {
c.api = cloudapi.NewServer(c.workers, c.distros, c.config.Koji.AWS.Bucket) config := v2.ServerConfig{
AWSBucket: c.config.Koji.AWS.Bucket,
}
c.api = cloudapi.NewServer(c.workers, c.distros, config)
c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros) c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros)
if !enableTLS { if !enableTLS {

4
internal/cloudapi/server.go
View file

@ -13,9 +13,9 @@ type Server struct {
v2 *v2.Server v2 *v2.Server
} }
func NewServer(workers *worker.Server, distros *distroregistry.Registry, awsBucket string) *Server { func NewServer(workers *worker.Server, distros *distroregistry.Registry, config v2.ServerConfig) *Server {
server := &Server{ server := &Server{
v2: v2.NewServer(workers, distros, awsBucket), v2: v2.NewServer(workers, distros, config),
} }
return server return server
} }

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

@ -34,9 +34,13 @@ import (
// Server represents the state of the cloud Server // Server represents the state of the cloud Server
type Server struct { type Server struct {
workers *worker.Server workers *worker.Server
distros *distroregistry.Registry distros *distroregistry.Registry
awsBucket string config ServerConfig
}
type ServerConfig struct {
AWSBucket string
} }
type apiHandlers struct { type apiHandlers struct {
@ -45,11 +49,11 @@ type apiHandlers struct {
type binder struct{} type binder struct{}
func NewServer(workers *worker.Server, distros *distroregistry.Registry, bucket string) *Server { func NewServer(workers *worker.Server, distros *distroregistry.Registry, config ServerConfig) *Server {
server := &Server{ server := &Server{
workers: workers, workers: workers,
distros: distros, distros: distros,
awsBucket: bucket, config: config,
} }
return server return server
} }
@ -345,7 +349,7 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
t := target.NewAWSTarget(&target.AWSTargetOptions{ t := target.NewAWSTarget(&target.AWSTargetOptions{
Filename: imageType.Filename(), Filename: imageType.Filename(),
Region: awsUploadOptions.Region, Region: awsUploadOptions.Region,
Bucket: h.server.awsBucket, Bucket: h.server.config.AWSBucket,
Key: key, Key: key,
ShareWithAccounts: awsUploadOptions.ShareWithAccounts, ShareWithAccounts: awsUploadOptions.ShareWithAccounts,
}) })
@ -381,7 +385,7 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
t := target.NewAWSS3Target(&target.AWSS3TargetOptions{ t := target.NewAWSS3Target(&target.AWSS3TargetOptions{
Filename: imageType.Filename(), Filename: imageType.Filename(),
Region: awsS3UploadOptions.Region, Region: awsS3UploadOptions.Region,
Bucket: h.server.awsBucket, Bucket: h.server.config.AWSBucket,
Key: key, Key: key,
}) })
t.ImageName = key t.ImageName = key

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

@ -32,7 +32,10 @@ func newV2Server(t *testing.T, dir string) (*v2.Server, *worker.Server, context.
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, distros) require.NotNil(t, distros)
v2Server := v2.NewServer(workerServer, distros, "image-builder.service") config := v2.ServerConfig{
AWSBucket: "image-builder.service",
}
v2Server := v2.NewServer(workerServer, distros, config)
require.NotNil(t, v2Server) require.NotNil(t, v2Server)
// start a routine which just completes depsolve jobs // start a routine which just completes depsolve jobs