Skip to content
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

Jump to bottom

fix: genproto google apis conflict fix #1922

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: genproto google apis conflict fix #1922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions internal/bzlmod/default_gazelle_overrides.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ DEFAULT_DIRECTIVES_BY_PATH = {
"gazelle:go_generate_proto false",
"gazelle:proto_import_prefix k8s.io/apimachinery",
],
"google.golang.org/genproto/googleapis/api/annotations": [
"gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @org_golang_google_genproto//googleapis/api/annotations",
Copy link
Member

Choose a reason for hiding this comment

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

Based on the comment you linked, it sounds like we should depend on the repo corresponding to the Go submodule, not this one. Could you confirm what's correct?

Copy link
Author

Choose a reason for hiding this comment

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

oh, so I should replace L105 with google.golang.org/genproto/googleapis/api then

Copy link
Author

Choose a reason for hiding this comment

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

or I guess we should do google.golang.org/genproto?

"gazelle:resolve go google.golang.org/genproto/googleapis/api @org_golang_google_genproto//googleapis/api",
],
}

DEFAULT_BUILD_EXTRA_ARGS_BY_PATH = {
Expand Down