From fd3238cd869d25e9370e90092efd93704436c5b3 Mon Sep 17 00:00:00 2001 From: Andrew Block Date: Mon, 3 Jan 2022 16:07:53 -0600 Subject: [PATCH] Resolved errors when entry creation failed Signed-off-by: Andrew Block --- pkg/rekor/rekor.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/rekor/rekor.go b/pkg/rekor/rekor.go index 8a2fe9e..8c9096d 100644 --- a/pkg/rekor/rekor.go +++ b/pkg/rekor/rekor.go @@ -17,6 +17,7 @@ package rekor import ( "fmt" + "path/filepath" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" @@ -97,12 +98,12 @@ func (r *Rekor) Upload(request *UploadRequest) (*UploadResponse, error) { resp, err := r.rekorClient.Entries.CreateLogEntry(params) if err != nil { - var entryConflict entries.CreateLogEntryConflict + entryConflict := &entries.CreateLogEntryConflict{} if errors.As(err, &entryConflict) { - return nil, fmt.Errorf("entry already exists: %s", entryConflict.Location.String()) + return nil, fmt.Errorf("entry already exists: UUID: %s", filepath.Base(entryConflict.Location.String())) } - var entryBadRequest entries.CreateLogEntryBadRequest + entryBadRequest := &entries.CreateLogEntryBadRequest{} if errors.As(err, &entryBadRequest) { return nil, fmt.Errorf("bad request against rekor: Code: %d, Message: %s", entryBadRequest.Payload.Code, entryBadRequest.Payload.Message) }