Skip to content

Revert "go_grpc_compiler: default to go_grpc_v2 (#2071)" #2171

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "go_grpc_compiler: default to go_grpc_v2 (#2071)" #2171

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ The following flags are accepted:
| If `all` or `true`, Gazelle indexes all directories in the repository, even when recursion is disabled. |
| This makes dependency resolution simple but can be slow for large repositories. |
+-------------------------------------------------------------------+------------------------------------------+
| :flag:`-go_grpc_compiler` | ``@io_bazel_rules_go//proto:go_grpc_v2`` |
| :flag:`-go_grpc_compiler` | ``@io_bazel_rules_go//proto:go_grpc`` |
+-------------------------------------------------------------------+------------------------------------------+
| The protocol buffers compiler to use for building go bindings for gRPC. May be repeated. |
| |
Expand Down Expand Up @@ -856,7 +856,7 @@ The following directives are recognized:
| * ``file``: A distinct ``go_test`` rule will be generated for each ``_test.go`` file in the |
| package directory. |
+---------------------------------------------------+------------------------------------------+
| :direc:`# gazelle:go_grpc_compilers` | ``@io_bazel_rules_go//proto:go_grpc_v2`` |
| :direc:`# gazelle:go_grpc_compilers` | ``@io_bazel_rules_go//proto:go_grpc_`` |
+---------------------------------------------------+------------------------------------------+
| The protocol buffers compiler(s) to use for building go bindings for gRPC. |
| Multiple compilers, separated by commas, may be specified. |
Expand Down Expand Up @@ -1278,7 +1278,7 @@ attributes with ``embed`` attributes.

**Migrate gRPC compilers (fix and update):** Gazelle converts
``go_grpc_library`` rules to ``go_proto_library`` rules with
``compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"]``.
``compilers = ["@io_bazel_rules_go//proto:go_grpc"]``.

**Flatten srcs (fix and update):** Gazelle converts ``srcs`` attributes that
use OS and architecture-specific ``select`` expressions to flat lists.
Expand Down
4 changes: 2 additions & 2 deletions cmd/gazelle/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ proto_library(

go_proto_library(
name = "repo_go_proto",
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo",
proto = ":repo_proto",
visibility = ["//visibility:public"],
Expand Down Expand Up @@ -2033,7 +2033,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")

go_proto_library(
name = "service_go_proto",
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo/service",
proto = ":service_proto",
visibility = ["//visibility:public"],
Expand Down
2 changes: 1 addition & 1 deletion language/go/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const (

var (
defaultGoProtoCompilers = []string{"@io_bazel_rules_go//proto:go_proto"}
defaultGoGrpcCompilers = []string{"@io_bazel_rules_go//proto:go_grpc_v2"}
defaultGoGrpcCompilers = []string{"@io_bazel_rules_go//proto:go_grpc"}
)

func (m testMode) String() string {
Expand Down
2 changes: 1 addition & 1 deletion language/go/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (

// grpcCompilerLabel is the label for the gRPC compiler plugin, used in the
// "compilers" attribute of go_proto_library rules.
grpcCompilerLabel = "@io_bazel_rules_go//proto:go_grpc_v2"
grpcCompilerLabel = "@io_bazel_rules_go//proto:go_grpc"

// goProtoSuffix is the suffix applied to the labels of all generated
// go_proto_library targets.
Expand Down
2 changes: 1 addition & 1 deletion language/go/fix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ proto_library(

go_proto_library(
name = "foo_go_proto",
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo",
proto = ":foo_proto",
visibility = ["//visibility:public"],
Expand Down
2 changes: 1 addition & 1 deletion language/go/testdata/proto_file_mode/abc/BUILD.want
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ go_proto_library(
"abc/a.proto",
"xyz/x.proto",
],
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo/proto_file_mode/abc",
protos = [
":a_proto",
Expand Down
2 changes: 1 addition & 1 deletion language/go/testdata/service/BUILD.want
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ go_proto_library(
"google/protobuf/any.proto",
"service/sub/sub.proto",
],
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo/service",
proto = ":service_proto",
visibility = ["//visibility:public"],
Expand Down
2 changes: 1 addition & 1 deletion language/go/testdata/service_gogo_subdir_reset/sub/BUILD.want
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ proto_library(
go_proto_library(
name = "protos_gogo_go_proto",
_gazelle_imports = [],
compilers = ["@io_bazel_rules_go//proto:go_grpc_v2"],
compilers = ["@io_bazel_rules_go//proto:go_grpc"],
importpath = "example.com/repo/protos_gogo",
proto = ":protos_gogo_proto",
visibility = ["//visibility:public"],
Expand Down