Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace bind() targets with alias() ones (#35272)

Browse Source 
Usage of `bind()` is [deprecated in WORKSPACE](https://bazel.build/reference/be/workspace#bind) and [not supported in Bzlmod](https://bazel.build/external/migration#bind-targets).

This is a required preparatory step for #35271.

An alternative would be to use the target names directly and completely get rid of `bind()` and `alias()`.

Fixes #13902, #20193.

Closes #35272

PiperOrigin-RevId: 642275803
pull/36887/head
Marcel 6 months ago committed by Copybara-Service
parent e4b7d46f43
commit 73d016e399
8 changed files with 228 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      WORKSPACE
  2. 4
      bazel/grpc_build_system.bzl
  3. 166
      bazel/grpc_deps.bzl
  4. 4
      examples/objective-c/BUILD
  5. 201
      third_party/BUILD
  6. 2
      third_party/objective_c/google_toolbox_for_mac/BUILD
  7. 10
      tools/buildgen/extract_metadata_from_bazel_xml.py
  8. 8
      tools/run_tests/sanity/check_bad_dependencies.sh

12
WORKSPACE
Unescape View File

@ -128,6 +128,12 @@ load("@com_github_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps"
benchmark_deps() benchmark_deps()
# This is a transitive dependency from google_cloud_cpp
bind(
name = "cares",
actual = "@com_github_cares_cares//:ares",
)
load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps") load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
opentelemetry_cpp_deps() opentelemetry_cpp_deps()
@ -136,6 +142,12 @@ load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
opentelemetry_extra_deps() opentelemetry_extra_deps()
# Transitive dependency of opentelemetry_extra_deps()
bind(
name = "madler_zlib",
actual = "@zlib//:zlib",
)
# TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved # TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
# #
#http_archive( #http_archive(

4
bazel/grpc_build_system.bzl
Unescape View File

@ -69,7 +69,7 @@ def _get_external_deps(external_deps):
elif dep == "cares": elif dep == "cares":
ret += select({ ret += select({
"//:grpc_no_ares": [], "//:grpc_no_ares": [],
"//conditions:default": ["//external:cares"], "//conditions:default": ["//third_party:cares"],
}) })
elif dep == "cronet_c_for_grpc": elif dep == "cronet_c_for_grpc":
ret.append("//third_party/objective_c/Cronet:cronet_c_for_grpc") ret.append("//third_party/objective_c/Cronet:cronet_c_for_grpc")
@ -84,7 +84,7 @@ def _get_external_deps(external_deps):
elif dep == "libprotobuf_mutator": elif dep == "libprotobuf_mutator":
ret.append("@com_google_libprotobuf_mutator//:libprotobuf_mutator") ret.append("@com_google_libprotobuf_mutator//:libprotobuf_mutator")
else: else:
ret.append("//external:" + dep) ret.append("//third_party:" + dep)
return ret return ret
def _update_visibility(visibility): def _update_visibility(visibility):

166
bazel/grpc_deps.bzl
Unescape View File

@ -14,167 +14,12 @@
"""Load dependencies needed to compile and test the grpc library as a 3rd-party consumer.""" """Load dependencies needed to compile and test the grpc library as a 3rd-party consumer."""
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@com_github_grpc_grpc//bazel:grpc_python_deps.bzl", "grpc_python_deps") load("//bazel:grpc_python_deps.bzl", "grpc_python_deps")
# buildifier: disable=unnamed-macro # buildifier: disable=unnamed-macro
def grpc_deps(): def grpc_deps():
"""Loads dependencies need to compile and test the grpc library.""" """Loads dependencies need to compile and test the grpc library."""
native.bind(
name = "libssl",
actual = "@boringssl//:ssl",
)
native.bind(
name = "libcrypto",
actual = "@boringssl//:crypto",
)
native.bind(
name = "madler_zlib",
actual = "@zlib//:zlib",
)
native.bind(
name = "protobuf",
actual = "@com_google_protobuf//:protobuf",
)
native.bind(
name = "protobuf_clib",
actual = "@com_google_protobuf//:protoc_lib",
)
native.bind(
name = "protobuf_headers",
actual = "@com_google_protobuf//:protobuf_headers",
)
native.bind(
name = "protocol_compiler",
actual = "@com_google_protobuf//:protoc",
)
native.bind(
name = "cares",
actual = "@com_github_cares_cares//:ares",
)
native.bind(
name = "gtest",
actual = "@com_google_googletest//:gtest",
)
native.bind(
name = "fuzztest",
actual = "@com_google_fuzztest//fuzztest",
)
native.bind(
name = "fuzztest_main",
actual = "@com_google_fuzztest//fuzztest:fuzztest_gtest_main",
)
native.bind(
name = "benchmark",
actual = "@com_github_google_benchmark//:benchmark",
)
native.bind(
name = "re2",
actual = "@com_googlesource_code_re2//:re2",
)
native.bind(
name = "grpc_cpp_plugin",
actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin",
)
native.bind(
name = "grpc++_codegen_proto",
actual = "@com_github_grpc_grpc//:grpc++_codegen_proto",
)
native.bind(
name = "opencensus-context",
actual = "@io_opencensus_cpp//opencensus/context:context",
)
native.bind(
name = "opencensus-trace",
actual = "@io_opencensus_cpp//opencensus/trace:trace",
)
native.bind(
name = "opencensus-trace-context_util",
actual = "@io_opencensus_cpp//opencensus/trace:context_util",
)
native.bind(
name = "opencensus-trace-propagation",
actual = "@io_opencensus_cpp//opencensus/trace:grpc_trace_bin",
)
native.bind(
name = "opencensus-trace-span_context",
actual = "@io_opencensus_cpp//opencensus/trace:span_context",
)
native.bind(
name = "opencensus-stats",
actual = "@io_opencensus_cpp//opencensus/stats:stats",
)
native.bind(
name = "opencensus-stats-test",
actual = "@io_opencensus_cpp//opencensus/stats:test_utils",
)
native.bind(
name = "opencensus-with-tag-map",
actual = "@io_opencensus_cpp//opencensus/tags:with_tag_map",
)
native.bind(
name = "opencensus-tags",
actual = "@io_opencensus_cpp//opencensus/tags:tags",
)
native.bind(
name = "opencensus-tags-context_util",
actual = "@io_opencensus_cpp//opencensus/tags:context_util",
)
native.bind(
name = "opencensus-trace-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/trace/stackdriver:stackdriver_exporter",
)
native.bind(
name = "opencensus-stats-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/stats/stackdriver:stackdriver_exporter",
)
native.bind(
name = "googleapis_trace_grpc_service",
actual = "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc",
)
native.bind(
name = "googleapis_monitoring_grpc_service",
actual = "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc",
)
native.bind(
name = "googleapis_logging_grpc_service",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_grpc",
)
native.bind(
name = "googleapis_logging_cc_proto",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_proto",
)
if "platforms" not in native.existing_rules(): if "platforms" not in native.existing_rules():
http_archive( http_archive(
name = "platforms", name = "platforms",
@ -496,15 +341,6 @@ def grpc_test_only_deps():
Loads dependencies that are only needed to run grpc library's tests. Loads dependencies that are only needed to run grpc library's tests.
""" """
native.bind(
name = "twisted",
actual = "@com_github_twisted_twisted//:twisted",
)
native.bind(
name = "yaml",
actual = "@com_github_yaml_pyyaml//:yaml",
)
if "com_github_twisted_twisted" not in native.existing_rules(): if "com_github_twisted_twisted" not in native.existing_rules():
http_archive( http_archive(

4
examples/objective-c/BUILD
Unescape View File

@ -27,10 +27,10 @@ objc_grpc_library(
deps = ["//examples/protos:helloworld_proto"], deps = ["//examples/protos:helloworld_proto"],
) )
# This one works with import "external/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h" # This one works with import "third_party/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h"
objc_grpc_library( objc_grpc_library(
name = "Keyvaluestore_grpc_proto_external", name = "Keyvaluestore_grpc_proto_external",
srcs = ["//external/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"], srcs = ["//third_party/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"],
tags = ["manual"], tags = ["manual"],
deps = ["@com_github_grpc_grpc//examples/protos:keyvaluestore_proto"], deps = ["@com_github_grpc_grpc//examples/protos:keyvaluestore_proto"],
) )

201
third_party/BUILD vendored
Unescape View File

@ -13,3 +13,204 @@ exports_files([
"protobuf.patch", "protobuf.patch",
"protoc-gen-validate.patch", "protoc-gen-validate.patch",
]) ])
package(default_visibility = ["//:__subpackages__"])
alias(
name = "libssl",
actual = "@boringssl//:ssl",
tags = ["manual"],
)
alias(
name = "libcrypto",
actual = "@boringssl//:crypto",
tags = ["manual"],
)
alias(
name = "madler_zlib",
actual = "@zlib//:zlib",
tags = ["manual"],
)
alias(
name = "protobuf",
actual = "@com_google_protobuf//:protobuf",
tags = ["manual"],
)
alias(
name = "protobuf_clib",
actual = "@com_google_protobuf//:protoc_lib",
tags = ["manual"],
)
alias(
name = "protobuf_headers",
actual = "@com_google_protobuf//:protobuf_headers",
tags = ["manual"],
)
alias(
name = "protocol_compiler",
actual = "@com_google_protobuf//:protoc",
tags = ["manual"],
visibility = ["//visibility:public"],
)
alias(
name = "cares",
actual = "@com_github_cares_cares//:ares",
tags = ["manual"],
)
alias(
name = "gtest",
actual = "@com_google_googletest//:gtest",
tags = ["manual"],
)
alias(
name = "fuzztest",
actual = "@com_google_fuzztest//fuzztest",
tags = ["manual"],
)
alias(
name = "fuzztest_main",
actual = "@com_google_fuzztest//fuzztest:fuzztest_gtest_main",
tags = ["manual"],
)
alias(
name = "benchmark",
actual = "@com_github_google_benchmark//:benchmark",
tags = ["manual"],
)
alias(
name = "re2",
actual = "@com_googlesource_code_re2//:re2",
tags = ["manual"],
)
alias(
name = "grpc_cpp_plugin",
actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin",
tags = ["manual"],
)
alias(
name = "grpc++_codegen_proto",
actual = "@com_github_grpc_grpc//:grpc++_codegen_proto",
tags = ["manual"],
)
alias(
name = "opencensus-context",
actual = "@io_opencensus_cpp//opencensus/context:context",
tags = ["manual"],
)
alias(
name = "opencensus-trace",
actual = "@io_opencensus_cpp//opencensus/trace:trace",
tags = ["manual"],
)
alias(
name = "opencensus-trace-context_util",
actual = "@io_opencensus_cpp//opencensus/trace:context_util",
tags = ["manual"],
)
alias(
name = "opencensus-trace-propagation",
actual = "@io_opencensus_cpp//opencensus/trace:grpc_trace_bin",
tags = ["manual"],
)
alias(
name = "opencensus-trace-span_context",
actual = "@io_opencensus_cpp//opencensus/trace:span_context",
tags = ["manual"],
)
alias(
name = "opencensus-stats",
actual = "@io_opencensus_cpp//opencensus/stats:stats",
tags = ["manual"],
)
alias(
name = "opencensus-stats-test",
actual = "@io_opencensus_cpp//opencensus/stats:test_utils",
tags = ["manual"],
)
alias(
name = "opencensus-with-tag-map",
actual = "@io_opencensus_cpp//opencensus/tags:with_tag_map",
tags = ["manual"],
)
alias(
name = "opencensus-tags",
actual = "@io_opencensus_cpp//opencensus/tags:tags",
tags = ["manual"],
)
alias(
name = "opencensus-tags-context_util",
actual = "@io_opencensus_cpp//opencensus/tags:context_util",
tags = ["manual"],
)
alias(
name = "opencensus-trace-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/trace/stackdriver:stackdriver_exporter",
tags = ["manual"],
)
alias(
name = "opencensus-stats-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/stats/stackdriver:stackdriver_exporter",
tags = ["manual"],
)
alias(
name = "googleapis_trace_grpc_service",
actual = "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc",
tags = ["manual"],
)
alias(
name = "googleapis_monitoring_grpc_service",
actual = "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc",
tags = ["manual"],
)
alias(
name = "googleapis_logging_grpc_service",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_grpc",
tags = ["manual"],
)
alias(
name = "googleapis_logging_cc_proto",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_proto",
tags = ["manual"],
)
alias(
name = "twisted",
actual = "@com_github_twisted_twisted//:twisted",
tags = ["manual"],
)
alias(
name = "yaml",
actual = "@com_github_yaml_pyyaml//:yaml",
tags = ["manual"],
)

2
third_party/objective_c/google_toolbox_for_mac/BUILD vendored
Unescape View File

@ -24,6 +24,6 @@ objc_library(
], ],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//external:gtest", "//third_party:gtest",
], ],
) )

