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

worker: NewServer: move config parameters to a new Config 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:37:21 +01:00 • committed by Ondřej Budai
parent 9feb7b59d6
commit c1dc58eba4
5 changed files with 49 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,10 +54,13 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos
cacheDir: cacheDir,
}
workerConfig := worker.Config{
BasePath: config.Worker.BasePath,
}
var err error
artifactsDir := ""
if config.Worker.EnableArtifacts {
artifactsDir, err = c.ensureStateDirectory("artifacts", 0755)
workerConfig.ArtifactsDir, err = c.ensureStateDirectory("artifacts", 0755)
if err != nil {
return nil, err
}
@ -98,12 +101,12 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string) (*Compos
}
}
requestJobTimeout, err := time.ParseDuration(config.Worker.RequestJobTimeout)
workerConfig.RequestJobTimeout, err = time.ParseDuration(config.Worker.RequestJobTimeout)
if err != nil {
return nil, fmt.Errorf("Unable to parse request job timeout: %v", err)
}
c.workers = worker.NewServer(c.logger, jobs, artifactsDir, requestJobTimeout, config.Worker.BasePath)
c.workers = worker.NewServer(c.logger, jobs, workerConfig)
return &c, nil
}
@ -121,8 +124,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 {
config := v2.ServerConfig{
AWSBucket: c.config.Koji.AWS.Bucket,
AWSBucket: c.config.Koji.AWS.Bucket,
TenantProviderFields: c.config.CloudAPI.JWT.TenantProviderFields,
}
c.api = cloudapi.NewServer(c.workers, c.distros, config)
c.koji = kojiapi.NewServer(c.logger, c.workers, c.rpm, c.distros)