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

osbuild-worker: change error handling for OCI upload

Browse source 
Issues caused by rebase-merge:
- Error handling was changed in one PR
- Errors using the old method were introduced in another
This commit is contained in:
Achilleas Koutsou 2022-01-28 15:56:28 +01:00 • committed by Sanne Raymaekers
parent 022a52d56b
commit edfdcf0be6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -536,14 +536,14 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
PrivateKey: options.PrivateKey,
})
if err != nil {
appendTargetError(osbuildJobResult, fmt.Errorf("failed to create an OCI uploder: %w", err))
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
return nil
}
log.Print("[OCI] 🔑 Logged in OCI")
log.Print("[OCI] ⬆ Uploading the image")
file, err := os.Open(path.Join(outputDirectory, exportPath, options.FileName))
if err != nil {
appendTargetError(osbuildJobResult, fmt.Errorf("failed to create an OCI uploder: %w", err))
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
return nil
}
defer file.Close()
@ -557,7 +557,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
args.Targets[0].ImageName,
)
if err != nil {
appendTargetError(osbuildJobResult, fmt.Errorf("failed to upload the image: %w", err))
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
return nil
}
log.Print("[OCI] 🎉 Image uploaded and registered!")