a0203503a7
Re-reviewed every module/client against the 10-category checklist
(REVIEW-PROCESS.md) at commit 1cd51bb, filed 72 new findings, and
fixed them in three priority waves (3 High, 17 Medium, 52 Low).
Highs
- Server-017: enumerate AcknowledgeAlarm / QueryActiveAlarms in
GatewayGrpcScopeResolver so non-admin keys can use them; document
the mapping in docs/Authorization.md; add interceptor tests.
- Client.Java-013: add the five missing bulk-method stubs to the
CLI FakeSession so the test module compiles on a clean tree.
- Client.Rust-013: fix the clippy::doc_lazy_continuation regression
in generated tonic code by reformatting the ReadBulkCommand proto
comment and scoping a #![allow(...)] to the generated submodules.
Mediums (highlights)
- Server: unify GatewaySession state-lock discipline (-015) and
make DisposeAsync race-safe against in-flight CloseAsync (-016);
add constraint-enforcement test coverage for the bulk-plan path
(-021).
- Worker: introduce StaRuntimeShutdownException so RunAlarmPollLoop
can distinguish graceful shutdown from a real STA-affinity
violation (-016); have the watchdog skip StaHung while
CurrentCommandCorrelationId is non-empty so a legitimate slow
ReadBulk no longer self-faults (-017).
- Tests: add per-method round-trip + cancellation coverage for the
11 GatewaySession bulk methods (-013); replace the real TCP probe
in GalaxyHierarchyCacheTests with an IGalaxyRepository fake
(-016).
- IntegrationTests: drive the StreamEvents writer in the live Write
test and assert OnWriteComplete (-012); add live tests for
Unadvise/RemoveItem/Unregister ordering, WriteSecured, and
abnormal worker exit (-014).
- Worker.Tests: replace MxAccessSession reflection with an internal
CreateForTesting factory (-016); cover WorkerCancel and
unexpected-body envelope branches (-017).
- Client.Java: cancel MxEventStream when close() races
beforeStart() (-014); return a CancellingCompletableFuture that
actually forwards cancellation through .thenApply chains (-015).
- Client.Python: drop the silent localhost-plaintext downgrade in
the CLI; require explicit --plaintext (-013).
- Client.Rust: stop bench-read-bulk from polluting success-latency
histograms with failed-call durations (-015); add coverage for
the five MalformedReply paths, the bulk-write helpers, the
Error::Unavailable mapping, and the unary-fault path (-016).
- Contracts: extend docs/Contracts.md with the bulk read/write
command family (-009).
Lows (highlights)
- Server: cap GalaxyGlobMatcher.RegexCache; align
WorkerAlarmRpcDispatcher missing-session handling; drop the
duplicate dashboard @page routes; refresh IAlarmRpcDispatcher
XML doc.
- Worker: surface SetXmlAlarmQuery COM failures; remove dead
subscriptionExpression / ExecutingCommand arms; preserve
factory-supplied runtime sessions; split MxAlarmSnapshot.cs into
three files.
- Tests: dispose the WebApplication in seven test classes; rebuild
FakeWorkerProcess.WaitForExitAsync against a real TaskCompletion
source; switch the heartbeat-expires test to ManualTimeProvider;
add InvariantCulture to the remaining DateTimeOffset.Parse sites;
document GalaxyFilterInputSafetyTests in GatewayTesting.md.
- IntegrationTests: comment fixes, RecordingServerStreamWriter
IDisposable, class-level [Trait], single-source ZB default
connection string.
- Worker.Tests: replace silent-return gating with LiveMxAccessFact
so absent env vars SKIP not pass; PascalCase rename of probe
[Fact]s; deterministic deadline test; new frame-protocol error
tests; ComputeTransitions diff-coverage; relocate dev-rig probes
to Probes/.
- Contracts: add round-trip coverage and per-field redaction /
Galaxy-identifier comments to the protos.
- Client.Dotnet: introduce clients/dotnet/Directory.Build.props so
TreatWarningsAsErrors / analysers apply; document
DiscoverHierarchyOptions and IMxGatewayCliClient; require typed
bulk-read handles in CLI; surface AcknowledgeAlarm transport
faults through Translate().
- Client.Go: kill dead code in alarms_test / fakeGalaxyServer /
runWriteBulkVariant; document the six new subcommands in
writeUsage; drain galaxy-watch events on limit; switch io.EOF
comparisons to errors.Is.
- Client.Java: shared shutdown helpers + new shutdownTimeout
option; regex-based credential redaction; Long.toUnsignedString
for uint64 sequence; doc fixes.
- Client.Python: combine duplicate imports; add coverage for
_percentile / bench-read-bulk / MAX_AGGREGATE_EVENTS /
_api_key_from_env; populate pyproject metadata and ship py.typed.
- Client.Rust: expose next_correlation_id() so CLI ping/close
stop hard-coding correlation IDs; resync RustClientDesign.md
with the current Session / Error surface and CLI subcommand set.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
217 lines
9.0 KiB
C#
217 lines
9.0 KiB
C#
using Google.Protobuf.WellKnownTypes;
|
|
using Grpc.Core;
|
|
using MxGateway.Contracts.Proto;
|
|
|
|
namespace MxGateway.Client.Tests;
|
|
|
|
/// <summary>
|
|
/// PR E.2 — pins the .NET SDK surface for the new alarm RPCs:
|
|
/// <see cref="MxGatewayClient.AcknowledgeAlarmAsync"/> and
|
|
/// <see cref="MxGatewayClient.QueryActiveAlarmsAsync"/>.
|
|
/// </summary>
|
|
public sealed class MxGatewayClientAlarmsTests
|
|
{
|
|
[Fact]
|
|
public async Task AcknowledgeAlarmAsync_RecordsRequestShapeAndReturnsReply()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddAcknowledgeReply(new AcknowledgeAlarmReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
CorrelationId = "corr-1",
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
Status = new MxStatusProxy
|
|
{
|
|
Success = 1,
|
|
Category = MxStatusCategory.Ok,
|
|
DetectedBy = MxStatusSource.RespondingLmx,
|
|
},
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
AcknowledgeAlarmReply reply = await client.AcknowledgeAlarmAsync(new AcknowledgeAlarmRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
ClientCorrelationId = "corr-1",
|
|
AlarmFullReference = "Tank01.Level.HiHi",
|
|
Comment = "investigating",
|
|
OperatorUser = "alice",
|
|
});
|
|
|
|
Assert.Equal(ProtocolStatusCode.Ok, reply.ProtocolStatus.Code);
|
|
Assert.Equal(MxStatusCategory.Ok, reply.Status.Category);
|
|
|
|
var call = Assert.Single(transport.AcknowledgeAlarmCalls);
|
|
Assert.Equal("Tank01.Level.HiHi", call.Request.AlarmFullReference);
|
|
Assert.Equal("investigating", call.Request.Comment);
|
|
Assert.Equal("alice", call.Request.OperatorUser);
|
|
Assert.Equal("Bearer test-api-key", call.CallOptions.Headers?.GetValue("authorization"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task AcknowledgeAlarmAsync_HonorsCancellation()
|
|
{
|
|
// Acks are routed through the safe-unary retry pipeline (idempotent at the
|
|
// MxAccess level), so the transport-side cancellation token is a linked one
|
|
// rather than the caller's original. Verify cancellation by tripping the source
|
|
// and asserting the call observes it.
|
|
using CancellationTokenSource cancellation = new();
|
|
cancellation.Cancel();
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
await Assert.ThrowsAnyAsync<OperationCanceledException>(() =>
|
|
client.AcknowledgeAlarmAsync(
|
|
new AcknowledgeAlarmRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
AlarmFullReference = "Tank01.Level.HiHi",
|
|
Comment = string.Empty,
|
|
OperatorUser = "alice",
|
|
},
|
|
cancellation.Token));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task AcknowledgeAlarmAsync_SurfacesRpcExceptionFromFakeTransportVerbatim_WhenMappingDisabled()
|
|
{
|
|
// Default FakeGatewayTransport.MapTransportExceptions is false, matching the
|
|
// historical pass-through shape: a thrown RpcException reaches the caller as
|
|
// RpcException rather than being mapped to a typed MxGatewayException. This
|
|
// test pins that shape so a future change can't silently flip it.
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AcknowledgeAlarmExceptions.Enqueue(
|
|
new RpcException(new Status(StatusCode.Unauthenticated, "expired key")));
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
var ex = await Assert.ThrowsAsync<RpcException>(
|
|
() => client.AcknowledgeAlarmAsync(new AcknowledgeAlarmRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
AlarmFullReference = "Tank01.Level.HiHi",
|
|
Comment = string.Empty,
|
|
OperatorUser = "alice",
|
|
}));
|
|
Assert.Equal(StatusCode.Unauthenticated, ex.StatusCode);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task AcknowledgeAlarmAsync_MapsUnauthenticated_RpcException_ToTypedException()
|
|
{
|
|
// Production parity: GrpcMxGatewayClientTransport.AcknowledgeAlarmAsync runs
|
|
// every thrown RpcException through RpcExceptionMapper.Map, so callers see
|
|
// MxGatewayAuthenticationException (for Unauthenticated) rather than the raw
|
|
// RpcException. The fake transport reproduces that mapping when
|
|
// MapTransportExceptions is set, letting this SDK-level test cover the same
|
|
// observable behaviour without standing up a real gRPC channel.
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.MapTransportExceptions = true;
|
|
transport.AcknowledgeAlarmExceptions.Enqueue(
|
|
new RpcException(new Status(StatusCode.Unauthenticated, "expired key")));
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
var ex = await Assert.ThrowsAsync<MxGatewayAuthenticationException>(
|
|
() => client.AcknowledgeAlarmAsync(new AcknowledgeAlarmRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
AlarmFullReference = "Tank01.Level.HiHi",
|
|
Comment = string.Empty,
|
|
OperatorUser = "alice",
|
|
}));
|
|
Assert.Equal(StatusCode.Unauthenticated, ex.StatusCode);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task QueryActiveAlarmsAsync_StreamsEnqueuedSnapshots()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank01.Level.HiHi", AlarmConditionState.Active));
|
|
transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank02.Level.HiHi", AlarmConditionState.ActiveAcked));
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
List<ActiveAlarmSnapshot> snapshots = [];
|
|
await foreach (ActiveAlarmSnapshot snapshot in client.QueryActiveAlarmsAsync(new QueryActiveAlarmsRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
}))
|
|
{
|
|
snapshots.Add(snapshot);
|
|
}
|
|
|
|
Assert.Equal(2, snapshots.Count);
|
|
Assert.Equal("Tank01.Level.HiHi", snapshots[0].AlarmFullReference);
|
|
Assert.Equal(AlarmConditionState.Active, snapshots[0].CurrentState);
|
|
Assert.Equal(AlarmConditionState.ActiveAcked, snapshots[1].CurrentState);
|
|
Assert.Single(transport.QueryActiveAlarmsCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task QueryActiveAlarmsAsync_PassesFilterPrefix()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
await foreach (ActiveAlarmSnapshot _ in client.QueryActiveAlarmsAsync(new QueryActiveAlarmsRequest
|
|
{
|
|
SessionId = "session-fixture",
|
|
AlarmFilterPrefix = "Tank01.",
|
|
}))
|
|
{
|
|
// no snapshots enqueued; just verifying the request passes through
|
|
}
|
|
|
|
var call = Assert.Single(transport.QueryActiveAlarmsCalls);
|
|
Assert.Equal("Tank01.", call.Request.AlarmFilterPrefix);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task QueryActiveAlarmsAsync_HonorsCancellationDuringEnumeration()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank01.Level.HiHi", AlarmConditionState.Active));
|
|
transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank02.Level.HiHi", AlarmConditionState.Active));
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
using CancellationTokenSource cancellation = new();
|
|
await Assert.ThrowsAsync<OperationCanceledException>(async () =>
|
|
{
|
|
await foreach (ActiveAlarmSnapshot _ in client.QueryActiveAlarmsAsync(
|
|
new QueryActiveAlarmsRequest { SessionId = "session-fixture" },
|
|
cancellation.Token))
|
|
{
|
|
cancellation.Cancel();
|
|
}
|
|
});
|
|
}
|
|
|
|
private static ActiveAlarmSnapshot MakeSnapshot(string fullReference, AlarmConditionState state)
|
|
{
|
|
return new ActiveAlarmSnapshot
|
|
{
|
|
AlarmFullReference = fullReference,
|
|
SourceObjectReference = fullReference.Split('.')[0],
|
|
AlarmTypeName = "AnalogLimitAlarm.HiHi",
|
|
Severity = 750,
|
|
CurrentState = state,
|
|
Category = "Process",
|
|
Description = "Tank high-high level",
|
|
OriginalRaiseTimestamp = Timestamp.FromDateTime(new DateTime(2026, 5, 1, 12, 0, 0, DateTimeKind.Utc)),
|
|
LastTransitionTimestamp = Timestamp.FromDateTime(new DateTime(2026, 5, 1, 12, 0, 30, DateTimeKind.Utc)),
|
|
};
|
|
}
|
|
|
|
private static MxGatewayClient CreateClient(FakeGatewayTransport transport)
|
|
{
|
|
return new MxGatewayClient(transport.Options, transport);
|
|
}
|
|
|
|
private static FakeGatewayTransport CreateTransport()
|
|
{
|
|
return new FakeGatewayTransport(new MxGatewayClientOptions
|
|
{
|
|
Endpoint = new Uri("http://localhost:5000"),
|
|
ApiKey = "test-api-key",
|
|
});
|
|
}
|
|
}
|