cdbg: better error reporting on deploy failure (#3155)

* Don't report `UPLOAD_FILES_START_FAILED` as unknown error
* Return error to `cdbg` if present

---------

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2024-06-07 15:46:37 +02:00 committed by GitHub
parent 095a66fb83
commit 32588339f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 82 additions and 68 deletions

View file

@ -271,9 +271,11 @@ func uploadFiles(ctx context.Context, client pb.DebugdClient, in deployOnEndpoin
case pb.UploadFilesStatus_UPLOAD_FILES_ALREADY_FINISHED:
in.log.Info("Files already uploaded")
case pb.UploadFilesStatus_UPLOAD_FILES_UPLOAD_FAILED:
return fmt.Errorf("uploading files to %v failed: %v", in.debugdEndpoint, uploadResponse)
return fmt.Errorf("uploading files to %v failed: %s: %s", in.debugdEndpoint, uploadResponse.Status, uploadResponse.Error)
case pb.UploadFilesStatus_UPLOAD_FILES_ALREADY_STARTED:
return fmt.Errorf("upload already started on %v", in.debugdEndpoint)
case pb.UploadFilesStatus_UPLOAD_FILES_START_FAILED:
return fmt.Errorf("overriding service units failed on %v: %s: %s", in.debugdEndpoint, uploadResponse.Status, uploadResponse.Error)
default:
return fmt.Errorf("unknown upload status %v", uploadResponse.Status)
}