From b61eb81b588fbd88d989bdc9b4e4283222bff172 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Tue, 28 Oct 2025 21:09:24 +0000 Subject: [PATCH] update xDS project version Signed-off-by: Matthieu MOREL --- api/bazel/pgv.patch | 30 --------- api/bazel/repositories.bzl | 2 - api/bazel/repository_locations.bzl | 12 ++-- bazel/dependency_imports.bzl | 64 ++++++------------- .../test/test_data/simple/go.mod | 19 +++--- go.mod | 2 +- mobile/WORKSPACE | 6 +- 7 files changed, 39 insertions(+), 96 deletions(-) delete mode 100644 api/bazel/pgv.patch diff --git a/api/bazel/pgv.patch b/api/bazel/pgv.patch deleted file mode 100644 index bafc642fb0cb7..0000000000000 --- a/api/bazel/pgv.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/templates/cc/register.go 2023-06-22 14:25:05.776175085 +0000 -+++ b/templates/cc/register.go 2023-06-22 14:26:33.008090583 +0000 -@@ -116,6 +116,10 @@ - func (fns CCFuncs) methodName(name interface{}) string { - nameStr := fmt.Sprintf("%s", name) - switch nameStr { -+ case "concept": -+ return "concept_" -+ case "requires": -+ return "requires_" - case "const": - return "const_" - case "inline": -diff --git a/validate/BUILD b/validate/BUILD -index a9d38c5..2baa5d2 100644 ---- a/validate/BUILD -+++ b/validate/BUILD -@@ -1,9 +1,10 @@ - load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") -+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -+load("@io_bazel_rules_go//go:def.bzl", "go_library") - load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") --load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library") -+load("@rules_cc//cc:defs.bzl", "cc_library") - load("@rules_java//java:defs.bzl", "java_proto_library") - load("@rules_proto//proto:defs.bzl", "proto_library") --load("@io_bazel_rules_go//go:def.bzl", "go_library") - - package( - default_visibility = diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl index ba118cb5f0496..95951c2141cf0 100644 --- a/api/bazel/repositories.bzl +++ b/api/bazel/repositories.bzl @@ -37,8 +37,6 @@ def api_dependencies(bzlmod = False): ) external_http_archive( name = "com_envoyproxy_protoc_gen_validate", - patch_args = ["-p1"], - patches = ["@envoy_api//bazel:pgv.patch"], ) external_http_archive( name = "com_google_googleapis", diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl index a3e36fbb5915e..5cf1b1c9632a1 100644 --- a/api/bazel/repository_locations.bzl +++ b/api/bazel/repository_locations.bzl @@ -17,11 +17,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_desc = "protoc plugin to generate polyglot message validators", project_url = "https://github.com/bufbuild/protoc-gen-validate", use_category = ["api"], - sha256 = "9372f9ecde8fbadf83c8c7de3dbb49b11067aa26fb608c501106d0b4bf06c28f", - version = "1.0.4", + sha256 = "ab51e978326b87e06be7a12fc6496f3ff6586339043557dbbd31f622332a5d45", + version = "1.2.1", urls = ["https://github.com/bufbuild/protoc-gen-validate/archive/refs/tags/v{version}.zip"], strip_prefix = "protoc-gen-validate-{version}", - release_date = "2024-01-17", + release_date = "2025-01-22", implied_untracked_deps = [ "com_github_iancoleman_strcase", "com_github_lyft_protoc_gen_star_v2", @@ -52,9 +52,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 = "2ee22ca5838277e4cff0f0219b1c62e5c0cd3cc1", - sha256 = "34d450522f7b2a1d66a923d12616ace6baca0596bbd7edcbb21c39c41fc8527f", - release_date = "2025-10-14", + version = "5cf4b19495289a9e992ce5e2c3ffb08f2cf387be", + sha256 = "a4746515f380b364497803881a4fb85296d3c141e8a507716fb5924686f129f9", + release_date = "2025-10-31", strip_prefix = "xds-{version}", urls = ["https://github.com/cncf/xds/archive/{version}.tar.gz"], use_category = ["api"], diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index d2ab0fc039089..bf7c396b4c8e7 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -90,6 +90,8 @@ def envoy_dependency_imports( setup_sanitizer_libs() + protoc_gen_jsonschema_go_dependencies() + # 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 @@ -97,55 +99,44 @@ def envoy_dependency_imports( name = "org_golang_google_grpc", build_file_proto_mode = "disable", importpath = "google.golang.org/grpc", - sum = "h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=", - version = "v1.34.0", + sum = "h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=", + version = "v1.68.0", build_external = "external", - # project_url = "https://pkg.go.dev/google.golang.org/grpc", - # last_update = "2020-12-02" - # use_category = ["api"], - # cpe = "cpe:2.3:a:grpc:grpc:*", ) go_repository( name = "org_golang_x_net", importpath = "golang.org/x/net", - sum = "h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=", - version = "v0.0.0-20200226121028-0de0cce0169b", + sum = "h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=", + version = "v0.34.0", build_external = "external", - # project_url = "https://pkg.go.dev/golang.org/x/net", - # last_update = "2020-02-26" - # use_category = ["api"], - # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L129-L134" ) go_repository( name = "org_golang_x_text", importpath = "golang.org/x/text", - sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=", - version = "v0.3.3", + sum = "h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=", + version = "v0.21.0", build_external = "external", - # project_url = "https://pkg.go.dev/golang.org/x/text", - # last_update = "2021-06-16" - # use_category = ["api"], - # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L148-L153" ) 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", + sum = "h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE=", + version = "v0.0.0-20251029180050-ab9386a59fda", 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", + sum = "h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=", + version = "v0.0.0-20251029180050-ab9386a59fda", build_external = "external", ) go_repository( name = "org_golang_google_protobuf", + build_file_proto_mode = "disable", importpath = "google.golang.org/protobuf", - sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=", - version = "v1.28.1", + sum = "h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=", + version = "v1.36.10", build_external = "external", ) go_repository( @@ -158,35 +149,23 @@ def envoy_dependency_imports( 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/v0.6.1/dependencies.bzl#L60-L65" ) go_repository( name = "com_github_lyft_protoc_gen_star_v2", importpath = "github.com/lyft/protoc-gen-star/v2", - sum = "h1:keaAo8hRuAT0O3DfJ/wM3rufbAjGeJ1lAtWZHDjKGB0=", - version = "v2.0.1", + sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=", + version = "v2.0.4-0.20230330145011-496ad1ac90a4", 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/v0.10.1/dependencies.bzl#L35-L40" ) 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/v0.6.1/dependencies.bzl#L23-L28" ) go_repository( name = "com_github_planetscale_vtprotobuf", @@ -196,7 +175,6 @@ def envoy_dependency_imports( build_external = "external", ) - protoc_gen_jsonschema_go_dependencies() rules_proto_grpc_toolchains() def envoy_download_go_sdks(go_version): diff --git a/contrib/golang/router/cluster_specifier/test/test_data/simple/go.mod b/contrib/golang/router/cluster_specifier/test/test_data/simple/go.mod index 18df0254986ca..7dfada50513d0 100644 --- a/contrib/golang/router/cluster_specifier/test/test_data/simple/go.mod +++ b/contrib/golang/router/cluster_specifier/test/test_data/simple/go.mod @@ -1,21 +1,18 @@ module example.com/routeconfig -go 1.23 +go 1.24.6 require ( - github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa - github.com/envoyproxy/envoy v1.33.2 -) - -require ( - google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect + github.com/cncf/xds/go v0.0.0-20251031190108-5cf4b1949528 + github.com/envoyproxy/envoy v1.36.2 + google.golang.org/protobuf v1.36.10 ) require ( - github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect - google.golang.org/protobuf v1.36.10 + cel.dev/expr v0.24.0 // indirect + github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect ) replace github.com/envoyproxy/envoy => ../../../../../../../ diff --git a/go.mod b/go.mod index 1c08d7e1bbcc7..8d500f6d76581 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/envoyproxy/envoy -go 1.23 +go 1.24.6 require google.golang.org/protobuf v1.36.10 diff --git a/mobile/WORKSPACE b/mobile/WORKSPACE index 4f69835631999..a4457820db02e 100644 --- a/mobile/WORKSPACE +++ b/mobile/WORKSPACE @@ -5,10 +5,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "bazel_gazelle", - sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002", + sha256 = "e467b801046b6598c657309b45d2426dc03513777bd1092af2c62eebf990aca5", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz", ], )