.bazelversion

@@ -1 +1 @@
-4.2.0
+6.3.2

.gitignore

@@ -1,2 +1 @@
 bazel-*
-go.sum

bazel/BUILD

@@ -1,12 +1 @@
-load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
-
 licenses(["notice"])  # Apache 2
-
-go_proto_compiler(
-    name = "pgv_plugin_go",
-    options = ["lang=go"],
-    plugin = "@com_envoyproxy_protoc_gen_validate//:protoc-gen-validate",
-    suffix = ".pb.validate.go",
-    valid_archive = False,
-    visibility = ["//visibility:public"],
-)

bazel/api_build_system.bzl

@@ -1,13 +1,12 @@
 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")
 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:
@@ -154,9 +102,9 @@ def xds_proto_package(
         has_services = has_services,
     )
 
-    compilers = ["@io_bazel_rules_go//proto:go_proto", "//bazel:pgv_plugin_go"]
+    compilers = ["@io_bazel_rules_go//proto:go_proto", "@com_envoyproxy_protoc_gen_validate//bazel/go:pgv_plugin_go"]
     if has_services:
-        compilers = ["@io_bazel_rules_go//proto:go_grpc", "//bazel:pgv_plugin_go"]
+        compilers = ["@io_bazel_rules_go//proto:go_proto", "@io_bazel_rules_go//proto:go_grpc_v2", "@com_envoyproxy_protoc_gen_validate//bazel/go:pgv_plugin_go"]
 
     # Because RBAC proro depends on googleapis syntax.proto and checked.proto,
     # which share the same go proto library, it causes duplicative dependencies.
@@ -169,14 +117,13 @@ def xds_proto_package(
         visibility = ["//visibility:public"],
         deps = depset([_go_proto_mapping(dep) for dep in deps] + [
             "@com_envoyproxy_protoc_gen_validate//validate:go_default_library",
-            "@com_github_golang_protobuf//ptypes:go_default_library_gen",
-            "@go_googleapis//google/api:annotations_go_proto",
-            "@go_googleapis//google/rpc:status_go_proto",
-            "@io_bazel_rules_go//proto/wkt:any_go_proto",
-            "@io_bazel_rules_go//proto/wkt:duration_go_proto",
-            "@io_bazel_rules_go//proto/wkt:struct_go_proto",
-            "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
-            "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
+            "@org_golang_google_genproto_googleapis_api//annotations:annotations",
+            "@org_golang_google_genproto_googleapis_rpc//status:status",
+            "@org_golang_google_protobuf//types/known/anypb:go_default_library",
+            "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
+            "@org_golang_google_protobuf//types/known/structpb:go_default_library",
+            "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
+            "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library",
         ]).to_list(),
     )
 
@@ -195,10 +142,10 @@ def xds_go_test(name, **kwargs):
 # Old names for backward compatibility.
 # TODO(roth): Remove these once all callers are migrated to the new names.
 def udpa_proto_package(srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]):
-  xds_proto_package(srcs=srcs, deps=deps, has_services=has_services, visibility=visibility)
+    xds_proto_package(srcs = srcs, deps = deps, has_services = has_services, visibility = visibility)
 
 def udpa_cc_test(name, **kwargs):
-  xds_cc_test(name, **kwargs)
+    xds_cc_test(name, **kwargs)
 
 def udpa_go_test(name, **kwargs):
-  xds_go_test(name, **kwargs)
+    xds_go_test(name, **kwargs)

bazel/dependency_imports.bzl

