Refactored settings handling

src/ServiceControl.AcceptanceTests.RavenDB/AcceptanceTestStorageConfiguration.cs

@@ -1,23 +1,26 @@
 namespace ServiceControl.AcceptanceTests
 {
-    using System.Collections.Generic;
+    using System;
+    using System.IO;
     using System.Linq;
     using System.Net.NetworkInformation;
     using System.Threading.Tasks;
     using Persistence.RavenDb;
+    using ServiceBus.Management.Infrastructure.Settings;
 
     class AcceptanceTestStorageConfiguration
     {
         public string PersistenceType { get; protected set; }
 
-        public Task<IDictionary<string, string>> CustomizeSettings()
+        public void CustomizeSettings(Settings settings)
         {
-            return Task.FromResult<IDictionary<string, string>>(new Dictionary<string, string>
+            settings.PersisterSpecificSettings = new RavenDBPersisterSettings
             {
-                { "RavenDB35/RunInMemory", bool.TrueString},
-                { "DatabaseMaintenancePort", FindAvailablePort(33334).ToString()},
-                { "HostName", "localhost" }
-            });
+                RunInMemory = true,
+                DatabaseMaintenancePort = FindAvailablePort(settings.Port + 1),
+                DatabasePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()),
+                ErrorRetentionPeriod = TimeSpan.FromDays(10),
+            };
         }
 
         public Task Configure()

src/ServiceControl.AcceptanceTests.RavenDB/App.config

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="ServiceControl/ForwardErrorMessages" value="false" />
     <add key="Raven/Esent/MaxVerPages" value="4096" />
-    <add key="ServiceControl/ErrorRetentionPeriod" value="10.00:00:00" />
-    <add key="ServiceControl/AllowMessageEditing" value="true"/>
   </appSettings>
   <runtime>
     <gcServer enabled="true" />

src/ServiceControl.AcceptanceTests.RavenDB/Legacy/AuditRetention.cs

@@ -14,7 +14,6 @@
     using ServiceBus.Management.Infrastructure.Settings;
     using ServiceControl.AcceptanceTests;
     using ServiceControl.AcceptanceTests.TestSupport.EndpointTemplates;
-    using ServiceControl.Persistence;
     using ServiceControl.Persistence.RavenDb.SagaAudit;
     using ServiceControl.SagaAudit;
 
@@ -34,7 +33,7 @@ public async Task
 
             //Override the configuration of the check in the container in order to make it run more frequently for testing purposes.
             CustomizeHostBuilder = hostBuilder => hostBuilder.ConfigureServices((ctx, services) =>
-                services.AddTransient<ICustomCheck, AuditRetentionCustomCheck>(provider => new AuditRetentionCustomCheck(provider.GetRequiredService<IDocumentStore>(), provider.GetRequiredService<PersistenceSettings>(), TimeSpan.FromSeconds(10))));
+                services.AddTransient<ICustomCheck, AuditRetentionCustomCheck>(provider => new AuditRetentionCustomCheck(provider.GetRequiredService<IDocumentStore>(), provider.GetRequiredService<RavenDBPersisterSettings>(), TimeSpan.FromSeconds(10))));
 
             SingleResult<EventLogItem> customCheckEventEntry = default;
             bool sagaAudiDataInMainInstanceIsAvailableForQuery = false;

src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs

