Joseph Doherty
544a6ddb77
Resolves the 35 findings from the 2026-06-01 baseline (commit 26ba1c7),
test-first for every behavioral change. +51 tests (331 -> 382 passing, 0 failed).
- Telemetry-001 (HIGH): RedactionEnricher now honours property removal, so a
redactor that drops a key actually scrubs the secret from the event.
- Auth: LDAP validator ValidateOnStart; API-key verify no longer fails on a
best-effort MarkUsed write or a corrupt scopes column (fail-closed); LDAP cert
validation hook; KeyPrefix persistence aligned; README algorithm corrected.
- Health: Akka checks return Degraded (not throw) when the cluster isn't up yet;
GrpcDependencyHealthCheck catch-all; null 'description' rendered; composite
endpoint builder; XML docs shipped.
- Audit: CompositeAuditWriter no longer re-throws OperationCanceledException;
TruncatingAuditRedactor over-redact scrubs Target + safe negative max; options
record; XML docs shipped.
- Configuration: TryAddEnumerable idempotent registration; consistent port
quoting; strict invariant port parsing; XML docs + README packaged.
- Theme: mobile toggle is now CSS-only (no Bootstrap JS); token/CSS hygiene;
XML docs on the public parameter surface.
Shared-contract/spec docs updated where the code was the source of truth
(observability service.instance.id, MapZbMetrics, redactor reach). All changes
additive/back-compatible at v0.1.0. code-reviews bookkeeping follows separately.
68 lines
2.5 KiB
C#
68 lines
2.5 KiB
C#
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Hosting;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.Configuration;
|
|
|
|
namespace ZB.MOM.WW.Configuration.Tests;
|
|
|
|
public sealed class AddValidatedOptionsTests
|
|
{
|
|
private sealed class NodeOptions { public int Port { get; set; } public string? Name { get; set; } }
|
|
|
|
private sealed class NodeValidator : OptionsValidatorBase<NodeOptions>
|
|
{
|
|
protected override void Validate(ValidationBuilder v, NodeOptions o)
|
|
{
|
|
v.Port(o.Port, "Node:Port");
|
|
v.Required(o.Name, "Node:Name");
|
|
}
|
|
}
|
|
|
|
private static IHost BuildHost(Dictionary<string, string?> config)
|
|
{
|
|
var builder = Host.CreateApplicationBuilder();
|
|
builder.Configuration.AddInMemoryCollection(config);
|
|
builder.Services.AddValidatedOptions<NodeOptions, NodeValidator>(builder.Configuration, "Node");
|
|
return builder.Build();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Bad_config_throws_at_startup()
|
|
{
|
|
using var host = BuildHost(new() { ["Node:Port"] = "0", ["Node:Name"] = "" });
|
|
await Assert.ThrowsAsync<OptionsValidationException>(() => host.StartAsync());
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Good_config_starts_and_binds()
|
|
{
|
|
using var host = BuildHost(new() { ["Node:Port"] = "8080", ["Node:Name"] = "central" });
|
|
await host.StartAsync();
|
|
var opts = host.Services.GetRequiredService<IOptions<NodeOptions>>().Value;
|
|
Assert.Equal(8080, opts.Port);
|
|
Assert.Equal("central", opts.Name);
|
|
await host.StopAsync();
|
|
}
|
|
|
|
[Fact]
|
|
public void Calling_twice_registers_validator_once()
|
|
{
|
|
var config = new ConfigurationBuilder()
|
|
.AddInMemoryCollection(new Dictionary<string, string?> { ["Node:Port"] = "0", ["Node:Name"] = "" })
|
|
.Build();
|
|
var services = new ServiceCollection();
|
|
services.AddValidatedOptions<NodeOptions, NodeValidator>(config, "Node");
|
|
services.AddValidatedOptions<NodeOptions, NodeValidator>(config, "Node");
|
|
|
|
using var provider = services.BuildServiceProvider();
|
|
var validators = provider.GetServices<IValidateOptions<NodeOptions>>().ToArray();
|
|
Assert.Single(validators);
|
|
|
|
// Resolving the options surfaces each accumulated failure exactly once, not doubled.
|
|
var ex = Assert.Throws<OptionsValidationException>(
|
|
() => provider.GetRequiredService<IOptions<NodeOptions>>().Value);
|
|
Assert.Equal(2, ex.Failures.Count());
|
|
}
|
|
}
|