Skip to content

Commit 3cf696c

Browse files
committed
deps: bzlmod migration with BCR dependencies and non-module extension
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 2f17c73 commit 3cf696c

File tree

12 files changed

+4253
-730
lines changed

12 files changed

+4253
-730
lines changed

MODULE.bazel

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,59 @@ module(
33
version = "1.37.0-dev",
44
)
55

6+
# All bazel_dep entries are organized alphabetically for improved readability.
7+
# Runtime dependencies from Bazel Central Registry
8+
bazel_dep(name = "apple_support", version = "1.23.1", repo_name = "build_bazel_apple_support")
69
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
10+
bazel_dep(name = "aspect_rules_js", version = "2.5.0")
11+
bazel_dep(name = "bazel_features", version = "1.38.0")
12+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
13+
bazel_dep(name = "boringssl", version = "0.20250514.0")
14+
bazel_dep(name = "brotli", version = "1.1.0", repo_name = "org_brotli")
15+
bazel_dep(name = "cel-spec", version = "0.24.0", repo_name = "dev_cel")
16+
bazel_dep(name = "emsdk", version = "4.0.13")
717
bazel_dep(name = "envoy_api", version = "1.37.0-dev")
818
bazel_dep(name = "envoy_build_config", version = "1.37.0-dev")
919
bazel_dep(name = "envoy_mobile", version = "1.37.0-dev")
20+
bazel_dep(name = "fast_float", version = "8.0.2")
21+
bazel_dep(name = "flatbuffers", version = "25.2.10", repo_name = "com_github_google_flatbuffers")
22+
bazel_dep(name = "fmt", version = "12.1.0", repo_name = "com_github_fmtlib_fmt")
23+
bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
24+
bazel_dep(name = "googleapis", version = "0.0.0-20241220-5e258e33.bcr.1", repo_name = "com_google_googleapis")
25+
bazel_dep(name = "googleurl", repo_name = "com_googlesource_googleurl")
1026
bazel_dep(name = "gperftools", version = "2.17.2")
27+
bazel_dep(name = "highway", version = "1.2.0")
28+
bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "com_github_nlohmann_json")
29+
bazel_dep(name = "platforms", version = "1.0.0")
30+
bazel_dep(name = "protobuf", version = "30.0", repo_name = "com_google_protobuf")
31+
bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1", repo_name = "com_envoyproxy_protoc_gen_validate")
32+
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
33+
bazel_dep(name = "rules_buf", version = "0.5.1")
34+
bazel_dep(name = "rules_cc", version = "0.2.13")
35+
bazel_dep(name = "rules_foreign_cc", version = "0.15.0")
36+
bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
37+
bazel_dep(name = "rules_java", version = "8.14.0")
38+
bazel_dep(name = "rules_license", version = "1.0.0")
39+
bazel_dep(name = "rules_nodejs", version = "6.5.0")
40+
bazel_dep(name = "rules_pkg", version = "1.1.0")
41+
bazel_dep(name = "rules_proto", version = "7.1.0")
1142
bazel_dep(name = "rules_python", version = "1.6.3")
43+
bazel_dep(name = "rules_rust", version = "0.63.0")
1244
bazel_dep(name = "rules_shell", version = "0.6.1")
45+
bazel_dep(name = "rules_swift", version = "2.3.0", repo_name = "build_bazel_rules_swift")
46+
bazel_dep(name = "spdlog", version = "1.16.0", repo_name = "com_github_gabime_spdlog")
47+
bazel_dep(name = "xxhash", version = "0.8.3", repo_name = "com_github_cyan4973_xxhash")
48+
bazel_dep(name = "yaml-cpp", version = "0.8.0", repo_name = "com_github_jbeder_yaml_cpp")
1349
bazel_dep(name = "zlib", version = "1.3.1.bcr.7")
1450
bazel_dep(name = "zstd", version = "1.5.7")
1551

