Skip to content

Commit 024c85f

Browse files
keithkeith
authored
bazel: Add support for bzlmod (#96)
Signed-off-by: Keith Smiley <[email protected]>
1 parent 555b57e commit 024c85f

Some content is hidden

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

42 files changed

+107
-75
lines changed

‎.bazelversion‎

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
bazel-*
2+
MODULE.bazel.lock

‎MODULE.bazel‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
module(
2+
name = "xds",
3+
version = "0.0.0",
4+
)
5+
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")
9+
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
10+
bazel_dep(name = "grpc", version = "1.56.3.bcr.1", repo_name = "com_github_grpc_grpc")
11+
bazel_dep(name = "protobuf", version = "27.0-rc2", repo_name = "com_google_protobuf")
12+
bazel_dep(name = "protoc-gen-validate", version = "1.0.4", repo_name = "com_envoyproxy_protoc_gen_validate")
13+
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")
16+
17+
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
18+
switched_rules.use_languages(
19+
cc = True,
20+
go = True,
21+
grpc = True,
22+
python = True,
23+
)
24+
25+
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
26+
go_sdk.download(version = "1.20.2")
27+
28+
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
29+
go_deps.from_file(go_mod = "//go:go.mod")
30+
use_repo(
31+
go_deps,
32+
"org_golang_google_genproto_googleapis_api",
33+
"org_golang_google_grpc",
34+
"org_golang_google_protobuf",
35+
)

‎WORKSPACE.bzlmod‎

Whitespace-only changes.

‎bazel/api_build_system.bzl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ _COMMON_PROTO_DEPS = [
2424
"@com_google_protobuf//:timestamp_proto",
2525
"@com_google_protobuf//:wrappers_proto",
2626
"@com_google_googleapis//google/api:http_proto",
27-
"@com_google_googleapis//google/api:annotations_proto",
2827
"@com_google_googleapis//google/rpc:status_proto",
2928
"@com_envoyproxy_protoc_gen_validate//validate:validate_proto",
3029
]
@@ -63,7 +62,6 @@ def _xds_cc_py_proto_library(
6362
cc_deps = [_cc_proto_mapping(dep) for dep in deps] + [
6463
"@com_google_googleapis//google/api:http_cc_proto",
6564
"@com_google_googleapis//google/api:httpbody_cc_proto",
66-
"@com_google_googleapis//google/api:annotations_cc_proto",
6765
"@com_google_googleapis//google/rpc:status_cc_proto",
6866
],
6967
deps = [relative_name],
@@ -117,8 +115,6 @@ def xds_proto_package(
117115
visibility = ["//visibility:public"],
118116
deps = depset([_go_proto_mapping(dep) for dep in deps] + [
119117
"@com_envoyproxy_protoc_gen_validate//validate:go_default_library",
120-
"@org_golang_google_genproto_googleapis_api//annotations:annotations",
121-
"@org_golang_google_genproto_googleapis_rpc//status:status",
122118
"@org_golang_google_protobuf//types/known/anypb:go_default_library",
123119
"@org_golang_google_protobuf//types/known/durationpb:go_default_library",
124120
"@org_golang_google_protobuf//types/known/structpb:go_default_library",

‎go/BUILD‎

Whitespace-only changes.

‎go/udpa/annotations/migrate.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/udpa/annotations/security.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/udpa/annotations/sensitive.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/udpa/annotations/status.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)