Add descriptor to deps of go_gen_grpc_gateway. (#1487)

Fixes #1392
grpc-ecosystem · Jun 25, 2020 · bf74220 · bf74220
1 parent 294b4d8
commit bf74220
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/examples/internal/proto/examplepb/BUILD.bazel b/examples/internal/proto/examplepb/BUILD.bazel
@@ -16,6 +16,7 @@ package(default_visibility = ["//visibility:public"])
 # gazelle:exclude stream.pb.gw.go
 # gazelle:exclude use_go_template.pb.gw.go
 # gazelle:exclude wrappers.pb.gw.go
+# gazelle:go_grpc_compilers @io_bazel_rules_go//proto:go_grpc,//protoc-gen-grpc-gateway:go_gen_grpc_gateway
 
 genrule(
     name = "generated_proto",
@@ -58,7 +59,7 @@ go_proto_library(
     name = "examplepb_go_proto",
     compilers = [
         "@io_bazel_rules_go//proto:go_grpc",
-        "//protoc-gen-grpc-gateway:go_gen_grpc_gateway",  # keep
+        "//protoc-gen-grpc-gateway:go_gen_grpc_gateway",
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/examples/internal/proto/examplepb",
     proto = ":examplepb_proto",
@@ -67,7 +68,6 @@ go_proto_library(
         "//examples/internal/proto/sub:go_default_library",
         "//examples/internal/proto/sub2:go_default_library",
         "//protoc-gen-swagger/options:go_default_library",
-        "@com_github_golang_protobuf//descriptor:go_default_library_gen",  # keep
         "@go_googleapis//google/api:annotations_go_proto",
     ],
 )

diff --git a/protoc-gen-grpc-gateway/BUILD.bazel b/protoc-gen-grpc-gateway/BUILD.bazel
@@ -35,6 +35,7 @@ go_proto_compiler(
     deps = [
         "//runtime:go_default_library",
         "//utilities:go_default_library",
+        "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",

diff --git a/runtime/internal/examplepb/BUILD.bazel b/runtime/internal/examplepb/BUILD.bazel
@@ -19,9 +19,6 @@ go_proto_library(
     name = "examplepb_go_proto",
     importpath = "github.com/grpc-ecosystem/grpc-gateway/runtime/internal/examplepb",
     proto = ":examplepb_proto",
-    deps = [
-        "@com_github_golang_protobuf//descriptor:go_default_library_gen",  # keep
-    ],
 )
 
 go_library(