cloudapi/v2: Configurable aws bucket

Fixes #1855

cmd/osbuild-composer/composer.go

@@ -104,7 +104,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.api = cloudapi.NewServer(c.workers, c.rpm, c.distros, c.config.Koji.AWS.Bucket)
 	c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros)
 
 	if !enableTLS {

cmd/osbuild-composer/config.go

@@ -25,7 +25,7 @@ type KojiAPIConfig struct {
 	JWTKeysURL     string    `toml:"jwt_keys_url"`
 	JWTKeysCA      string    `toml:"jwt_ca_file"`
 	JWTACLFile     string    `toml:"jwt_acl_file"`
-	AWSConfig      AWSConfig `toml:"aws_config"`
+	AWS            AWSConfig `toml:"aws_config"`
 }
 
 type AWSConfig struct {
@@ -80,6 +80,9 @@ func GetDefaultConfig() *ComposerConfigFile {
 			EnableTLS:  true,
 			EnableMTLS: true,
 			EnableJWT:  false,
+			AWS: AWSConfig{
+				Bucket: "image-builder.service",
+			},
 		},
 		Worker: WorkerAPIConfig{
 			EnableTLS:  true,

cmd/osbuild-composer/config_test.go

@@ -33,6 +33,9 @@ func TestDefaultConfig(t *testing.T) {
 		EnableTLS:  true,
 		EnableMTLS: true,
 		EnableJWT:  false,
+		AWS: AWSConfig{
+			Bucket: "image-builder.service",
+		},
 	}, defaultConfig.Koji)
 
 	require.Equal(t, WorkerAPIConfig{