Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2ee22ca

Browse files
mmorel-35phlax
mmorel-35
and
phlax
authored
build: remove rules_proto dependency and update protobuf version (#123)
Signed-off-by: Matthieu MOREL <[email protected]> Co-authored-by: phlax <[email protected]>
1 parent 2ac532f commit 2ee22ca

46 files changed

Lines changed: 893 additions & 1796 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bazelrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
build:ci --announce_rc
2+
3+
# C++17 standard required for newer protobuf and grpc versions
4+
build --cxxopt=-std=c++17
5+
build --host_cxxopt=-std=c++17

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.1
1+
7.6.1

‎MODULE.bazel‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@ module(
33
version = "0.0.0",
44
)
55

6-
bazel_dep(name = "bazel_skylib", version = "1.5.0")
7-
bazel_dep(name = "cel-spec", version = "0.15.0", repo_name = "dev_cel")
8-
bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle")
6+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
7+
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "dev_cel")
8+
bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
99
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
1010
bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc")
1111
bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
1212
bazel_dep(name = "protoc-gen-validate", version = "1.0.4", repo_name = "com_envoyproxy_protoc_gen_validate")
1313
bazel_dep(name = "re2", version = "2024-05-01", repo_name = "com_googlesource_code_re2")
14-
bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go")
15-
bazel_dep(name = "rules_proto", version = "6.0.0")
14+
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
15+
bazel_dep(name = "rules_python", version = "1.6.3")
16+
17+
# Configure Python toolchain for bzlmod
18+
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
19+
python.toolchain(
20+
python_version = "3.12",
21+
)
1622

