save progress

src/Concelier/__Libraries/StellaOps.Concelier.Connector.Distro.Alpine/AlpineConnector.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
@@ -228,7 +229,14 @@ public sealed class AlpineConnector : IFeedConnector
             }
 
             var payload = ToDocument(dto);
-            var dtoRecord = new DtoRecord(Guid.NewGuid(), document.Id, SourceName, SchemaVersion, payload, _timeProvider.GetUtcNow());
+            var dtoRecord = new DtoRecord(
+                CreateDeterministicGuid($"alpine:dto:{document.Id}:{SchemaVersion}"),
+                document.Id,
+                SourceName,
+                SchemaVersion,
+                payload,
+                _timeProvider.GetUtcNow(),
+                SchemaVersion: SchemaVersion);
             await _dtoStore.UpsertAsync(dtoRecord, cancellationToken).ConfigureAwait(false);
             await _documentStore.UpdateStatusAsync(document.Id, DocumentStatuses.PendingMap, cancellationToken).ConfigureAwait(false);
 
@@ -271,32 +279,50 @@ public sealed class AlpineConnector : IFeedConnector
             }
 
             AlpineSecDbDto dto;
+            IReadOnlyList<Advisory> advisories;
             try
             {
                 dto = FromDocument(dtoRecord.Payload);
                 dto = ApplyMetadataFallbacks(dto, document);
+                advisories = AlpineMapper.Map(dto, document, _timeProvider.GetUtcNow());
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Failed to deserialize Alpine secdb DTO for document {DocumentId}", documentId);
+                _logger.LogError(ex, "Failed to deserialize or map Alpine secdb DTO for document {DocumentId}", documentId);
                 await _documentStore.UpdateStatusAsync(documentId, DocumentStatuses.Failed, cancellationToken).ConfigureAwait(false);
                 pendingMappings.Remove(documentId);
                 continue;
             }
 
-            var advisories = AlpineMapper.Map(dto, document, _timeProvider.GetUtcNow());
+            var hadFailures = false;
             foreach (var advisory in advisories)
             {
-                await _advisoryStore.UpsertAsync(advisory, cancellationToken).ConfigureAwait(false);
-
-                // Ingest to canonical advisory service if available
-                if (_canonicalService is not null)
+                try
                 {
-                    await IngestToCanonicalAsync(advisory, document.FetchedAt, cancellationToken).ConfigureAwait(false);
+                    await _advisoryStore.UpsertAsync(advisory, cancellationToken).ConfigureAwait(false);
+
+                    // Ingest to canonical advisory service if available
+                    if (_canonicalService is not null)
+                    {
+                        await IngestToCanonicalAsync(advisory, document.FetchedAt, cancellationToken).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    hadFailures = true;
+                    _logger.LogError(ex, "Alpine advisory upsert failed for {AdvisoryKey}", advisory.AdvisoryKey);
                 }
             }
 
-            await _documentStore.UpdateStatusAsync(documentId, DocumentStatuses.Mapped, cancellationToken).ConfigureAwait(false);
+            if (hadFailures)
+            {
+                await _documentStore.UpdateStatusAsync(documentId, DocumentStatuses.Failed, cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                await _documentStore.UpdateStatusAsync(documentId, DocumentStatuses.Mapped, cancellationToken).ConfigureAwait(false);
+            }
+
             pendingMappings.Remove(documentId);
 
             if (advisories.Count > 0)
@@ -632,4 +658,12 @@ public sealed class AlpineConnector : IFeedConnector
             }
         }
     }
+
+    private static Guid CreateDeterministicGuid(string value)
+    {
+        var bytes = SHA256.HashData(Encoding.UTF8.GetBytes(value ?? string.Empty));
+        bytes[6] = (byte)((bytes[6] & 0x0F) | 0x50);
+        bytes[8] = (byte)((bytes[8] & 0x3F) | 0x80);
+        return new Guid(bytes.AsSpan(0, 16));
+    }
 }

src/Concelier/__Libraries/StellaOps.Concelier.Connector.Distro.Alpine/Internal/AlpineCursor.cs

