Import changes.

  - e3247e3598500e2bb570f83e4cc0d36271a159d2

GitOrigin-RevId: e3247e3598500e2bb570f83e4cc0d36271a159d2

Author: Aalyria Technologies, Inc

Cargo.lock

@@ -0,0 +1,21 @@
+# This is a dummy package that declares the external Rust dependencies for
+# rules_rs crate_universe (from_cargo). It is not built directly; the actual
+# Rust targets are Bazel rules. Consumed as @st_crates.
+[package]
+name = "aalyria-api-bazel-deps"
+version = "0.0.1"
+edition = "2024"
+
+# Stub target: rules_rs from_cargo runs `cargo` against this manifest, which
+# requires a target. lib.rs is an empty placeholder; nothing is built from it.
+[lib]
+path = "lib.rs"
+
+[dependencies]
+prost = { version = "0.14.3" }
+prost-types = { version = "0.14.3", default-features = false }
+protoc-gen-prost = { version = "0.5.0" }
+protoc-gen-tonic = { version = "0.5.0" }
+tonic = { version = "0.14.4", features = ["transport"] }
+tonic-build = { version = "0.14.4" }
+tonic-prost = { version = "0.14.4" }

Cargo.toml

@@ -33,8 +33,7 @@ bazel_dep(name = "rules_proto_grpc_doc", version = "5.6.0")
 bazel_dep(name = "rules_proto_grpc_java", version = "5.6.0")
 bazel_dep(name = "rules_proto_grpc_python", version = "5.6.0")
 bazel_dep(name = "rules_python", version = "1.6.3")
-bazel_dep(name = "rules_rust", version = "0.69.0")
-bazel_dep(name = "rules_rust_prost", version = "0.69.0")
+bazel_dep(name = "rules_rs", version = "0.0.94")
 bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "aspect_rules_py", version = "1.8.4")
 bazel_dep(name = "toolchains_protoc", version = "0.4.3")
@@ -63,10 +62,12 @@ single_version_override(
     version = "1.19.1",
 )
 