@@ -1,59 +1,118 @@
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
+load("@com_envoyproxy_protoc_gen_validate//bazel:repositories.bzl", "pgv_dependencies")
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 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.16.6"
+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)
+    go_register_toolchains(go_version = 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.
+    # These repos also have transient dependencies - `build_external` allows them to use them.
+    # TODO(phlax): remove `build_external` and pin all transients
     go_repository(
         name = "com_github_iancoleman_strcase",
         importpath = "github.com/iancoleman/strcase",
-        sum = "h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk=",
-        version = "v0.0.0-20180726023541-3605ed457bf7",
+        sum = "h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=",
+        version = "v0.3.0",
+        build_external = "external",
+        # project_url = "https://pkg.go.dev/github.com/iancoleman/strcase",
+        # last_update = "2020-11-22"
+        # use_category = ["api"],
+        # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v1.0.4/dependencies.bzl#L170-L175"
+    )
+    go_repository(
+        name = "org_golang_x_net",
+        importpath = "golang.org/x/net",
+        sum = "h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=",
+        version = "v0.20.0",
+        build_external = "external",
+    )
+    go_repository(
+        name = "org_golang_x_text",
+        importpath = "golang.org/x/text",
+        sum = "h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=",
+        version = "v0.14.0",
+        build_external = "external",
     )
-
     go_repository(
         name = "com_github_spf13_afero",
         importpath = "github.com/spf13/afero",
-        sum = "h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=",
-        version = "v1.3.4",
+        sum = "h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=",
+        version = "v1.10.0",
+        build_external = "external",
+        # project_url = "https://pkg.go.dev/github.com/spf13/afero",
+        # last_update = "2021-03-20"
+        # use_category = ["api"],
+        # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v1.0.4/dependencies.bzl#L257-L262"
     )
-
     go_repository(
-        name = "com_github_lyft_protoc_gen_star",
-        importpath = "github.com/lyft/protoc-gen-star",
-        sum = "h1:sImehRT+p7lW9n6R7MQc5hVgzWGEkDVZU4AsBQ4Isu8=",
-        version = "v0.5.1",
+        name = "com_github_lyft_protoc_gen_star_v2",
+        importpath = "github.com/lyft/protoc-gen-star/v2",
+        sum = "h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o=",
+        version = "v2.0.3",
+        build_external = "external",
+        # project_url = "https://pkg.go.dev/github.com/lyft/protoc-gen-star",
+        # last_update = "2023-01-06"
+        # use_category = ["api"],
+        # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v1.0.4/dependencies.bzl#L220-L225"
+    )
+    go_repository(
+        name = "org_golang_google_genproto_googleapis_api",
+        importpath = "google.golang.org/genproto/googleapis/api",
+        sum = "h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=",
+        version = "v0.0.0-20230822172742-b8732ec3820d",
+        build_external = "external",
+    )
+    go_repository(
+        name = "org_golang_google_genproto_googleapis_rpc",
+        importpath = "google.golang.org/genproto/googleapis/rpc",
+        sum = "h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=",
+        version = "v0.0.0-20230822172742-b8732ec3820d",
+        build_external = "external",
+    )
+    go_repository(
+        name = "org_golang_google_protobuf",
+        importpath = "google.golang.org/protobuf",
+        sum = "h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=",
+        version = "v1.32.0",
+        build_external = "external",
     )
-
     go_repository(
         name = "org_golang_google_grpc",
         build_file_proto_mode = "disable",
         importpath = "google.golang.org/grpc",
-        sum = "h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=",
-        version = "v1.40.0",
+        sum = "h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=",
+        version = "v1.59.0",
     )
 
 # Old name for backward compatibility.
 # TODO(roth): Remove this once callers are migrated to the new name.
 def udpa_dependency_imports(go_version = GO_VERSION):
-  xds_dependency_imports(go_version=go_version)
+    xds_dependency_imports(go_version = go_version)

bazel/envoy_http_archive.bzl

@@ -26,4 +26,4 @@ def xds_http_archive(name, locations, **kwargs):
 # Old name for backward compatibility.
 # TODO(roth): Remove once all callers are changed to use the new name.
 def udpa_http_archive(name, locations, **kwargs):
-  xds_http_archive(name, locations, **kwargs)
+    xds_http_archive(name, locations, **kwargs)

bazel/external_proto_deps.bzl

@@ -27,18 +27,16 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
     # TODO(https://github.com/bazelbuild/rules_go/issues/1986): update to
     #    @com_google_googleapis when the bug is resolved. Also see the note to
     #    go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies
-    "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
-    "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
+    "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
+    "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
+    "@dev_cel//proto/cel/expr:checked_proto": "@dev_cel//proto/cel/expr:checked_go_proto",
+    "@dev_cel//proto/cel/expr:syntax_proto": "@dev_cel//proto/cel/expr:syntax_go_proto",
 }
 
 # This maps from the Bazel proto_library target to the C++ language binding target for external dependencies.
 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",
+    "@dev_cel//proto/cel/expr:checked_proto": "@dev_cel//proto/cel/expr:checked_cc_proto",
+    "@dev_cel//proto/cel/expr:syntax_proto": "@dev_cel//proto/cel/expr:syntax_cc_proto",
 }

bazel/repositories.bzl

@@ -22,12 +22,20 @@ def xds_api_dependencies():
         "com_google_protobuf",
         locations = REPOSITORY_LOCATIONS,
     )
+    xds_http_archive(
+        name = "dev_cel",
+        locations = REPOSITORY_LOCATIONS,
+    )
     xds_http_archive(
         "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.
 def udpa_api_dependencies():
-  xds_api_dependencies()
+    xds_api_dependencies()