@@ -34,14 +34,14 @@ internal sealed record AlpineCursor(
     {
         var doc = new DocumentObject
         {
-            ["pendingDocuments"] = new DocumentArray(PendingDocuments.Select(id => id.ToString())),
-            ["pendingMappings"] = new DocumentArray(PendingMappings.Select(id => id.ToString()))
+            ["pendingDocuments"] = new DocumentArray(PendingDocuments.OrderBy(static id => id).Select(id => id.ToString())),
+            ["pendingMappings"] = new DocumentArray(PendingMappings.OrderBy(static id => id).Select(id => id.ToString()))
         };
 
         if (FetchCache.Count > 0)
         {
             var cacheDoc = new DocumentObject();
-            foreach (var (key, entry) in FetchCache)
+            foreach (var (key, entry) in FetchCache.OrderBy(static pair => pair.Key, StringComparer.OrdinalIgnoreCase))
             {
                 cacheDoc[key] = entry.ToDocumentObject();
             }
@@ -53,10 +53,10 @@ internal sealed record AlpineCursor(
     }
 
     public AlpineCursor WithPendingDocuments(IEnumerable<Guid> ids)
-        => this with { PendingDocuments = ids?.Distinct().ToArray() ?? EmptyGuidList };
+        => this with { PendingDocuments = ids?.Distinct().OrderBy(static id => id).ToArray() ?? EmptyGuidList };
 
     public AlpineCursor WithPendingMappings(IEnumerable<Guid> ids)
-        => this with { PendingMappings = ids?.Distinct().ToArray() ?? EmptyGuidList };
+        => this with { PendingMappings = ids?.Distinct().OrderBy(static id => id).ToArray() ?? EmptyGuidList };
 
     public AlpineCursor WithFetchCache(IDictionary<string, AlpineFetchCacheEntry>? cache)
     {
@@ -95,7 +95,10 @@ internal sealed record AlpineCursor(
             }
         }
 
-        return list;
+        return list
+            .Distinct()
+            .OrderBy(static id => id)
+            .ToArray();
     }
 
     private static IReadOnlyDictionary<string, AlpineFetchCacheEntry> ReadCache(DocumentObject document)

src/Concelier/__Libraries/StellaOps.Concelier.Connector.Distro.Alpine/Internal/AlpineFetchCacheEntry.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using StellaOps.Concelier.Documents;
 using StorageContracts = StellaOps.Concelier.Storage.Contracts;
 
@@ -31,7 +32,11 @@ internal sealed record AlpineFetchCacheEntry(string? ETag, DateTimeOffset? LastM
             lastModified = modifiedValue.DocumentType switch
             {
                 DocumentType.DateTime => DateTime.SpecifyKind(modifiedValue.ToUniversalTime(), DateTimeKind.Utc),
-                DocumentType.String when DateTimeOffset.TryParse(modifiedValue.AsString, out var parsed) => parsed.ToUniversalTime(),
+                DocumentType.String when DateTimeOffset.TryParse(
+                    modifiedValue.AsString,
+                    CultureInfo.InvariantCulture,
+                    DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
+                    out var parsed) => parsed.ToUniversalTime(),
                 _ => null
             };
         }

src/Concelier/__Libraries/StellaOps.Concelier.Connector.Distro.Alpine/StellaOps.Concelier.Connector.Distro.Alpine.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

src/Concelier/__Libraries/StellaOps.Concelier.Connector.Distro.Alpine/TASKS.md

@@ -7,4 +7,4 @@ Source of truth: `docs/implplan/SPRINT_20251229_049_BE_csproj_audit_maint_tests.
 | --- | --- | --- |
 | AUDIT-0163-M | DONE | Maintainability audit for StellaOps.Concelier.Connector.Distro.Alpine. |
 | AUDIT-0163-T | DONE | Test coverage audit for StellaOps.Concelier.Connector.Distro.Alpine. |
-| AUDIT-0163-A | TODO | Pending approval for changes. |
+| AUDIT-0163-A | DONE | Determinism, cursor ordering, and map isolation applied. |