10
tools/buildgen/extract_metadata_from_bazel_xml.py
Unescape View File

@ -544,11 +544,11 @@ def update_test_metadata_with_transitive_metadata(
bazel_rule = bazel_rules[_get_bazel_label(lib_name)] bazel_rule = bazel_rules[_get_bazel_label(lib_name)]
if "//external:benchmark" in bazel_rule["_TRANSITIVE_DEPS"]: if "//third_party:benchmark" in bazel_rule["_TRANSITIVE_DEPS"]:
lib_dict["benchmark"] = True lib_dict["benchmark"] = True
lib_dict["defaults"] = "benchmark" lib_dict["defaults"] = "benchmark"
if "//external:gtest" in bazel_rule["_TRANSITIVE_DEPS"]: if "//third_party:gtest" in bazel_rule["_TRANSITIVE_DEPS"]:
# run_tests.py checks the "gtest" property to see if test should be run via gtest. # run_tests.py checks the "gtest" property to see if test should be run via gtest.
lib_dict["gtest"] = True lib_dict["gtest"] = True
# TODO: this might be incorrect categorization of the test... # TODO: this might be incorrect categorization of the test...
@ -672,7 +672,7 @@ def _patch_grpc_proto_library_rules(bazel_rules):
and generator_func == "grpc_proto_library" 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("//external:protobuf") bazel_rule["deps"].append("//third_party:protobuf")
def _patch_descriptor_upb_proto_library(bazel_rules): def _patch_descriptor_upb_proto_library(bazel_rules):
@ -1333,8 +1333,8 @@ _BAZEL_DEPS_QUERIES = [
'deps("//test/...")', 'deps("//test/...")',
'deps("//:all")', 'deps("//:all")',
'deps("//src/compiler/...")', 'deps("//src/compiler/...")',
# allow resolving bind() workspace rules to the actual targets they point to # allow resolving alias() targets to the actual targets they point to
'kind(bind, "//external:*")', 'kind(alias, "//third_party:*")',
# The ^ is needed to differentiate proto_library from go_proto_library # The ^ is needed to differentiate proto_library from go_proto_library
'deps(kind("^proto_library", @envoy_api//envoy/...))', 'deps(kind("^proto_library", @envoy_api//envoy/...))',
# Make sure we have source info for all the targets that _expand_upb_proto_library_rules artificially adds # Make sure we have source info for all the targets that _expand_upb_proto_library_rules artificially adds

8
tools/run_tests/sanity/check_bad_dependencies.sh
Unescape View File

@ -18,10 +18,10 @@ set -ex
# Make sure that there is no path from known unsecure libraries and targets # Make sure that there is no path from known unsecure libraries and targets
# to an SSL library. Any failure among these will make the script fail. # to an SSL library. Any failure among these will make the script fail.
test "$(bazel query 'somepath("//:grpc_unsecure", "//external:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1 test "$(bazel query 'somepath("//:grpc_unsecure", "//third_party:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1
test "$(bazel query 'somepath("//:grpc++_unsecure", "//external:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1 test "$(bazel query 'somepath("//:grpc++_unsecure", "//third_party:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1
test "$(bazel query 'somepath("//:grpc++_codegen_proto", "//external:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1 test "$(bazel query 'somepath("//:grpc++_codegen_proto", "//third_party:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1
test "$(bazel query 'somepath("//test/cpp/microbenchmarks:helpers", "//external:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1 test "$(bazel query 'somepath("//test/cpp/microbenchmarks:helpers", "//third_party:libssl")' 2>/dev/null | wc -l)" -eq 0 || exit 1
# Make sure that core doesn't depend on anything in C++ library # Make sure that core doesn't depend on anything in C++ library

Write Preview
Loading…
Cancel
Save