Merge branch 'worktree-agent-aae48b78656e5a4e0' into arch-review-remediation

# Conflicts: # src/ZB.MOM.WW.ScadaBridge.SiteRuntime/Repositories/SiteExternalSystemRepository.cs
2026-08-14 21:16:11 -04:00
parent edd925e277 a212283104
commit 4cd1441984
32 changed files with 1361 additions and 120 deletions
@@ -104,3 +104,78 @@ public class ManagementHttpClientTests
        Assert.Equal("TIMEOUT", response.ErrorCode);
    }
 }
+
+/// <summary>
+/// WP2.6e (arch-review misc — CLI HttpClient timeout): the public
+/// <see cref="ManagementHttpClient"/> constructor must bound its underlying
+/// <see cref="HttpClient.Timeout"/> explicitly (30 s default) rather than leaving the
+/// framework's 100 s default in place, and must honor the
+/// <c>SCADABRIDGE_HTTP_TIMEOUT_SECONDS</c> override — consistent with how every other
+/// CLI setting is environment-overridable (<see cref="CliConfig"/>). Runs in the shared
+/// "Environment" collection (see <see cref="TestCollections"/>) so it never races another
+/// test mutating process-wide environment variables.
+/// </summary>
+[Collection("Environment")]
+public class ManagementHttpClientTimeoutTests
+{
+    private const string EnvVar = "SCADABRIDGE_HTTP_TIMEOUT_SECONDS";
+
+    [Fact]
+    public void DefaultConstructor_SetsThirtySecondTimeout_WhenEnvVarUnset()
+    {
+        var original = Environment.GetEnvironmentVariable(EnvVar);
+        try
+        {
+            Environment.SetEnvironmentVariable(EnvVar, null);
+
+            using var client = new ManagementHttpClient("http://localhost:9001", "user", "pass");
+
+            Assert.Equal(TimeSpan.FromSeconds(30), ManagementHttpClient.DefaultTimeout);
+            Assert.Equal(TimeSpan.FromSeconds(30), client.EffectiveTimeout);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(EnvVar, original);
+        }
+    }
+
+    [Theory]
+    [InlineData("0")]
+    [InlineData("-5")]
+    [InlineData("not-a-number")]
+    [InlineData("")]
+    public void InvalidOrNonPositiveEnvValue_FallsBackToDefault(string value)
+    {
+        var original = Environment.GetEnvironmentVariable(EnvVar);
+        try
+        {
+            Environment.SetEnvironmentVariable(EnvVar, value);
+
+            using var client = new ManagementHttpClient("http://localhost:9001", "user", "pass");
+
+            Assert.Equal(TimeSpan.FromSeconds(30), client.EffectiveTimeout);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(EnvVar, original);
+        }
+    }
+
+    [Fact]
+    public void PositiveEnvValue_OverridesDefaultTimeout()
+    {
+        var original = Environment.GetEnvironmentVariable(EnvVar);
+        try
+        {
+            Environment.SetEnvironmentVariable(EnvVar, "5");
+
+            using var client = new ManagementHttpClient("http://localhost:9001", "user", "pass");
+
+            Assert.Equal(TimeSpan.FromSeconds(5), client.EffectiveTimeout);
+        }
+        finally
+        {
+            Environment.SetEnvironmentVariable(EnvVar, original);
+        }
+    }
+}