Search indexer: fixing support for Marketplace.

Author: gfraiteur

src/PostSharp.Engineering.BuildTools/Search/Backends/Typesense/TypesenseImportFailedException.cs

@@ -12,7 +12,8 @@ public class TypesenseImportFailedException : Exception
 {
     private readonly Dictionary<int, ImportResponse> _data;
 
-    public TypesenseImportFailedException( IEnumerable<ImportResponse> failedResponses ) : base( "Import failed." )
+    public TypesenseImportFailedException( IReadOnlyCollection<ImportResponse> failedResponses ) :
+        base( $"Import failed: {string.Join( "", failedResponses.Select( x => $"\n - {x.Error}" ) )}" )
     {
         var i = 0;
         this._data = failedResponses.ToDictionary( _ => i++, r => r );

src/PostSharp.Engineering.BuildTools/Search/UpdateSearchCommand.cs

@@ -18,9 +18,6 @@ namespace PostSharp.Engineering.BuildTools.Search;
 [UsedImplicitly]
 public class UpdateSearchCommand : BaseCommand<UpdateSearchCommandSettings>
 {
-    private static CollectionUpdater CreateUpdater( UpdateSearchProductExtension productExtension, SearchBackendBase backend )
-        => new DocumentationUpdater( productExtension.Products, backend );
-
     protected override bool ExecuteCore( BuildContext context, UpdateSearchCommandSettings settings )
         => ExecuteCoreAsync( context, settings ).GetAwaiter().GetResult();
 
@@ -45,7 +42,7 @@ private static async Task<bool> ExecuteCoreAsync( BuildContext context, UpdateSe
 
         if ( settings.Dry )
         {
-            updater = CreateUpdater( productExtension, new DrySearchBackend( console ) );
+            updater = productExtension.CreateUpdater( new DrySearchBackend( console ) );
             targetCollection = "dry"; // Console backend doesn't work with collection names.
             targetCollections = (null, targetCollection);
         }
@@ -63,7 +60,7 @@ private static async Task<bool> ExecuteCoreAsync( BuildContext context, UpdateSe
 
             var uri = new Uri( productExtension.TypesenseUri );
             var backend = new TypesenseBackend( apiKey, uri.Host, uri.Port.ToString( CultureInfo.InvariantCulture ), uri.Scheme );
-            updater = CreateUpdater( productExtension, backend );
+            updater = productExtension.CreateUpdater( backend );
 
             targetCollections = alias == null
                 ? (null, settings.Collection!)

src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs

@@ -1,13 +1,16 @@
 // Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
 
+using Amazon.Runtime.Documents;
 using JetBrains.Annotations;
 using PostSharp.Engineering.BuildTools.Build;
 using PostSharp.Engineering.BuildTools.Build.Model;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.Model;
 using PostSharp.Engineering.BuildTools.ContinuousIntegration.Model.BuildSteps;
 using PostSharp.Engineering.BuildTools.Dependencies.Model;
+using PostSharp.Engineering.BuildTools.Search.Backends;
 using PostSharp.Engineering.BuildTools.Search.Crawlers;
+using PostSharp.Engineering.BuildTools.Search.Updaters;
 using Spectre.Console.Cli;
 using System;
 using System.Collections.Generic;
@@ -18,14 +21,14 @@ namespace PostSharp.Engineering.BuildTools.Search;
 [PublicAPI]
 public class UpdateSearchProductExtension : ProductExtension
 {
+    private readonly Func<SearchBackendBase, CollectionUpdater> _createUpdater;
+
     public string TypesenseUri { get; }
 
     public string Source { get; }
 
     public string SourceUrl { get; }
 
-    public DocumentParserFactory DocumentParserFactory { get; }
-
     public BuildConfiguration[] BuildConfigurations { get; }
 
     public TimeSpan TimeOutThreshold { get; }
@@ -34,8 +37,6 @@ public class UpdateSearchProductExtension : ProductExtension
 
     public ConfigurationSpecific<IBuildTrigger[]?>? BuildTriggers { get; }
 
-    public ImmutableArray<string> Products { get; }
-
     public UpdateSearchProductExtension(
         string typesenseUri,
         string source,
@@ -45,18 +46,41 @@ public UpdateSearchProductExtension(
         BuildConfiguration[]? buildConfigurations = null,
         TimeSpan? timeOutThreshold = null,
         string? customBuildConfigurationName = null,
+        ConfigurationSpecific<IBuildTrigger[]?>? buildTriggers = null ) : this(
+        typesenseUri,
+        source,
+        sourceUrl,
+        searchBackend => new DocumentationUpdater( products, new DocumentParserFactory( createParser ), searchBackend ),
+        buildConfigurations,
+        timeOutThreshold,
+        customBuildConfigurationName,
+        buildTriggers ) { }
+
+    public UpdateSearchProductExtension(
+        string typesenseUri,
+        string source,
+        string sourceUrl,
+        Func<SearchBackendBase, CollectionUpdater> createUpdater,
+        BuildConfiguration[]? buildConfigurations = null,
+        TimeSpan? timeOutThreshold = null,
+        string? customBuildConfigurationName = null,
         ConfigurationSpecific<IBuildTrigger[]?>? buildTriggers = null )
     {
+        this._createUpdater = createUpdater;
         this.TypesenseUri = typesenseUri;
         this.Source = source;
         this.SourceUrl = sourceUrl;
-        this.DocumentParserFactory = new DocumentParserFactory( createParser );
-        this.Products = products;
         this.BuildConfigurations = buildConfigurations ?? [BuildConfiguration.Public];
         this.TimeOutThreshold = timeOutThreshold ?? TimeSpan.FromMinutes( 5 );
         this.CustomBuildConfigurationName = customBuildConfigurationName;
         this.BuildTriggers = buildTriggers;
     }
+    
+    
+    internal CollectionUpdater CreateUpdater( SearchBackendBase searchBackend )
+    {
+        return this._createUpdater( searchBackend );
+    }
 
     internal override bool AddTeamcityBuildConfiguration( BuildContext context, List<TeamCityBuildConfiguration> teamCityBuildConfigurations )
     {

src/PostSharp.Engineering.BuildTools/Search/Updaters/DocumentationUpdater.cs

@@ -16,10 +16,12 @@ namespace PostSharp.Engineering.BuildTools.Search.Updaters;
 internal class DocumentationUpdater : CollectionUpdater
 {
     private readonly ImmutableArray<string> _products;
+    private readonly DocumentParserFactory _documentParserFactory;
 
-    public DocumentationUpdater( ImmutableArray<string> products, SearchBackendBase backend ) : base( backend )
+    public DocumentationUpdater( ImmutableArray<string> products, DocumentParserFactory documentParserFactory,  SearchBackendBase backend ) : base( backend )
     {
         this._products = products;
+        this._documentParserFactory = documentParserFactory;
     }
 
     public override async Task<bool> UpdateAsync( BuildContext context, UpdateSearchCommandSettings settings, string targetCollection )
@@ -36,7 +38,7 @@ public override async Task<bool> UpdateAsync( BuildContext context, UpdateSearch
 
         using ( web )
         {
-            var siteIndexer = new SiteIndexer( this.Backend, productExtension.DocumentParserFactory, web, context.Console );
+            var siteIndexer = new SiteIndexer( this.Backend, this._documentParserFactory, web, context.Console );
 
             if ( !string.IsNullOrEmpty( settings.SingleArticleUrl ) )
             {