Align bootstrappers and move things into commands (#3992)

* Align bootstrappers and move things into commands * Namespace cleanup
Particular · Mar 12, 2024 · 7c2e3ab · 7c2e3ab
1 parent f5db181
commit 7c2e3ab
Show file tree

Hide file tree

Showing 25 changed files with 277 additions and 362 deletions.
diff --git a/src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs b/src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs
@@ -3,10 +3,12 @@
     using System;
     using System.Threading.Tasks;
     using Hosting.Commands;
+    using Microsoft.Extensions.Hosting;
     using NServiceBus;
     using NUnit.Framework;
     using Particular.ServiceControl;
     using Particular.ServiceControl.Hosting;
+    using Persistence;
     using Persistence.RavenDB;
     using ServiceBus.Management.Infrastructure.Settings;
     using ServiceControl.AcceptanceTesting.InfrastructureConfig;
@@ -41,10 +43,12 @@ public async Task InitializeSettings()
         [Test]
         public async Task CanRunMaintenanceMode()
         {
-            var bootstrapper = new MaintenanceBootstrapper(settings);
-
-            var host = bootstrapper.HostBuilder.Build();
+            // ideally we'd be using the MaintenanceModeCommand here but that indefinitely blocks due to the RunAsync
+            // not terminating.
+            var hostBuilder = Host.CreateApplicationBuilder();
+            hostBuilder.Services.AddPersistence(settings, maintenanceMode: true);
 
+            using var host = hostBuilder.Build();
             await host.StartAsync();
             await host.StopAsync();
         }

diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs b/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Threading.Tasks;
     using AcceptanceTesting.EndpointTemplates;
+    using Hosting.Commands;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting.Support;
     using NServiceBus.Features;
@@ -12,7 +13,7 @@ public class DefaultServer : IEndpointSetupTemplate
     {
         // TODO: Revisit the default server base having a bootstrapper reference
         public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func<EndpointConfiguration, Task> configurationBuilderCustomization) =>
-            new DefaultServerBase<SetupBootstrapper>().GetConfiguration(runDescriptor, endpointConfiguration, async b =>
+            new DefaultServerBase<SetupCommand>().GetConfiguration(runDescriptor, endpointConfiguration, async b =>
             {
                 b.DisableFeature<Audit>();
 

diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -7,6 +7,7 @@
     using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
+    using Hosting.Commands;
     using Infrastructure.DomainEvents;
     using Infrastructure.WebApi;
     using Microsoft.AspNetCore.Builder;
@@ -20,6 +21,7 @@
     using NServiceBus.AcceptanceTesting.Support;
     using NServiceBus.Configuration.AdvancedExtensibility;
     using Particular.ServiceControl;
+    using Particular.ServiceControl.Hosting;
     using RavenDB.Shared;
     using ServiceBus.Management.Infrastructure.Settings;
 
@@ -96,8 +98,8 @@ async Task InitializeServiceControl(ScenarioContext context)
 
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
-                var setupBootstrapper = new SetupBootstrapper(settings);
-                await setupBootstrapper.Run();
+                var setupCommand = new SetupCommand();
+                await setupCommand.Execute(new HostArguments(Array.Empty<string>()), settings);
             }
 
             var configuration = new EndpointConfiguration(instanceName);

diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -11,6 +11,8 @@ namespace ServiceControl.Audit.AcceptanceTests.TestSupport
     using AcceptanceTesting;
     using Auditing;
     using Infrastructure;
+    using Infrastructure.Hosting;
+    using Infrastructure.Hosting.Commands;
     using Infrastructure.Settings;
     using Infrastructure.WebApi;
     using Microsoft.AspNetCore.Builder;
@@ -102,9 +104,8 @@ async Task InitializeServiceControl(ScenarioContext context)
 
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
-
-                var setupBootstrapper = new SetupBootstrapper(settings);
-                await setupBootstrapper.Run();
+                var setupCommand = new SetupCommand();
+                await setupCommand.Execute(new HostArguments(Array.Empty<string>()), settings);
             }
 
             var configuration = new EndpointConfiguration(instanceName);

diff --git a/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs b/src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs
@@ -5,6 +5,8 @@
     using System.Threading;
     using System.Threading.Tasks;
     using Audit.Infrastructure;
+    using Audit.Infrastructure.Hosting;
+    using Audit.Infrastructure.Hosting.Commands;
     using Audit.Infrastructure.Settings;
     using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
@@ -25,9 +27,8 @@ public async Task Should_provision_queues()
                 ForwardAuditMessages = true,
             };
 
-            var setupBootstrapper = new SetupBootstrapper(settings);
-
-            await setupBootstrapper.Run();
+            var setupCommand = new SetupCommand();
+            await setupCommand.Execute(new HostArguments(Array.Empty<string>()), settings);
 
             CollectionAssert.AreEquivalent(new[]
             {

diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/CommandRunner.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/CommandRunner.cs
@@ -4,13 +4,8 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
 
-    class CommandRunner
+    class CommandRunner(List<Type> commands)
     {
-        public CommandRunner(List<Type> commands)
-        {
-            this.commands = commands;
-        }
-
         public async Task Execute(HostArguments args, Settings.Settings settings)
         {
             foreach (var commandType in commands)
@@ -19,7 +14,5 @@ public async Task Execute(HostArguments args, Settings.Settings settings)
                 await command.Execute(args, settings);
             }
         }
-
-        readonly List<Type> commands;
     }
 }
diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/MaintCommand.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/MaintCommand.cs
diff --git a/...Infrastructure/MaintenanceBootstrapper.cs → ...osting/Commands/MaintenanceModeCommand.cs b/...Infrastructure/MaintenanceBootstrapper.cs → ...osting/Commands/MaintenanceModeCommand.cs
@@ -1,14 +1,14 @@
-namespace ServiceControl.Audit.Infrastructure
+namespace ServiceControl.Audit.Infrastructure.Hosting.Commands
 {
     using System;
     using System.Threading.Tasks;
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Hosting.WindowsServices;
-    using ServiceControl.Audit.Persistence;
+    using Persistence;
 
-    static class MaintenanceBootstrapper
+    class MaintenanceModeCommand : AbstractCommand
     {
-        public static async Task Run(Settings.Settings settings)
+        public override async Task Execute(HostArguments args, Settings.Settings settings)
         {
             var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings.PersistenceType);
             var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);

diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/SetupCommand.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/SetupCommand.cs
@@ -1,15 +1,97 @@
 namespace ServiceControl.Audit.Infrastructure.Hosting.Commands
 {
+    using System.Collections.Generic;
     using System.Threading.Tasks;
+    using LicenseManagement;
+    using NServiceBus.Logging;
+    using Persistence;
     using Settings;
+    using Transports;
 
     class SetupCommand : AbstractCommand
     {
         public override async Task Execute(HostArguments args, Settings settings)
         {
             settings.SkipQueueCreation = args.SkipQueueCreation;
 
-            await new SetupBootstrapper(settings).Run();
+            // Validate license:
+            if (!ValidateLicense(settings))
+            {
+                return;
+            }
+
+            var transportSettings = MapSettings(settings);
+            var transportCustomization = settings.LoadTransportCustomization();
+
+            if (settings.IngestAuditMessages)
+            {
+                if (settings.SkipQueueCreation)
+                {
+                    Logger.Info("Skipping queue creation");
+                }
+                else
+                {
+                    var additionalQueues = new List<string> { settings.AuditQueue };
+
+                    if (settings.ForwardAuditMessages && settings.AuditLogQueue != null)
+                    {
+                        additionalQueues.Add(settings.AuditLogQueue);
+                    }
+
+                    await transportCustomization.ProvisionQueues(transportSettings, additionalQueues);
+                }
+            }
+
+            EventSource.Create();
+
+            var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings.PersistenceType);
+            var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);
+            var persistence = persistenceConfiguration.Create(persistenceSettings);
+            var installer = persistence.CreateInstaller();
+
+            await installer.Install();
+        }
+
+        bool ValidateLicense(Settings settings)
+        {
+            if (!string.IsNullOrWhiteSpace(settings.LicenseFileText))
+            {
+                if (!LicenseManager.IsLicenseValidForServiceControlInit(settings.LicenseFileText, out var errorMessageForLicenseText))
+                {
+                    Logger.Error(errorMessageForLicenseText);
+                    return false;
+                }
+
+                if (!LicenseManager.TryImportLicenseFromText(settings.LicenseFileText, out var importErrorMessage))
+                {
+                    Logger.Error(importErrorMessage);
+                    return false;
+                }
+            }
+            else
+            {
+                var license = LicenseManager.FindLicense();
+                if (!LicenseManager.IsLicenseValidForServiceControlInit(license, out var errorMessageForFoundLicense))
+                {
+                    Logger.Error(errorMessageForFoundLicense);
+                    return false;
+                }
+            }
+
+            return true;
         }
+
+        static TransportSettings MapSettings(Settings settings)
+        {
+            var transportSettings = new TransportSettings
+            {
+                EndpointName = settings.ServiceName,
+                ConnectionString = settings.TransportConnectionString,
+                MaxConcurrency = settings.MaximumConcurrencyLevel
+            };
+            return transportSettings;
+        }
+
+        static readonly ILog Logger = LogManager.GetLogger<SetupCommand>();
     }
 }
diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/HostArguments.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/HostArguments.cs
@@ -41,7 +41,7 @@ public HostArguments(string[] args)
                     {
                         Commands =
                         [
-                            typeof(MaintCommand)
+                            typeof(MaintenanceModeCommand)
                         ];
                         executionMode = ExecutionMode.Maintenance;
                     }

diff --git a/src/ServiceControl.Audit/Infrastructure/SetupBootstrapper.cs b/src/ServiceControl.Audit/Infrastructure/SetupBootstrapper.cs
diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs
@@ -13,7 +13,7 @@ public class DefaultServer : IEndpointSetupTemplate
     {
         // TODO: Revisit the default server base having a bootstrapper reference
         public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func<EndpointConfiguration, Task> configurationBuilderCustomization) =>
-            new DefaultServerBase<SetupBootstrapper>(new ConfigureEndpointLearningTransport()).GetConfiguration(runDescriptor, endpointConfiguration, async b =>
+            new DefaultServerBase<SetupCommand>(new ConfigureEndpointLearningTransport()).GetConfiguration(runDescriptor, endpointConfiguration, async b =>
             {
                 b.DisableFeature<Audit>();
 

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -79,8 +79,8 @@ async Task InitializeServiceControl(ScenarioContext context)
 
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
-                var setupBootstrapper = new SetupBootstrapper(settings);
-                await setupBootstrapper.Run();
+                var setupCommand = new SetupCommand();
+                await setupCommand.Execute(settings);
             }
 
             var configuration = new EndpointConfiguration(instanceName);