diff --git a/BUILD b/BUILD index 9d3d7e9f051..e1d4d322338 100644 --- a/BUILD +++ b/BUILD @@ -5272,46 +5272,14 @@ grpc_cc_library( ], ) -grpc_cc_library( +grpc_upb_proto_library( name = "proto_gen_validate_upb", - srcs = [ - "src/core/ext/upb-generated/validate/validate.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/validate/validate.upb.h", - ], - external_deps = [ - "upb_lib", - "upb_lib_descriptor", - "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ], - language = "c++", - deps = [ - "protobuf_duration_upb", - "protobuf_timestamp_upb", - ], + deps = ["@com_envoyproxy_protoc_gen_validate//validate:validate_proto"], ) -grpc_cc_library( +grpc_upb_proto_reflection_library( name = "proto_gen_validate_upbdefs", - srcs = [ - "src/core/ext/upbdefs-generated/validate/validate.upbdefs.c", - ], - hdrs = [ - "src/core/ext/upbdefs-generated/validate/validate.upbdefs.h", - ], - external_deps = [ - "upb_lib", - "upb_lib_descriptor_reflection", - "upb_textformat_lib", - "upb_reflection", - "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ], - language = "c++", - deps = [ - "proto_gen_validate_upb", - "protobuf_timestamp_upbdefs", - ], + deps = ["@com_envoyproxy_protoc_gen_validate//validate:validate_proto"], ) # Once upb code-gen issue is resolved, replace xds_orca_upb with this. @@ -5339,60 +5307,14 @@ grpc_cc_library( ], ) -grpc_cc_library( +grpc_upb_proto_library( name = "udpa_annotations_upb", - srcs = [ - "src/core/ext/upb-generated/udpa/annotations/migrate.upb.c", - "src/core/ext/upb-generated/udpa/annotations/security.upb.c", - "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c", - "src/core/ext/upb-generated/udpa/annotations/status.upb.c", - "src/core/ext/upb-generated/udpa/annotations/versioning.upb.c", - ], - hdrs = [ - "src/core/ext/upb-generated/udpa/annotations/migrate.upb.h", - "src/core/ext/upb-generated/udpa/annotations/security.upb.h", - "src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h", - "src/core/ext/upb-generated/udpa/annotations/status.upb.h", - "src/core/ext/upb-generated/udpa/annotations/versioning.upb.h", - ], - external_deps = [ - "upb_lib", - "upb_lib_descriptor", - "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ], - language = "c++", - deps = [ - "proto_gen_validate_upb", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) -grpc_cc_library( +grpc_upb_proto_reflection_library( name = "udpa_annotations_upbdefs", - srcs = [ - "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c", - "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c", - "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c", - "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c", - "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c", - ], - hdrs = [ - "src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.h", - "src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.h", - "src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.h", - "src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.h", - "src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.h", - ], - external_deps = [ - "upb_lib", - "upb_lib_descriptor_reflection", - "upb_textformat_lib", - "upb_reflection", - "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ], - language = "c++", - deps = [ - "udpa_annotations_upb", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) grpc_cc_library( diff --git a/CMakeLists.txt b/CMakeLists.txt index ab4a0aaa342..4a1a9e6adae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2511,6 +2511,7 @@ add_library(grpc_unsecure src/core/ext/transport/chttp2/transport/writing.cc src/core/ext/transport/inproc/inproc_plugin.cc src/core/ext/transport/inproc/inproc_transport.cc + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c src/core/ext/upb-generated/google/protobuf/duration.upb.c src/core/ext/upb-generated/google/protobuf/timestamp.upb.c src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c diff --git a/Makefile b/Makefile index 2843f86461d..0cae2f63366 100644 --- a/Makefile +++ b/Makefile @@ -1846,6 +1846,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/transport/chttp2/transport/writing.cc \ src/core/ext/transport/inproc/inproc_plugin.cc \ src/core/ext/transport/inproc/inproc_transport.cc \ + src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ src/core/ext/upb-generated/google/protobuf/duration.upb.c \ src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index ac11967de96..ef9b2bea94f 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -445,6 +445,17 @@ def grpc_deps(): ], ) + if "com_github_cncf_udpa" not in native.existing_rules(): + http_archive( + name = "com_github_cncf_udpa", + sha256 = "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", + strip_prefix = "xds-cb28da3451f158a947dfc45090fe92b07b243bc1", + urls = [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + ], + ) + grpc_python_deps() # TODO: move some dependencies from "grpc_deps" here? diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 6f67921b082..f230940ac01 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1825,6 +1825,7 @@ libs: - src/core/ext/transport/chttp2/transport/stream_map.h - src/core/ext/transport/chttp2/transport/varint.h - src/core/ext/transport/inproc/inproc_transport.h + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.h - src/core/ext/upb-generated/google/protobuf/duration.upb.h - src/core/ext/upb-generated/google/protobuf/timestamp.upb.h - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h @@ -2112,6 +2113,7 @@ libs: - src/core/ext/transport/chttp2/transport/writing.cc - src/core/ext/transport/inproc/inproc_plugin.cc - src/core/ext/transport/inproc/inproc_transport.cc + - src/core/ext/upb-generated/google/protobuf/descriptor.upb.c - src/core/ext/upb-generated/google/protobuf/duration.upb.c - src/core/ext/upb-generated/google/protobuf/timestamp.upb.c - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c diff --git a/grpc.gyp b/grpc.gyp index e8fcffcf0ba..7dead4dcfc3 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -1266,6 +1266,7 @@ 'src/core/ext/transport/chttp2/transport/writing.cc', 'src/core/ext/transport/inproc/inproc_plugin.cc', 'src/core/ext/transport/inproc/inproc_transport.cc', + 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py index e7aaf512f48..e0904f8963e 100755 --- a/tools/buildgen/extract_metadata_from_bazel_xml.py +++ b/tools/buildgen/extract_metadata_from_bazel_xml.py @@ -406,7 +406,9 @@ def _expand_upb_proto_library_rules(bazel_rules): GEN_UPB_ROOT = '//:src/core/ext/upb-generated/' GEN_UPBDEFS_ROOT = '//:src/core/ext/upbdefs-generated/' EXTERNAL_LINKS = [('@com_google_protobuf//', ':src/'), - ('@com_google_googleapis//', '')] + ('@com_google_googleapis//', ''), + ('@com_github_cncf_udpa//', ''), + ('@com_envoyproxy_protoc_gen_validate//', '')] for name, bazel_rule in bazel_rules.items(): gen_func = bazel_rule.get('generator_function', None) if gen_func in ('grpc_upb_proto_library', diff --git a/tools/codegen/core/gen_upb_api.sh b/tools/codegen/core/gen_upb_api.sh index 10642cd398f..4b8bc09ca09 100755 --- a/tools/codegen/core/gen_upb_api.sh +++ b/tools/codegen/core/gen_upb_api.sh @@ -117,12 +117,6 @@ proto_files=( \ "envoy/type/v3/percent.proto" \ "envoy/type/v3/range.proto" \ "envoy/type/v3/semantic_version.proto" \ - "udpa/annotations/migrate.proto" \ - "udpa/annotations/security.proto" \ - "udpa/annotations/sensitive.proto" \ - "udpa/annotations/status.proto" \ - "udpa/annotations/versioning.proto" \ - "validate/validate.proto" \ "xds/annotations/v3/status.proto" \ "xds/core/v3/authority.proto" \ "xds/core/v3/collection_entry.proto" \ diff --git a/tools/codegen/core/gen_upb_api_from_bazel_xml.py b/tools/codegen/core/gen_upb_api_from_bazel_xml.py index 9c27dfc261c..d08aedce06d 100755 --- a/tools/codegen/core/gen_upb_api_from_bazel_xml.py +++ b/tools/codegen/core/gen_upb_api_from_bazel_xml.py @@ -137,7 +137,9 @@ def get_bazel_bin_root_path(elink): def get_external_link(file): EXTERNAL_LINKS = [('@com_google_protobuf//', ':src/'), - ('@com_google_googleapis//', '')] + ('@com_google_googleapis//', ''), + ('@com_github_cncf_udpa//', ''), + ('@com_envoyproxy_protoc_gen_validate//', '')] for external_link in EXTERNAL_LINKS: if file.startswith(external_link[0]): return external_link diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index f6dc0be391e..257f2b4c330 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -51,7 +51,7 @@ _GRPC_DEP_NAMES = [ 'build_bazel_rules_apple', 'build_bazel_apple_support', 'libuv', 'com_googlesource_code_re2', 'bazel_gazelle', 'opencensus_proto', 'com_envoyproxy_protoc_gen_validate', 'com_google_googleapis', - 'com_google_libprotobuf_mutator' + 'com_google_libprotobuf_mutator', 'com_github_cncf_udpa' ] _GRPC_BAZEL_ONLY_DEPS = [