@@ -0,0 +1,69 @@
+namespace ServiceControl.AcceptanceTests.RavenDB
+{
+    using System;
+    using System.Threading.Tasks;
+    using Hosting.Commands;
+    using NServiceBus;
+    using NUnit.Framework;
+    using Particular.ServiceControl;
+    using Particular.ServiceControl.Hosting;
+    using Persistence.RavenDb;
+    using ServiceBus.Management.Infrastructure.Settings;
+    using ServiceControl.AcceptanceTesting.InfrastructureConfig;
+
+    class StartupModeTests : AcceptanceTest
+    {
+        Settings settings;
+
+        [SetUp]
+        public void InitializeSettings()
+        {
+            var transportIntegration = new ConfigureEndpointLearningTransport();
+            settings = new Settings(
+                forwardErrorMessages: false,
+                errorRetentionPeriod: TimeSpan.FromDays(1),
+                persisterType: typeof(RavenDbPersistenceConfiguration).AssemblyQualifiedName)
+            {
+                PersisterSpecificSettings = new RavenDBPersisterSettings
+                {
+                    ErrorRetentionPeriod = TimeSpan.FromDays(1),
+                    RunInMemory = true
+                },
+                TransportType = transportIntegration.TypeName,
+                TransportConnectionString = transportIntegration.ConnectionString
+            };
+        }
+
+        [Test]
+        public async Task CanRunMaintenanceMode()
+        {
+            var bootstrapper = new MaintenanceBootstrapper(settings);
+
+            var host = bootstrapper.HostBuilder.Build();
+
+            await host.StartAsync();
+            await host.StopAsync();
+        }
+
+        [Test]
+        public async Task CanRunImportFailedMessagesMode()
+        {
+            await new TestableImportFailedErrorsCommand().Execute(new HostArguments(Array.Empty<string>()), settings);
+        }
+
+        class TestableImportFailedErrorsCommand : ImportFailedErrorsCommand
+        {
+            protected override EndpointConfiguration CreateEndpointConfiguration(Settings settings)
+            {
+                var configuration = base.CreateEndpointConfiguration(settings);
+
+                //HINT: we want to exclude this assembly to prevent loading features that are part of the acceptance testing framework  
+                var thisAssembly = new[] { typeof(StartupModeTests).Assembly.GetName().Name };
+
+                configuration.AssemblyScanner().ExcludeAssemblies(thisAssembly);
+
+                return configuration;
+            }
+        }
+    }
+}

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs

@@ -2,16 +2,12 @@
 {
     using System;
     using System.Linq;
-    using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using MessageFailures.Api;
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.Hosting;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
     using NUnit.Framework;
-    using Persistence;
     using ServiceBus.Management.Infrastructure.Settings;
     using TestSupport.EndpointTemplates;
 
@@ -28,35 +24,19 @@ public void SetupIngestion()
             };
         }
 
-        class PersisterSettingsRetriever : IHostedService
-        {
-            static PersistenceSettings _persistenceSettings;
-
-            public PersisterSettingsRetriever(PersistenceSettings persistenceSettings, int value)
-            {
-                _persistenceSettings = persistenceSettings;
-                SetMinimumStorageLeftForIngestion(value);
-            }
-
-            public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-            public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-
-            public static void SetMinimumStorageLeftForIngestion(int value) => _persistenceSettings.PersisterSpecificSettings["MinimumStorageLeftRequiredForIngestion"] = value.ToString();
-        }
+        RavenDBPersisterSettings PersisterSettings => (RavenDBPersisterSettings)Settings.PersisterSpecificSettings;
 
         [Test]
         public async Task Should_stop_ingestion()
         {
-            CustomizeHostBuilder = hostBuilder => hostBuilder.ConfigureServices(services => services.AddHostedService(b => new PersisterSettingsRetriever(b.GetRequiredService<PersistenceSettings>(), 0)));
-
             await Define<ScenarioContext>()
                 .WithEndpoint<Sender>(b => b
                     .When(context =>
                     {
                         return context.Logs.ToArray().Any(i => i.Message.StartsWith("Ensure started. Infrastructure started"));
                     }, (_, __) =>
                     {
-                        PersisterSettingsRetriever.SetMinimumStorageLeftForIngestion(100);
+                        PersisterSettings.MinimumStorageLeftRequiredForIngestion = 100;
                         return Task.CompletedTask;
                     })
                     .When(context =>
@@ -67,14 +47,13 @@ await Define<ScenarioContext>()
                     }, (bus, c) => bus.SendLocal(new MyMessage())
                     )
                     .DoNotFailOnErrorMessages())
