Skip to content

Commit a594e63

Browse files
mmorel-35mmorel-35
committed
chore: update Bazel configurations and add MODULE files for envoy_examples and envoy-example-wasmcc
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent e7d10bf commit a594e63

File tree

12 files changed

+202
-11
lines changed

12 files changed

+202
-11
lines changed

‎.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
common --enable_bzlmod=0
1+
common --enable_bzlmod
22
common --color=yes
33
common:ci --noshow_progress
44
common:ci --noshow_loading_progress

‎.bazelversion

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

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
!\.zuul.yaml
2626

2727
/bazel-*
28-
/mobile/bazel-*
28+
MODULE.bazel.lock
2929
BROWSE
3030
/build
3131
/build_*
3232
*.bzlc
33-
/ci/bazel-*
3433
compile_commands.json
3534
cscope.*
3635
/docs/landing_source/.bundle

‎MODULE.bazel

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
module(
2+
name = "envoy_examples",
3+
version = "0.0.0-dev",
4+
)
5+
6+
bazel_dep(name = "bazel_skylib", version = "1.8.1")
7+
bazel_dep(name = "envoy", version = "0.0.0-dev")
8+
git_override(
9+
module_name = "envoy",
10+
commit = "9416048f843abbbd6a467e2e75574cac81d13d1c",
11+
remote = "https://github.com/mmorel-35/envoy.git",
12+
)
13+
14+
bazel_dep(name = "envoy_api", version = "0.0.0-dev")
15+
git_override(
16+
module_name = "envoy_api",
17+
commit = "9416048f843abbbd6a467e2e75574cac81d13d1c",
18+
remote = "https://github.com/mmorel-35/envoy.git",
19+
strip_prefix = "api",
20+
)
21+
22+
bazel_dep(name = "envoy_build_config", version = "0.0.0-dev")
23+
git_override(
24+
module_name = "envoy_build_config",
25+
commit = "9416048f843abbbd6a467e2e75574cac81d13d1c",
26+
remote = "https://github.com/mmorel-35/envoy.git",
27+
strip_prefix = "mobile/envoy_build_config",
28+
)
29+
30+
bazel_dep(name = "envoy-example-wasmcc", version = "0.0.0-dev")
31+
local_path_override(
32+
module_name = "envoy-example-wasmcc",
33+
path = "wasm-cc",
34+
)
35+
36+
bazel_dep(name = "envoy_toolshed", version = "0.3.3")
37+
git_override(
38+
module_name = "envoy_toolshed",
39+
commit = "f536601588f6a523346091adb3420d39b4692d3a",
40+
remote = "https://github.com/envoyproxy/toolshed.git",
41+
strip_prefix = "bazel",
42+
)
43+
44+
bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
45+
bazel_dep(name = "googleurl", version = "0.0.0-dev", repo_name = "com_googlesource_googleurl")
46+
git_override(
47+
module_name = "googleurl",
48+
commit = "e6c272102e0554e02c1bb317edff927ee56c7d0b",
49+
remote = "https://quiche.googlesource.com/googleurl",
50+
)
51+
52+
bazel_dep(name = "rules_cc", version = "0.2.2")
53+
bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
54+
bazel_dep(name = "rules_pkg", version = "1.1.0")
55+
bazel_dep(name = "rules_python", version = "1.4.1")
56+
bazel_dep(name = "rules_rust", version = "0.63.0")
57+
# -- bazel_dep definitions -- #
58+
59+
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
60+
go_sdk.download(version = "1.24.1")
61+
use_repo(
62+
go_sdk,
63+
go_sdk = "go_default_sdk",
64+
)
65+
66+
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
67+
go_deps.from_file(
68+
go_mod = "//golang-network/simple:go.mod",
69+
)
70+
use_repo(
71+
go_deps,
72+
"com_github_cncf_xds_go",
73+
"com_github_envoyproxy_envoy",
74+
"org_golang_google_protobuf",
75+
)
76+
77+
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
78+
python.toolchain(
79+
is_default = True,
80+
python_version = "3.12",
81+
)
82+
use_repo(
83+
python,
84+
"python_3_12",
85+
python = "python_versions",
86+
)
87+
# -- use_repo_rule statements -- #
88+
89+
# -- repo definitions -- #

‎WORKSPACE.bzlmod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
workspace(name = "envoy_examples")

‎golang-network/simple/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ go_binary(
1313
linkmode = "c-shared",
1414
visibility = ["//visibility:public"],
1515
deps = [
16-
"//contrib/golang/common/go/api",
17-
"//contrib/golang/filters/network/source/go/pkg/network",
16+
"@envoy//contrib/golang/common/go/api",
17+
"@envoy//contrib/golang/filters/network/source/go/pkg/network",
1818
"@com_github_cncf_xds_go//xds/type/v3:type",
1919
"@org_golang_google_protobuf//types/known/anypb",
2020
],

‎golang-network/simple/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ toolchain go1.24.1
77

88
// NOTICE: these lines could be generated automatically by "go mod tidy"
99
require (
10-
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa
10+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443
1111
github.com/envoyproxy/envoy v1.34.3
1212
google.golang.org/protobuf v1.36.6
1313
)
1414

1515
require (
16-
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
16+
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
1717
github.com/golang/protobuf v1.5.3 // indirect
1818
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
19-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
19+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
2020
)

‎golang-network/simple/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
22
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
3+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls=
4+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
35
github.com/envoyproxy/envoy v1.34.3 h1:nN+nIXyG3/n+FmnRsSCLEKK16wdeYIdbGxuZPbdRWlc=
46
github.com/envoyproxy/envoy v1.34.3/go.mod h1:A/vRPuqivdZBAr0NfT3sccV8KtY07B2PyvILAdV0qCU=
57
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
68
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
9+
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
710
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
811
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
912
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -15,6 +18,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:
1518
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0=
1619
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ=
1720
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU=
21+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
1822
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
1923
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
2024
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=

‎wasm-cc/.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
common --enable_bzlmod=0
1+
common --enable_bzlmod
22
common --color=yes
33
common:ci --noshow_progress
44
common:ci --noshow_loading_progress

‎wasm-cc/.bazelversion

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

0 commit comments

Comments
 (0)