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>
237 lines
6.8 KiB
Go
237 lines
6.8 KiB
Go
package mxgateway
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"testing"
|
|
|
|
pb "gitea.dohertylan.com/dohertj2/mxaccessgw/clients/go/internal/generated"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
"google.golang.org/grpc/test/bufconn"
|
|
)
|
|
|
|
// PR E.4 — pins the Go SDK surface for the new alarm RPCs:
|
|
// AcknowledgeAlarm + QueryActiveAlarms.
|
|
|
|
func TestAcknowledgeAlarmSendsRequestAndReturnsReply(t *testing.T) {
|
|
fake := &fakeGatewayWithAlarms{
|
|
acknowledgeReply: &pb.AcknowledgeAlarmReply{
|
|
SessionId: "session-1",
|
|
CorrelationId: "corr-1",
|
|
ProtocolStatus: &pb.ProtocolStatus{
|
|
Code: pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK,
|
|
},
|
|
Status: &pb.MxStatusProxy{
|
|
Success: 1,
|
|
Category: pb.MxStatusCategory_MX_STATUS_CATEGORY_OK,
|
|
},
|
|
},
|
|
}
|
|
client, cleanup := newBufconnClientWithAlarms(t, fake)
|
|
defer cleanup()
|
|
|
|
reply, err := client.AcknowledgeAlarm(context.Background(), &pb.AcknowledgeAlarmRequest{
|
|
SessionId: "session-1",
|
|
ClientCorrelationId: "corr-1",
|
|
AlarmFullReference: "Tank01.Level.HiHi",
|
|
Comment: "investigating",
|
|
OperatorUser: "alice",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("AcknowledgeAlarm() error = %v", err)
|
|
}
|
|
if reply.GetProtocolStatus().GetCode() != pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK {
|
|
t.Fatalf("protocol status = %v", reply.GetProtocolStatus().GetCode())
|
|
}
|
|
if got := fake.acknowledgeRequest.GetAlarmFullReference(); got != "Tank01.Level.HiHi" {
|
|
t.Fatalf("captured alarm reference = %q", got)
|
|
}
|
|
if got := fake.acknowledgeRequest.GetComment(); got != "investigating" {
|
|
t.Fatalf("captured comment = %q", got)
|
|
}
|
|
if got := fake.acknowledgeAuth; got != "Bearer test-api-key" {
|
|
t.Fatalf("authorization metadata = %q", got)
|
|
}
|
|
}
|
|
|
|
func TestAcknowledgeAlarmRejectsNilRequest(t *testing.T) {
|
|
fake := &fakeGatewayWithAlarms{}
|
|
client, cleanup := newBufconnClientWithAlarms(t, fake)
|
|
defer cleanup()
|
|
|
|
_, err := client.AcknowledgeAlarm(context.Background(), nil)
|
|
if err == nil {
|
|
t.Fatalf("AcknowledgeAlarm(nil) returned no error")
|
|
}
|
|
}
|
|
|
|
func TestAcknowledgeAlarmMapsUnauthenticated(t *testing.T) {
|
|
fake := &fakeGatewayWithAlarms{
|
|
acknowledgeError: status.Error(codes.Unauthenticated, "expired key"),
|
|
}
|
|
client, cleanup := newBufconnClientWithAlarms(t, fake)
|
|
defer cleanup()
|
|
|
|
_, err := client.AcknowledgeAlarm(context.Background(), &pb.AcknowledgeAlarmRequest{
|
|
SessionId: "session-1",
|
|
AlarmFullReference: "Tank01.Level.HiHi",
|
|
OperatorUser: "alice",
|
|
})
|
|
if err == nil {
|
|
t.Fatalf("AcknowledgeAlarm() returned no error on Unauthenticated")
|
|
}
|
|
var gwErr *GatewayError
|
|
if !errors.As(err, &gwErr) {
|
|
t.Fatalf("error %T does not unwrap to *GatewayError", err)
|
|
}
|
|
if got, _ := status.FromError(gwErr.Err); got.Code() != codes.Unauthenticated {
|
|
t.Fatalf("inner status code = %v", got.Code())
|
|
}
|
|
}
|
|
|
|
func TestQueryActiveAlarmsStreamsSnapshots(t *testing.T) {
|
|
fake := &fakeGatewayWithAlarms{
|
|
activeSnapshots: []*pb.ActiveAlarmSnapshot{
|
|
{
|
|
AlarmFullReference: "Tank01.Level.HiHi",
|
|
CurrentState: pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE,
|
|
Severity: 750,
|
|
},
|
|
{
|
|
AlarmFullReference: "Tank02.Level.HiHi",
|
|
CurrentState: pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE_ACKED,
|
|
Severity: 750,
|
|
},
|
|
},
|
|
}
|
|
client, cleanup := newBufconnClientWithAlarms(t, fake)
|
|
defer cleanup()
|
|
|
|
stream, err := client.QueryActiveAlarms(context.Background(), &pb.QueryActiveAlarmsRequest{
|
|
SessionId: "session-1",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("QueryActiveAlarms() error = %v", err)
|
|
}
|
|
|
|
var received []*pb.ActiveAlarmSnapshot
|
|
for {
|
|
snap, err := stream.Recv()
|
|
if errors.Is(err, io.EOF) {
|
|
break
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("stream.Recv() error = %v", err)
|
|
}
|
|
received = append(received, snap)
|
|
}
|
|
if len(received) != 2 {
|
|
t.Fatalf("snapshot count = %d, want 2", len(received))
|
|
}
|
|
if received[0].GetAlarmFullReference() != "Tank01.Level.HiHi" {
|
|
t.Fatalf("snapshot[0] ref = %q", received[0].GetAlarmFullReference())
|
|
}
|
|
if received[1].GetCurrentState() != pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE_ACKED {
|
|
t.Fatalf("snapshot[1] state = %v", received[1].GetCurrentState())
|
|
}
|
|
}
|
|
|
|
func TestQueryActiveAlarmsPassesFilterPrefix(t *testing.T) {
|
|
fake := &fakeGatewayWithAlarms{}
|
|
client, cleanup := newBufconnClientWithAlarms(t, fake)
|
|
defer cleanup()
|
|
|
|
stream, err := client.QueryActiveAlarms(context.Background(), &pb.QueryActiveAlarmsRequest{
|
|
SessionId: "session-1",
|
|
AlarmFilterPrefix: "Tank01.",
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("QueryActiveAlarms() error = %v", err)
|
|
}
|
|
for {
|
|
_, err := stream.Recv()
|
|
if errors.Is(err, io.EOF) {
|
|
break
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("stream.Recv() error = %v", err)
|
|
}
|
|
}
|
|
|
|
if got := fake.queryRequest.GetAlarmFilterPrefix(); got != "Tank01." {
|
|
t.Fatalf("captured filter prefix = %q", got)
|
|
}
|
|
}
|
|
|
|
type fakeGatewayWithAlarms struct {
|
|
pb.UnimplementedMxAccessGatewayServer
|
|
|
|
acknowledgeRequest *pb.AcknowledgeAlarmRequest
|
|
acknowledgeReply *pb.AcknowledgeAlarmReply
|
|
acknowledgeError error
|
|
acknowledgeAuth string
|
|
|
|
queryRequest *pb.QueryActiveAlarmsRequest
|
|
activeSnapshots []*pb.ActiveAlarmSnapshot
|
|
}
|
|
|
|
func (s *fakeGatewayWithAlarms) AcknowledgeAlarm(ctx context.Context, req *pb.AcknowledgeAlarmRequest) (*pb.AcknowledgeAlarmReply, error) {
|
|
s.acknowledgeRequest = req
|
|
s.acknowledgeAuth = authorizationFromContext(ctx)
|
|
if s.acknowledgeError != nil {
|
|
return nil, s.acknowledgeError
|
|
}
|
|
if s.acknowledgeReply != nil {
|
|
return s.acknowledgeReply, nil
|
|
}
|
|
return &pb.AcknowledgeAlarmReply{
|
|
SessionId: req.GetSessionId(),
|
|
ProtocolStatus: &pb.ProtocolStatus{
|
|
Code: pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func (s *fakeGatewayWithAlarms) QueryActiveAlarms(req *pb.QueryActiveAlarmsRequest, stream grpc.ServerStreamingServer[pb.ActiveAlarmSnapshot]) error {
|
|
s.queryRequest = req
|
|
for _, snap := range s.activeSnapshots {
|
|
if err := stream.Send(snap); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newBufconnClientWithAlarms(t *testing.T, fake *fakeGatewayWithAlarms) (*Client, func()) {
|
|
t.Helper()
|
|
listener := bufconn.Listen(bufSize)
|
|
server := grpc.NewServer()
|
|
pb.RegisterMxAccessGatewayServer(server, fake)
|
|
go func() {
|
|
_ = server.Serve(listener)
|
|
}()
|
|
dialer := func(ctx context.Context, _ string) (net.Conn, error) {
|
|
return listener.DialContext(ctx)
|
|
}
|
|
// grpc.NewClient defaults to the dns scheme; use passthrough so the
|
|
// bufconn fake target reaches the context dialer unresolved.
|
|
client, err := Dial(context.Background(), Options{
|
|
Endpoint: "passthrough:///bufnet",
|
|
APIKey: "test-api-key",
|
|
Plaintext: true,
|
|
DialOptions: []grpc.DialOption{grpc.WithContextDialer(dialer)},
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("Dial() error = %v", err)
|
|
}
|
|
return client, func() {
|
|
client.Close()
|
|
server.Stop()
|
|
listener.Close()
|
|
}
|
|
}
|