prep docs and service updates

src/Concelier/__Libraries/StellaOps.Concelier.Storage.Mongo/Observations/AdvisoryObservationEventDocument.cs

@@ -48,21 +48,6 @@ public sealed class AdvisoryObservationEventDocument
     public DateTime? PublishedAt { get; set; }
 }
 
-public sealed class AdvisoryObservationSourceDocument
-{
-    [BsonElement("vendor")]
-    public string Vendor { get; set; } = string.Empty;
-
-    [BsonElement("stream")]
-    public string Stream { get; set; } = string.Empty;
-
-    [BsonElement("api")]
-    public string Api { get; set; } = string.Empty;
-
-    [BsonElement("collectorVersion")]
-    public string? CollectorVersion { get; set; }
-}
-
 public sealed class AdvisoryObservationLinksetSummaryDocument
 {
     [BsonElement("aliases")]

src/Concelier/__Libraries/StellaOps.Concelier.Storage.Mongo/Observations/MongoAdvisoryObservationEventOutbox.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

src/Concelier/__Libraries/StellaOps.Concelier.Storage.Mongo/Observations/NatsAdvisoryObservationEventPublisher.cs

@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NATS.Client.Core;
 using NATS.Client.JetStream;
+using NATS.Client.JetStream.Models;
 using StellaOps.Concelier.Core.Observations;
 
 namespace StellaOps.Concelier.Storage.Mongo.Observations;
@@ -44,19 +45,17 @@ internal sealed class NatsAdvisoryObservationEventPublisher : IAdvisoryObservati
         _logger.LogDebug("Published advisory.observation.updated@1 to NATS subject {Subject} for observation {ObservationId}", subject, @event.ObservationId);
     }
 
-    private async Task EnsureStreamAsync(INatsJSContext js, CancellationToken cancellationToken)
+    private async Task EnsureStreamAsync(NatsJSContext js, CancellationToken cancellationToken)
     {
         var stream = _options.Stream;
         try
         {
-            await js.GetStreamAsync(stream, cancellationToken).ConfigureAwait(false);
+            await js.GetStreamAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
         catch (NatsJSApiException ex) when (ex.Error?.Code == 404)
         {
-            var cfg = new NatsJSStreamConfig
+            var cfg = new StreamConfig(stream, new[] { _options.Subject })
             {
-                Name = stream,
-                Subjects = new[] { _options.Subject },
                 Description = "Concelier advisory observation events",
                 MaxMsgSize = 512 * 1024,
             };

src/Concelier/__Libraries/StellaOps.Concelier.Storage.Mongo/ServiceCollectionExtensions.cs

@@ -1,9 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
-using MongoDB.Driver;
-using StellaOps.Concelier.Core.Jobs;
-using StellaOps.Concelier.Storage.Mongo.Advisories;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using MongoDB.Driver;
+using StellaOps.Concelier.Core.Jobs;
+using StellaOps.Concelier.Storage.Mongo.Advisories;
 using StellaOps.Concelier.Storage.Mongo.Aliases;
 using StellaOps.Concelier.Storage.Mongo.ChangeHistory;
 using StellaOps.Concelier.Storage.Mongo.Documents;
@@ -21,6 +22,7 @@ using StellaOps.Concelier.Core.Events;
 using StellaOps.Concelier.Storage.Mongo.Migrations;
 using StellaOps.Concelier.Storage.Mongo.Observations;
 using StellaOps.Concelier.Core.Observations;
+using StellaOps.Concelier.Storage.Mongo.Linksets;
 
 namespace StellaOps.Concelier.Storage.Mongo;
 

src/Concelier/__Libraries/StellaOps.Concelier.Storage.Mongo/StellaOps.Concelier.Storage.Mongo.csproj

@@ -11,6 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-rc.2.25502.107" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107" />
     <PackageReference Include="NATS.Client.Core" Version="2.0.0" />
+    <PackageReference Include="NATS.Client.JetStream" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\StellaOps.Concelier.Core\StellaOps.Concelier.Core.csproj" />

src/Concelier/seed-data

@@ -0,0 +1 @@
+../../seed-data