-                //.Done(async c => await this.TryGetSingle<FailedMessageView>("/api/errors") == false)
+                .Done(async c => await this.TryGetSingle<FailedMessageView>("/api/errors") == false)
                 .Run();
         }
 
         [Test]
         public async Task Should_stop_ingestion_and_resume_when_more_space_is_available()
         {
-            CustomizeHostBuilder = hostBuilder => hostBuilder.ConfigureServices(services => services.AddHostedService(b => new PersisterSettingsRetriever(b.GetRequiredService<PersistenceSettings>(), 0)));
             var ingestionShutdown = false;
 
             await Define<ScenarioContext>()
@@ -86,7 +65,7 @@ await Define<ScenarioContext>()
                                 "Ensure started. Infrastructure started"));
                     }, (session, context) =>
                     {
-                        PersisterSettingsRetriever.SetMinimumStorageLeftForIngestion(100);
+                        PersisterSettings.MinimumStorageLeftRequiredForIngestion = 100;
                         return Task.CompletedTask;
                     })
                     .When(context =>
@@ -103,7 +82,7 @@ await Define<ScenarioContext>()
                         })
                     .When(c => ingestionShutdown, (session, context) =>
                     {
-                        PersisterSettingsRetriever.SetMinimumStorageLeftForIngestion(0);
+                        PersisterSettings.MinimumStorageLeftRequiredForIngestion = 0;
                         return Task.CompletedTask;
                     })
                     .DoNotFailOnErrorMessages())

src/ServiceControl.AcceptanceTests/RootControllerTests.cs

