Joseph Doherty
b92fea15d4
- Configuration-004: NodePermissions stored as int to match the EF HasConversion<int>() in OtOpcUaConfigDbContext.ConfigureNodeAcl. - Configuration-005: serialise LiteDbConfigCache.PutAsync so concurrent Put for the same (ClusterId, GenerationId) cannot duplicate rows. - Configuration-007: rethrow OperationCanceledException from GenerationApplier.ApplyPass when the caller's token is cancelled. - Configuration-010: scrub secrets and drop the full exception object from the ResilientConfigReader fallback warning log. - Configuration-011: pin the previously-uncovered GenerationApplier cancellation and path-length / publish-validation paths. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
59 lines
3.0 KiB
C#
59 lines
3.0 KiB
C#
using ZB.MOM.WW.OtOpcUa.Configuration.Validation;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Configuration.Apply;
|
|
|
|
public sealed class GenerationApplier(ApplyCallbacks callbacks) : IGenerationApplier
|
|
{
|
|
public async Task<ApplyResult> ApplyAsync(DraftSnapshot? from, DraftSnapshot to, CancellationToken ct)
|
|
{
|
|
var diff = GenerationDiffer.Compute(from, to);
|
|
var errors = new List<string>();
|
|
|
|
// Removed first, then Added/Modified — prevents FK dangling while cascades settle.
|
|
await ApplyPass(diff.Tags, ChangeKind.Removed, callbacks.OnTag, errors, ct);
|
|
await ApplyPass(diff.PollGroups, ChangeKind.Removed, callbacks.OnPollGroup, errors, ct);
|
|
await ApplyPass(diff.Equipment, ChangeKind.Removed, callbacks.OnEquipment, errors, ct);
|
|
await ApplyPass(diff.Devices, ChangeKind.Removed, callbacks.OnDevice, errors, ct);
|
|
await ApplyPass(diff.Drivers, ChangeKind.Removed, callbacks.OnDriver, errors, ct);
|
|
await ApplyPass(diff.Namespaces, ChangeKind.Removed, callbacks.OnNamespace, errors, ct);
|
|
|
|
foreach (var kind in new[] { ChangeKind.Added, ChangeKind.Modified })
|
|
{
|
|
// Honour cancellation between passes — a caller can abort the apply between Removed
|
|
// and Added phases even if individual callbacks don't observe the token themselves
|
|
// (Configuration-007).
|
|
ct.ThrowIfCancellationRequested();
|
|
await ApplyPass(diff.Namespaces, kind, callbacks.OnNamespace, errors, ct);
|
|
await ApplyPass(diff.Drivers, kind, callbacks.OnDriver, errors, ct);
|
|
await ApplyPass(diff.Devices, kind, callbacks.OnDevice, errors, ct);
|
|
await ApplyPass(diff.Equipment, kind, callbacks.OnEquipment, errors, ct);
|
|
await ApplyPass(diff.PollGroups, kind, callbacks.OnPollGroup, errors, ct);
|
|
await ApplyPass(diff.Tags, kind, callbacks.OnTag, errors, ct);
|
|
}
|
|
|
|
return errors.Count == 0 ? ApplyResult.Ok(diff) : ApplyResult.Fail(diff, errors);
|
|
}
|
|
|
|
private static async Task ApplyPass<T>(
|
|
IReadOnlyList<EntityChange<T>> changes,
|
|
ChangeKind kind,
|
|
Func<EntityChange<T>, CancellationToken, Task>? callback,
|
|
List<string> errors,
|
|
CancellationToken ct)
|
|
{
|
|
if (callback is null) return;
|
|
|
|
foreach (var change in changes.Where(c => c.Kind == kind))
|
|
{
|
|
try { await callback(change, ct); }
|
|
// Configuration-007: cancellation must propagate, not be silently recorded as an
|
|
// entity error. Distinguish caller cancellation (token signalled) from any
|
|
// OperationCanceledException raised independently of the caller's token, which we
|
|
// still want to surface as an entity error so a single misbehaving callback does
|
|
// not crash the entire apply.
|
|
catch (OperationCanceledException) when (ct.IsCancellationRequested) { throw; }
|
|
catch (Exception ex) { errors.Add($"{typeof(T).Name} {change.Kind} '{change.LogicalId}': {ex.Message}"); }
|
|
}
|
|
}
|
|
}
|