-# Patch gRPC v1.74.1 to fix RBE build with strict header checking.
-# The issue: xds_route_config target is missing upb library dependencies,
-# which causes undeclared inclusion errors for envoy upb-generated headers
-# when building with RBE's strict header checking.
+# grpc is pulled in transitively by rules_proto_grpc_*. Pin and patch it to match
+# the monorepo. The upb-gen include-shadowing patch drops grpc's committed
+# upb-gen include dirs, which otherwise shadow protobuf's generated upb headers
+# and cause "undeclared inclusion" failures under strict header checking (e.g.
+# when compiling cygrpc). The rbe_xds patch supplies header deps needed for
+# RBE + xDS builds.
 single_version_override(
     module_name = "grpc",
     patch_strip = 0,
@@ -214,57 +215,40 @@ RUST_EDITION = "2024"
 
 RUST_VERSION = "1.94.1"
 
-rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
-rust.toolchain(
+# rules_rs provides hermetic Rust toolchains and the patched rules_rust facade.
+rs_toolchains = use_extension("@rules_rs//rs/toolchains:module_extension.bzl", "toolchains")
+rs_toolchains.toolchain(
     edition = RUST_EDITION,
-    extra_exec_rustc_flags = ["-Clink-self-contained=no"],
-    extra_rustc_flags = ["-Clink-self-contained=no"],
-    versions = [RUST_VERSION],
+    # -Clink-self-contained=no: link with the registered cc toolchain's linker.
+    # rules_rs's rustc does not ship the self-contained linker (rust-lld) in its
+    # sysroot, so self-contained linking (the default) fails for tool/bin targets.
+    extra_exec_rustc_flags = {
+        "x86_64-unknown-linux-gnu": ["-Clink-self-contained=no"],
+    },
+    extra_rustc_flags = {
+        "x86_64-unknown-linux-gnu": ["-Clink-self-contained=no"],
+    },
+    version = RUST_VERSION,
 )
-use_repo(rust, "rust_toolchains")
+use_repo(rs_toolchains, "default_rust_toolchains")
 
-register_toolchains("@rust_toolchains//:all")
+# Re-export the pinned, patched @rules_rust so existing @rules_rust// loads keep
+# working. rules_rs bundles the prost extension under @rules_rust//extensions/prost.
+rules_rust = use_extension("@rules_rs//rs:rules_rust.bzl", "rules_rust")
+use_repo(rules_rust, "rules_rust")
+
+register_toolchains("@default_rust_toolchains//:all")
 
 register_toolchains(
     "//api/build_tools/prost_toolchain",
 )
 
-# All of these crates come from crates.io, hence the "crates_io" name.
-# The "st_" (spacetime) prefix is required to avoid a collision with the
-# nmts submodule, which defines its own "crates_io" (and "crates") repo:
-# rules_rust's crate extension is shared across the whole module graph,
-# so two modules generating a repo of the same name would error.
-crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
-crate.spec(
-    package = "prost",
-    version = "0.14.3",
-)
-crate.spec(
-    default_features = False,
-    package = "prost-types",
-    version = "0.14.3",
-)
-crate.spec(
-    package = "protoc-gen-prost",
-    version = "0.5.0",
-)
-crate.spec(
-    package = "protoc-gen-tonic",
-    version = "0.5.0",
-)
-crate.spec(
-    features = ["transport"],
-    package = "tonic",
-    version = "0.14.4",
-)
-crate.spec(
-    package = "tonic-build",
-    version = "0.14.4",
-)
-crate.spec(
-    package = "tonic-prost",
-    version = "0.14.4",
-)
+# Rust crate dependencies via rules_rs crate_universe (from_cargo). The
+# dependency set lives in Cargo.toml / Cargo.lock (rules_rs supports only
+# from_cargo). The "st_" (spacetime) prefix keeps this hub distinct from the
+# nmts submodule's crate hub: the crate extension is shared across the module
+# graph, so two hubs of the same name would collide.
+crate = use_extension("@rules_rs//rs:extensions.bzl", "crate")
 crate.annotation(
     crate = "protoc-gen-prost",
     gen_binaries = ["protoc-gen-prost"],
@@ -273,10 +257,13 @@ crate.annotation(
     crate = "protoc-gen-tonic",
     gen_binaries = ["protoc-gen-tonic"],
 )
-crate.from_specs(
-    name = "st_crates_io",
+crate.from_cargo(
+    name = "st_crates",
+    cargo_lock = "//:Cargo.lock",
+    cargo_toml = "//:Cargo.toml",
+    platform_triples = ["x86_64-unknown-linux-gnu"],
 )
-use_repo(crate, "st_crates_io")
+use_repo(crate, "st_crates")
 
 bazel_dep(name = "org_outernetcouncil_nmts")
 archive_override(

MODULE.bazel

@@ -12,37 +12,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_rust//extensions/prost:defs.bzl", "rust_prost_toolchain")
 load("@rules_rust//rust:defs.bzl", "rust_library_group")
-load("@rules_rust_prost//:defs.bzl", "rust_prost_toolchain")
 
 rust_library_group(
     name = "prost_runtime",
     deps = [
-        "@st_crates_io//:prost",
+        "@st_crates//:prost",
     ],
 )
 
 rust_library_group(
     name = "tonic_runtime",
     deps = [
         ":prost_runtime",
-        "@st_crates_io//:tonic",
-        "@st_crates_io//:tonic-prost",
+        "@st_crates//:tonic",
+        "@st_crates//:tonic-prost",
     ],
 )
 
 rust_prost_toolchain(
     name = "prost_toolchain_impl",
     compile_well_known_types = False,
-    prost_plugin = "@st_crates_io//:protoc-gen-prost__protoc-gen-prost",
+    prost_plugin = "@st_crates//:protoc-gen-prost__protoc-gen-prost",
     prost_runtime = ":prost_runtime",
-    prost_types = "@st_crates_io//:prost-types",
-    tonic_plugin = "@st_crates_io//:protoc-gen-tonic__protoc-gen-tonic",
+    prost_types = "@st_crates//:prost-types",
+    tonic_plugin = "@st_crates//:protoc-gen-tonic__protoc-gen-tonic",
     tonic_runtime = ":tonic_runtime",
 )
 
 toolchain(
     name = "prost_toolchain",
     toolchain = "prost_toolchain_impl",
-    toolchain_type = "@rules_rust_prost//:toolchain_type",
+    toolchain_type = "@rules_rust//extensions/prost:toolchain_type",
 )

api/build_tools/prost_toolchain/BUILD

@@ -17,7 +17,7 @@ load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_proto_library")
 load("@rules_proto_grpc_java//:defs.bzl", "java_proto_library")
 load("@rules_proto_grpc_python//:defs.bzl", "python_proto_library")
-load("@rules_rust_prost//:defs.bzl", "rust_prost_library")
+load("@rules_rust//extensions/prost:defs.bzl", "rust_prost_library")
 
 package(default_visibility = ["//visibility:public"])
 

api/common/BUILD

@@ -17,7 +17,7 @@ load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_grpc_library")
 load("@rules_proto_grpc_java//:defs.bzl", "java_grpc_library")
 load("@rules_proto_grpc_python//:defs.bzl", "python_grpc_library")
-load("@rules_rust_prost//:defs.bzl", "rust_prost_library")
+load("@rules_rust//extensions/prost:defs.bzl", "rust_prost_library")
 
 package(default_visibility = ["//visibility:public"])
 

api/nbi/v1alpha/resources/BUILD

@@ -17,7 +17,7 @@ load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_grpc_library")
 load("@rules_proto_grpc_java//:defs.bzl", "java_grpc_library")
 load("@rules_proto_grpc_python//:defs.bzl", "python_grpc_library")
-load("@rules_rust_prost//:defs.bzl", "rust_prost_library")
+load("@rules_rust//extensions/prost:defs.bzl", "rust_prost_library")
 
 package(default_visibility = ["//visibility:public"])
 

api/provisioning/v1alpha/BUILD

@@ -17,7 +17,7 @@ load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_grpc_library")
 load("@rules_proto_grpc_java//:defs.bzl", "java_grpc_library")
 load("@rules_proto_grpc_python//:defs.bzl", "python_grpc_library")
-load("@rules_rust_prost//:defs.bzl", "rust_prost_library")
+load("@rules_rust//extensions/prost:defs.bzl", "rust_prost_library")
 
 package(default_visibility = ["//visibility:public"])
 

api/solution/v1alpha/BUILD

@@ -52,6 +52,23 @@ build --host_cxxopt=-Wno-deprecated-declarations
 ##
 build --features=external_include_paths
 
+# The hermetic clang toolchain enforces module-map strictness that the previous
+# toolchain did not. grpc includes zlib's module-private zconf.h/zlib.h, which
+# clang flags under -Wprivate-header.
+build --per_file_copt=external/grpc[~+]/.*@-Wno-private-header
+
+# opencensus-cpp (a grpc dependency) has an unused local variable
+# (cloud_trace_context.cc) that clang flags under -Wunused-variable. It is
+# third-party code.
+build --per_file_copt=external/opencensus-cpp[~+]/.*@-Wno-unused-variable
+
+# The hermetic clang toolchain enables Bazel's layering_check feature (module
+# strict-decluse), which neither this tree nor external deps like grpc declare
+# the layering dependencies for, so compiles fail with "module ... does not
+# depend on a module exporting ...". Disable it repo-wide. This is a feature,
+# not a -W flag, so it cannot be scoped per external repo via per_file_copt.
+build --features=-layering_check
+
 ##
 # Enable hermetic testing and compilation of Java using a JVM downloaded from a
 # remote repository.

common.bazelrc

@@ -0,0 +1 @@
+// Empty stub for the rules_rs from_cargo dummy package (see Cargo.toml).