52+
# Development dependencies from Bazel Central Registry
53+
bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_github_google_benchmark")
54+
bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True, repo_name = "com_google_googletest")
55+
bazel_dep(name = "rules_fuzzing", version = "0.6.0", dev_dependency = True)
56+
bazel_dep(name = "rules_shellcheck", version = "0.3.3", dev_dependency = True, repo_name = "com_github_aignas_rules_shellcheck")
57+
58+
# Local module overrides for internal Envoy modules
1659
local_path_override(
1760
module_name = "envoy_api",
1861
path = "api",
@@ -27,3 +70,140 @@ local_path_override(
2770
module_name = "envoy_mobile",
2871
path = "mobile",
2972
)
73+
74+
# Git overrides for dependencies not in BCR
75+
git_override(
76+
module_name = "googleurl",
77+
commit = "94ff147fe0b96b4cca5d6d316b9af6210c0b8051",
78+
remote = "https://github.com/google/gurl",
79+
)
80+
81+
git_override(
82+
module_name = "xds",
83+
# Commit containing MODULE.bazel with version 0.0.0
84+
commit = "8bfbf64dc13ee1a570be4fbdcfccbdd8532463f0",
85+
remote = "https://github.com/cncf/xds",
86+
)
87+
88+
# Rules CC extensions for toolchain configuration
89+
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
90+
use_repo(cc_configure, "local_config_cc", "local_config_cc_toolchains")
91+
92+
# CC compatibility layer
93+
compat = use_extension("@rules_cc//cc:extensions.bzl", "compatibility_proxy")
94+
use_repo(compat, "cc_compatibility_proxy")
95+
96+
# Java compatibility extension
97+
java_compat = use_extension("@rules_java//java:rules_java_deps.bzl", "compatibility_proxy")
98+
use_repo(java_compat, "compatibility_proxy")
99+
100+
# Go SDK and toolchain configuration
101+
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
102+
go_sdk.download(version = "1.24.6")
103+
use_repo(
104+
go_sdk,
105+
"go_toolchains",
106+
"io_bazel_rules_nogo",
107+
)
108+
109+
# Go dependencies for Envoy's Go components
110+
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
111+
go_deps.module(
112+
path = "github.com/cncf/xds/go",
113+
sum = "h1:JT2cFfgB9jT3Tt8OjKB8GWf6vweZzgb5pWZeXlGP7Ds=",
114+
version = "v0.0.0-20240423153145-555b57ec207b",
115+
)
116+
go_deps.module(
117+
path = "github.com/iancoleman/strcase",
118+
sum = "h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=",
119+
version = "v0.3.0",
120+
)
121+
go_deps.module(
122+
path = "github.com/lyft/protoc-gen-star/v2",
123+
sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=",
124+
version = "v2.0.4-0.20230330145011-496ad1ac90a4",
125+
)
126+
go_deps.module(
127+
path = "github.com/planetscale/vtprotobuf",
128+
sum = "h1:ujRGEVWJEoaxQ+8+HMl8YEpGaDAgohgZxJ5S+d2TTFQ=",
129+
version = "v0.6.1-0.20240409071808-615f978279ca",
130+
)
131+
go_deps.module(
132+
path = "github.com/spf13/afero",
133+
sum = "h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=",
134+
version = "v1.10.0",
135+
)
136+
go_deps.module(
137+
path = "golang.org/x/net",
138+
sum = "h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=",
139+
version = "v0.35.0",
140+
)
141+
go_deps.module(
142+
path = "golang.org/x/text",
143+
sum = "h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=",
144+
version = "v0.22.0",
145+
)
146+
go_deps.module(
147+
path = "google.golang.org/genproto/googleapis/api",
148+
sum = "h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=",
149+
version = "v0.0.0-20250115164207-1a7da9e5054f",
150+
)
151+
go_deps.module(
152+
path = "google.golang.org/genproto/googleapis/rpc",
153+
sum = "h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=",
154+
version = "v0.0.0-20250115164207-1a7da9e5054f",
155+
)
156+
go_deps.module(
157+
path = "google.golang.org/protobuf",
158+
sum = "h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=",
159+
version = "v1.36.10",
160+
)
161+
use_repo(
162+
go_deps,
163+
"com_github_cncf_xds_go",
164+
"com_github_iancoleman_strcase",
165+
"com_github_lyft_protoc_gen_star_v2",
166+
"com_github_planetscale_vtprotobuf",
167+
"com_github_spf13_afero",
168+
"org_golang_google_genproto_googleapis_api",
169+
"org_golang_google_genproto_googleapis_rpc",
170+
"org_golang_google_protobuf",
171+
"org_golang_x_net",
172+
"org_golang_x_text",
173+
)
174+
175+
# Aspect Bazel lib extensions
176+
bazel_lib = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains")
177+
bazel_lib.jq()
178+
bazel_lib.yq()
179+
use_repo(bazel_lib, "jq_toolchains", "yq_toolchains")
180+
181+
# Buf extension for protocol buffers
182+
buf = use_extension("@rules_buf//buf:extensions.bzl", "buf")
183+
buf.toolchains(
184+
sha256 = "5790beb45aaf51a6d7e68ca2255b22e1b14c9ae405a6c472cdcfc228c66abfc1",
185+
version = "v1.56.0",
186+
)
187+
use_repo(buf, "rules_buf_toolchains")
188+
189+
# Rust crate dependencies
190+
crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
191+
crate.from_cargo(
192+
name = "dynamic_modules_rust_sdk_crate_index",
193+
cargo_lockfile = "//source/extensions/dynamic_modules/sdk/rust:Cargo.lock",
194+
lockfile = "//source/extensions/dynamic_modules/sdk/rust:Cargo.Bazel.lock",
195+
manifests = ["//source/extensions/dynamic_modules/sdk/rust:Cargo.toml"],
196+
)
197+
use_repo(crate, "dynamic_modules_rust_sdk_crate_index")
198+
199+
# Python dependencies using upstream rules_python extensions
200+
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
201+
python.toolchain(
202+
is_default = True,
203+
python_version = "3.12",
204+
)
205+
use_repo(
206+
python,
207+
"python_3_12",
208+
python = "python_versions",
209+
)

0 commit comments

Comments
 (0)