397d3c5c4f
Rename across every client surface using each language's idiomatic convention:
* .NET clients/dotnet/MxGateway.Client[.Cli|.Tests]/
-> clients/dotnet/ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]/
namespaces -> ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]
contracts ProjectReference repointed to ZB.MOM.WW.MxGateway.Contracts
sln migrated to slnx (dotnet sln migrate)
* Python src/mxgateway -> src/zb_mom_ww_mxgateway
src/mxgateway_cli -> src/zb_mom_ww_mxgateway_cli
distribution: mxaccess-gateway-client -> zb-mom-ww-mxaccess-gateway-client
* Rust crate: mxgateway-client -> zb-mom-ww-mxgateway-client
build.rs proto path repointed
* Java subprojects: mxgateway-{client,cli} -> zb-mom-ww-mxgateway-{client,cli}
packages com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
group com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
rootProject mxaccessgw-java -> zb-mom-ww-mxaccessgw-java
* Go generate-proto.ps1 proto path repointed; module path and
package mxgateway kept (Go convention).
* proto-inputs.json: generatedOutputs.python updated to new package path.
* scripts/run-client-e2e-tests.ps1: Java CLI install path + gradle task
updated to zb-mom-ww-mxgateway-cli.
CLI binary names (mxgw, mxgw-py, mxgw-go, mxgateway-cli) and wire-level
identifiers (MXGATEWAY_* env vars, the mxgw_<id>_<secret> API key
prefix, protobuf package names like mxaccess_gateway.v1, all MXAccess
references) intentionally NOT renamed.
Fix pre-existing alarms-over-gateway breaks unblocked by the rename:
* mxaccess_gateway.proto: add missing public message QueryActiveAlarmsRequest
{session_id, client_correlation_id, alarm_filter_prefix} and missing
rpc QueryActiveAlarms(QueryActiveAlarmsRequest) returns
(stream ActiveAlarmSnapshot). All four typed clients referenced
these but they were absent from the proto.
* MxAccessGatewayService.QueryActiveAlarms: implement the new RPC on
the server, streaming from IGatewayAlarmService.CurrentAlarms with
optional alarm_filter_prefix filter.
* clients/dotnet/.../DiscoverHierarchyOptions.cs: add the hand-written
.NET POCO that wraps DiscoverHierarchyRequest (referenced by
GalaxyRepositoryClient.DiscoverHierarchyAsync but never authored).
* Drop retired session_id field references from
AcknowledgeAlarmRequest/AcknowledgeAlarmReply test fixtures across
.NET, Rust, Go, and Python clients.
* Rust integration test: add the missing stream_alarms impl on the
fake MxAccessGateway server (the trait gained the method, fake
didn't).
* Rust CLI test: bump expected gatewayProtocolVersion 2 -> 3.
Regenerated artifacts updated in this commit:
* src/ZB.MOM.WW.MxGateway.Contracts/Generated/{MxaccessGateway,MxaccessGatewayGrpc}.cs
* clients/python/src/zb_mom_ww_mxgateway/generated/*_pb2{,_grpc}.py
* clients/go/internal/generated/*.pb.go
(C# regenerated by Grpc.Tools on contracts build; Python and Go via
their generate-proto.ps1 scripts; Rust regenerates from .proto via
tonic-build at compile time so no checked-in artefact.)
Verification: 472 server tests, 275 worker tests (9 dev-rig skipped),
18 integration tests (live MxAccess + LDAP + Galaxy), 57 .NET client
tests, 32 Rust workspace tests, 39 Python tests, all Go packages, and
gradle build for Java all pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
66 lines
2.0 KiB
Rust
66 lines
2.0 KiB
Rust
use std::env;
|
|
use std::error::Error;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
fn main() -> Result<(), Box<dyn Error>> {
|
|
configure_protoc();
|
|
|
|
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
|
|
let repo_root = manifest_dir
|
|
.parent()
|
|
.and_then(Path::parent)
|
|
.ok_or("clients/rust must live two levels below the repository root")?;
|
|
let proto_root = repo_root.join("src/ZB.MOM.WW.MxGateway.Contracts/Protos");
|
|
let gateway_proto = proto_root.join("mxaccess_gateway.proto");
|
|
let worker_proto = proto_root.join("mxaccess_worker.proto");
|
|
let galaxy_proto = proto_root.join("galaxy_repository.proto");
|
|
let descriptor_path = PathBuf::from(env::var("OUT_DIR")?).join("mxaccessgw-client-v1.protoset");
|
|
|
|
println!("cargo:rerun-if-changed={}", gateway_proto.display());
|
|
println!("cargo:rerun-if-changed={}", worker_proto.display());
|
|
println!("cargo:rerun-if-changed={}", galaxy_proto.display());
|
|
|
|
tonic_build::configure()
|
|
.build_server(true)
|
|
.build_client(true)
|
|
.file_descriptor_set_path(descriptor_path)
|
|
.compile_protos(
|
|
&[
|
|
gateway_proto.as_path(),
|
|
worker_proto.as_path(),
|
|
galaxy_proto.as_path(),
|
|
],
|
|
&[proto_root.as_path()],
|
|
)?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn configure_protoc() {
|
|
if env::var_os("PROTOC").is_some() {
|
|
return;
|
|
}
|
|
|
|
for candidate in protoc_candidates() {
|
|
if candidate.is_file() {
|
|
env::set_var("PROTOC", candidate);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
fn protoc_candidates() -> Vec<PathBuf> {
|
|
let mut candidates = Vec::new();
|
|
|
|
if cfg!(windows) {
|
|
if let Some(local_app_data) = env::var_os("LOCALAPPDATA") {
|
|
candidates.push(PathBuf::from(local_app_data).join(
|
|
"Microsoft/WinGet/Packages/Google.Protobuf_Microsoft.Winget.Source_8wekyb3d8bbwe/bin/protoc.exe",
|
|
));
|
|
}
|
|
}
|
|
|
|
candidates.push(PathBuf::from("protoc"));
|
|
candidates
|
|
}
|