1723
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
1824
switched_rules.use_languages(
@@ -23,7 +29,7 @@ switched_rules.use_languages(
2329
)
2430

2531
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
26-
go_sdk.download(version = "1.20.2")
32+
go_sdk.download(version = "1.24.6")
2733

2834
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
2935
go_deps.from_file(go_mod = "//go:go.mod")

‎bazel/api_build_system.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library")
22
load("@com_github_grpc_grpc//bazel:python_rules.bzl", _py_proto_library = "py_proto_library")
3+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
34
load("@io_bazel_rules_go//go:def.bzl", "go_test")
45
load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library")
5-
load("@rules_proto//proto:defs.bzl", "proto_library")
66
load(
77
"//bazel:external_proto_deps.bzl",
88
"EXTERNAL_PROTO_CC_BAZEL_DEP_MAP",

‎bazel/dependency_imports.bzl‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,28 @@ load("@com_envoyproxy_protoc_gen_validate//bazel:repositories.bzl", "pgv_depende
33
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
44
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
55
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
6-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
6+
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
77

88
# go version for rules_go
9-
GO_VERSION = "1.20.2"
9+
GO_VERSION = "1.24.6"
10+
11+
# Python version for rules_python
12+
PYTHON_VERSION = "3.12"
1013

1114
def xds_dependency_imports(go_version = GO_VERSION):
12-
rules_proto_dependencies()
13-
rules_proto_toolchains()
1415
protobuf_deps()
1516
go_rules_dependencies()
1617
go_register_toolchains(go_version = go_version)
17-
gazelle_dependencies()
18+
gazelle_dependencies(go_sdk = "go_sdk")
1819
pgv_dependencies()
1920

21+
# Initialize rules_python for WORKSPACE mode
22+
py_repositories()
23+
python_register_toolchains(
24+
name = "python_%s" % PYTHON_VERSION,
25+
python_version = PYTHON_VERSION,
26+
)
27+
2028
# Needed for grpc's @com_github_grpc_grpc//bazel:python_rules.bzl
2129
# Used in place of calling grpc_deps() because it needs to be called before
2230
# loading `grpc_extra_deps.bzl` - which is not allowed in a method def context.
@@ -36,6 +44,25 @@ def xds_dependency_imports(go_version = GO_VERSION):
3644
# These dependencies, like most of the Go in this repository, exist only for the API.
3745
# These repos also have transient dependencies - `build_external` allows them to use them.
3846
# TODO(phlax): remove `build_external` and pin all transients
47+
go_repository(
48+
name = "org_golang_x_mod",
49+
importpath = "golang.org/x/mod",
50+
sum = "h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=",
51+
version = "v0.15.0",
52+
build_external = "external",
53+
)
54+
go_repository(
55+
name = "org_golang_x_tools",
56+
importpath = "golang.org/x/tools",
57+
sum = "h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=",
58+
version = "v0.17.0",
59+
# Using vendored mode to avoid having to resolve all transitive dependencies manually
60+
build_external = "vendored",
61+
build_directives = [
62+
"gazelle:resolve go golang.org/x/mod/semver @org_golang_x_mod//semver:go_default_library",
63+
"gazelle:resolve go golang.org/x/mod/module @org_golang_x_mod//module:go_default_library",
64+
],
65+
)
3966
go_repository(
4067
name = "com_github_iancoleman_strcase",
4168
importpath = "github.com/iancoleman/strcase",
@@ -78,6 +105,9 @@ def xds_dependency_imports(go_version = GO_VERSION):
78105
sum = "h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o=",
79106
version = "v2.0.3",
80107
build_external = "external",
108+
build_directives = [
109+
"gazelle:resolve go golang.org/x/tools/imports @org_golang_x_tools//imports:go_default_library",
110+
],
81111
# project_url = "https://pkg.go.dev/github.com/lyft/protoc-gen-star",
82112
# last_update = "2023-01-06"
83113
# use_category = ["api"],

‎bazel/repositories.bzl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ load(":envoy_http_archive.bzl", "xds_http_archive")
22
load(":repository_locations.bzl", "REPOSITORY_LOCATIONS")
33

44
def xds_api_dependencies():
5+
xds_http_archive(
6+
"bazel_skylib",
7+
locations = REPOSITORY_LOCATIONS,
8+
)
59
xds_http_archive(
610
"bazel_gazelle",
711
locations = REPOSITORY_LOCATIONS,
@@ -30,6 +34,10 @@ def xds_api_dependencies():
3034
"io_bazel_rules_go",
3135
locations = REPOSITORY_LOCATIONS,
3236
)
37+
xds_http_archive(
38+
"rules_python",
39+
locations = REPOSITORY_LOCATIONS,
40+
)
3341
xds_http_archive(
3442
"rules_proto",
3543
locations = REPOSITORY_LOCATIONS,

‎bazel/repository_locations.bzl‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
REPOSITORY_LOCATIONS = dict(
22
bazel_gazelle = dict(
3-
sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
3+
sha256 = "e467b801046b6598c657309b45d2426dc03513777bd1092af2c62eebf990aca5",
44
urls = [
5-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
6-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
5+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz",
76
],
87
),
98
bazel_skylib = dict(
10-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
11-
urls = ["https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"],
9+
sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446",
10+
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz"],
1211
),
1312
com_envoyproxy_protoc_gen_validate = dict(
1413
sha256 = "92e29c2150675ce954c965bcaa559ca944704b75711533cfe03ce541dcf5a1dd",
@@ -29,25 +28,29 @@ REPOSITORY_LOCATIONS = dict(
2928
],
3029
),
3130
com_google_protobuf = dict(
32-
sha256 = "8242327e5df8c80ba49e4165250b8f79a76bd11765facefaaecfca7747dc8da2",
33-
strip_prefix = "protobuf-3.21.5",
34-
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.5.zip"],
31+
sha256 = "3d32940e975c4ad9b8ba69640e78f5527075bae33ca2890275bf26b853c0962c",
32+
strip_prefix = "protobuf-29.1",
33+
urls = ["https://github.com/protocolbuffers/protobuf/archive/v29.1.tar.gz"],
3534
),
3635
dev_cel = dict(
37-
sha256 = "3ee09eb69dbe77722e9dee23dc48dc2cd9f765869fcf5ffb1226587c81791a0b",
38-
strip_prefix = "cel-spec-0.15.0",
39-
urls = ["https://github.com/google/cel-spec/archive/refs/tags/v0.15.0.tar.gz"],
36+
sha256 = "5cba6b0029e727d1f4d8fd134de4e747cecc0bc293d026017d7edc48058d09f7",
37+
strip_prefix = "cel-spec-0.24.0",
38+
urls = ["https://github.com/google/cel-spec/archive/refs/tags/v0.24.0.tar.gz"],
4039
),
4140
io_bazel_rules_go = dict(
42-
sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
41+
sha256 = "b78f77458e77162f45b4564d6b20b6f92f56431ed59eaaab09e7819d1d850313",
4342
urls = [
44-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
45-
"https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
43+
"https://github.com/bazelbuild/rules_go/releases/download/v0.53.0/rules_go-v0.53.0.zip",
4644
],
4745
),
4846
rules_proto = dict(
49-
sha256 = "80d3a4ec17354cccc898bfe32118edd934f851b03029d63ef3fc7c8663a7415c",
50-
strip_prefix = "rules_proto-5.3.0-21.5",
51-
urls = ["https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.5.tar.gz"],
47+
sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4",
48+
strip_prefix = "rules_proto-7.1.0",
49+
urls = ["https://github.com/bazelbuild/rules_proto/archive/refs/tags/7.1.0.tar.gz"],
50+
),
51+
rules_python = dict(
52+
sha256 = "2f5c284fbb4e86045c2632d3573fc006facbca5d1fa02976e89dc0cd5488b590",
53+
strip_prefix = "rules_python-1.6.3",
54+
urls = ["https://github.com/bazelbuild/rules_python/archive/1.6.3.tar.gz"],
5255
),
5356
)

‎ci/azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- task: GoTool@0
3333
displayName: "Install Go"
3434
inputs:
35-
version: '1.20.2'
35+
version: '1.24.6'
3636

3737
- task: Go@0
3838
displayName: "go mod download"

‎go/go.mod‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
module github.com/cncf/xds/go
22

3-
go 1.19
3+
go 1.24
44

55
require (
6-
cel.dev/expr v0.15.0
7-
github.com/envoyproxy/protoc-gen-validate v1.0.4
8-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
9-
google.golang.org/grpc v1.59.0
10-
google.golang.org/protobuf v1.33.0
6+
cel.dev/expr v0.24.0
7+
github.com/envoyproxy/protoc-gen-validate v1.1.0
8+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
9+
google.golang.org/grpc v1.67.3
10+
google.golang.org/protobuf v1.36.3
1111
)
1212

1313
require (
14-
github.com/golang/protobuf v1.5.3 // indirect
15-
golang.org/x/net v0.20.0 // indirect
16-
golang.org/x/sys v0.16.0 // indirect
17-
golang.org/x/text v0.14.0 // indirect
18-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
14+
golang.org/x/net v0.28.0 // indirect
15+
golang.org/x/sys v0.28.0 // indirect
16+
golang.org/x/text v0.17.0 // indirect
17+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
1918
)

‎go/go.sum‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
cel.dev/expr v0.15.0 h1:O1jzfJCQBfL5BFoYktaxwIhuttaQPsVWerH9/EEKx0w=
2-
cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg=
3-
github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
4-
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
5-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
7-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
8-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
10-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
11-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
12-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
13-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
14-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
15-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
16-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
17-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
18-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
19-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
20-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
21-
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
22-
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
23-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
24-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
25-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
26-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
1+
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2+
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
3+
github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
4+
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
5+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
6+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
7+
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
8+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
9+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
10+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11+
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
12+
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
13+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
14+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
15+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=
16+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
17+
google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8=
18+
google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s=
19+
google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
20+
google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

0 commit comments

Comments
 (0)