Skip to content

gopackagesdriver: Add additional labels #4474

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.

Sign up for GitHub

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

Open
r-hang wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

gopackagesdriver: Add additional labels #4474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9d2156
gopackagesdriver: Add additional labels
r-hang Oct 7, 2025
67ca376
Merge branch 'master' into rhang/add-labels
r-hang Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions go/tools/gopackagesdriver/bazel_json_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func (b *BazelJSONBuilder) query(ctx context.Context, query string) ([]string, e
return labels, nil
}

func (b *BazelJSONBuilder) Labels(ctx context.Context, requests []string) ([]string, error) {
func (b *BazelJSONBuilder) Labels(ctx context.Context, requests []string, additionalLabels []string) ([]string, error) {
labels, err := b.query(ctx, b.queryFromRequests(requests...))
if err != nil {
return nil, fmt.Errorf("query failed: %w", err)
Expand All @@ -198,8 +198,7 @@ func (b *BazelJSONBuilder) Labels(ctx context.Context, requests []string) ([]str
if len(labels) == 0 {
return nil, fmt.Errorf("found no labels matching the requests")
}

return labels, nil
return append(labels, additionalLabels...), nil
}

func (b *BazelJSONBuilder) Build(ctx context.Context, labels []string, mode packages.LoadMode) ([]string, error) {
Expand Down
3 changes: 2 additions & 1 deletion go/tools/gopackagesdriver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ var (
buildWorkingDirectory = os.Getenv("BUILD_WORKING_DIRECTORY")
additionalAspects = strings.Fields(os.Getenv("GOPACKAGESDRIVER_BAZEL_ADDTL_ASPECTS"))
additionalKinds = strings.Fields(os.Getenv("GOPACKAGESDRIVER_BAZEL_KINDS"))
additionalLabels = strings.Fields(os.Getenv("GOPACKAGESDRIVER_BAZEL_ADDTL_LABELS"))
Copy link
Member

@fmeum fmeum Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's write this out, the abbreviation isn't that commonly used

emptyResponse = &driverResponse{
NotHandled: true,
Compiler: "gc",
Expand Down Expand Up @@ -93,7 +94,7 @@ func run(ctx context.Context, in io.Reader, out io.Writer, args []string) error
return fmt.Errorf("unable to build JSON files: %w", err)
}

labels, err := bazelJsonBuilder.Labels(ctx, queries)
labels, err := bazelJsonBuilder.Labels(ctx, queries, additionalLabels)
if err != nil {
return fmt.Errorf("unable to lookup package: %w", err)
}
Expand Down