-
Notifications
You must be signed in to change notification settings - Fork 277
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add buftarget package #2799
Merged
Merged
Add buftarget package #2799
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
This has some failing tests in `reader_test.go` because we are changing the behaviour of `ProtoFileRef`. We need to wire the logic a couple of layers up before we change these tests and ensure that everything works.
InputPath, TargetPaths, and TargetExcludePaths are now entirely handled by buftarget.BucketTargeting, so we can remove these workspace options.
bufdev
approved these changes
Mar 6, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving to get this into bufmod
as this is clearly an improvement over the status quo - we're going to do a line-by-line review as we go, but I've QA'ed the logic and done a basic pass, and we're in a much better state after this.
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.
This PR adds a
buftarget
package, which provides path targeting informationfor a storage bucket:
BucketTargeting
provides information on aControllingWorkspace
if one wasfound in the bucket, the input path, target paths, and target exclude paths
TerminateAtControllingWorkspace
has been consolidated to this packageThe way the package is used is that when
bufctl.Controller
callsbuffetch/internal.Reader
to get the storage bucket ,
buffetch/internal.Reader
now also returnsbuftarget.BucketTargeting
alongside the bucket.
bufworkspace.WorkspaceProvider
then handles the workspace and moduletargeting using
buftarget.BucketTargeting
. This removes the need to set input path, target paths,and target exclude paths as workspace provider options, and is instead just passed through
workspaceTargeting
andmoduleTargeting
.This change also introduces some fallback logic in
workspaceTargeting
for inputs that did notresolve to a controlling workspace.
Lastly, tests that were skipped previously for path/exclude-path behavior issues have been
unskipped and resolved accordingly.