Add Startup module settings

henkmollema · Feb 21, 2020 · 8022314 · 8022314
1 parent 513b063
commit 8022314
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/src/StartupModules/ConfigureMiddlewareContext.cs b/src/StartupModules/ConfigureMiddlewareContext.cs
@@ -12,11 +12,12 @@ public class ConfigureMiddlewareContext
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigureServicesContext"/> class.
         /// </summary>
-        public ConfigureMiddlewareContext(IConfiguration configuration, IWebHostEnvironment hostingEnvironment, IServiceProvider serviceProvider)
+        public ConfigureMiddlewareContext(IConfiguration configuration, IWebHostEnvironment hostingEnvironment, IServiceProvider serviceProvider, StartupModulesOptions options)
         {
             Configuration = configuration;
             HostingEnvironment = hostingEnvironment;
             ServiceProvider = serviceProvider;
+            Options = options;
         }
 
         /// <summary>
@@ -33,5 +34,10 @@ public ConfigureMiddlewareContext(IConfiguration configuration, IWebHostEnvironm
         /// Gets the <see cref="IServiceProvider"/> instance scoped for the lifetime of application startup.
         /// </summary>
         public IServiceProvider ServiceProvider { get; }
+
+        /// <summary>
+        /// Gets the <see cref="StartupModulesOptions"/>.
+        /// </summary>
+        public StartupModulesOptions Options { get; }
     }
 }
diff --git a/src/StartupModules/ConfigureServicesContext.cs b/src/StartupModules/ConfigureServicesContext.cs
@@ -11,10 +11,11 @@ public class ConfigureServicesContext
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigureServicesContext"/> class.
         /// </summary>
-        public ConfigureServicesContext(IConfiguration configuration, IWebHostEnvironment hostingEnvironment)
+        public ConfigureServicesContext(IConfiguration configuration, IWebHostEnvironment hostingEnvironment, StartupModulesOptions options)
         {
             Configuration = configuration;
             HostingEnvironment = hostingEnvironment;
+            Options = options;
         }
 
         /// <summary>
@@ -26,5 +27,10 @@ public ConfigureServicesContext(IConfiguration configuration, IWebHostEnvironmen
         /// Gets the application <see cref="IWebHostEnvironment"/> instance.
         /// </summary>
         public IWebHostEnvironment HostingEnvironment { get; }
+
+        /// <summary>
+        /// Gets the <see cref="StartupModulesOptions"/>.
+        /// </summary>
+        public StartupModulesOptions Options { get; }
     }
 }
diff --git a/src/StartupModules/StartupModuleRunner.cs b/src/StartupModules/StartupModuleRunner.cs
@@ -30,7 +30,7 @@ public StartupModuleRunner(StartupModulesOptions options)
         /// </summary>
         public void ConfigureServices(IServiceCollection services, IConfiguration configuration, IWebHostEnvironment hostingEnvironment)
         {
-            var ctx = new ConfigureServicesContext(configuration, hostingEnvironment);
+            var ctx = new ConfigureServicesContext(configuration, hostingEnvironment, _options);
 
             foreach (var cfg in _options.StartupModules)
             {
@@ -45,7 +45,7 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
         public void Configure(IApplicationBuilder app, IConfiguration configuration, IWebHostEnvironment hostingEnvironment)
         {
             using var scope = app.ApplicationServices.CreateScope();
-            var ctx = new ConfigureMiddlewareContext(configuration, hostingEnvironment, scope.ServiceProvider);
+            var ctx = new ConfigureMiddlewareContext(configuration, hostingEnvironment, scope.ServiceProvider, _options);
             foreach (var cfg in _options.StartupModules)
             {
                 cfg.Configure(app, ctx);

diff --git a/src/StartupModules/StartupModulesOptions.cs b/src/StartupModules/StartupModulesOptions.cs
@@ -22,6 +22,11 @@ public class StartupModulesOptions
         /// </summary>
         public ICollection<Type> ApplicationInitializers { get; } = new List<Type>();
 
+        /// <summary>
+        /// Gets the settings.
+        /// </summary>
+        public IDictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
+
         /// <summary>
         /// Discovers <see cref="IStartupModule"/> implementations from the entry assembly of the application.
         /// </summary>

diff --git a/src/StartupModules/WebHostBuilderExtensions.cs b/src/StartupModules/WebHostBuilderExtensions.cs
@@ -60,7 +60,7 @@ public static IWebHostBuilder UseStartupModules(this IWebHostBuilder builder, Ac
             {
                 services.AddSingleton<IStartupFilter>(sp => ActivatorUtilities.CreateInstance<ModulesStartupFilter>(sp, runner));
 
-                var configureServicesContext = new ConfigureServicesContext(hostContext.Configuration, hostContext.HostingEnvironment);
+                var configureServicesContext = new ConfigureServicesContext(hostContext.Configuration, hostContext.HostingEnvironment, options);
                 runner.ConfigureServices(services, hostContext.Configuration, hostContext.HostingEnvironment);
             });
 

diff --git a/test/TestWebApp/HangfireStartupModule.cs b/test/TestWebApp/HangfireStartupModule.cs
@@ -18,7 +18,10 @@ public void ConfigureServices(IServiceCollection services, ConfigureServicesCont
                 // Do something based on this
             }
 
-            services.AddHangfireContrib(c => c.UseMemoryStorage());
+            if ((bool)context.Options.Settings["AddHangfire"] == true)
+            {
+                services.AddHangfireContrib(c => c.UseMemoryStorage());
+            }
         }
 
         public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context) { }

diff --git a/test/TestWebApp/Program.cs b/test/TestWebApp/Program.cs
@@ -13,7 +13,7 @@ public static void Main(string[] args)
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartupModules()
+                .UseStartupModules(x => x.Settings["AddHangfire"] = true)
                 .UseStartup<Startup>();
     }
 }