From 21a54b800eb1669251e8f5ebc7e0156ff9c2109a Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Wed, 15 Nov 2023 16:04:04 -0800 Subject: [PATCH] bazel: rename `@com_github_cncf_udpa` to `@com_github_cncf_xds` The repo has been renamed from cncf/udpa to cncf/xds long time ago, this is just to reflect this in the bazel repo name. Otherwise this is a noop. --- BUILD | 8 ++++---- bazel/grpc_deps.bzl | 4 ++-- src/core/BUILD | 8 ++++---- tools/buildgen/extract_metadata_from_bazel_xml.py | 4 ++-- tools/codegen/core/gen_upb_api_from_bazel_xml.py | 2 +- tools/run_tests/sanity/check_bazel_workspace.py | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/BUILD b/BUILD index ba8cce5ec3894..60890311798c8 100644 --- a/BUILD +++ b/BUILD @@ -4359,22 +4359,22 @@ grpc_upb_proto_library( grpc_upb_proto_library( name = "xds_type_upb", - deps = ["@com_github_cncf_udpa//xds/type/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/type/v3:pkg"], ) grpc_upb_proto_reflection_library( name = "xds_type_upbdefs", - deps = ["@com_github_cncf_udpa//xds/type/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/type/v3:pkg"], ) grpc_upb_proto_library( name = "xds_orca_upb", - deps = ["@com_github_cncf_udpa//xds/data/orca/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/data/orca/v3:pkg"], ) grpc_upb_proto_library( name = "xds_orca_service_upb", - deps = ["@com_github_cncf_udpa//xds/service/orca/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/service/orca/v3:pkg"], ) grpc_upb_proto_library( diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index dc2500fe63c67..f99c314b1dabc 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -491,9 +491,9 @@ def grpc_deps(): patch_args = ["-p1"], ) - if "com_github_cncf_udpa" not in native.existing_rules(): + if "com_github_cncf_xds" not in native.existing_rules(): http_archive( - name = "com_github_cncf_udpa", + name = "com_github_cncf_xds", sha256 = "0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899", strip_prefix = "xds-e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7", urls = [ diff --git a/src/core/BUILD b/src/core/BUILD index aea45544adb38..bc6cf3493c390 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -6951,22 +6951,22 @@ grpc_upb_proto_library( grpc_upb_proto_library( name = "xds_type_upb", - deps = ["@com_github_cncf_udpa//xds/type/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/type/v3:pkg"], ) grpc_upb_proto_reflection_library( name = "xds_type_upbdefs", - deps = ["@com_github_cncf_udpa//xds/type/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/type/v3:pkg"], ) grpc_upb_proto_library( name = "xds_orca_upb", - deps = ["@com_github_cncf_udpa//xds/data/orca/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/data/orca/v3:pkg"], ) grpc_upb_proto_library( name = "xds_orca_service_upb", - deps = ["@com_github_cncf_udpa//xds/service/orca/v3:pkg"], + deps = ["@com_github_cncf_xds//xds/service/orca/v3:pkg"], ) grpc_upb_proto_library( diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py index 18471eb1d8bfc..0223fb6b7a882 100755 --- a/tools/buildgen/extract_metadata_from_bazel_xml.py +++ b/tools/buildgen/extract_metadata_from_bazel_xml.py @@ -85,7 +85,7 @@ def __init__( destination="third_party/googleapis", proto_prefix="third_party/googleapis/", ), - "com_github_cncf_udpa": ExternalProtoLibrary( + "com_github_cncf_xds": ExternalProtoLibrary( destination="third_party/xds", proto_prefix="third_party/xds/" ), "opencensus_proto": ExternalProtoLibrary( @@ -574,7 +574,7 @@ def _expand_upb_proto_library_rules(bazel_rules): EXTERNAL_LINKS = [ ("@com_google_protobuf//", "src/"), ("@com_google_googleapis//", ""), - ("@com_github_cncf_udpa//", ""), + ("@com_github_cncf_xds//", ""), ("@com_envoyproxy_protoc_gen_validate//", ""), ("@envoy_api//", ""), ("@opencensus_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 4fe35bd197d33..85e035cbebe74 100755 --- a/tools/codegen/core/gen_upb_api_from_bazel_xml.py +++ b/tools/codegen/core/gen_upb_api_from_bazel_xml.py @@ -182,7 +182,7 @@ def get_external_link(file): EXTERNAL_LINKS = [ ("@com_google_protobuf//", "src/"), ("@com_google_googleapis//", ""), - ("@com_github_cncf_udpa//", ""), + ("@com_github_cncf_xds//", ""), ("@com_envoyproxy_protoc_gen_validate//", ""), ("@envoy_api//", ""), ("@opencensus_proto//", ""), diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index 24e1f4f694a8c..3e0c32757d76b 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -79,7 +79,7 @@ "com_envoyproxy_protoc_gen_validate", "com_google_googleapis", "com_google_libprotobuf_mutator", - "com_github_cncf_udpa", + "com_github_cncf_xds", "google_cloud_cpp", ]