@@ -24,7 +24,7 @@ public async Task Should_gather_remote_data()
             {
                 hostBuilder.ConfigureServices((hostBuilderContext, services) =>
                 {
-                    services.AddSingleton(new Settings(serviceName)
+                    services.AddSingleton(new Settings(serviceName, forwardErrorMessages: false, errorRetentionPeriod: TimeSpan.FromDays(10))
                     {
                         RemoteInstances = new[]
                         {

src/ServiceControl.AcceptanceTests/TestSupport/AcceptanceTest.cs

@@ -72,7 +72,16 @@ public async Task Setup()
 
             await StorageConfiguration.Configure();
 
-            serviceControlRunnerBehavior = new ServiceControlComponentBehavior(TransportIntegration, StorageConfiguration, s => SetSettings(s), s => CustomConfiguration(s), hb => CustomizeHostBuilder(hb));
+            serviceControlRunnerBehavior = new ServiceControlComponentBehavior(
+                TransportIntegration,
+                StorageConfiguration,
+                s =>
+                {
+                    SetSettings(s);
+                },
+                s => CustomConfiguration(s),
+                hb => CustomizeHostBuilder(hb)
+                );
         }
 
         [TearDown]

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -70,22 +70,13 @@ static int FindAvailablePort(int startPort)
         async Task InitializeServiceControl(ScenarioContext context)
         {
             var instancePort = FindAvailablePort(33333);
-            var maintenancePort = FindAvailablePort(instancePort + 1);
 
             ConfigurationManager.AppSettings.Set("ServiceControl/TransportType", transportToUse.TypeName);
 
-            // TODO: ⬇️ This is required for the PERSISTER implementation to actually retrieve the DBPath settings are persister isn't using this type-safe settings class
-            var dbPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            ConfigurationManager.AppSettings.Set("ServiceControl/DBPath", dbPath); // TODO: Tests should not use static ConfigurationManager.AppSettings
-            ConfigurationManager.AppSettings.Set("ServiceControl/DatabaseMaintenancePort", "33434");
-            ConfigurationManager.AppSettings.Set("ServiceControl/ExposeRavenDB", "False");
-            // TODO: ⬆️
-
-            var settings = new Settings(instanceName, transportToUse.TypeName, persistenceToUse.PersistenceType)
+            var settings = new Settings(instanceName, transportToUse.TypeName, persistenceToUse.PersistenceType, forwardErrorMessages: false, errorRetentionPeriod: TimeSpan.FromDays(10))
             {
+                AllowMessageEditing = true,
                 Port = instancePort,
-                DatabaseMaintenancePort = maintenancePort,
-                DbPath = dbPath,
                 ForwardErrorMessages = false,
                 TransportConnectionString = transportToUse.ConnectionString,
                 ProcessRetryBatchesFrequency = TimeSpan.FromSeconds(2),
@@ -124,19 +115,14 @@ async Task InitializeServiceControl(ScenarioContext context)
                     }
 
                     return false;
-                }
+                },
             };
 
+            persistenceToUse.CustomizeSettings(settings);
+
             setSettings(settings);
             Settings = settings;
 
-            var persisterSpecificSettings = await persistenceToUse.CustomizeSettings();
-
-            foreach (var persisterSpecificSetting in persisterSpecificSettings)
-            {
-                ConfigurationManager.AppSettings.Set($"ServiceControl/{persisterSpecificSetting.Key}", persisterSpecificSetting.Value);
-            }
-
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
 
@@ -223,7 +209,7 @@ public override async Task Stop()
                 await host.StopAsync();
                 HttpClient.Dispose();
                 Handler.Dispose();
-                DirectoryDeleter.Delete(Settings.DbPath);
+                DirectoryDeleter.Delete(Settings.PersisterSpecificSettings.DatabasePath);
             }
 
             bootstrapper = null;

src/ServiceControl.Audit/App.config

@@ -9,7 +9,7 @@ These settings are only here so that we can debug ServiceControl while developin
 		<add key="ServiceControl.Audit/ServiceControlQueueAddress" value="Particular.ServiceControl" />
 
 		<add key="ServiceControl.Audit/TransportType" value="LearningTransport" />
-		
+
 		<!-- DEVS - Pick a transport to run Auditing instance on
 		<add key="ServiceControl.Audit/TransportType" value="AmazonSQS" />
 		<add key="ServiceControl.Audit/TransportType" value="LearningTransport" />
@@ -19,32 +19,32 @@ These settings are only here so that we can debug ServiceControl while developin
 		<add key="ServiceControl.Audit/TransportType" value="RabbitMQ.QuorumConventionalRouting" />
 		<add key="ServiceControl.Audit/TransportType" value="SQLServer" />
 		-->
-		
+
 		<add key="ServiceControl.Audit/PersistenceType" value="InMemory" />
 
 		<!-- DEVS - Pick a persistence to run Auditing instance on.
 		Note that the RavenDB5 persistence requires the DBPath and LogPath settings
-		
+
 		<add key="ServiceControl.Audit/PersistenceType" value="InMemory" />
-		
+
 		<add key="ServiceControl.Audit/PersistenceType" value="RavenDb35" />
 		<add key="ServiceControl.Audit/RavenDB35/RunInMemory" value="true" />
-		
+
 		<add key="ServiceControl.Audit/PersistenceType" value="RavenDb5" />	
-		<add key="ServiceControl.Audit/DBPath" value="c:\tmp\audit_db" />	
-		<add key="ServiceControl.Audit/LogPath" value="c:\tmp\audit_logs" />
+		<add key="ServiceControl.Audit/DBPath" value="%TEMP%\audit_db" />
+		<add key="ServiceControl.Audit/LogPath" value="%TEMP%\audit_logs" />
 		-->
-				
+
 		<add key="ServiceControl.Audit/HostName" value="localhost" />
 		<!-- The default ServiceControl.Audit http port is 44444, the databaase maintenance port must be different -->
 		<add key="ServiceControl.Audit/DatabaseMaintenancePort" value="44445" />
-		
+
 	</appSettings>
 	<connectionStrings>
 		<!-- DEVS - Pick a transport connection string to match chosen transport above -->
 
 		<!-- Learning -->
-		<add name="NServiceBus/Transport" connectionString="C:\tmp\" />
+		<add name="NServiceBus/Transport" connectionString="%TEMP%\.learningtransport" />
 
 		<!--Amazon SQS -->
 		<!--<add name="NServiceBus/Transport" connectionString="Region=;QueueNamePrefix=;TopicNamePrefix=;AccessKeyId=;SecretAccessKey=;S3BucketForLargeMessages=;S3KeyPrefix=" />-->
@@ -63,8 +63,7 @@ These settings are only here so that we can debug ServiceControl while developin
 
 		<!--SQLServer -->
 		<!--<add name="NServiceBus/Transport" connectionString="Data Source=<SQLInstance>;Initial Catalog=nservicebus;Integrated Security=True;Queue Schema=myschema;Subscriptions Table=tablename@schema@catalog" />-->
-
-
+
 	</connectionStrings>
 	<runtime>
 		<gcServer enabled="true" />