From 3a472e524827f72d1ad621c4983dd5af54c46776 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 16 Nov 2023 06:28:03 -0800 Subject: [PATCH] bazel: Migrate py_proto_library to `@com_github_grpc_grpc` (#74) py_proto_library provided by @com_google_protobuf//:protobuf.bzl has been deprecated for a while now: This is provided for backwards compatibility only. Bazel 5.3 will introduce support for py_proto_library, which should be used instead. https://github.com/protocolbuffers/protobuf/blob/32af7d211b85f71920acdfa9b796db008f8c2a45/protobuf.bzl#L642-L644 However, native py_proto_library has never been provided, see bazelbuild/bazel#3935. Instead @rules_python//python:proto.bzl is recommended. I attempted switching to this library, but it's not compatible with @com_google_googleapis's py_proto_library targets, see #69. I found a hacky workaround by using cc_proto_library to generate python targets, but downstream integration into Envoy failed (envoyproxy/envoy#30159). This PR migrates py_proto_library implementation to to @com_github_grpc_grpc. This implementation is used by @com_google_googleapis's, and, more importantly, uses bazel aspects. Which decouples cncf/xds and Envoy's dependencies from concrete upstream py_proto_library implementations. This resulted in a significant code improvement of bazel/api_build_system.bzl: No more custom @com_google_googleapis dependency mapping needed via py_proto_library rules override. No more hardcoded dependencies _xds_py_proto_library - proto dependency tree is determined from proto_library definitions via Basel aspects. No more EXTERNAL_PROTO_PY_BAZEL_DEP_MAP dependency map needed - for the same reason. Similar work in Envoy: envoyproxy/envoy#30834. Signed-off-by: Sergii Tkachenko --- bazel/api_build_system.bzl | 72 +++------------------ bazel/dependency_imports.bzl | 15 ++++- bazel/external_proto_deps.bzl | 6 -- bazel/repositories.bzl | 4 ++ bazel/repository_locations.bzl | 17 +++-- go/udpa/annotations/migrate.pb.go | 2 +- go/udpa/annotations/security.pb.go | 2 +- go/udpa/annotations/sensitive.pb.go | 2 +- go/udpa/annotations/status.pb.go | 2 +- go/udpa/annotations/versioning.pb.go | 2 +- go/udpa/data/orca/v1/orca_load_report.pb.go | 2 +- go/udpa/service/orca/v1/orca.pb.go | 2 +- go/udpa/type/v1/typed_struct.pb.go | 2 +- go/xds/annotations/v3/migrate.pb.go | 2 +- go/xds/annotations/v3/security.pb.go | 2 +- go/xds/annotations/v3/sensitive.pb.go | 2 +- go/xds/annotations/v3/status.pb.go | 2 +- go/xds/annotations/v3/versioning.pb.go | 2 +- go/xds/core/v3/authority.pb.go | 2 +- go/xds/core/v3/cidr.pb.go | 2 +- go/xds/core/v3/collection_entry.pb.go | 2 +- go/xds/core/v3/context_params.pb.go | 2 +- go/xds/core/v3/extension.pb.go | 2 +- go/xds/core/v3/resource.pb.go | 2 +- go/xds/core/v3/resource_locator.pb.go | 2 +- go/xds/core/v3/resource_name.pb.go | 2 +- go/xds/data/orca/v3/orca_load_report.pb.go | 2 +- go/xds/service/orca/v3/orca.pb.go | 2 +- go/xds/type/matcher/v3/cel.pb.go | 2 +- go/xds/type/matcher/v3/domain.pb.go | 2 +- go/xds/type/matcher/v3/http_inputs.pb.go | 2 +- go/xds/type/matcher/v3/ip.pb.go | 2 +- go/xds/type/matcher/v3/matcher.pb.go | 2 +- go/xds/type/matcher/v3/range.pb.go | 2 +- go/xds/type/matcher/v3/regex.pb.go | 2 +- go/xds/type/matcher/v3/string.pb.go | 2 +- go/xds/type/v3/cel.pb.go | 2 +- go/xds/type/v3/range.pb.go | 2 +- go/xds/type/v3/typed_struct.pb.go | 2 +- 39 files changed, 71 insertions(+), 111 deletions(-) diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl index b7c0b2f..d0f588c 100644 --- a/bazel/api_build_system.bzl +++ b/bazel/api_build_system.bzl @@ -1,5 +1,5 @@ load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library") -load("@com_google_protobuf//:protobuf.bzl", _py_proto_library = "py_proto_library") +load("@com_github_grpc_grpc//bazel:python_rules.bzl", _py_proto_library = "py_proto_library") load("@io_bazel_rules_go//go:def.bzl", "go_test") load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") @@ -7,7 +7,6 @@ load( "//bazel:external_proto_deps.bzl", "EXTERNAL_PROTO_CC_BAZEL_DEP_MAP", "EXTERNAL_PROTO_GO_BAZEL_DEP_MAP", - "EXTERNAL_PROTO_PY_BAZEL_DEP_MAP", ) _PY_PROTO_SUFFIX = "_py_proto" @@ -43,65 +42,6 @@ def _go_proto_mapping(dep): def _cc_proto_mapping(dep): return _proto_mapping(dep, EXTERNAL_PROTO_CC_BAZEL_DEP_MAP, _CC_PROTO_SUFFIX) -def _py_proto_mapping(dep): - return _proto_mapping(dep, EXTERNAL_PROTO_PY_BAZEL_DEP_MAP, _PY_PROTO_SUFFIX) - -# TODO(htuch): Convert this to native py_proto_library once -# https://github.com/bazelbuild/bazel/issues/3935 and/or -# https://github.com/bazelbuild/bazel/issues/2626 are resolved. -def _xds_py_proto_library(name, srcs = [], deps = []): - mapped_deps = [_py_proto_mapping(dep) for dep in deps] - mapped_unique_deps = [] - [mapped_unique_deps.append(d) for d in mapped_deps if d not in mapped_unique_deps] - _py_proto_library( - name = name + _PY_PROTO_SUFFIX, - srcs = srcs, - default_runtime = "@com_google_protobuf//:protobuf_python", - protoc = "@com_google_protobuf//:protoc", - 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", - "@com_google_googleapis//google/api:http_py_proto", - "@com_google_googleapis//google/api:httpbody_py_proto", - ], - visibility = ["//visibility:public"], - ) - -# This defines googleapis py_proto_library. The repository does not provide its definition and requires -# overriding it in the consuming project (see https://github.com/grpc/grpc/issues/19255 for more details). -def py_proto_library(name, deps = [], plugin = None): - srcs = [dep[:-6] + ".proto" if dep.endswith("_proto") else dep for dep in deps] - proto_deps = [] - - # py_proto_library in googleapis specifies *_proto rules in dependencies. - # By rewriting *_proto to *.proto above, the dependencies in *_proto rules are not preserved. - # As a workaround, manually specify the proto dependencies for the imported python rules. - if name == "annotations_py_proto": - proto_deps = proto_deps + [":http_py_proto"] - - # checked.proto depends on syntax.proto, we have to add this dependency manually as well. - 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. - _py_proto_library( - name = name, - srcs = srcs, - default_runtime = "@com_google_protobuf//:protobuf_python", - protoc = "@com_google_protobuf//:protoc", - deps = proto_deps + ["@com_google_protobuf//:protobuf_python"], - visibility = ["//visibility:public"], - ) - def _xds_cc_py_proto_library( name, visibility = ["//visibility:private"], @@ -129,7 +69,15 @@ def _xds_cc_py_proto_library( deps = [relative_name], visibility = ["//visibility:public"], ) - _xds_py_proto_library(name, srcs, deps) + + # Uses gRPC implementation of py_proto_library. + # https://github.com/grpc/grpc/blob/v1.59.1/bazel/python_rules.bzl#L160 + _py_proto_library( + name = name + _PY_PROTO_SUFFIX, + # Actual dependencies are resolved automatically from the proto_library dep tree. + deps = [relative_name], + visibility = ["//visibility:public"], + ) # Optionally define gRPC services if has_services: diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index c617cf3..e9701ff 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -3,25 +3,34 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@com_envoyproxy_protoc_gen_validate//bazel:repositories.bzl", "pgv_dependencies") +load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") # go version for rules_go GO_VERSION = "1.20.2" def xds_dependency_imports(go_version = GO_VERSION): + rules_proto_dependencies() + rules_proto_toolchains() protobuf_deps() go_rules_dependencies() go_register_toolchains(go_version) gazelle_dependencies() pgv_dependencies() + # Needed for grpc's @com_github_grpc_grpc//bazel:python_rules.bzl + # Used in place of calling grpc_deps() because it needs to be called before + # loading `grpc_extra_deps.bzl` - which is not allowed in a method def context. + native.bind( + name = "protocol_compiler", + actual = "@com_google_protobuf//:protoc", + ) + switched_rules_by_language( name = "com_google_googleapis_imports", cc = True, go = True, + python = True, grpc = True, - rules_override = { - "py_proto_library": ["@com_github_cncf_xds//bazel:api_build_system.bzl", "",], - }, ) # These dependencies, like most of the Go in this repository, exist only for the API. diff --git a/bazel/external_proto_deps.bzl b/bazel/external_proto_deps.bzl index 4d95ab2..445361b 100644 --- a/bazel/external_proto_deps.bzl +++ b/bazel/external_proto_deps.bzl @@ -36,9 +36,3 @@ EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = { "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto", "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto", } - -# 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:expr_py_proto", - "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:expr_py_proto", -} diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 3ab16c5..0852669 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -26,6 +26,10 @@ def xds_api_dependencies(): "io_bazel_rules_go", locations = REPOSITORY_LOCATIONS, ) + xds_http_archive( + "rules_proto", + locations = REPOSITORY_LOCATIONS, + ) # Old name for backward compatibility. # TODO(roth): Remove once all callers are updated to use the new name. diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 080f504..8ba3f08 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -13,9 +13,9 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/envoyproxy/protoc-gen-validate/archive/refs/tags/v0.6.1.tar.gz"], ), com_github_grpc_grpc = dict( - sha256 = "13e7c6460cd979726e5b3b129bb01c34532f115883ac696a75eb7f1d6a9765ed", - strip_prefix = "grpc-1.40.0", - urls = ["https://github.com/grpc/grpc/archive/refs/tags/v1.40.0.tar.gz"], + sha256 = "916f88a34f06b56432611aaa8c55befee96d0a7b7d7457733b9deeacbc016f99", + strip_prefix = "grpc-1.59.1", + urls = ["https://github.com/grpc/grpc/archive/refs/tags/v1.59.1.tar.gz"], ), com_google_googleapis = dict( # TODO(dio): Consider writing a Skylark macro for importing Google API proto. @@ -24,9 +24,9 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/googleapis/googleapis/archive/114a745b2841a044e98cdbb19358ed29fcf4a5f1.tar.gz"], ), com_google_protobuf = dict( - sha256 = "52b6160ae9266630adb5e96a9fc645215336371a740e87d411bfb63ea2f268a0", - strip_prefix = "protobuf-3.18.0", - urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.18.0/protobuf-all-3.18.0.tar.gz"], + sha256 = "8242327e5df8c80ba49e4165250b8f79a76bd11765facefaaecfca7747dc8da2", + strip_prefix = "protobuf-3.21.5", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.5.zip"], ), io_bazel_rules_go = dict( sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", @@ -35,4 +35,9 @@ REPOSITORY_LOCATIONS = dict( "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", ], ), + rules_proto = dict( + sha256 = "80d3a4ec17354cccc898bfe32118edd934f851b03029d63ef3fc7c8663a7415c", + strip_prefix = "rules_proto-5.3.0-21.5", + urls = ["https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.5.tar.gz",], + ), ) diff --git a/go/udpa/annotations/migrate.pb.go b/go/udpa/annotations/migrate.pb.go index be9f467..732f6b6 100644 --- a/go/udpa/annotations/migrate.pb.go +++ b/go/udpa/annotations/migrate.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/annotations/migrate.proto package annotations diff --git a/go/udpa/annotations/security.pb.go b/go/udpa/annotations/security.pb.go index aaac45e..78ffd38 100644 --- a/go/udpa/annotations/security.pb.go +++ b/go/udpa/annotations/security.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/annotations/security.proto package annotations diff --git a/go/udpa/annotations/sensitive.pb.go b/go/udpa/annotations/sensitive.pb.go index 0a46801..b5aa7eb 100644 --- a/go/udpa/annotations/sensitive.pb.go +++ b/go/udpa/annotations/sensitive.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/annotations/sensitive.proto package annotations diff --git a/go/udpa/annotations/status.pb.go b/go/udpa/annotations/status.pb.go index 25b93a7..ba399a6 100644 --- a/go/udpa/annotations/status.pb.go +++ b/go/udpa/annotations/status.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/annotations/status.proto package annotations diff --git a/go/udpa/annotations/versioning.pb.go b/go/udpa/annotations/versioning.pb.go index 7af3ed3..5bb3910 100644 --- a/go/udpa/annotations/versioning.pb.go +++ b/go/udpa/annotations/versioning.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/annotations/versioning.proto package annotations diff --git a/go/udpa/data/orca/v1/orca_load_report.pb.go b/go/udpa/data/orca/v1/orca_load_report.pb.go index 6ee0925..d25cc80 100644 --- a/go/udpa/data/orca/v1/orca_load_report.pb.go +++ b/go/udpa/data/orca/v1/orca_load_report.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/data/orca/v1/orca_load_report.proto package v1 diff --git a/go/udpa/service/orca/v1/orca.pb.go b/go/udpa/service/orca/v1/orca.pb.go index c93308f..4f96b1e 100644 --- a/go/udpa/service/orca/v1/orca.pb.go +++ b/go/udpa/service/orca/v1/orca.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/service/orca/v1/orca.proto package v1 diff --git a/go/udpa/type/v1/typed_struct.pb.go b/go/udpa/type/v1/typed_struct.pb.go index f2a65d4..2251ab9 100644 --- a/go/udpa/type/v1/typed_struct.pb.go +++ b/go/udpa/type/v1/typed_struct.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: udpa/type/v1/typed_struct.proto package v1 diff --git a/go/xds/annotations/v3/migrate.pb.go b/go/xds/annotations/v3/migrate.pb.go index cf1ee18..0cdd47f 100644 --- a/go/xds/annotations/v3/migrate.pb.go +++ b/go/xds/annotations/v3/migrate.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/annotations/v3/migrate.proto package v3 diff --git a/go/xds/annotations/v3/security.pb.go b/go/xds/annotations/v3/security.pb.go index 084664f..a50efc4 100644 --- a/go/xds/annotations/v3/security.pb.go +++ b/go/xds/annotations/v3/security.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/annotations/v3/security.proto package v3 diff --git a/go/xds/annotations/v3/sensitive.pb.go b/go/xds/annotations/v3/sensitive.pb.go index b603aa4..1fbfafa 100644 --- a/go/xds/annotations/v3/sensitive.pb.go +++ b/go/xds/annotations/v3/sensitive.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/annotations/v3/sensitive.proto package v3 diff --git a/go/xds/annotations/v3/status.pb.go b/go/xds/annotations/v3/status.pb.go index cc624ac..842025b 100644 --- a/go/xds/annotations/v3/status.pb.go +++ b/go/xds/annotations/v3/status.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/annotations/v3/status.proto package v3 diff --git a/go/xds/annotations/v3/versioning.pb.go b/go/xds/annotations/v3/versioning.pb.go index 2252689..5412c81 100644 --- a/go/xds/annotations/v3/versioning.pb.go +++ b/go/xds/annotations/v3/versioning.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/annotations/v3/versioning.proto package v3 diff --git a/go/xds/core/v3/authority.pb.go b/go/xds/core/v3/authority.pb.go index d6655c7..5a22c32 100644 --- a/go/xds/core/v3/authority.pb.go +++ b/go/xds/core/v3/authority.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/authority.proto package v3 diff --git a/go/xds/core/v3/cidr.pb.go b/go/xds/core/v3/cidr.pb.go index 0e9a4de..e915cdb 100644 --- a/go/xds/core/v3/cidr.pb.go +++ b/go/xds/core/v3/cidr.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/cidr.proto package v3 diff --git a/go/xds/core/v3/collection_entry.pb.go b/go/xds/core/v3/collection_entry.pb.go index 8f598cb..e91c6ab 100644 --- a/go/xds/core/v3/collection_entry.pb.go +++ b/go/xds/core/v3/collection_entry.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/collection_entry.proto package v3 diff --git a/go/xds/core/v3/context_params.pb.go b/go/xds/core/v3/context_params.pb.go index 2d0e2b6..f3f3716 100644 --- a/go/xds/core/v3/context_params.pb.go +++ b/go/xds/core/v3/context_params.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/context_params.proto package v3 diff --git a/go/xds/core/v3/extension.pb.go b/go/xds/core/v3/extension.pb.go index ba0c246..41db466 100644 --- a/go/xds/core/v3/extension.pb.go +++ b/go/xds/core/v3/extension.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/extension.proto package v3 diff --git a/go/xds/core/v3/resource.pb.go b/go/xds/core/v3/resource.pb.go index 915e3c7..3b4c853 100644 --- a/go/xds/core/v3/resource.pb.go +++ b/go/xds/core/v3/resource.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/resource.proto package v3 diff --git a/go/xds/core/v3/resource_locator.pb.go b/go/xds/core/v3/resource_locator.pb.go index bc28d50..8123f11 100644 --- a/go/xds/core/v3/resource_locator.pb.go +++ b/go/xds/core/v3/resource_locator.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/resource_locator.proto package v3 diff --git a/go/xds/core/v3/resource_name.pb.go b/go/xds/core/v3/resource_name.pb.go index 92a54df..19e67f6 100644 --- a/go/xds/core/v3/resource_name.pb.go +++ b/go/xds/core/v3/resource_name.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/core/v3/resource_name.proto package v3 diff --git a/go/xds/data/orca/v3/orca_load_report.pb.go b/go/xds/data/orca/v3/orca_load_report.pb.go index 13d26cf..b7bc07c 100644 --- a/go/xds/data/orca/v3/orca_load_report.pb.go +++ b/go/xds/data/orca/v3/orca_load_report.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/data/orca/v3/orca_load_report.proto package v3 diff --git a/go/xds/service/orca/v3/orca.pb.go b/go/xds/service/orca/v3/orca.pb.go index bf71080..c88f201 100644 --- a/go/xds/service/orca/v3/orca.pb.go +++ b/go/xds/service/orca/v3/orca.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/service/orca/v3/orca.proto package v3 diff --git a/go/xds/type/matcher/v3/cel.pb.go b/go/xds/type/matcher/v3/cel.pb.go index 3b44e39..4168ac3 100644 --- a/go/xds/type/matcher/v3/cel.pb.go +++ b/go/xds/type/matcher/v3/cel.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/cel.proto package v3 diff --git a/go/xds/type/matcher/v3/domain.pb.go b/go/xds/type/matcher/v3/domain.pb.go index 4548fd0..6e13992 100644 --- a/go/xds/type/matcher/v3/domain.pb.go +++ b/go/xds/type/matcher/v3/domain.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/domain.proto package v3 diff --git a/go/xds/type/matcher/v3/http_inputs.pb.go b/go/xds/type/matcher/v3/http_inputs.pb.go index c9e49a6..ed3392c 100644 --- a/go/xds/type/matcher/v3/http_inputs.pb.go +++ b/go/xds/type/matcher/v3/http_inputs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/http_inputs.proto package v3 diff --git a/go/xds/type/matcher/v3/ip.pb.go b/go/xds/type/matcher/v3/ip.pb.go index de457f4..20fa124 100644 --- a/go/xds/type/matcher/v3/ip.pb.go +++ b/go/xds/type/matcher/v3/ip.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/ip.proto package v3 diff --git a/go/xds/type/matcher/v3/matcher.pb.go b/go/xds/type/matcher/v3/matcher.pb.go index cdfa2bc..97c629b 100644 --- a/go/xds/type/matcher/v3/matcher.pb.go +++ b/go/xds/type/matcher/v3/matcher.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/matcher.proto package v3 diff --git a/go/xds/type/matcher/v3/range.pb.go b/go/xds/type/matcher/v3/range.pb.go index 6051501..2fd6aa7 100644 --- a/go/xds/type/matcher/v3/range.pb.go +++ b/go/xds/type/matcher/v3/range.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/range.proto package v3 diff --git a/go/xds/type/matcher/v3/regex.pb.go b/go/xds/type/matcher/v3/regex.pb.go index 105a076..1faf80e 100644 --- a/go/xds/type/matcher/v3/regex.pb.go +++ b/go/xds/type/matcher/v3/regex.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/regex.proto package v3 diff --git a/go/xds/type/matcher/v3/string.pb.go b/go/xds/type/matcher/v3/string.pb.go index 04812f3..0aac938 100644 --- a/go/xds/type/matcher/v3/string.pb.go +++ b/go/xds/type/matcher/v3/string.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/matcher/v3/string.proto package v3 diff --git a/go/xds/type/v3/cel.pb.go b/go/xds/type/v3/cel.pb.go index f033ccd..8c4fd9d 100644 --- a/go/xds/type/v3/cel.pb.go +++ b/go/xds/type/v3/cel.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/v3/cel.proto package v3 diff --git a/go/xds/type/v3/range.pb.go b/go/xds/type/v3/range.pb.go index a4b017c..6259e55 100644 --- a/go/xds/type/v3/range.pb.go +++ b/go/xds/type/v3/range.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/v3/range.proto package v3 diff --git a/go/xds/type/v3/typed_struct.pb.go b/go/xds/type/v3/typed_struct.pb.go index ee102a5..c348e64 100644 --- a/go/xds/type/v3/typed_struct.pb.go +++ b/go/xds/type/v3/typed_struct.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.18.0 +// protoc v3.21.5 // source: xds/type/v3/typed_struct.proto package v3