From 3fc9e33cc2177d2944da11c27a1fc99b1f586193 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Fri, 20 Jan 2023 23:05:18 +0000 Subject: [PATCH] deps: Update googleapis to 114a745 and xDS API to 46e39c7 (#24914) * Update googleapis to 114a745 and xDS API to 46e39c7 Signed-off-by: Yan Avlasov Mirrored from https://github.com/envoyproxy/envoy @ 8319b9287e5324a4f24bfd2072493c1a208cfa83 --- bazel/api_build_system.bzl | 9 ++++++++- bazel/external_proto_deps.bzl | 4 ++-- bazel/repository_locations.bzl | 12 ++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl index bb4853e2..138879b8 100644 --- a/bazel/api_build_system.bzl +++ b/bazel/api_build_system.bzl @@ -54,12 +54,14 @@ def _py_proto_mapping(dep): # https://github.com/bazelbuild/bazel/issues/3935 and/or # https://github.com/bazelbuild/bazel/issues/2626 are resolved. def _api_py_proto_library(name, srcs = [], deps = []): + mapped_deps = [_py_proto_mapping(dep) for dep in deps] + mapped_unique_deps = {k: True for k in mapped_deps}.keys() _py_proto_library( name = name + _PY_PROTO_SUFFIX, srcs = srcs, default_runtime = "@com_google_protobuf//:protobuf_python", protoc = "@com_google_protobuf//:protoc", - deps = [_py_proto_mapping(dep) for dep in deps] + [ + deps = mapped_unique_deps + [ "@com_envoyproxy_protoc_gen_validate//validate:validate_py", "@com_google_googleapis//google/rpc:status_py_proto", "@com_google_googleapis//google/api:annotations_py_proto", @@ -85,6 +87,11 @@ def py_proto_library(name, deps = [], plugin = None): if name == "checked_py_proto": proto_deps = proto_deps + [":syntax_py_proto"] + # Special handling for expr_proto target + if srcs[0] == ":expr_moved.proto": + srcs = ["checked.proto", "eval.proto", "explain.proto", "syntax.proto", "value.proto"] + proto_deps = proto_deps + ["@com_google_googleapis//google/rpc:status_py_proto"] + # py_proto_library does not support plugin as an argument yet at gRPC v1.25.0: # https://github.com/grpc/grpc/blob/v1.25.0/bazel/python_rules.bzl#L72. # plugin should also be passed in here when gRPC version is greater than v1.25.x. diff --git a/bazel/external_proto_deps.bzl b/bazel/external_proto_deps.bzl index 9b1775ac..3bcc2b02 100644 --- a/bazel/external_proto_deps.bzl +++ b/bazel/external_proto_deps.bzl @@ -50,8 +50,8 @@ EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = { # This maps from the Bazel proto_library target to the Python language binding target for external dependencies. EXTERNAL_PROTO_PY_BAZEL_DEP_MAP = { - "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_py_proto", - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_py_proto", + "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:expr_py_proto", + "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:expr_py_proto", "@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_py", "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_py", "@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_py_proto", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 4fe94788..ccb8283d 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -37,9 +37,9 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_desc = "xDS API Working Group (xDS-WG)", project_url = "https://github.com/cncf/xds", # During the UDPA -> xDS migration, we aren't working with releases. - version = "1e77728a1eaa11d6c931ec2ccd6e95f516a7ef94", - sha256 = "57d8a0d8c8412dbe31dae34b576498c5f8b1fd523a2fcd4f5e5154870b043fe8", - release_date = "2022-05-20", + version = "46e39c7b9b4321731ebe247f2e176fdf0518d76e", + sha256 = "a39bc06b1b420629643e3e49795004522c2b6439709fd98adccb4930e2b2c197", + release_date = "2023-01-12", strip_prefix = "xds-{version}", urls = ["https://github.com/cncf/xds/archive/{version}.tar.gz"], use_category = ["api"], @@ -64,9 +64,9 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Google APIs", project_desc = "Public interface definitions of Google APIs", project_url = "https://github.com/googleapis/googleapis", - version = "82944da21578a53b74e547774cf62ed31a05b841", - sha256 = "a45019af4d3290f02eaeb1ce10990166978c807cb33a9692141a076ba46d1405", - release_date = "2019-12-02", + version = "114a745b2841a044e98cdbb19358ed29fcf4a5f1", + sha256 = "9b4e0d0a04a217c06b426aefd03b82581a9510ca766d2d1c70e52bb2ad4a0703", + release_date = "2023-01-10", strip_prefix = "googleapis-{version}", urls = ["https://github.com/googleapis/googleapis/archive/{version}.tar.gz"], use_category = ["api"],