feat(audit): archive retention and superseded stale-archive cleanup (ScadaBridge#109)
Owner decisions recorded: the archive destination stays a directory/UNC (no object-storage client; share + permissions named at enablement), parquet-tools-only reading (no re-import), unsigned like the chain (#107). AuditLog:Archive:RetentionDays (default 0 = never delete; else must exceed AuditLog:RetentionDays, counted from the archived month's end) and DeleteSupersededStaleArchives (default true) run after every purge tick. A retried purge's stale Archived archive is deleted only when a later, verifying, Purged archive of the same partition provably holds every row: same prior anchor and the stale chain-end hash at its chain-end sequence (row or tombstone), every unchained row present by EventId; otherwise it is reported KeptStale. A sole copy left at Archived is never touched. Deletion removes only the archive name's own three files in its folder, manifest first, never a manifest-supplied path. `audit archive cleanup [--dry-run]` = CleanupAuditArchives (Administrator). AuditLogArchiveCleanupTests (MSSQL) cover retried purge, kept stale copy, sole copy, retention and the path guard; each safety rule mutation-checked. Follow-ups filed: #113, #114, #115. Claude-Session: https://claude.ai/code/session_01GT67AEHd2Acv1YPwGfXEoV
This commit is contained in:
@@ -30,13 +30,13 @@ public class AuditArchiveCommandTests
|
||||
"\"rowsRead\":11,\"chains\":[{\"chain\":{\"partition\":\"2025-10\",\"status\":\"Intact\",\"rowsVerified\":10," +
|
||||
"\"tombstonesApplied\":0,\"unchainedRows\":0},\"anchor\":\"Mismatch\",\"anchorDetail\":\"hash differs\"}]}";
|
||||
|
||||
/// <summary>The audit group carries the archive group with list + verify.</summary>
|
||||
/// <summary>The audit group carries the archive group with list + verify + cleanup (ScadaBridge#109).</summary>
|
||||
[Fact]
|
||||
public void AuditGroup_HasArchiveListAndVerify()
|
||||
public void AuditGroup_HasArchiveListVerifyAndCleanup()
|
||||
{
|
||||
var root = AuditCommandTestHarness.BuildRoot();
|
||||
var archive = root.Subcommands.Single(c => c.Name == "audit").Subcommands.Single(c => c.Name == "archive");
|
||||
Assert.Equal(["list", "verify"], archive.Subcommands.Select(c => c.Name).Order());
|
||||
Assert.Equal(["cleanup", "list", "verify"], archive.Subcommands.Select(c => c.Name).Order());
|
||||
}
|
||||
|
||||
/// <summary><c>list</c> sends ListAuditArchives and prints the archives.</summary>
|
||||
@@ -78,6 +78,34 @@ public class AuditArchiveCommandTests
|
||||
Assert.Equal(Name, name);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <c>cleanup</c> (ScadaBridge#109) sends CleanupAuditArchives with the dry-run flag and
|
||||
/// reports each action; it always exits 0.
|
||||
/// </summary>
|
||||
/// <param name="dryRun">Whether <c>--dry-run</c> is passed.</param>
|
||||
/// <returns>A task that represents the asynchronous operation.</returns>
|
||||
[Theory]
|
||||
[InlineData(true)]
|
||||
[InlineData(false)]
|
||||
public async Task Cleanup_SendsCleanupAuditArchives_WithTheDryRunFlag(bool dryRun)
|
||||
{
|
||||
var body = "{\"dryRun\":" + (dryRun ? "true" : "false") + ",\"retentionDays\":0,\"items\":[{\"name\":\"" + Name
|
||||
+ "\",\"partition\":\"2025-10\",\"action\":\"DeletedSuperseded\",\"detail\":\"superseded by x\"}]}";
|
||||
string[] args = dryRun
|
||||
? ["audit", "archive", "cleanup", "--dry-run", "--format", "table"]
|
||||
: ["audit", "archive", "cleanup", "--format", "table"];
|
||||
var (exit, output, request) = await RunAsync(body, args);
|
||||
|
||||
Assert.Equal(0, exit);
|
||||
Assert.Contains("DeletedSuperseded", output);
|
||||
Assert.Contains("never delete", output);
|
||||
Assert.Equal(dryRun, output.Contains("Dry run", StringComparison.Ordinal));
|
||||
using var payload = JsonDocument.Parse(request);
|
||||
Assert.Equal("CleanupAuditArchives", payload.RootElement.GetProperty("command").GetString());
|
||||
Assert.Equal(dryRun, payload.RootElement.GetProperty("payload").EnumerateObject()
|
||||
.First(p => string.Equals(p.Name, "dryRun", StringComparison.OrdinalIgnoreCase)).Value.GetBoolean());
|
||||
}
|
||||
|
||||
/// <summary><c>verify</c> without <c>--name</c> is a usage error.</summary>
|
||||
[Fact]
|
||||
public void Verify_MissingName_ProducesRequiredFlagError()
|
||||
|
||||
@@ -62,10 +62,10 @@ public class AuditCommandsScaffoldTests
|
||||
[Fact]
|
||||
public void Audit_EveryLeafCommand_HasAnAction()
|
||||
{
|
||||
// `archive` is a group (list / verify, ScadaBridge#42): check its leaves, not it.
|
||||
// `archive` is a group (list / verify, ScadaBridge#42; cleanup, ScadaBridge#109): check its leaves, not it.
|
||||
var audit = BuildAudit();
|
||||
var leaves = audit.Subcommands.SelectMany(c => c.Subcommands.Count == 0 ? [c] : c.Subcommands).ToList();
|
||||
Assert.Equal(8, leaves.Count); // + verify-heads (ScadaBridge#107)
|
||||
Assert.Equal(9, leaves.Count); // + verify-heads (ScadaBridge#107), archive cleanup (ScadaBridge#109)
|
||||
Assert.All(leaves, sub =>
|
||||
Assert.True(sub.Action != null, $"Leaf command '{sub.Name}' has no action."));
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ public class ManagementSurfaceParityTests
|
||||
}
|
||||
|
||||
private static readonly HashSet<string> AuditManagementLeaves =
|
||||
["audit verify-chain", "audit verify-heads", "audit archive list", "audit archive verify"];
|
||||
["audit verify-chain", "audit verify-heads", "audit archive list", "audit archive verify", "audit archive cleanup"];
|
||||
|
||||
private static async Task<ConcurrentDictionary<string, string>> ProbeProductionTree(string? omitGroup = null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user