Replace pborman/uuid with google/uuid #550
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrahs
reviewed
Apr 15, 2024
go/pkg/cas/upload.go
Outdated
| @@ -1069,9 +1069,9 @@ func (u *uploader) streamFromReader(ctx context.Context, r io.Reader, digest *re | |||
| instanceSegment = "" | |||
| } | |||
| if compressed { | |||
| req.ResourceName = fmt.Sprintf("%suploads/%s/compressed-blobs/zstd/%s/%d", instanceSegment, uuid.New(), digest.Hash, digest.SizeBytes) | |||
| req.ResourceName = fmt.Sprintf("%suploads/%s/compressed-blobs/zstd/%s/%d", instanceSegment, uuid.New().String(), digest.Hash, digest.SizeBytes) | |||
There was a problem hiding this comment.
New() and NewString() may panic. Perhaps a convenient function to log the error and gracefully return an empty string would better match the current behaviour.
There was a problem hiding this comment.
I didn't end up making a convenience wrapper, since I converted a few of these over to actual error handling instead. An empty string here would/could have caused different failures later on. In the actual optional cases I did add logging.
mrahs
approved these changes
Apr 25, 2024
|
Looks like there is simple merge conflict in build files. |
The two functions we were using were just thin wrappers around google/uuid anyways: * `New()` -> `New().String()` * `Parse(...)` returns an `error` instead of a `nil` result
When we need a UUID to upload, return an error. Otherwise, log the error and continue with an empty string.
I rebased the changes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The two functions we were using were just thin wrappers around google/uuid anyways:
New()->NewRandom(), then.String()Parse(...)returns anerrorinstead of anilresultNewRandom()returns anerrorinstead of an invalid UUID, so handle that as appropriate (we weren't really handling it appropriately in the current upload paths)