Joseph Doherty
76198b36e3
REQ-HOST-3/REQ-HOST-4 require a MachineDataDb connection string for Central nodes. The shipped docker appsettings (docker/central-node-a/appsettings.Central.json and central-node-b) already carry the key. Host-008 had removed the fail-fast Require because MachineDataDb had no consumer yet; this commit reverses that decision so a misconfigured or missing connection string is caught at startup with a clear error. Changes: - DatabaseOptions: add MachineDataDb property with XML doc comment - StartupValidator: add .Require for ScadaBridge:Database:MachineDataDb inside the existing Central .When block, immediately after the ConfigurationDb Require - StartupValidatorTests: rename Central_MissingMachineDataDb_PassesValidation -> FailsValidation and flip to Assert.Throws; update comment to cite REQ-HOST-3/4, shipped docker appsettings, and the Host-008 reversal; add MachineDataDb to ValidCentralConfig() so all other Central tests remain green - CentralDbTestEnvironment: supply ScadaBridge__Database__MachineDataDb env var (mirrors ConfigurationDb pattern) so HostStartupTests, HealthCheckTests, and MetricsEndpointTests pass through the new Require - CompositionRootTests, AkkaHostedServiceAuditWiringTests, ActorPathTests: set ScadaBridge__Database__MachineDataDb env var alongside the pepper env var and clear it in Dispose, matching the existing pepper handling pattern Build: 0 warnings, 0 errors. dotnet test Host.Tests: 233/233 passed.
63 lines
3.1 KiB
C#
63 lines
3.1 KiB
C#
namespace ZB.MOM.WW.ScadaBridge.Host.Tests;
|
|
|
|
/// <summary>
|
|
/// Host-003: <c>appsettings.Central.json</c> no longer commits database connection
|
|
/// strings — they are externalised to environment variables. Tests that exercise the
|
|
/// full <c>Program</c> startup pipeline against the real SQL provider must therefore
|
|
/// supply the local dev connection string the way a deployment would: via an
|
|
/// environment variable (<c>Program</c>'s configuration builder calls
|
|
/// <c>AddEnvironmentVariables()</c>).
|
|
///
|
|
/// Also supplies <c>ScadaBridge__InboundApi__ApiKeyPepper</c> so the Central-role
|
|
/// StartupValidator preflight (added in 1fcc4f5) does not fail for tests that set
|
|
/// <c>DOTNET_ENVIRONMENT=Central</c> without an explicit pepper env var.
|
|
///
|
|
/// Also supplies <c>ScadaBridge__Database__MachineDataDb</c> so the Central-role
|
|
/// StartupValidator preflight (reverts Host-008, REQ-HOST-3/4, M2.9 #17) does not
|
|
/// fail for tests that set <c>DOTNET_ENVIRONMENT=Central</c> without an explicit
|
|
/// MachineDataDb env var. All vars are restored on Dispose so tests stay isolated.
|
|
/// </summary>
|
|
internal sealed class CentralDbTestEnvironment : IDisposable
|
|
{
|
|
// Local dev/test database — same credentials the infra docker-compose stack uses.
|
|
// This is a test fixture value, not a committed production secret.
|
|
private const string ConfigurationDb =
|
|
"Server=localhost,1433;Database=ScadaBridgeConfig;User Id=scadabridge_app;Password=ScadaBridge_Dev1#;TrustServerCertificate=true";
|
|
|
|
private const string ConfigKey = "ScadaBridge__Database__ConfigurationDb";
|
|
|
|
private const string MachineDataDb =
|
|
"Server=localhost,1433;Database=ScadaBridgeMachineData;User Id=scadabridge_app;Password=ScadaBridge_Dev1#;TrustServerCertificate=true";
|
|
|
|
private const string MachineDataKey = "ScadaBridge__Database__MachineDataDb";
|
|
|
|
// Test-only pepper — satisfies the ≥16-char StartupValidator requirement without
|
|
// committing a real secret. The env-var name uses the double-underscore delimiter
|
|
// so AddEnvironmentVariables() maps it to ScadaBridge:InboundApi:ApiKeyPepper.
|
|
internal const string TestPepper = "test-pepper-01234567890";
|
|
private const string PepperKey = "ScadaBridge__InboundApi__ApiKeyPepper";
|
|
|
|
private readonly string? _previousConfig;
|
|
private readonly string? _previousMachineData;
|
|
private readonly string? _previousPepper;
|
|
|
|
public CentralDbTestEnvironment()
|
|
{
|
|
_previousConfig = Environment.GetEnvironmentVariable(ConfigKey);
|
|
Environment.SetEnvironmentVariable(ConfigKey, ConfigurationDb);
|
|
|
|
_previousMachineData = Environment.GetEnvironmentVariable(MachineDataKey);
|
|
Environment.SetEnvironmentVariable(MachineDataKey, MachineDataDb);
|
|
|
|
_previousPepper = Environment.GetEnvironmentVariable(PepperKey);
|
|
Environment.SetEnvironmentVariable(PepperKey, TestPepper);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Environment.SetEnvironmentVariable(ConfigKey, _previousConfig);
|
|
Environment.SetEnvironmentVariable(MachineDataKey, _previousMachineData);
|
|
Environment.SetEnvironmentVariable(PepperKey, _previousPepper);
|
|
}
|
|
}
|