[build] replace grpc_proto_library rules with separate proto_library/cc_proto_library/cc_grpc_library rules (#37943)

Closes #37943

PiperOrigin-RevId: 691538475
pull/37920/head^2
Mark D. Roth 4 weeks ago committed by Copybara-Service
parent 14ac94d923
commit 55b1ae9700
  1. 22
      BUILD
  2. 41
      bazel/grpc_build_system.bzl
  3. 4
      examples/cpp/error_details/BUILD
  4. 2
      examples/cpp/health/BUILD
  5. 10
      src/core/BUILD
  6. 22
      src/proto/grpc/channelz/BUILD
  7. 4
      src/proto/grpc/gcp/BUILD
  8. 18
      src/proto/grpc/health/v1/BUILD
  9. 42
      src/proto/grpc/lb/v1/BUILD
  10. 36
      src/proto/grpc/lookup/v1/BUILD
  11. 18
      src/proto/grpc/reflection/v1/BUILD
  12. 18
      src/proto/grpc/reflection/v1alpha/BUILD
  13. 14
      src/proto/grpc/status/BUILD
  14. 339
      src/proto/grpc/testing/BUILD
  15. 16
      src/proto/grpc/testing/duplicate/BUILD
  16. 7
      src/proto/grpc/testing/proto2/BUILD.bazel
  17. 644
      src/proto/grpc/testing/xds/v3/BUILD
  18. 4
      src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel
  19. 4
      src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel
  20. 4
      src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel
  21. 13
      test/core/call/yodel/BUILD
  22. 2
      test/core/call/yodel/grpc_yodel_test.bzl
  23. 12
      test/core/end2end/BUILD
  24. 30
      test/core/end2end/fuzzers/BUILD
  25. 12
      test/core/event_engine/fuzzing_event_engine/BUILD
  26. 4
      test/core/memory_usage/BUILD
  27. 4
      test/core/security/BUILD
  28. 22
      test/core/test_util/BUILD
  29. 17
      test/core/test_util/grpc_fuzzer.bzl
  30. 6
      test/core/transport/chaotic_good/BUILD
  31. 27
      test/core/tsi/alts/fake_handshaker/BUILD
  32. 14
      test/core/xds/BUILD
  33. 4
      test/cpp/codegen/BUILD
  34. 240
      test/cpp/end2end/BUILD
  35. 156
      test/cpp/end2end/xds/BUILD
  36. 2
      test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
  37. 10
      test/cpp/end2end/xds/xds_csds_end2end_test.cc
  38. 23
      test/cpp/end2end/xds/xds_end2end_test.cc
  39. 2
      test/cpp/end2end/xds/xds_end2end_test_lib.cc
  40. 6
      test/cpp/end2end/xds/xds_end2end_test_lib.h
  41. 2
      test/cpp/end2end/xds/xds_fallback_end2end_test.cc
  42. 8
      test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
  43. 8
      test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
  44. 4
      test/cpp/end2end/xds/xds_http_connect_end2end_test.cc
  45. 8
      test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
  46. 2
      test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
  47. 4
      test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
  48. 1
      test/cpp/end2end/xds/xds_rls_end2end_test.cc
  49. 4
      test/cpp/end2end/xds/xds_routing_end2end_test.cc
  50. 2
      test/cpp/end2end/xds/xds_server.cc
  51. 9
      test/cpp/end2end/xds/xds_server.h
  52. 2
      test/cpp/end2end/xds/xds_utils.cc
  53. 4
      test/cpp/end2end/xds/xds_wrr_end2end_test.cc
  54. 6
      test/cpp/ext/filters/census/BUILD
  55. 6
      test/cpp/ext/filters/logging/BUILD
  56. 2
      test/cpp/ext/gcp/BUILD
  57. 2
      test/cpp/grpclb/BUILD
  58. 56
      test/cpp/interop/BUILD
  59. 8
      test/cpp/microbenchmarks/BUILD
  60. 2
      test/cpp/performance/BUILD
  61. 20
      test/cpp/qps/BUILD
  62. 6
      test/cpp/server/BUILD
  63. 2
      test/cpp/test/BUILD
  64. 30
      test/cpp/util/BUILD
  65. 11
      tools/buildgen/extract_metadata_from_bazel_xml.py

22
BUILD

@ -2057,7 +2057,7 @@ grpc_cc_library(
":gpr", ":gpr",
":grpc++", ":grpc++",
":lb_load_reporter", ":lb_load_reporter",
"//src/proto/grpc/lb/v1:load_reporter_proto", "//src/proto/grpc/lb/v1:load_reporter_cc_grpc",
], ],
) )
@ -2104,7 +2104,7 @@ grpc_cc_library(
"gpr", "gpr",
"lb_get_cpu_stats", "lb_get_cpu_stats",
"lb_load_data_store", "lb_load_data_store",
"//src/proto/grpc/lb/v1:load_reporter_proto", "//src/proto/grpc/lb/v1:load_reporter_cc_grpc",
], ],
) )
@ -2524,8 +2524,8 @@ grpc_cc_library(
"config_vars", "config_vars",
"grpc++", "grpc++",
"grpc++_config_proto", "grpc++_config_proto",
"//src/proto/grpc/reflection/v1:reflection_proto", "//src/proto/grpc/reflection/v1:reflection_cc_grpc",
"//src/proto/grpc/reflection/v1alpha:reflection_proto", "//src/proto/grpc/reflection/v1alpha:reflection_cc_grpc",
], ],
alwayslink = 1, alwayslink = 1,
) )
@ -2633,7 +2633,7 @@ grpc_cc_library(
"grpc", "grpc",
"grpc++", "grpc++",
"grpc++_config_proto", "grpc++_config_proto",
"//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/channelz:channelz_cc_grpc",
], ],
alwayslink = 1, alwayslink = 1,
) )
@ -2656,7 +2656,7 @@ grpc_cc_library(
"gpr", "gpr",
"grpc", "grpc",
"grpc++_base", "grpc++_base",
"//src/proto/grpc/testing/xds/v3:csds_proto", "//src/proto/grpc/testing/xds/v3:csds_cc_grpc",
], ],
alwayslink = 1, alwayslink = 1,
) )
@ -5105,7 +5105,7 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "grpc_health_upb", name = "grpc_health_upb",
deps = ["//src/proto/grpc/health/v1:health_proto_descriptor"], deps = ["//src/proto/grpc/health/v1:health_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
@ -5125,7 +5125,7 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "grpc_lb_upb", name = "grpc_lb_upb",
deps = ["//src/proto/grpc/lb/v1:load_balancer_proto_descriptor"], deps = ["//src/proto/grpc/lb/v1:load_balancer_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
@ -5135,17 +5135,17 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "rls_upb", name = "rls_upb",
deps = ["//src/proto/grpc/lookup/v1:rls_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
name = "rls_config_upb", name = "rls_config_upb",
deps = ["//src/proto/grpc/lookup/v1:rls_config_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_config_proto"],
) )
grpc_upb_proto_reflection_library( grpc_upb_proto_reflection_library(
name = "rls_config_upbdefs", name = "rls_config_upbdefs",
deps = ["//src/proto/grpc/lookup/v1:rls_config_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_config_proto"],
) )
WELL_KNOWN_PROTO_TARGETS = [ WELL_KNOWN_PROTO_TARGETS = [

@ -30,6 +30,7 @@ Contains macros used throughout the repo.
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner") load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library") load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS") load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS") load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS")
@ -242,6 +243,25 @@ def grpc_proto_plugin(name, srcs = [], deps = []):
deps = deps, deps = deps,
) )
def grpc_internal_proto_library(
name,
srcs = [],
deps = [],
visibility = None,
has_services = False): # buildifier: disable=unused-variable
proto_library(
name = name,
srcs = srcs,
deps = deps,
visibility = visibility,
)
def grpc_cc_proto_library(name, deps = [], visibility = None):
native.cc_proto_library(name = name, deps = deps, visibility = visibility)
# DO NOT USE -- callers should instead be changed to use separate
# grpc_internal_proto_library(), grpc_cc_proto_library(), and
# grpc_cc_grpc_library() rules.
def grpc_proto_library( def grpc_proto_library(
name, name,
srcs = [], srcs = [],
@ -262,6 +282,27 @@ def grpc_proto_library(
generate_mocks = generate_mocks, generate_mocks = generate_mocks,
) )
def grpc_cc_grpc_library(
name,
srcs = [],
deps = [],
visibility = None,
generate_mocks = False):
"""A wrapper around cc_grpc_library that forces grpc_only=True.
Callers are expected to have their own proto_library() and
cc_proto_library() rules and then use this rule to produce only the
gRPC generated code.
"""
cc_grpc_library(
name = name,
srcs = srcs,
deps = deps,
visibility = visibility,
generate_mocks = generate_mocks,
grpc_only = True,
)
def ios_cc_test( def ios_cc_test(
name, name,
tags = [], tags = [],

@ -21,7 +21,7 @@ cc_binary(
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//examples/protos:helloworld_cc_grpc", "//examples/protos:helloworld_cc_grpc",
"//src/proto/grpc/status:status_proto", "//src/proto/grpc/status:status_cc_proto",
"@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/flags:parse", "@com_google_absl//absl/flags:parse",
"@com_google_googleapis//google/rpc:error_details_cc_proto", "@com_google_googleapis//google/rpc:error_details_cc_proto",
@ -36,7 +36,7 @@ cc_binary(
"//:grpc++", "//:grpc++",
"//:grpc++_reflection", "//:grpc++_reflection",
"//examples/protos:helloworld_cc_grpc", "//examples/protos:helloworld_cc_grpc",
"//src/proto/grpc/status:status_proto", "//src/proto/grpc/status:status_cc_proto",
"@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/flags:parse", "@com_google_absl//absl/flags:parse",
"@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/strings:str_format",

@ -21,7 +21,7 @@ cc_binary(
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//examples/protos:helloworld_cc_grpc", "//examples/protos:helloworld_cc_grpc",
"//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/health/v1:health_cc_grpc",
"@com_google_absl//absl/flags:flag", "@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/flags:parse", "@com_google_absl//absl/flags:parse",
], ],

@ -8883,7 +8883,7 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "grpc_health_upb", name = "grpc_health_upb",
deps = ["//src/proto/grpc/health/v1:health_proto_descriptor"], deps = ["//src/proto/grpc/health/v1:health_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
@ -8903,7 +8903,7 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "grpc_lb_upb", name = "grpc_lb_upb",
deps = ["//src/proto/grpc/lb/v1:load_balancer_proto_descriptor"], deps = ["//src/proto/grpc/lb/v1:load_balancer_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
@ -8913,17 +8913,17 @@ grpc_upb_proto_library(
grpc_upb_proto_library( grpc_upb_proto_library(
name = "rls_upb", name = "rls_upb",
deps = ["//src/proto/grpc/lookup/v1:rls_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_proto"],
) )
grpc_upb_proto_library( grpc_upb_proto_library(
name = "rls_config_upb", name = "rls_config_upb",
deps = ["//src/proto/grpc/lookup/v1:rls_config_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_config_proto"],
) )
grpc_upb_proto_reflection_library( grpc_upb_proto_reflection_library(
name = "rls_config_upbdefs", name = "rls_config_upbdefs",
deps = ["//src/proto/grpc/lookup/v1:rls_config_proto_descriptor"], deps = ["//src/proto/grpc/lookup/v1:rls_config_proto"],
) )
WELL_KNOWN_PROTO_TARGETS = [ WELL_KNOWN_PROTO_TARGETS = [

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,16 +21,10 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "channelz_proto", name = "channelz_proto",
srcs = ["channelz.proto"], srcs = ["channelz.proto"],
has_services = True, has_services = True,
well_known_protos = True,
)
proto_library(
name = "channelz_proto_descriptors",
srcs = ["channelz.proto"],
deps = [ deps = [
"@com_google_protobuf//:any_proto", "@com_google_protobuf//:any_proto",
"@com_google_protobuf//:duration_proto", "@com_google_protobuf//:duration_proto",
@ -40,6 +33,17 @@ proto_library(
], ],
) )
grpc_cc_proto_library(
name = "channelz_cc_proto",
deps = ["channelz_proto"],
)
grpc_cc_grpc_library(
name = "channelz_cc_grpc",
srcs = ["channelz_proto"],
deps = ["channelz_cc_proto"],
)
filegroup( filegroup(
name = "channelz_proto_file", name = "channelz_proto_file",
srcs = [ srcs = [

@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_internal_proto_library")
licenses(["notice"]) licenses(["notice"])
proto_library( grpc_internal_proto_library(
name = "alts_handshaker_proto", name = "alts_handshaker_proto",
srcs = [ srcs = [
"altscontext.proto", "altscontext.proto",

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,14 +21,21 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "health_proto", name = "health_proto",
srcs = ["health.proto"], srcs = ["health.proto"],
has_services = True,
) )
proto_library( grpc_cc_proto_library(
name = "health_proto_descriptor", name = "health_cc_proto",
srcs = ["health.proto"], deps = ["health_proto"],
)
grpc_cc_grpc_library(
name = "health_cc_grpc",
srcs = ["health_proto"],
deps = ["health_cc_proto"],
) )
filegroup( filegroup(

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,26 +21,43 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "load_balancer_proto", name = "load_balancer_proto",
srcs = [
"load_balancer.proto",
],
well_known_protos = True,
)
proto_library(
name = "load_balancer_proto_descriptor",
srcs = ["load_balancer.proto"], srcs = ["load_balancer.proto"],
has_services = True,
deps = [ deps = [
"@com_google_protobuf//:duration_proto", "@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:timestamp_proto", "@com_google_protobuf//:timestamp_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "load_balancer_cc_proto",
deps = ["load_balancer_proto"],
)
grpc_cc_grpc_library(
name = "load_balancer_cc_grpc",
srcs = ["load_balancer_proto"],
deps = ["load_balancer_cc_proto"],
)
grpc_internal_proto_library(
name = "load_reporter_proto", name = "load_reporter_proto",
srcs = ["load_reporter.proto"], srcs = ["load_reporter.proto"],
has_services = True, has_services = True,
well_known_protos = True, deps = [
"@com_google_protobuf//:duration_proto",
],
)
grpc_cc_proto_library(
name = "load_reporter_cc_proto",
deps = ["load_reporter_proto"],
)
grpc_cc_grpc_library(
name = "load_reporter_cc_grpc",
srcs = ["load_reporter_proto"],
deps = ["load_reporter_cc_proto"],
) )

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,27 +21,38 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "rls_proto", name = "rls_proto",
srcs = ["rls.proto"], srcs = ["rls.proto"],
well_known_protos = True, has_services = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "rls_config_proto", name = "rls_cc_proto",
srcs = ["rls_config.proto"], deps = ["rls_proto"],
well_known_protos = True,
) )
proto_library( grpc_cc_grpc_library(
name = "rls_proto_descriptor", name = "rls_cc_grpc",
srcs = ["rls.proto"], srcs = ["rls_proto"],
deps = ["rls_cc_proto"],
) )
proto_library( grpc_internal_proto_library(
name = "rls_config_proto_descriptor", name = "rls_config_proto",
srcs = ["rls_config.proto"], srcs = ["rls_config.proto"],
deps = [ deps = [
"@com_google_protobuf//:duration_proto", "@com_google_protobuf//:duration_proto",
], ],
) )
grpc_cc_proto_library(
name = "rls_config_cc_proto",
deps = ["rls_config_proto"],
)
grpc_cc_grpc_library(
name = "rls_config_cc_grpc",
srcs = ["rls_config_proto"],
deps = ["rls_config_cc_proto"],
)

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,14 +21,21 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "reflection_proto", name = "reflection_proto",
srcs = ["reflection.proto"], srcs = ["reflection.proto"],
has_services = True,
) )
proto_library( grpc_cc_proto_library(
name = "reflection_proto_descriptor", name = "reflection_cc_proto",
srcs = ["reflection.proto"], deps = ["reflection_proto"],
)
grpc_cc_grpc_library(
name = "reflection_cc_grpc",
srcs = ["reflection_proto"],
deps = ["reflection_cc_proto"],
) )
filegroup( filegroup(

@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -22,14 +21,21 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "reflection_proto", name = "reflection_proto",
srcs = ["reflection.proto"], srcs = ["reflection.proto"],
has_services = True,
) )
proto_library( grpc_cc_proto_library(
name = "reflection_proto_descriptor", name = "reflection_cc_proto",
srcs = ["reflection.proto"], deps = ["reflection_proto"],
)
grpc_cc_grpc_library(
name = "reflection_cc_grpc",
srcs = ["reflection_proto"],
deps = ["reflection_cc_proto"],
) )
filegroup( filegroup(

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
licenses(["notice"]) licenses(["notice"])
@ -21,9 +21,15 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "status_proto", name = "status_proto",
srcs = ["status.proto"], srcs = ["status.proto"],
has_services = False, deps = [
well_known_protos = True, "@com_google_protobuf//:any_proto",
],
)
grpc_cc_proto_library(
name = "status_cc_proto",
deps = ["status_proto"],
) )

@ -12,8 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library") load(
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") "//bazel:grpc_build_system.bzl",
"grpc_cc_grpc_library",
"grpc_cc_proto_library",
"grpc_internal_proto_library",
"grpc_package",
"grpc_proto_library",
)
load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -32,24 +38,45 @@ exports_files([
"test.proto", "test.proto",
]) ])
grpc_proto_library( grpc_internal_proto_library(
name = "compiler_test_proto", name = "compiler_test_proto",
srcs = ["compiler_test.proto"], srcs = ["compiler_test.proto"],
has_services = True,
)
grpc_cc_proto_library(
name = "compiler_test_cc_proto",
deps = ["compiler_test_proto"],
)
grpc_cc_grpc_library(
name = "compiler_test_cc_grpc",
srcs = ["compiler_test_proto"],
generate_mocks = True, generate_mocks = True,
deps = ["compiler_test_cc_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "control_proto", name = "control_proto",
srcs = ["control.proto"], srcs = ["control.proto"],
has_services = False,
well_known_protos = True,
deps = [ deps = [
"payloads_proto", "payloads_proto",
"stats_proto", "stats_proto",
"@com_google_protobuf//:timestamp_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "control_cc_proto",
deps = ["control_proto"],
)
py_proto_library(
name = "control_py_pb2",
deps = [":control_proto"],
)
grpc_internal_proto_library(
name = "echo_messages_proto", name = "echo_messages_proto",
srcs = ["echo_messages.proto"], srcs = ["echo_messages.proto"],
deps = [ deps = [
@ -57,237 +84,315 @@ grpc_proto_library(
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "echo_messages_cc_proto",
deps = ["echo_messages_proto"],
)
grpc_internal_proto_library(
name = "echo_proto", name = "echo_proto",
srcs = ["echo.proto"], srcs = ["echo.proto"],
generate_mocks = True, has_services = True,
deps = [ deps = [
"echo_messages_proto", "echo_messages_proto",
"simple_messages_proto", "simple_messages_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "echo_cc_proto",
deps = ["echo_proto"],
)
grpc_cc_grpc_library(
name = "echo_cc_grpc",
srcs = ["echo_proto"],
generate_mocks = True,
deps = [
"echo_cc_proto",
"echo_messages_cc_proto",
"simple_messages_cc_proto",
],
)
grpc_internal_proto_library(
name = "empty_proto", name = "empty_proto",
srcs = ["empty.proto"], srcs = ["empty.proto"],
has_services = False,
) )
proto_library( grpc_cc_proto_library(
name = "empty_proto_descriptor", name = "empty_cc_proto",
srcs = ["empty.proto"], deps = ["empty_proto"],
) )
py_proto_library( py_proto_library(
name = "empty_py_pb2", name = "empty_py_pb2",
deps = [":empty_proto_descriptor"], deps = [":empty_proto"],
) )
py_grpc_library( py_grpc_library(
name = "empty_py_pb2_grpc", name = "empty_py_pb2_grpc",
srcs = [":empty_proto_descriptor"], srcs = [":empty_proto"],
deps = [":empty_py_pb2"], deps = [":empty_py_pb2"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "messages_proto", name = "messages_proto",
srcs = ["messages.proto"], srcs = ["messages.proto"],
has_services = False,
) )
proto_library( grpc_cc_proto_library(
name = "messages_proto_descriptor", name = "messages_cc_proto",
srcs = ["messages.proto"], deps = ["messages_proto"],
) )
py_proto_library( py_proto_library(
name = "py_messages_proto", name = "py_messages_proto",
deps = [":messages_proto_descriptor"], deps = [":messages_proto"],
) )
py_grpc_library( py_grpc_library(
name = "messages_py_pb2_grpc", name = "messages_py_pb2_grpc",
srcs = [":messages_proto_descriptor"], srcs = [":messages_proto"],
deps = [":py_messages_proto"], deps = [":py_messages_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "metrics_proto", name = "metrics_proto",
srcs = ["metrics.proto"], srcs = ["metrics.proto"],
has_services = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "metrics_cc_proto",
deps = ["metrics_proto"],
)
grpc_cc_grpc_library(
name = "metrics_cc_grpc",
srcs = ["metrics_proto"],
deps = ["metrics_cc_proto"],
)
grpc_internal_proto_library(
name = "payloads_proto", name = "payloads_proto",
srcs = ["payloads.proto"], srcs = ["payloads.proto"],
has_services = False,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "payloads_cc_proto",
deps = ["payloads_proto"],
)
py_proto_library(
name = "payloads_py_pb2",
deps = [":payloads_proto"],
)
grpc_internal_proto_library(
name = "benchmark_service_proto", name = "benchmark_service_proto",
srcs = ["benchmark_service.proto"], srcs = ["benchmark_service.proto"],
has_services = True,
deps = [ deps = [
"messages_proto", "messages_proto",
], ],
) )
proto_library( grpc_cc_proto_library(
name = "benchmark_service_descriptor", name = "benchmark_service_cc_proto",
srcs = ["benchmark_service.proto"], deps = ["benchmark_service_proto"],
deps = [":messages_proto_descriptor"], )
grpc_cc_grpc_library(
name = "benchmark_service_cc_grpc",
srcs = ["benchmark_service_proto"],
deps = [
"benchmark_service_cc_proto",
"messages_cc_proto",
],
) )
py_proto_library( py_proto_library(
name = "benchmark_service_py_pb2", name = "benchmark_service_py_pb2",
deps = [":benchmark_service_descriptor"], deps = [":benchmark_service_proto"],
) )
py_grpc_library( py_grpc_library(
name = "benchmark_service_py_pb2_grpc", name = "benchmark_service_py_pb2_grpc",
srcs = [":benchmark_service_descriptor"], srcs = [":benchmark_service_proto"],
deps = [":benchmark_service_py_pb2"], deps = [":benchmark_service_py_pb2"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "report_qps_scenario_service_proto", name = "report_qps_scenario_service_proto",
srcs = ["report_qps_scenario_service.proto"], srcs = ["report_qps_scenario_service.proto"],
has_services = True,
deps = [ deps = [
"control_proto", "control_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "report_qps_scenario_service_cc_proto",
deps = ["report_qps_scenario_service_proto"],
)
grpc_cc_grpc_library(
name = "report_qps_scenario_service_cc_grpc",
srcs = ["report_qps_scenario_service_proto"],
deps = [
"control_cc_proto",
"report_qps_scenario_service_cc_proto",
],
)
grpc_internal_proto_library(
name = "worker_service_proto", name = "worker_service_proto",
srcs = ["worker_service.proto"], srcs = ["worker_service.proto"],
has_services = True,
deps = [ deps = [
"control_proto", "control_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "worker_service_cc_proto",
deps = ["worker_service_proto"],
)
grpc_cc_grpc_library(
name = "worker_service_cc_grpc",
srcs = ["worker_service_proto"],
deps = [
"control_cc_proto",
"worker_service_cc_proto",
],
)
py_proto_library(
name = "worker_service_py_pb2",
deps = [":worker_service_proto"],
)
py_grpc_library(
name = "worker_service_py_pb2_grpc",
srcs = [":worker_service_proto"],
deps = [":worker_service_py_pb2"],
)
grpc_internal_proto_library(
name = "simple_messages_proto", name = "simple_messages_proto",
srcs = ["simple_messages.proto"], srcs = ["simple_messages.proto"],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "stats_proto", name = "simple_messages_cc_proto",
srcs = ["stats.proto"], deps = [":simple_messages_proto"],
has_services = False,
) )
grpc_proto_library( grpc_internal_proto_library(
name = "test_proto", name = "stats_proto",
srcs = ["test.proto"], srcs = ["stats.proto"],
deps = [
"empty_proto",
"messages_proto",
],
) )
# Test that grpc_proto_library/cc_grpc_library can consume generated files grpc_cc_proto_library(
genrule( name = "stats_cc_proto",
name = "messages_gen_proto_file", deps = ["stats_proto"],
srcs = ["messages.proto"],
outs = ["messages_gen.proto"],
cmd = "cp $< $@",
) )
grpc_proto_library( py_proto_library(
name = "messages_gen_proto", name = "stats_py_pb2",
srcs = ["messages_gen_proto_file"], deps = [":stats_proto"],
has_services = False,
) )
genrule( grpc_internal_proto_library(
name = "test_gen_proto_file", name = "test_proto",
srcs = ["test.proto"], srcs = ["test.proto"],
outs = ["test_gen.proto"], has_services = True,
cmd = "sed 's/messages.proto/messages_gen.proto/' $< > $@",
)
# Consume generated files in srcs and in deps
grpc_proto_library(
name = "test_gen_proto",
srcs = ["test_gen_proto_file"],
deps = [ deps = [
"empty_proto", "empty_proto",
"messages_gen_proto", "messages_proto",
], ],
) )
proto_library( grpc_cc_proto_library(
name = "test_proto_descriptor", name = "test_cc_proto",
srcs = ["test.proto"], deps = ["test_proto"],
deps = [ )
":empty_proto_descriptor",
":messages_proto_descriptor", grpc_cc_grpc_library(
], name = "test_cc_grpc",
srcs = ["test_proto"],
deps = ["test_cc_proto"],
) )
py_proto_library( py_proto_library(
name = "py_test_proto", name = "py_test_proto",
deps = [":test_proto_descriptor"], deps = [":test_proto"],
) )
py_grpc_library( py_grpc_library(
name = "test_py_pb2_grpc", name = "test_py_pb2_grpc",
srcs = [":test_proto_descriptor"], srcs = [":test_proto"],
deps = [":py_test_proto"], deps = [":py_test_proto"],
) )
proto_library( grpc_internal_proto_library(
name = "worker_service_descriptor", name = "istio_echo_proto",
srcs = ["worker_service.proto"], srcs = ["istio_echo.proto"],
deps = [":control_descriptor"], has_services = True,
deps = [
"@com_google_protobuf//:wrappers_proto",
],
) )
py_proto_library( grpc_cc_proto_library(
name = "worker_service_py_pb2", name = "istio_echo_cc_proto",
deps = [":worker_service_descriptor"], deps = ["istio_echo_proto"],
) )
py_grpc_library( grpc_cc_grpc_library(
name = "worker_service_py_pb2_grpc", name = "istio_echo_cc_grpc",
srcs = [":worker_service_descriptor"], srcs = ["istio_echo_proto"],
deps = [":worker_service_py_pb2"], deps = ["istio_echo_cc_proto"],
) )
proto_library( # Test that grpc_proto_library/cc_grpc_library can consume generated files
name = "stats_descriptor", genrule(
srcs = ["stats.proto"], name = "messages_gen_proto_file",
srcs = ["messages.proto"],
outs = ["messages_gen.proto"],
cmd = "cp $< $@",
) )
py_proto_library( grpc_proto_library(
name = "stats_py_pb2", name = "messages_gen_proto",
deps = [":stats_descriptor"], srcs = ["messages_gen_proto_file"],
has_services = False,
) )
proto_library( genrule(
name = "payloads_descriptor", name = "test_gen_proto_file",
srcs = ["payloads.proto"], srcs = ["test.proto"],
outs = ["test_gen.proto"],
cmd = "sed 's/messages.proto/messages_gen.proto/' $< > $@",
) )
py_proto_library( # The test_gen_proto rule below expects the name that grpc_proto_library
name = "payloads_py_pb2", # would have generated for the dependency, but the dependency was actually
deps = [":payloads_descriptor"], # generated by a separate proto_library rule, so we use an alias to make
# things work.
alias(
name = "_empty_proto_only",
actual = "empty_proto",
) )
proto_library( # Consume generated files in srcs and in deps
name = "control_descriptor", grpc_proto_library(
srcs = ["control.proto"], name = "test_gen_proto",
srcs = ["test_gen_proto_file"],
deps = [ deps = [
":payloads_descriptor", "empty_proto",
":stats_descriptor", "messages_gen_proto",
"@com_google_protobuf//:timestamp_proto",
], ],
) )
py_proto_library(
name = "control_py_pb2",
deps = [":control_descriptor"],
)
grpc_proto_library(
name = "istio_echo_proto",
srcs = ["istio_echo.proto"],
well_known_protos = True,
)

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
licenses(["notice"]) licenses(["notice"])
@ -21,8 +21,20 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "echo_duplicate_proto", name = "echo_duplicate_proto",
srcs = ["echo_duplicate.proto"], srcs = ["echo_duplicate.proto"],
has_services = True,
deps = ["//src/proto/grpc/testing:echo_messages_proto"], deps = ["//src/proto/grpc/testing:echo_messages_proto"],
) )
grpc_cc_proto_library(
name = "echo_duplicate_cc_proto",
deps = ["echo_duplicate_proto"],
)
grpc_cc_grpc_library(
name = "echo_duplicate_cc_grpc",
srcs = ["echo_duplicate_proto"],
deps = ["echo_duplicate_cc_proto"],
)

@ -11,12 +11,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//bazel:grpc_build_system.bzl", "grpc_internal_proto_library")
load("//bazel:python_rules.bzl", "py_proto_library") load("//bazel:python_rules.bzl", "py_proto_library")
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
proto_library( grpc_internal_proto_library(
name = "empty2_proto_descriptor", name = "empty2_proto_descriptor",
srcs = ["empty2.proto"], srcs = ["empty2.proto"],
) )
@ -26,7 +27,7 @@ py_proto_library(
deps = [":empty2_proto_descriptor"], deps = [":empty2_proto_descriptor"],
) )
proto_library( grpc_internal_proto_library(
name = "empty2_extensions_proto_descriptor", name = "empty2_extensions_proto_descriptor",
srcs = ["empty2_extensions.proto"], srcs = ["empty2_extensions.proto"],
deps = [ deps = [

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_grpc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
licenses(["notice"]) licenses(["notice"])
@ -26,68 +26,93 @@ grpc_package(
visibility = "tests", visibility = "tests",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "address_proto", name = "address_proto",
srcs = [ srcs = ["address.proto"],
"address.proto", deps = [
"@com_google_protobuf//:wrappers_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "address_cc_proto",
deps = ["address_proto"],
)
grpc_internal_proto_library(
name = "percent_proto", name = "percent_proto",
srcs = [ srcs = ["percent.proto"],
"percent.proto", )
],
grpc_cc_proto_library(
name = "percent_cc_proto",
deps = ["percent_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "base_proto", name = "base_proto",
srcs = [ srcs = ["base.proto"],
"base.proto",
],
well_known_protos = True,
deps = [ deps = [
"percent_proto", "percent_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:struct_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "base_cc_proto",
deps = ["base_proto"],
)
grpc_internal_proto_library(
name = "discovery_proto", name = "discovery_proto",
srcs = [ srcs = ["discovery.proto"],
"discovery.proto", has_services = True,
],
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:duration_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "discovery_cc_proto",
deps = ["discovery_proto"],
)
grpc_internal_proto_library(
name = "ads_proto", name = "ads_proto",
srcs = [ srcs = ["ads.proto"],
"ads.proto",
],
has_services = True, has_services = True,
well_known_protos = True,
deps = [ deps = [
"discovery_proto", "discovery_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "ads_cc_proto",
deps = ["ads_proto"],
)
grpc_cc_grpc_library(
name = "ads_cc_grpc",
srcs = ["ads_proto"],
deps = ["ads_cc_proto"],
)
grpc_internal_proto_library(
name = "config_source_proto", name = "config_source_proto",
srcs = [ srcs = ["config_source.proto"],
"config_source.proto", )
],
grpc_cc_proto_library(
name = "config_source_cc_proto",
deps = ["config_source_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "cluster_proto", name = "cluster_proto",
srcs = [ srcs = ["cluster.proto"],
"cluster.proto",
],
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"config_source_proto", "config_source_proto",
@ -95,152 +120,217 @@ grpc_proto_library(
"extension_proto", "extension_proto",
"health_check_proto", "health_check_proto",
"outlier_detection_proto", "outlier_detection_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "cluster_cc_proto",
deps = ["cluster_proto"],
)
grpc_internal_proto_library(
name = "endpoint_proto", name = "endpoint_proto",
srcs = [ srcs = ["endpoint.proto"],
"endpoint.proto",
],
well_known_protos = True,
deps = [ deps = [
"address_proto", "address_proto",
"base_proto", "base_proto",
"health_check_proto", "health_check_proto",
"percent_proto", "percent_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "endpoint_cc_proto",
deps = ["endpoint_proto"],
)
grpc_internal_proto_library(
name = "health_check_proto", name = "health_check_proto",
srcs = [ srcs = ["health_check.proto"],
"health_check.proto", )
],
grpc_cc_proto_library(
name = "health_check_cc_proto",
deps = ["health_check_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "extension_proto", name = "extension_proto",
srcs = [ srcs = ["extension.proto"],
"extension.proto", deps = [
"@com_google_protobuf//:any_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "extension_cc_proto",
deps = ["extension_proto"],
)
grpc_internal_proto_library(
name = "path_proto", name = "path_proto",
srcs = [ srcs = ["path.proto"],
"path.proto",
],
well_known_protos = True,
deps = [ deps = [
"string_proto", "string_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "path_cc_proto",
deps = ["path_proto"],
)
grpc_internal_proto_library(
name = "listener_proto", name = "listener_proto",
srcs = [ srcs = ["listener.proto"],
"listener.proto",
],
well_known_protos = True,
deps = [ deps = [
"address_proto", "address_proto",
"base_proto", "base_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "listener_cc_proto",
deps = ["listener_proto"],
)
grpc_internal_proto_library(
name = "load_report_proto", name = "load_report_proto",
srcs = [ srcs = ["load_report.proto"],
"load_report.proto",
],
well_known_protos = True,
deps = [ deps = [
"address_proto", "address_proto",
"base_proto", "base_proto",
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:struct_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "load_report_cc_proto",
deps = ["load_report_proto"],
)
grpc_internal_proto_library(
name = "lrs_proto", name = "lrs_proto",
srcs = [ srcs = ["lrs.proto"],
"lrs.proto",
],
has_services = True, has_services = True,
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"load_report_proto", "load_report_proto",
"@com_google_protobuf//:duration_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "lrs_cc_proto",
deps = ["lrs_proto"],
)
grpc_cc_grpc_library(
name = "lrs_cc_grpc",
srcs = ["lrs_proto"],
deps = ["lrs_cc_proto"],
)
grpc_internal_proto_library(
name = "orca_load_report_proto", name = "orca_load_report_proto",
srcs = [ srcs = ["orca_load_report.proto"],
"orca_load_report.proto", )
],
grpc_cc_proto_library(
name = "orca_load_report_cc_proto",
deps = ["orca_load_report_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "orca_service_proto", name = "orca_service_proto",
srcs = [ srcs = ["orca_service.proto"],
"orca_service.proto",
],
has_services = True, has_services = True,
well_known_protos = True,
deps = [ deps = [
"orca_load_report_proto", "orca_load_report_proto",
"@com_google_protobuf//:duration_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "orca_service_cc_proto",
deps = ["orca_service_proto"],
)
grpc_cc_grpc_library(
name = "orca_service_cc_grpc",
srcs = ["orca_service_proto"],
deps = ["orca_service_cc_proto"],
)
grpc_internal_proto_library(
name = "outlier_detection_proto", name = "outlier_detection_proto",
srcs = [ srcs = ["outlier_detection.proto"],
"outlier_detection.proto", deps = [
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
has_services = True,
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "outlier_detection_cc_proto",
deps = ["outlier_detection_proto"],
)
grpc_internal_proto_library(
name = "protocol_proto", name = "protocol_proto",
srcs = [ srcs = ["protocol.proto"],
"protocol.proto", deps = [
"@com_google_protobuf//:duration_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "protocol_cc_proto",
deps = ["protocol_proto"],
)
grpc_internal_proto_library(
name = "http_protocol_options_proto", name = "http_protocol_options_proto",
srcs = [ srcs = ["http_protocol_options.proto"],
"http_protocol_options.proto",
],
deps = [ deps = [
"protocol_proto", "protocol_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "http_protocol_options_cc_proto",
deps = ["http_protocol_options_proto"],
)
grpc_internal_proto_library(
name = "range_proto", name = "range_proto",
srcs = [ srcs = ["range.proto"],
"range.proto",
],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "range_cc_proto",
deps = ["range_proto"],
)
grpc_internal_proto_library(
name = "regex_proto", name = "regex_proto",
srcs = [ srcs = ["regex.proto"],
"regex.proto",
],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "regex_cc_proto",
deps = ["regex_proto"],
)
grpc_internal_proto_library(
name = "route_proto", name = "route_proto",
srcs = [ srcs = ["route.proto"],
"route.proto",
],
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"extension_proto", "extension_proto",
@ -248,151 +338,204 @@ grpc_proto_library(
"range_proto", "range_proto",
"regex_proto", "regex_proto",
"string_proto", "string_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "route_cc_proto",
deps = ["route_proto"],
)
grpc_internal_proto_library(
name = "http_connection_manager_proto", name = "http_connection_manager_proto",
srcs = [ srcs = ["http_connection_manager.proto"],
"http_connection_manager.proto",
],
well_known_protos = True,
deps = [ deps = [
"config_source_proto", "config_source_proto",
"extension_proto", "extension_proto",
"protocol_proto", "protocol_proto",
"route_proto", "route_proto",
"@com_google_protobuf//:any_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "http_connection_manager_cc_proto",
deps = ["http_connection_manager_proto"],
)
grpc_internal_proto_library(
name = "router_proto", name = "router_proto",
srcs = [ srcs = ["router.proto"],
"router.proto", )
],
grpc_cc_proto_library(
name = "router_cc_proto",
deps = ["router_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "string_proto", name = "string_proto",
srcs = [ srcs = ["string.proto"],
"string.proto",
],
well_known_protos = True,
deps = [ deps = [
"regex_proto", "regex_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "string_cc_proto",
deps = ["string_proto"],
)
grpc_internal_proto_library(
name = "aggregate_cluster_proto", name = "aggregate_cluster_proto",
srcs = [ srcs = ["aggregate_cluster.proto"],
"aggregate_cluster.proto",
],
well_known_protos = True,
deps = [ deps = [
"string_proto", "string_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "aggregate_cluster_cc_proto",
deps = ["aggregate_cluster_proto"],
)
grpc_internal_proto_library(
name = "fault_common_proto", name = "fault_common_proto",
srcs = [ srcs = ["fault_common.proto"],
"fault_common.proto",
],
well_known_protos = True,
deps = [ deps = [
"percent_proto", "percent_proto",
"@com_google_protobuf//:duration_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "fault_common_cc_proto",
deps = ["fault_common_proto"],
)
grpc_internal_proto_library(
name = "tls_proto", name = "tls_proto",
srcs = [ srcs = ["tls.proto"],
"tls.proto",
],
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"extension_proto", "extension_proto",
"string_proto", "string_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "tls_cc_proto",
deps = ["tls_proto"],
)
grpc_internal_proto_library(
name = "upstream_http_11_connect_proto", name = "upstream_http_11_connect_proto",
srcs = [ srcs = ["upstream_http_11_connect.proto"],
"upstream_http_11_connect.proto",
],
deps = [ deps = [
"base_proto", "base_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "upstream_http_11_connect_cc_proto",
deps = ["upstream_http_11_connect_proto"],
)
grpc_internal_proto_library(
name = "config_dump_proto", name = "config_dump_proto",
srcs = [ srcs = ["config_dump.proto"],
"config_dump.proto", deps = [
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:timestamp_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "config_dump_cc_proto",
deps = ["config_dump_proto"],
)
grpc_internal_proto_library(
name = "csds_proto", name = "csds_proto",
srcs = [ srcs = ["csds.proto"],
"csds.proto", has_services = True,
],
# Needs to be visible to //:grpcpp_csds
visibility = ["//:__subpackages__"],
well_known_protos = True,
deps = [ deps = [
"base_proto", "base_proto",
"config_dump_proto", "config_dump_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:timestamp_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "csds_cc_proto",
deps = ["csds_proto"],
)
grpc_cc_grpc_library(
name = "csds_cc_grpc",
srcs = ["csds_proto"],
# Needs to be visible to //:grpcpp_csds
visibility = ["//:__subpackages__"],
deps = ["csds_cc_proto"],
)
grpc_internal_proto_library(
name = "fault_proto", name = "fault_proto",
srcs = [ srcs = ["fault.proto"],
"fault.proto",
],
well_known_protos = True,
deps = [ deps = [
"fault_common_proto", "fault_common_proto",
"percent_proto", "percent_proto",
"route_proto", "route_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "fault_cc_proto",
deps = ["fault_proto"],
)
grpc_internal_proto_library(
name = "gcp_authn_proto", name = "gcp_authn_proto",
srcs = [ srcs = ["gcp_authn.proto"],
"gcp_authn.proto", deps = [
"@com_google_protobuf//:wrappers_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "gcp_authn_cc_proto",
deps = ["gcp_authn_proto"],
)
grpc_internal_proto_library(
name = "metadata_proto", name = "metadata_proto",
srcs = [ srcs = ["metadata.proto"],
"metadata.proto", )
],
well_known_protos = True, grpc_cc_proto_library(
name = "metadata_cc_proto",
deps = ["metadata_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "expr_proto", name = "expr_proto",
srcs = [ srcs = ["expr.proto"],
"expr.proto", )
],
well_known_protos = True, grpc_cc_proto_library(
name = "expr_cc_proto",
deps = ["expr_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "rbac_proto", name = "rbac_proto",
srcs = [ srcs = ["rbac.proto"],
"rbac.proto",
],
well_known_protos = True,
deps = [ deps = [
"address_proto", "address_proto",
"expr_proto", "expr_proto",
@ -405,134 +548,181 @@ grpc_proto_library(
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "rbac_cc_proto",
deps = ["rbac_proto"],
)
grpc_internal_proto_library(
name = "http_filter_rbac_proto", name = "http_filter_rbac_proto",
srcs = [ srcs = ["http_filter_rbac.proto"],
"http_filter_rbac.proto",
],
well_known_protos = True,
deps = [ deps = [
"rbac_proto", "rbac_proto",
], ],
) )
# Contains stdout audit logger. grpc_cc_proto_library(
grpc_proto_library( name = "http_filter_rbac_cc_proto",
deps = ["http_filter_rbac_proto"],
)
grpc_internal_proto_library(
name = "audit_logger_stream_proto", name = "audit_logger_stream_proto",
srcs = [ srcs = ["audit_logger_stream.proto"],
"audit_logger_stream.proto", )
],
grpc_cc_proto_library(
name = "audit_logger_stream_cc_proto",
deps = ["audit_logger_stream_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "client_side_weighted_round_robin_proto", name = "client_side_weighted_round_robin_proto",
srcs = [ srcs = ["client_side_weighted_round_robin.proto"],
"client_side_weighted_round_robin.proto", deps = [
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:wrappers_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "client_side_weighted_round_robin_cc_proto",
deps = ["client_side_weighted_round_robin_proto"],
)
grpc_internal_proto_library(
name = "pick_first_proto", name = "pick_first_proto",
srcs = [ srcs = ["pick_first.proto"],
"pick_first.proto", )
],
well_known_protos = True, grpc_cc_proto_library(
name = "pick_first_cc_proto",
deps = ["pick_first_proto"],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "ring_hash_proto", name = "ring_hash_proto",
srcs = [ srcs = ["ring_hash.proto"],
"ring_hash.proto", deps = [
"@com_google_protobuf//:wrappers_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "ring_hash_cc_proto",
deps = ["ring_hash_proto"],
)
grpc_internal_proto_library(
name = "round_robin_proto", name = "round_robin_proto",
srcs = [ srcs = ["round_robin.proto"],
"round_robin.proto",
],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "round_robin_cc_proto",
deps = ["round_robin_proto"],
)
grpc_internal_proto_library(
name = "wrr_locality_proto", name = "wrr_locality_proto",
srcs = [ srcs = ["wrr_locality.proto"],
"wrr_locality.proto",
],
well_known_protos = True,
deps = [ deps = [
"cluster_proto", "cluster_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "wrr_locality_cc_proto",
deps = ["wrr_locality_proto"],
)
grpc_internal_proto_library(
name = "typed_struct_proto", name = "typed_struct_proto",
srcs = [ srcs = ["typed_struct.proto"],
"typed_struct.proto", deps = [
"@com_google_protobuf//:struct_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "typed_struct_cc_proto",
deps = ["typed_struct_proto"],
)
grpc_internal_proto_library(
name = "udpa_typed_struct_proto", name = "udpa_typed_struct_proto",
srcs = [ srcs = ["udpa_typed_struct.proto"],
"udpa_typed_struct.proto", deps = [
"@com_google_protobuf//:struct_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "udpa_typed_struct_cc_proto",
deps = ["udpa_typed_struct_proto"],
)
grpc_internal_proto_library(
name = "cookie_proto", name = "cookie_proto",
srcs = [ srcs = ["cookie.proto"],
"cookie.proto", deps = [
"@com_google_protobuf//:duration_proto",
], ],
well_known_protos = True,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "cookie_cc_proto",
deps = ["cookie_proto"],
)
grpc_internal_proto_library(
name = "stateful_session_cookie_proto", name = "stateful_session_cookie_proto",
srcs = [ srcs = ["stateful_session_cookie.proto"],
"stateful_session_cookie.proto",
],
deps = [ deps = [
"cookie_proto", "cookie_proto",
], ],
) )
grpc_proto_library( grpc_cc_proto_library(
name = "stateful_session_cookie_cc_proto",
deps = ["stateful_session_cookie_proto"],
)
grpc_internal_proto_library(
name = "stateful_session_proto", name = "stateful_session_proto",
srcs = [ srcs = ["stateful_session.proto"],
"stateful_session.proto",
],
deps = [ deps = [
"extension_proto", "extension_proto",
], ],
) )
grpc_cc_proto_library(
name = "stateful_session_cc_proto",
deps = ["stateful_session_proto"],
)
py_proto_library( py_proto_library(
name = "csds_py_pb2", name = "csds_py_pb2",
deps = [":_csds_proto_only"], deps = [":csds_proto"],
) )
py_grpc_library( py_grpc_library(
name = "csds_py_pb2_grpc", name = "csds_py_pb2_grpc",
srcs = [":_csds_proto_only"], srcs = [":csds_proto"],
deps = [":csds_py_pb2"], deps = [":csds_py_pb2"],
) )
py_proto_library( py_proto_library(
name = "config_dump_py_pb2", name = "config_dump_py_pb2",
deps = [":_config_dump_proto_only"], deps = [":config_dump_proto"],
) )
py_proto_library( py_proto_library(
name = "base_py_pb2", name = "base_py_pb2",
deps = [":_base_proto_only"], deps = [":base_proto"],
) )
py_proto_library( py_proto_library(
name = "percent_py_pb2", name = "percent_py_pb2",
deps = [":_percent_proto_only"], deps = [":percent_proto"],
) )

@ -19,12 +19,12 @@ package(default_visibility = ["//visibility:public"])
py_proto_library( py_proto_library(
name = "channelz_py_pb2", name = "channelz_py_pb2",
imports = ["../../"], imports = ["../../"],
deps = ["//src/proto/grpc/channelz:channelz_proto_descriptors"], deps = ["//src/proto/grpc/channelz:channelz_proto"],
) )
py_grpc_library( py_grpc_library(
name = "channelz_py_pb2_grpc", name = "channelz_py_pb2_grpc",
srcs = ["//src/proto/grpc/channelz:channelz_proto_descriptors"], srcs = ["//src/proto/grpc/channelz:channelz_proto"],
strip_prefixes = ["src.python.grpcio_channelz."], strip_prefixes = ["src.python.grpcio_channelz."],
deps = [":channelz_py_pb2"], deps = [":channelz_py_pb2"],
) )

@ -19,12 +19,12 @@ package(default_visibility = ["//visibility:public"])
py_proto_library( py_proto_library(
name = "health_py_pb2", name = "health_py_pb2",
imports = ["../../"], imports = ["../../"],
deps = ["//src/proto/grpc/health/v1:health_proto_descriptor"], deps = ["//src/proto/grpc/health/v1:health_proto"],
) )
py_grpc_library( py_grpc_library(
name = "health_py_pb2_grpc", name = "health_py_pb2_grpc",
srcs = ["//src/proto/grpc/health/v1:health_proto_descriptor"], srcs = ["//src/proto/grpc/health/v1:health_proto"],
strip_prefixes = ["src.python.grpcio_health_checking."], strip_prefixes = ["src.python.grpcio_health_checking."],
deps = [":health_py_pb2"], deps = [":health_py_pb2"],
) )

@ -19,12 +19,12 @@ package(default_visibility = ["//visibility:public"])
py_proto_library( py_proto_library(
name = "reflection_py_pb2", name = "reflection_py_pb2",
imports = ["../../"], imports = ["../../"],
deps = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor"], deps = ["//src/proto/grpc/reflection/v1alpha:reflection_proto"],
) )
py_grpc_library( py_grpc_library(
name = "reflection_py_pb2_grpc", name = "reflection_py_pb2_grpc",
srcs = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor"], srcs = ["//src/proto/grpc/reflection/v1alpha:reflection_proto"],
strip_prefixes = ["src.python.grpcio_reflection."], strip_prefixes = ["src.python.grpcio_reflection."],
deps = ["reflection_py_pb2"], deps = ["reflection_py_pb2"],
) )

@ -15,8 +15,9 @@
load( load(
"//bazel:grpc_build_system.bzl", "//bazel:grpc_build_system.bzl",
"grpc_cc_library", "grpc_cc_library",
"grpc_cc_proto_library",
"grpc_internal_proto_library",
"grpc_package", "grpc_package",
"grpc_proto_library",
) )
grpc_package(name = "test/core/call/yodel") grpc_package(name = "test/core/call/yodel")
@ -72,13 +73,17 @@ grpc_cc_library(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "fuzzer_proto", name = "fuzzer_proto",
srcs = ["fuzzer.proto"], srcs = ["fuzzer.proto"],
has_services = False,
visibility = ["//test:__subpackages__"],
deps = [ deps = [
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
"//test/core/test_util:fuzz_config_vars_proto", "//test/core/test_util:fuzz_config_vars_proto",
], ],
) )
grpc_cc_proto_library(
name = "fuzzer_cc_proto",
visibility = ["//test:__subpackages__"],
deps = ["fuzzer_proto"],
)

@ -40,7 +40,7 @@ def grpc_yodel_test(name, deps):
], ],
deps = [ deps = [
"//test/core/call/yodel:yodel_test", "//test/core/call/yodel:yodel_test",
"//test/core/call/yodel:fuzzer_proto", "//test/core/call/yodel:fuzzer_cc_proto",
"//:event_engine_base_hdrs", "//:event_engine_base_hdrs",
"//:config_vars", "//:config_vars",
"//:exec_ctx", "//:exec_ctx",

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_proto_library", "grpc_cc_test", "grpc_internal_proto_library", "grpc_package")
load("grpc_core_end2end_test.bzl", "grpc_core_end2end_test") load("grpc_core_end2end_test.bzl", "grpc_core_end2end_test")
licenses(["notice"]) licenses(["notice"])
@ -282,7 +282,7 @@ grpc_cc_library(
], ],
tags = ["nofixdeps"], tags = ["nofixdeps"],
deps = [ deps = [
"end2end_test_fuzzer_proto", "end2end_test_fuzzer_cc_proto",
"end2end_test_lib", "end2end_test_lib",
"end2end_test_suites", "end2end_test_suites",
"fixture_support", "fixture_support",
@ -767,12 +767,16 @@ grpc_cc_test(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "end2end_test_fuzzer_proto", name = "end2end_test_fuzzer_proto",
srcs = ["end2end_test_fuzzer.proto"], srcs = ["end2end_test_fuzzer.proto"],
has_services = False,
deps = [ deps = [
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
"//test/core/test_util:fuzz_config_vars_proto", "//test/core/test_util:fuzz_config_vars_proto",
], ],
) )
grpc_cc_proto_library(
name = "end2end_test_fuzzer_cc_proto",
deps = ["end2end_test_fuzzer_proto"],
)

@ -12,17 +12,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
grpc_package(name = "test/core/end2end/fuzzers") grpc_package(name = "test/core/end2end/fuzzers")
licenses(["notice"]) licenses(["notice"])
grpc_proto_library( grpc_internal_proto_library(
name = "api_fuzzer_proto", name = "api_fuzzer_proto",
srcs = ["api_fuzzer.proto"], srcs = ["api_fuzzer.proto"],
has_services = False,
deps = [ deps = [
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
"//test/core/test_util:fuzz_config_vars_proto", "//test/core/test_util:fuzz_config_vars_proto",
@ -30,6 +29,11 @@ grpc_proto_library(
], ],
) )
grpc_cc_proto_library(
name = "api_fuzzer_cc_proto",
deps = ["api_fuzzer_proto"],
)
grpc_cc_library( grpc_cc_library(
name = "fuzzing_common", name = "fuzzing_common",
srcs = ["fuzzing_common.cc"], srcs = ["fuzzing_common.cc"],
@ -40,7 +44,7 @@ grpc_cc_library(
"absl/strings", "absl/strings",
], ],
deps = [ deps = [
"api_fuzzer_proto", "api_fuzzer_cc_proto",
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
@ -62,7 +66,7 @@ grpc_proto_fuzzer(
uses_event_engine = False, uses_event_engine = False,
uses_polling = False, uses_polling = False,
deps = [ deps = [
"api_fuzzer_proto", "api_fuzzer_cc_proto",
"fuzzing_common", "fuzzing_common",
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
@ -78,10 +82,9 @@ grpc_proto_fuzzer(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "fuzzer_input_proto", name = "fuzzer_input_proto",
srcs = ["fuzzer_input.proto"], srcs = ["fuzzer_input.proto"],
has_services = False,
deps = [ deps = [
"api_fuzzer_proto", "api_fuzzer_proto",
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
@ -90,13 +93,18 @@ grpc_proto_library(
], ],
) )
grpc_cc_proto_library(
name = "fuzzer_input_cc_proto",
deps = ["fuzzer_input_proto"],
)
grpc_cc_library( grpc_cc_library(
name = "network_input", name = "network_input",
srcs = ["network_input.cc"], srcs = ["network_input.cc"],
hdrs = ["network_input.h"], hdrs = ["network_input.h"],
external_deps = ["absl/log:log"], external_deps = ["absl/log:log"],
deps = [ deps = [
"fuzzer_input_proto", "fuzzer_input_cc_proto",
"//:chttp2_frame", "//:chttp2_frame",
"//src/core:chaotic_good_frame_header", "//src/core:chaotic_good_frame_header",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
@ -117,7 +125,7 @@ grpc_proto_fuzzer(
uses_event_engine = False, uses_event_engine = False,
uses_polling = False, uses_polling = False,
deps = [ deps = [
"fuzzer_input_proto", "fuzzer_input_cc_proto",
"fuzzing_common", "fuzzing_common",
"network_input", "network_input",
"//:gpr", "//:gpr",
@ -136,7 +144,7 @@ grpc_cc_library(
hdrs = ["server_fuzzer.h"], hdrs = ["server_fuzzer.h"],
external_deps = ["absl/log:check"], external_deps = ["absl/log:check"],
deps = [ deps = [
"fuzzer_input_proto", "fuzzer_input_cc_proto",
"fuzzing_common", "fuzzing_common",
"network_input", "network_input",
"//:gpr", "//:gpr",
@ -213,7 +221,7 @@ grpc_cc_library(
hdrs = ["connector_fuzzer.h"], hdrs = ["connector_fuzzer.h"],
external_deps = ["absl/log:check"], external_deps = ["absl/log:check"],
deps = [ deps = [
"fuzzer_input_proto", "fuzzer_input_cc_proto",
"fuzzing_common", "fuzzing_common",
"network_input", "network_input",
"//:gpr", "//:gpr",

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_proto_library", "grpc_cc_test", "grpc_internal_proto_library", "grpc_package")
licenses(["notice"]) licenses(["notice"])
@ -30,7 +30,7 @@ grpc_cc_library(
"absl/log:log", "absl/log:log",
], ],
deps = [ deps = [
":fuzzing_event_engine_proto", ":fuzzing_event_engine_cc_proto",
"//:event_engine_base_hdrs", "//:event_engine_base_hdrs",
"//src/core:default_event_engine", "//src/core:default_event_engine",
"//src/core:native_posix_dns_resolver", "//src/core:native_posix_dns_resolver",
@ -39,10 +39,14 @@ grpc_cc_library(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "fuzzing_event_engine_proto", name = "fuzzing_event_engine_proto",
srcs = ["fuzzing_event_engine.proto"], srcs = ["fuzzing_event_engine.proto"],
has_services = False, )
grpc_cc_proto_library(
name = "fuzzing_event_engine_cc_proto",
deps = [":fuzzing_event_engine_proto"],
) )
grpc_cc_test( grpc_cc_test(

@ -112,7 +112,7 @@ grpc_cc_binary(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpcpp_chaotic_good", "//:grpcpp_chaotic_good",
"//src/proto/grpc/testing:benchmark_service_proto", "//src/proto/grpc/testing:benchmark_service_cc_grpc",
"//test/core/end2end:ssl_test_data", "//test/core/end2end:ssl_test_data",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
@ -139,7 +139,7 @@ grpc_cc_binary(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpcpp_chaotic_good", "//:grpcpp_chaotic_good",
"//src/proto/grpc/testing:benchmark_service_proto", "//src/proto/grpc/testing:benchmark_service_cc_grpc",
"//test/core/end2end:ssl_test_data", "//test/core/end2end:ssl_test_data",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",

@ -647,8 +647,8 @@ grpc_cc_test(
"//src/core:grpc_crl_provider", "//src/core:grpc_crl_provider",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_cc_proto",
"//test/core/test_util:fuzz_config_vars_proto", "//test/core/test_util:fuzz_config_vars_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/tsi:transport_security_test_lib", "//test/core/tsi:transport_security_test_lib",
], ],

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_proto_library", "grpc_cc_test", "grpc_internal_proto_library", "grpc_package")
licenses(["notice"]) licenses(["notice"])
@ -453,10 +453,14 @@ grpc_cc_library(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "fuzz_config_vars_proto", name = "fuzz_config_vars_proto",
srcs = ["fuzz_config_vars.proto"], srcs = ["fuzz_config_vars.proto"],
has_services = False, )
grpc_cc_proto_library(
name = "fuzz_config_vars_cc_proto",
deps = ["fuzz_config_vars_proto"],
) )
grpc_cc_library( grpc_cc_library(
@ -465,8 +469,8 @@ grpc_cc_library(
hdrs = ["fuzz_config_vars.h"], hdrs = ["fuzz_config_vars.h"],
external_deps = ["absl/types:optional"], external_deps = ["absl/types:optional"],
deps = [ deps = [
"fuzz_config_vars_cc_proto",
"fuzz_config_vars_helpers", "fuzz_config_vars_helpers",
"fuzz_config_vars_proto",
"//:config_vars", "//:config_vars",
"//:gpr_platform", "//:gpr_platform",
], ],
@ -499,10 +503,14 @@ grpc_cc_library(
], ],
) )
grpc_proto_library( grpc_internal_proto_library(
name = "fuzzing_channel_args_proto", name = "fuzzing_channel_args_proto",
srcs = ["fuzzing_channel_args.proto"], srcs = ["fuzzing_channel_args.proto"],
has_services = False, )
grpc_cc_proto_library(
name = "fuzzing_channel_args_cc_proto",
deps = ["fuzzing_channel_args_proto"],
) )
grpc_cc_library( grpc_cc_library(
@ -510,7 +518,7 @@ grpc_cc_library(
srcs = ["fuzzing_channel_args.cc"], srcs = ["fuzzing_channel_args.cc"],
hdrs = ["fuzzing_channel_args.h"], hdrs = ["fuzzing_channel_args.h"],
deps = [ deps = [
"fuzzing_channel_args_proto", "fuzzing_channel_args_cc_proto",
"//:gpr_platform", "//:gpr_platform",
"//:ref_counted_ptr", "//:ref_counted_ptr",
"//src/core:channel_args", "//src/core:channel_args",

@ -16,7 +16,7 @@
Includes fuzzer rules. Includes fuzzer rules.
""" """
load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_proto_library", "grpc_cc_test", "grpc_internal_proto_library")
def grpc_fuzzer(name, corpus, owner = "grpc", srcs = [], tags = [], external_deps = [], deps = [], data = [], size = "large", **kwargs): def grpc_fuzzer(name, corpus, owner = "grpc", srcs = [], tags = [], external_deps = [], deps = [], data = [], size = "large", **kwargs):
"""Instantiates a fuzzer test. """Instantiates a fuzzer test.
@ -75,8 +75,9 @@ def grpc_proto_fuzzer(
corpus: The corpus for the test. corpus: The corpus for the test.
proto: The proto for the test. If empty, it assumes the proto dependency proto: The proto for the test. If empty, it assumes the proto dependency
is already included in the target deps. Otherwise it creates a is already included in the target deps. Otherwise it creates a
new grpc_proto_library with name "_{name}_proto" and makes the new proto_library with name "_{name}_proto" and
fuzz target depend on it. cc_proto_library with name "_{name}_cc_proto" and makes the
fuzz target depend on the latter.
proto_deps: Deps for proto. Only used if proto is not empty. proto_deps: Deps for proto. Only used if proto is not empty.
external_deps: External deps. external_deps: External deps.
srcs: The source files for the test. srcs: The source files for the test.
@ -98,13 +99,17 @@ def grpc_proto_fuzzer(
if proto != None: if proto != None:
PROTO_LIBRARY = "_%s_proto" % name PROTO_LIBRARY = "_%s_proto" % name
grpc_proto_library( grpc_internal_proto_library(
name = PROTO_LIBRARY, name = PROTO_LIBRARY,
srcs = [proto], srcs = [proto],
deps = proto_deps, deps = proto_deps,
has_services = False,
) )
deps = deps + [PROTO_LIBRARY] CC_PROTO_LIBRARY = "_%s_cc_proto" % name
grpc_cc_proto_library(
name = CC_PROTO_LIBRARY,
deps = [PROTO_LIBRARY],
)
deps = deps + [CC_PROTO_LIBRARY]
grpc_cc_test( grpc_cc_test(
name = name, name = name,

@ -46,7 +46,7 @@ grpc_cc_library(
"//src/core:memory_quota", "//src/core:memory_quota",
"//src/core:resource_quota", "//src/core:resource_quota",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_cc_proto",
], ],
) )
@ -183,7 +183,7 @@ grpc_cc_test(
"//src/core:slice", "//src/core:slice",
"//src/core:slice_buffer", "//src/core:slice_buffer",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_cc_proto",
], ],
) )
@ -216,7 +216,7 @@ grpc_cc_test(
"//src/core:slice", "//src/core:slice",
"//src/core:slice_buffer", "//src/core:slice_buffer",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto", "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_cc_proto",
], ],
) )

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_package", "grpc_proto_library") load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_grpc_library", "grpc_cc_library", "grpc_cc_proto_library", "grpc_internal_proto_library", "grpc_package")
licenses(["notice"]) licenses(["notice"])
@ -21,13 +21,17 @@ grpc_package(
visibility = "public", visibility = "public",
) )
grpc_proto_library( grpc_internal_proto_library(
name = "transport_security_common_proto", name = "transport_security_common_proto",
srcs = ["transport_security_common.proto"], srcs = ["transport_security_common.proto"],
has_services = False,
) )
grpc_proto_library( grpc_cc_proto_library(
name = "transport_security_common_cc_proto",
deps = ["transport_security_common_proto"],
)
grpc_internal_proto_library(
name = "handshaker_proto", name = "handshaker_proto",
srcs = ["handshaker.proto"], srcs = ["handshaker.proto"],
has_services = True, has_services = True,
@ -36,6 +40,17 @@ grpc_proto_library(
], ],
) )
grpc_cc_proto_library(
name = "handshaker_cc_proto",
deps = ["handshaker_proto"],
)
grpc_cc_grpc_library(
name = "handshaker_cc_grpc",
srcs = ["handshaker_proto"],
deps = ["handshaker_cc_proto"],
)
grpc_cc_library( grpc_cc_library(
name = "fake_handshaker_lib", name = "fake_handshaker_lib",
testonly = True, testonly = True,
@ -46,8 +61,8 @@ grpc_cc_library(
], ],
language = "C++", language = "C++",
deps = [ deps = [
"handshaker_proto", "handshaker_cc_grpc",
"transport_security_common_proto", "transport_security_common_cc_proto",
"//:grpc++", "//:grpc++",
], ],
) )

@ -209,12 +209,12 @@ grpc_proto_fuzzer(
# These proto deps are needed to ensure that we can read these # These proto deps are needed to ensure that we can read these
# resource types out of the google.protobuf.Any fields in the # resource types out of the google.protobuf.Any fields in the
# textproto files in the corpora. # textproto files in the corpora.
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
], ],
@ -326,7 +326,7 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++_codegen_proto", "//:grpc++_codegen_proto",
"//src/core:grpc_xds_client", "//src/core:grpc_xds_client",
"//src/proto/grpc/lookup/v1:rls_config_proto", "//src/proto/grpc/lookup/v1:rls_config_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
"//test/cpp/util:grpc_cli_utils", "//test/cpp/util:grpc_cli_utils",

@ -78,14 +78,14 @@ grpc_cc_binary(
genrule( genrule(
name = "copy_compiler_test_grpc_pb_h", name = "copy_compiler_test_grpc_pb_h",
srcs = ["//src/proto/grpc/testing:_compiler_test_proto_grpc_codegen"], srcs = ["//src/proto/grpc/testing:_compiler_test_cc_grpc_grpc_codegen"],
outs = ["compiler_test.grpc.pb.h"], outs = ["compiler_test.grpc.pb.h"],
cmd = "cat $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.h > $@", cmd = "cat $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.h > $@",
) )
genrule( genrule(
name = "copy_compiler_test_mock_grpc_pb_h", name = "copy_compiler_test_mock_grpc_pb_h",
srcs = ["//src/proto/grpc/testing:_compiler_test_proto_grpc_codegen"], srcs = ["//src/proto/grpc/testing:_compiler_test_cc_grpc_grpc_codegen"],
outs = ["compiler_test_mock.grpc.pb.h"], outs = ["compiler_test_mock.grpc.pb.h"],
cmd = "cat $(GENDIR)/src/proto/grpc/testing/compiler_test_mock.grpc.pb.h > $@", cmd = "cat $(GENDIR)/src/proto/grpc/testing/compiler_test_mock.grpc.pb.h > $@",
) )

@ -32,7 +32,7 @@ grpc_cc_library(
"absl/synchronization", "absl/synchronization",
], ],
deps = [ deps = [
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -46,7 +46,7 @@ grpc_cc_library(
deps = [ deps = [
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/health/v1:health_cc_grpc",
], ],
) )
@ -81,7 +81,7 @@ grpc_cc_library(
"gtest", "gtest",
], ],
deps = [ deps = [
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
) )
@ -96,7 +96,7 @@ grpc_cc_library(
], ],
deps = [ deps = [
":counted_service", ":counted_service",
"//src/proto/grpc/lookup/v1:rls_proto", "//src/proto/grpc/lookup/v1:rls_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -118,10 +118,10 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/health/v1:health_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -148,8 +148,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -174,9 +174,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -195,9 +195,9 @@ grpc_cc_binary(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -220,9 +220,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -242,9 +242,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing:simple_messages_proto", "//src/proto/grpc/testing:simple_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -262,8 +262,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -283,8 +283,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -306,9 +306,9 @@ grpc_cc_library(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc++_test", "//:grpc++_test",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -342,9 +342,9 @@ grpc_cc_test(
"//:grpc++", "//:grpc++",
"//:grpcpp_channelz", "//:grpcpp_channelz",
"//src/core:slice", "//src/core:slice",
"//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/channelz:channelz_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -362,8 +362,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -396,8 +396,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -414,9 +414,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -435,10 +435,10 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/health/v1:health_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -457,9 +457,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -478,9 +478,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -498,9 +498,9 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc++_test", "//:grpc++_test",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -518,8 +518,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -550,11 +550,11 @@ grpc_cc_test(
"//:grpcpp_orca_service", "//:grpcpp_orca_service",
"//src/core:channel_args", "//src/core:channel_args",
"//src/core:config_selector", "//src/core:config_selector",
"//src/proto/grpc/health/v1:health_proto", "//src/proto/grpc/health/v1:health_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//src/proto/grpc/testing/xds/v3:orca_load_report_proto", "//src/proto/grpc/testing/xds/v3:orca_load_report_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:test_lb_policies", "//test/core/test_util:test_lb_policies",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -582,10 +582,10 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/core:channel_args", "//src/core:channel_args",
"//src/proto/grpc/lookup/v1:rls_proto", "//src/proto/grpc/lookup/v1:rls_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
"//test/core/test_util:fake_stats_plugin", "//test/core/test_util:fake_stats_plugin",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
@ -609,9 +609,9 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/core:channel_args", "//src/core:channel_args",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -640,10 +640,10 @@ grpc_cc_test(
"//:grpc++", "//:grpc++",
"//:grpc_resolver_fake", "//:grpc_resolver_fake",
"//src/core:channel_args", "//src/core:channel_args",
"//src/proto/grpc/lb/v1:load_balancer_proto", "//src/proto/grpc/lb/v1:load_balancer_cc_grpc",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -663,9 +663,9 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc++_reflection", "//:grpc++_reflection",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:grpc++_proto_reflection_desc_db", "//test/cpp/util:grpc++_proto_reflection_desc_db",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -684,9 +684,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -711,9 +711,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -732,9 +732,9 @@ grpc_cc_binary(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -754,8 +754,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -774,7 +774,7 @@ grpc_cc_test(
], ],
deps = [ deps = [
"//:grpcpp_server_load_reporting", "//:grpcpp_server_load_reporting",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
) )
@ -798,8 +798,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -817,9 +817,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -839,9 +839,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -863,9 +863,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -892,9 +892,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing:simple_messages_proto", "//src/proto/grpc/testing:simple_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -913,9 +913,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing:simple_messages_proto", "//src/proto/grpc/testing:simple_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -934,9 +934,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing:simple_messages_proto", "//src/proto/grpc/testing:simple_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -955,8 +955,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -998,8 +998,8 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc++_authorization_provider", "//:grpc++_authorization_provider",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:audit_logging_utils", "//test/core/test_util:audit_logging_utils",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -1025,8 +1025,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -1044,7 +1044,7 @@ grpc_cc_test(
"//:grpcpp_backend_metric_recorder", "//:grpcpp_backend_metric_recorder",
"//:grpcpp_call_metric_recorder", "//:grpcpp_call_metric_recorder",
"//:grpcpp_orca_service", "//:grpcpp_orca_service",
"//src/proto/grpc/testing/xds/v3:orca_service_proto", "//src/proto/grpc/testing/xds/v3:orca_service_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -1063,8 +1063,8 @@ grpc_cc_test(
"//src/core:event_engine_tcp_socket_utils", "//src/core:event_engine_tcp_socket_utils",
"//src/core:experiments", "//src/core:experiments",
"//src/core:grpc_fake_credentials", "//src/core:grpc_fake_credentials",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -1089,8 +1089,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -1115,8 +1115,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -1143,8 +1143,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],

@ -34,13 +34,13 @@ grpc_cc_library(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:ads_proto", "//src/proto/grpc/testing/xds/v3:ads_cc_grpc",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:discovery_proto", "//src/proto/grpc/testing/xds/v3:discovery_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:lrs_proto", "//src/proto/grpc/testing/xds/v3:lrs_cc_grpc",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:counted_service", "//test/cpp/end2end:counted_service",
], ],
@ -53,13 +53,13 @@ grpc_cc_library(
visibility = ["@grpc:xds_end2end_test_utils"], visibility = ["@grpc:xds_end2end_test_utils"],
deps = [ deps = [
":xds_server", ":xds_server",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:discovery_proto", "//src/proto/grpc/testing/xds/v3:discovery_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
], ],
) )
@ -80,19 +80,19 @@ grpc_cc_library(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc_resolver_fake", "//:grpc_resolver_fake",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//src/proto/grpc/testing/xds/v3:ads_proto", "//src/proto/grpc/testing/xds/v3:ads_cc_grpc",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:discovery_proto", "//src/proto/grpc/testing/xds/v3:discovery_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_filter_rbac_proto", "//src/proto/grpc/testing/xds/v3:http_filter_rbac_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:lrs_proto", "//src/proto/grpc/testing/xds/v3:lrs_cc_grpc",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:counted_service", "//test/cpp/end2end:counted_service",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
@ -133,21 +133,21 @@ grpc_cc_test(
"//:grpc_resolver_fake", "//:grpc_resolver_fake",
"//src/core:channel_args", "//src/core:channel_args",
"//src/core:grpc_audit_logging", "//src/core:grpc_audit_logging",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_cc_grpc",
"//src/proto/grpc/testing/xds/v3:aggregate_cluster_proto", "//src/proto/grpc/testing/xds/v3:aggregate_cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:fault_common_proto", "//src/proto/grpc/testing/xds/v3:fault_cc_proto",
"//src/proto/grpc/testing/xds/v3:fault_proto", "//src/proto/grpc/testing/xds/v3:fault_common_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_filter_rbac_proto", "//src/proto/grpc/testing/xds/v3:http_filter_rbac_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//src/proto/grpc/testing/xds/v3:tls_proto", "//src/proto/grpc/testing/xds/v3:tls_cc_proto",
"//src/proto/grpc/testing/xds/v3:typed_struct_proto", "//src/proto/grpc/testing/xds/v3:typed_struct_cc_proto",
"//test/core/test_util:audit_logging_utils", "//test/core/test_util:audit_logging_utils",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
@ -205,7 +205,7 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc_resolver_fake", "//:grpc_resolver_fake",
"//src/proto/grpc/testing/xds/v3:aggregate_cluster_proto", "//src/proto/grpc/testing/xds/v3:aggregate_cluster_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
"//test/cpp/end2end:connection_attempt_injector", "//test/cpp/end2end:connection_attempt_injector",
@ -262,10 +262,10 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpcpp_csds", "//:grpcpp_csds",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -291,10 +291,10 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:fault_proto", "//src/proto/grpc/testing/xds/v3:fault_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -327,10 +327,10 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:gcp_authn_proto", "//src/proto/grpc/testing/xds/v3:gcp_authn_cc_proto",
"//src/proto/grpc/testing/xds/v3:http_connection_manager_proto", "//src/proto/grpc/testing/xds/v3:http_connection_manager_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
], ],
@ -356,8 +356,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:fault_proto", "//src/proto/grpc/testing/xds/v3:fault_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -380,9 +380,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:client_side_weighted_round_robin_proto", "//src/proto/grpc/testing/xds/v3:client_side_weighted_round_robin_cc_proto",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:wrr_locality_proto", "//src/proto/grpc/testing/xds/v3:wrr_locality_cc_proto",
"//test/core/test_util:fake_stats_plugin", "//test/core/test_util:fake_stats_plugin",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
@ -412,11 +412,11 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc_resolver_fake", "//:grpc_resolver_fake",
"//src/proto/grpc/testing/xds/v3:aggregate_cluster_proto", "//src/proto/grpc/testing/xds/v3:aggregate_cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:cluster_proto", "//src/proto/grpc/testing/xds/v3:cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:endpoint_proto", "//src/proto/grpc/testing/xds/v3:endpoint_cc_proto",
"//src/proto/grpc/testing/xds/v3:listener_proto", "//src/proto/grpc/testing/xds/v3:listener_cc_proto",
"//src/proto/grpc/testing/xds/v3:route_proto", "//src/proto/grpc/testing/xds/v3:route_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:connection_attempt_injector", "//test/cpp/end2end:connection_attempt_injector",
], ],
@ -440,8 +440,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/lookup/v1:rls_config_proto", "//src/proto/grpc/lookup/v1:rls_cc_proto",
"//src/proto/grpc/lookup/v1:rls_proto", "//src/proto/grpc/lookup/v1:rls_config_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
"//test/cpp/end2end:rls_server", "//test/cpp/end2end:rls_server",
@ -468,8 +468,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:fault_proto", "//src/proto/grpc/testing/xds/v3:fault_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -488,8 +488,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -514,8 +514,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:stateful_session_cookie_proto", "//src/proto/grpc/testing/xds/v3:stateful_session_cc_proto",
"//src/proto/grpc/testing/xds/v3:stateful_session_proto", "//src/proto/grpc/testing/xds/v3:stateful_session_cookie_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
], ],
@ -539,9 +539,9 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:aggregate_cluster_proto", "//src/proto/grpc/testing/xds/v3:aggregate_cluster_cc_proto",
"//src/proto/grpc/testing/xds/v3:pick_first_proto", "//src/proto/grpc/testing/xds/v3:pick_first_cc_proto",
"//src/proto/grpc/testing/xds/v3:router_proto", "//src/proto/grpc/testing/xds/v3:router_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
"//test/cpp/end2end:connection_attempt_injector", "//test/cpp/end2end:connection_attempt_injector",
@ -586,8 +586,8 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing/xds/v3:address_proto", "//src/proto/grpc/testing/xds/v3:address_cc_proto",
"//src/proto/grpc/testing/xds/v3:upstream_http_11_connect_proto", "//src/proto/grpc/testing/xds/v3:upstream_http_11_connect_cc_proto",
"//test/core/end2end:http_proxy", "//test/core/end2end:http_proxy",
"//test/core/test_util:scoped_env_var", "//test/core/test_util:scoped_env_var",
], ],

@ -30,7 +30,7 @@
#include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/endpoint_addresses.h"
#include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/fake/fake_resolver.h"
#include "src/core/util/env.h" #include "src/core/util/env.h"
#include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"
#include "test/cpp/end2end/connection_attempt_injector.h" #include "test/cpp/end2end/connection_attempt_injector.h"

@ -28,11 +28,11 @@
#include "absl/strings/strip.h" #include "absl/strings/strip.h"
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
#include "src/proto/grpc/testing/xds/v3/listener.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/listener.pb.h"
#include "src/proto/grpc/testing/xds/v3/route.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/route.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -84,21 +84,20 @@
#include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_client.h"
#include "src/cpp/client/secure_credentials.h" #include "src/cpp/client/secure_credentials.h"
#include "src/cpp/server/secure_server_credentials.h" #include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h"
#include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
#include "src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
#include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/fault.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_filter_rbac.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_filter_rbac.pb.h" #include "src/proto/grpc/testing/xds/v3/http_filter_rbac.pb.h"
#include "src/proto/grpc/testing/xds/v3/listener.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/listener.pb.h"
#include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/route.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/route.pb.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "src/proto/grpc/testing/xds/v3/tls.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/tls.pb.h"
#include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
#include "test/core/test_util/audit_logging_utils.h" #include "test/core/test_util/audit_logging_utils.h"
#include "test/core/test_util/port.h" #include "test/core/test_util/port.h"

@ -41,7 +41,7 @@
#include "src/core/util/tmpfile.h" #include "src/core/util/tmpfile.h"
#include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/xds_client/xds_channel_args.h" #include "src/core/xds/xds_client/xds_channel_args.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/core/test_util/tls_utils.h" #include "test/core/test_util/tls_utils.h"
#include "test/cpp/util/credentials.h" #include "test/cpp/util/credentials.h"

@ -41,9 +41,9 @@
#include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/security/security_connector/ssl_utils.h"
#include "src/cpp/server/secure_server_credentials.h" #include "src/cpp/server/secure_server_credentials.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_filter_rbac.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_filter_rbac.pb.h"
#include "src/proto/grpc/testing/xds/v3/orca_load_report.pb.h" #include "src/proto/grpc/testing/xds/v3/orca_load_report.pb.h"
#include "src/proto/grpc/testing/xds/v3/rbac.pb.h" #include "src/proto/grpc/testing/xds/v3/rbac.pb.h"
#include "test/core/test_util/port.h" #include "test/core/test_util/port.h"

@ -27,7 +27,7 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/strip.h" #include "absl/strings/strip.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h"
#include "src/proto/grpc/testing/echo_messages.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"

@ -21,10 +21,10 @@
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/fault.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -24,10 +24,10 @@
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/gcp_authn.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/gcp_authn.pb.h"
#include "src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -25,8 +25,8 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/address.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/address.pb.h"
#include "src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.h"
#include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"

@ -23,10 +23,10 @@
#include "absl/log/check.h" #include "absl/log/check.h"
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/fault.pb.h"
#include "src/proto/grpc/testing/xds/v3/outlier_detection.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/outlier_detection.pb.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -32,7 +32,7 @@
#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/fake/fake_resolver.h"
#include "src/core/util/env.h" #include "src/core/util/env.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/pick_first.pb.h" #include "src/proto/grpc/testing/xds/v3/pick_first.pb.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"
#include "test/cpp/end2end/connection_attempt_injector.h" #include "test/cpp/end2end/connection_attempt_injector.h"

@ -30,8 +30,8 @@
#include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/load_balancing/xds/xds_channel_args.h"
#include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/fake/fake_resolver.h"
#include "src/core/util/env.h" #include "src/core/util/env.h"
#include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
#include "test/cpp/end2end/connection_attempt_injector.h" #include "test/cpp/end2end/connection_attempt_injector.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -23,7 +23,6 @@
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/core/util/env.h" #include "src/core/util/env.h"
#include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
#include "src/proto/grpc/lookup/v1/rls.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h"
#include "src/proto/grpc/lookup/v1/rls_config.pb.h" #include "src/proto/grpc/lookup/v1/rls_config.pb.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"

@ -23,8 +23,8 @@
#include "absl/log/log.h" #include "absl/log/log.h"
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/fault.pb.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"
namespace grpc { namespace grpc {

@ -29,7 +29,7 @@
#include "src/core/util/crash.h" #include "src/core/util/crash.h"
#include "src/core/util/sync.h" #include "src/core/util/sync.h"
#include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
#include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h"
namespace grpc { namespace grpc {

@ -32,13 +32,12 @@
#include "src/core/util/crash.h" #include "src/core/util/crash.h"
#include "src/core/util/sync.h" #include "src/core/util/sync.h"
#include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
#include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/discovery.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
#include "src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
#include "src/proto/grpc/testing/xds/v3/listener.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/listener.pb.h"
#include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h"
#include "src/proto/grpc/testing/xds/v3/route.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/route.pb.h"
#include "test/core/test_util/test_config.h" #include "test/core/test_util/test_config.h"
#include "test/cpp/end2end/counted_service.h" #include "test/cpp/end2end/counted_service.h"

@ -39,7 +39,7 @@
#include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h"
#include "src/core/xds/xds_client/xds_channel_args.h" #include "src/core/xds/xds_client/xds_channel_args.h"
#include "src/cpp/client/secure_credentials.h" #include "src/cpp/client/secure_credentials.h"
#include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/router.pb.h"
#include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/resolve_localhost_ip46.h"
namespace grpc { namespace grpc {

@ -26,8 +26,8 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/backup_poller.h"
#include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/config_vars.h"
#include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.pb.h"
#include "src/proto/grpc/testing/xds/v3/wrr_locality.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
#include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/fake_stats_plugin.h"
#include "test/core/test_util/scoped_env_var.h" #include "test/core/test_util/scoped_env_var.h"
#include "test/cpp/end2end/xds/xds_end2end_test_lib.h" #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"

@ -36,7 +36,7 @@ grpc_cc_library(
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//:grpc_opencensus_plugin", "//:grpc_opencensus_plugin",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:test_lb_policies", "//test/core/test_util:test_lb_policies",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
@ -68,7 +68,7 @@ grpc_cc_test(
"library", "library",
"//:grpc++", "//:grpc++",
"//:grpc_opencensus_plugin", "//:grpc_opencensus_plugin",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -97,7 +97,7 @@ grpc_cc_test(
"library", "library",
"//:grpc++", "//:grpc++",
"//:grpc_opencensus_plugin", "//:grpc_opencensus_plugin",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",

@ -33,7 +33,7 @@ grpc_cc_library(
"//:grpc++", "//:grpc++",
"//src/core:logging_filter", "//src/core:logging_filter",
"//src/cpp/ext/gcp:observability_logging_sink", "//src/cpp/ext/gcp:observability_logging_sink",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
@ -60,7 +60,7 @@ grpc_cc_test(
"//src/core:dump_args", "//src/core:dump_args",
"//src/core:logging_filter", "//src/core:logging_filter",
"//src/cpp/ext/gcp:observability_logging_sink", "//src/cpp/ext/gcp:observability_logging_sink",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
@ -86,7 +86,7 @@ grpc_cc_test(
"//:grpc++", "//:grpc++",
"//src/core:logging_filter", "//src/core:logging_filter",
"//src/cpp/ext/gcp:observability_logging_sink", "//src/cpp/ext/gcp:observability_logging_sink",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
"//test/cpp/ext/filters/census:library", "//test/cpp/ext/filters/census:library",

@ -30,7 +30,7 @@ grpc_cc_test(
uses_polling = False, uses_polling = False,
deps = [ deps = [
"//:grpcpp_gcp_observability", "//:grpcpp_gcp_observability",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/cpp/end2end:test_service_impl", "//test/cpp/end2end:test_service_impl",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],

@ -32,7 +32,7 @@ grpc_cc_test(
"//:gpr", "//:gpr",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/lb/v1:load_balancer_proto", "//src/proto/grpc/lb/v1:load_balancer_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],

@ -53,9 +53,9 @@ grpc_cc_binary(
tags = ["no_windows"], tags = ["no_windows"],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -90,9 +90,9 @@ grpc_cc_library(
deps = [ deps = [
":server_helper_lib", ":server_helper_lib",
"//:grpcpp_orca_service", "//:grpcpp_orca_service",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
) )
@ -115,9 +115,9 @@ grpc_cc_library(
language = "C++", language = "C++",
deps = [ deps = [
":backend_metrics_lb_policy", ":backend_metrics_lb_policy",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/security:oauth2_utils", "//test/core/security:oauth2_utils",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -262,9 +262,9 @@ grpc_cc_library(
"//:grpc++", "//:grpc++",
"//:grpc++_reflection", "//:grpc++_reflection",
"//:grpcpp_admin", "//:grpcpp_admin",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -297,9 +297,9 @@ grpc_cc_binary(
"//:grpc++_reflection", "//:grpc++_reflection",
"//:grpcpp_admin", "//:grpcpp_admin",
"//:grpcpp_csm_observability", "//:grpcpp_csm_observability",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -320,9 +320,9 @@ grpc_cc_library(
"//:grpc++", "//:grpc++",
"//:grpc++_reflection", "//:grpc++_reflection",
"//:grpcpp_admin", "//:grpcpp_admin",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/cpp/end2end:test_health_check_service_impl", "//test/cpp/end2end:test_health_check_service_impl",
], ],
) )
@ -357,7 +357,7 @@ grpc_cc_test(
deps = [ deps = [
":xds_interop_server_lib", ":xds_interop_server_lib",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:istio_echo_proto", "//src/proto/grpc/testing:istio_echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -372,7 +372,7 @@ grpc_cc_test(
deps = [ deps = [
":xds_interop_server_lib", ":xds_interop_server_lib",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:istio_echo_proto", "//src/proto/grpc/testing:istio_echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -386,7 +386,7 @@ grpc_cc_library(
hdrs = ["istio_echo_server_lib.h"], hdrs = ["istio_echo_server_lib.h"],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:istio_echo_proto", "//src/proto/grpc/testing:istio_echo_cc_grpc",
], ],
) )
@ -403,7 +403,7 @@ grpc_cc_binary(
"//:grpc++", "//:grpc++",
"//:grpc++_reflection", "//:grpc++_reflection",
"//:grpcpp_admin", "//:grpcpp_admin",
"//src/proto/grpc/testing:istio_echo_proto", "//src/proto/grpc/testing:istio_echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -418,7 +418,7 @@ grpc_cc_test(
deps = [ deps = [
":istio_echo_server_lib", ":istio_echo_server_lib",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:istio_echo_proto", "//src/proto/grpc/testing:istio_echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -437,9 +437,9 @@ grpc_cc_binary(
], ],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:empty_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
@ -551,7 +551,7 @@ grpc_cc_library(
deps = [ deps = [
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
], ],
) )
@ -565,7 +565,7 @@ grpc_cc_test(
":backend_metrics_lb_policy", ":backend_metrics_lb_policy",
"//:grpc++", "//:grpc++",
"//:grpcpp_orca_service", "//:grpcpp_orca_service",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],

@ -102,7 +102,7 @@ grpc_cc_library(
], ],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
@ -125,7 +125,7 @@ grpc_cc_library(
], ],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
@ -316,7 +316,7 @@ grpc_cc_benchmark(
deps = [ deps = [
":helpers_secure", ":helpers_secure",
"//:grpc_opencensus_plugin", "//:grpc_opencensus_plugin",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
], ],
) )
@ -331,7 +331,7 @@ grpc_cc_library(
], ],
deps = [ deps = [
":helpers", ":helpers",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
) )

@ -32,7 +32,7 @@ grpc_cc_test(
"//:grpc++", "//:grpc++",
"//:server", "//:server",
"//src/core:channel_args", "//src/core:channel_args",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
"//test/core/event_engine/fuzzing_event_engine", "//test/core/event_engine/fuzzing_event_engine",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",

@ -56,10 +56,10 @@ grpc_cc_library(
":usage_timer", ":usage_timer",
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:benchmark_service_proto", "//src/proto/grpc/testing:benchmark_service_cc_grpc",
"//src/proto/grpc/testing:control_proto", "//src/proto/grpc/testing:control_cc_proto",
"//src/proto/grpc/testing:payloads_proto", "//src/proto/grpc/testing:payloads_cc_proto",
"//src/proto/grpc/testing:worker_service_proto", "//src/proto/grpc/testing:worker_service_cc_grpc",
"//test/core/end2end:ssl_test_data", "//test/core/end2end:ssl_test_data",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
@ -86,10 +86,10 @@ grpc_cc_library(
":parse_json", ":parse_json",
":qps_worker_impl", ":qps_worker_impl",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:control_proto", "//src/proto/grpc/testing:control_cc_proto",
"//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:messages_cc_proto",
"//src/proto/grpc/testing:report_qps_scenario_service_proto", "//src/proto/grpc/testing:report_qps_scenario_service_cc_grpc",
"//src/proto/grpc/testing:worker_service_proto", "//src/proto/grpc/testing:worker_service_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -111,7 +111,7 @@ grpc_cc_library(
":driver_impl", ":driver_impl",
":histogram", ":histogram",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:control_proto", "//src/proto/grpc/testing:control_cc_proto",
], ],
) )
@ -122,7 +122,7 @@ grpc_cc_library(
"stats.h", "stats.h",
], ],
deps = [ deps = [
"//src/proto/grpc/testing:stats_proto", "//src/proto/grpc/testing:stats_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )

@ -27,7 +27,7 @@ grpc_cc_test(
tags = ["no_windows"], tags = ["no_windows"],
deps = [ deps = [
"//:grpc++_unsecure", "//:grpc++_unsecure",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/event_engine:event_engine_test_utils", "//test/core/event_engine:event_engine_test_utils",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
"//test/core/test_util:grpc_test_util_unsecure", "//test/core/test_util:grpc_test_util_unsecure",
@ -43,7 +43,7 @@ grpc_cc_test(
tags = ["no_windows"], tags = ["no_windows"],
deps = [ deps = [
"//:grpc++_unsecure", "//:grpc++_unsecure",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
"//test/core/test_util:grpc_test_util_unsecure", "//test/core/test_util:grpc_test_util_unsecure",
], ],
@ -58,7 +58,7 @@ grpc_cc_test(
tags = ["no_windows"], tags = ["no_windows"],
deps = [ deps = [
"//:grpc++_unsecure", "//:grpc++_unsecure",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util_base", "//test/core/test_util:grpc_test_util_base",
"//test/core/test_util:grpc_test_util_unsecure", "//test/core/test_util:grpc_test_util_unsecure",
], ],

@ -32,7 +32,7 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpc++_test", "//:grpc++_test",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],

@ -49,7 +49,7 @@ grpc_cc_library(
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//:grpc++_config_proto", "//:grpc++_config_proto",
"//src/proto/grpc/reflection/v1alpha:reflection_proto", "//src/proto/grpc/reflection/v1alpha:reflection_cc_grpc",
], ],
) )
@ -106,7 +106,7 @@ grpc_cc_library(
], ],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/channelz:channelz_cc_proto",
], ],
) )
@ -150,7 +150,7 @@ grpc_cc_library(
deps = [ deps = [
":grpc++_proto_reflection_desc_db", ":grpc++_proto_reflection_desc_db",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/reflection/v1alpha:reflection_proto", "//src/proto/grpc/reflection/v1alpha:reflection_cc_grpc",
], ],
) )
@ -181,7 +181,7 @@ grpc_cc_library(
external_deps = ["absl/log:log"], external_deps = ["absl/log:log"],
deps = [ deps = [
"//:grpc++", "//:grpc++",
"//src/proto/grpc/testing:metrics_proto", "//src/proto/grpc/testing:metrics_cc_grpc",
], ],
) )
@ -213,10 +213,10 @@ grpc_cc_test(
":grpc_cli_libs", ":grpc_cli_libs",
":test_util", ":test_util",
"//:grpc++_reflection", "//:grpc++_reflection",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//src/proto/grpc/testing:simple_messages_proto", "//src/proto/grpc/testing:simple_messages_cc_proto",
"//src/proto/grpc/testing/xds/v3:orca_load_report_proto", "//src/proto/grpc/testing/xds/v3:orca_load_report_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
], ],
@ -294,7 +294,7 @@ grpc_cc_test(
deps = [ deps = [
":grpc_cli_libs", ":grpc_cli_libs",
":test_util", ":test_util",
"//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing:echo_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -310,8 +310,8 @@ grpc_cc_test(
tags = ["no_test_ios"], tags = ["no_test_ios"],
deps = [ deps = [
"//:grpc++_error_details", "//:grpc++_error_details",
"//src/proto/grpc/status:status_proto", "//src/proto/grpc/status:status_cc_proto",
"//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_messages_cc_proto",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
], ],
) )
@ -332,7 +332,7 @@ grpc_cc_binary(
":grpc_cli_libs", ":grpc_cli_libs",
":test_config", ":test_config",
"//:grpc++", "//:grpc++",
"//src/proto/grpc/reflection/v1alpha:reflection_proto", "//src/proto/grpc/reflection/v1alpha:reflection_cc_grpc",
], ],
) )
@ -353,7 +353,7 @@ grpc_cc_binary(
"//:gpr", "//:gpr",
"//:grpc++", "//:grpc++",
"//:grpcpp_channelz", "//:grpcpp_channelz",
"//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/channelz:channelz_cc_grpc",
"//test/cpp/util:test_config", "//test/cpp/util:test_config",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],
@ -384,8 +384,8 @@ grpc_cc_test(
"//:grpc", "//:grpc",
"//:grpc++", "//:grpc++",
"//:grpcpp_channelz", "//:grpcpp_channelz",
"//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/channelz:channelz_cc_grpc",
"//src/proto/grpc/testing:test_proto", "//src/proto/grpc/testing:test_cc_grpc",
"//test/core/test_util:grpc_test_util", "//test/core/test_util:grpc_test_util",
"//test/cpp/util:test_util", "//test/cpp/util:test_util",
], ],

@ -665,15 +665,10 @@ def _expand_upb_proto_library_rules(bazel_rules):
def _patch_grpc_proto_library_rules(bazel_rules): def _patch_grpc_proto_library_rules(bazel_rules):
for name, bazel_rule in bazel_rules.items(): for name, bazel_rule in bazel_rules.items():
contains_proto = any(
src.endswith(".proto") for src in bazel_rule.get("srcs", [])
)
generator_func = bazel_rule.get("generator_function", None) generator_func = bazel_rule.get("generator_function", None)
if name.startswith("//") and (
if ( generator_func == "grpc_proto_library"
name.startswith("//") or bazel_rule["class"] == "cc_proto_library"
and contains_proto
and generator_func == "grpc_proto_library"
): ):
# Add explicit protobuf dependency for internal c++ proto targets. # Add explicit protobuf dependency for internal c++ proto targets.
bazel_rule["deps"].append("//third_party:protobuf") bazel_rule["deps"].append("//third_party:protobuf")

Loading…
Cancel
Save