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

cloudapi: add targetresults

Browse source 
Add the TargetResult struct to OSBuildJobResult. Include the 'options'
interface on TargetResult to contain target-specific information,
for example amiID and region from AWS. Expose 'options' on a status
call as an UploadStatus field. Add logic to support AWS within this
format, which can be used as a template for other targets.
This commit is contained in:
Chloe Kaubisch 2020-12-01 15:14:06 +01:00 • committed by Sanne Raymaekers
parent 10ec97c2d1
commit f091af55d8
6 changed files with 140 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -115,6 +115,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
}
var r []error
var targetResults []*target.TargetResult
for _, t := range args.Targets {
switch options := t.Options.(type) {
@ -189,6 +190,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
if !osbuildOutput.Success {
continue
}
a, err := awsupload.New(options.Region, options.AccessKeyID, options.SecretAccessKey)
if err != nil {
r = append(r, err)
@ -206,12 +208,21 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
continue
}
/* TODO: communicate back the AMI */
_, err = a.Register(t.ImageName, options.Bucket, key, options.ShareWithAccounts, common.CurrentArch())
ami, err := a.Register(t.ImageName, options.Bucket, key, options.ShareWithAccounts, common.CurrentArch())
if err != nil {
r = append(r, err)
continue
}
if ami == nil {
r = append(r, fmt.Errorf("No ami returned"))
continue
}
targetResults = append(targetResults, target.NewAWSTargetResult(&target.AWSTargetResultOptions{
Ami: *ami,
Region: options.Region,
}))
case *target.AzureTargetOptions:
if !osbuildOutput.Success {
continue
@ -406,6 +417,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
Success: osbuildOutput.Success && len(targetErrors) == 0,
OSBuildOutput: osbuildOutput,
TargetErrors: targetErrors,
TargetResults: targetResults,
UploadStatus: uploadstatus,
})
if err != nil {