cloud: populate URI field for all external storage types #158893
+93
−20
Conversation
This file contains hidden or 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
Member
|
This change is |
spilchen
reviewed
Dec 5, 2025
Contributor
spilchen
left a comment
spilchen
left a comment
There was a problem hiding this comment.
Looks like a good thing to have. I had one minor nit. I noticed the CI run found a few other cases. I can take a look again after those are resolved.
@spilchen reviewed 3 of 12 files at r1, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @dt and @mw5h)
pkg/cloud/cloudpb/external_storage.proto line 181 at r1 (raw file):
// URI is the string URI from which this encoded external storage config was // derived, if known. May be empty in most cases unless set explicitly by the
nit: May want to update the "May be empty in most cases..." part of the comment. It's the opposite now.
mw5h
force-pushed
the
cloud-external-uri
branch
2 times, most recently
from
3c861ee to
a81120e
Compare
Contributor
Author
|
Okay, let's see what CI makes of this. Previous run failed because we were comparing a the non-escaped URI to the escaped one that we built the external storage configuration from. |
Previously, the URI field in the ExternalStorage proto was not populated by all storage provider implementations. This field is intended to store the original URI used to construct the storage, allowing for proper round-tripping of configuration. This commit implements URI field population for all external storage types. ExternalStorageFromURI() now checks that this field is set in returned implementations when running in a test build. The implementation ensures that `ExternalStorage.Conf()` returns the complete configuration including the original URI, which is validated by existing tests that use `cloudtestutils.CheckExportStore()` for most storage types. Nullsink, which cannot use the standard test helper due to its no-op nature, has an explicit URI round-trip test. Informs: cockroachdb#156658 Release note: none
mw5h
force-pushed
the
cloud-external-uri
branch
from
a81120e to
0143262
Compare
Contributor
Author
|
Okay, this is RFAL. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Previously, the URI field in the ExternalStorage proto was not populated by all storage provider implementations. This field is intended to store the original URI used to construct the storage, allowing for proper round-tripping of configuration.
This commit implements URI field population for all external storage types. ExternalStorageFromURI() now checks that this field is set in returned implementations when running in a test build.
The implementation ensures that
ExternalStorage.Conf()returns the complete configuration including the original URI, which is validated by existing tests that usecloudtestutils.CheckExportStore()for most storage types. Nullsink, which cannot use the standard test helper due to its no-op nature, has an explicit URI round-trip test.Informs: #156658
Release note: none