Auto-include tonic dep on protobuf build rules

Ben Carr · facebook-github-bot · commit b5e6de5e34d0 · 2025-05-27T18:06:42.000-07:00
Reviewed By: JakobDegen

Differential Revision: D75253859

fbshipit-source-id: 103a0dcef926f834c046fe34525cfa3ff52f3a43
diff --git a/app/buck2_action_metadata_proto/BUCK b/app/buck2_action_metadata_proto/BUCK
@@ -7,9 +7,6 @@ rust_protobuf_library(
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
     proto_srcs = ":buck2_action_metadata_proto.proto",
-    deps = [
-        "fbsource//third-party/rust:tonic",
-    ],
 )
 
 proto_srcs(
diff --git a/app/buck2_cli_proto/BUCK b/app/buck2_cli_proto/BUCK
@@ -18,7 +18,6 @@ rust_protobuf_library(
         "fbsource//third-party/rust:prost-types",
         "fbsource//third-party/rust:serde",
         "fbsource//third-party/rust:tokio-util",
-        "fbsource//third-party/rust:tonic",
         "//buck2/allocative/allocative:allocative",
         "//buck2/app/buck2_core:buck2_core",
         "//buck2/app/buck2_data:buck2_data",
diff --git a/app/buck2_data/BUCK b/app/buck2_data/BUCK
@@ -14,7 +14,6 @@ rust_protobuf_library(
         "fbsource//third-party/rust:hex",
         "fbsource//third-party/rust:prost-types",
         "fbsource//third-party/rust:serde",
-        "fbsource//third-party/rust:tonic",
         "//buck2/allocative/allocative:allocative",
         "//buck2/app/buck2_host_sharing_proto:buck2_host_sharing_proto",
         "//buck2/gazebo/dupe:dupe",
diff --git a/app/buck2_downward_api_proto/BUCK b/app/buck2_downward_api_proto/BUCK
@@ -8,7 +8,6 @@ rust_protobuf_library(
     build_script = "build.rs",
     proto_srcs = ":buck2_downward_api_proto.proto",
     deps = [
-        "fbsource//third-party/rust:tonic",
         "fbsource//third-party/rust:tracing",
         "//buck2/app/buck2_error:buck2_error",
     ],
diff --git a/app/buck2_forkserver_proto/BUCK b/app/buck2_forkserver_proto/BUCK
@@ -11,7 +11,6 @@ rust_protobuf_library(
     deps = [
         "fbsource//third-party/rust:derive_more",
         "fbsource//third-party/rust:prost-types",
-        "fbsource//third-party/rust:tonic",
         "//buck2/app/buck2_data:buck2_data",
         "//buck2/gazebo/gazebo:gazebo",
     ],
diff --git a/app/buck2_health_check_proto/BUCK b/app/buck2_health_check_proto/BUCK
@@ -10,7 +10,6 @@ rust_protobuf_library(
     build_script = "build.rs",
     proto_srcs = ":buck2_health_check_proto.proto",
     deps = [
-        "fbsource//third-party/rust:tonic",
         "//buck2/app/buck2_data:buck2_data",
     ],
 )
diff --git a/app/buck2_host_sharing_proto/BUCK b/app/buck2_host_sharing_proto/BUCK
@@ -10,7 +10,6 @@ rust_protobuf_library(
     proto_srcs = ":host_sharing.proto",
     deps = [
         "fbsource//third-party/rust:serde",
-        "fbsource//third-party/rust:tonic",
         "//buck2/allocative/allocative:allocative",
     ],
 )
diff --git a/app/buck2_install_proto/BUCK b/app/buck2_install_proto/BUCK
@@ -8,9 +8,6 @@ rust_protobuf_library(
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
     proto_srcs = ":buck2_install_proto.proto",
-    deps = [
-        "fbsource//third-party/rust:tonic",
-    ],
 )
 
 proto_srcs(
diff --git a/app/buck2_subscription_proto/BUCK b/app/buck2_subscription_proto/BUCK
@@ -12,7 +12,6 @@ rust_protobuf_library(
     deps = [
         "fbsource//third-party/rust:derive_more",
         "fbsource//third-party/rust:serde",
-        "fbsource//third-party/rust:tonic",
         "//buck2/allocative/allocative:allocative",
     ],
 )
diff --git a/app/buck2_test_proto/BUCK b/app/buck2_test_proto/BUCK
@@ -10,7 +10,6 @@ rust_protobuf_library(
     proto_srcs = ":buck2_test_proto.proto",
     deps = [
         "fbsource//third-party/rust:prost-types",
-        "fbsource//third-party/rust:tonic",
         "//buck2/app/buck2_data:buck2_data",
         "//buck2/app/buck2_host_sharing_proto:buck2_host_sharing_proto",
     ],
diff --git a/app/buck2_worker_proto/BUCK b/app/buck2_worker_proto/BUCK
@@ -9,9 +9,6 @@ rust_protobuf_library(
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
     proto_srcs = ":buck2_worker_proto.proto",
-    deps = [
-        "fbsource//third-party/rust:tonic",
-    ],
 )
 
 proto_srcs(
diff --git a/proto_defs.bzl b/proto_defs.bzl
@@ -67,6 +67,7 @@ def rust_protobuf_library(
         ],
         deps = [
             "fbsource//third-party/rust:prost",
+            "fbsource//third-party/rust:tonic",
         ] + (deps or []),
         test_deps = test_deps,
     )
diff --git a/remote_execution/oss/re_grpc_proto/BUCK b/remote_execution/oss/re_grpc_proto/BUCK
@@ -10,7 +10,6 @@ rust_protobuf_library(
     deps = [
         "fbsource//third-party/rust:prost-types",
         "fbsource//third-party/rust:serde",
-        "fbsource//third-party/rust:tonic",
         "//buck2/app/buck2_data:buck2_data",
     ],
 )
diff --git a/shim/shims.bzl b/shim/shims.bzl
@@ -367,6 +367,7 @@ def rust_protobuf_library(
         deps = [
             "fbsource//third-party/rust:prost",
             "fbsource//third-party/rust:prost-types",
+            "fbsource//third-party/rust:tonic",
         ] + (deps or []),
     )
 

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@ rust_protobuf_library(`
`7`	`7`	`srcs = glob(["src/*/.rs"]),`
`8`	`8`	`build_script = "build.rs",`
`9`	`9`	`proto_srcs = ":buck2_action_metadata_proto.proto",`
`10`		`- deps = [`
`11`		`- "fbsource//third-party/rust:tonic",`
`12`		`- ],`
`13`	`10`	`)`
`14`	`11`
`15`	`12`	`proto_srcs(`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ rust_protobuf_library(`
`10`	`10`	`build_script = "build.rs",`
`11`	`11`	`proto_srcs = ":buck2_health_check_proto.proto",`
`12`	`12`	`deps = [`
`13`		`- "fbsource//third-party/rust:tonic",`
`14`	`13`	`"//buck2/app/buck2_data:buck2_data",`
`15`	`14`	`],`
`16`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@ rust_protobuf_library(`
`8`	`8`	`srcs = glob(["src/*/.rs"]),`
`9`	`9`	`build_script = "build.rs",`
`10`	`10`	`proto_srcs = ":buck2_install_proto.proto",`
`11`		`- deps = [`
`12`		`- "fbsource//third-party/rust:tonic",`
`13`		`- ],`
`14`	`11`	`)`
`15`	`12`
`16`	`13`	`proto_srcs(`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ rust_protobuf_library(`
`12`	`12`	`deps = [`
`13`	`13`	`"fbsource//third-party/rust:derive_more",`
`14`	`14`	`"fbsource//third-party/rust:serde",`
`15`		`- "fbsource//third-party/rust:tonic",`
`16`	`15`	`"//buck2/allocative/allocative:allocative",`
`17`	`16`	`],`
`18`	`17`	`)`