Fixing the service registration for IJobHostMiddlewarePipeline and updating the location for http configuration

Author: soninaren

src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs

@@ -77,8 +77,8 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                     services.AddSingleton<DefaultScriptWebHookProvider>();
                     services.TryAddSingleton<IScriptWebHookProvider>(p => p.GetService<DefaultScriptWebHookProvider>());
                     services.TryAddSingleton<IWebHookProvider>(p => p.GetService<DefaultScriptWebHookProvider>());
-                    services.TryAddSingleton<IJobHostMiddlewarePipeline, DefaultMiddlewarePipeline>();
-                    services.TryAddSingleton<IJobHostHttpMiddleware, CustomHttpHeadersMiddleware>();
+                    services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostMiddlewarePipeline, DefaultMiddlewarePipeline>());
+                    services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostHttpMiddleware, CustomHttpHeadersMiddleware>());
                     services.TryAddSingleton<IJobHostHttpMiddleware, HstsConfigurationMiddleware>();
 
                     // Make sure the registered IHostIdProvider is used

src/WebJobs.Script/Config/ConfigurationSectionNames.cs

@@ -13,7 +13,8 @@ public static class ConfigurationSectionNames
         public const string HostIdPath = WebHost + ":hostid";
         public const string ExtensionBundle = "extensionBundle";
         public const string ManagedDependency = "managedDependency";
-        public const string Http = "http";
+        public const string Extensions = "extensions";
+        public const string Http = Extensions + ":http";
         public const string Hsts = Http + ":hsts";
         public const string CustomHttpHeaders = Http + ":customHeaders";
     }

test/WebJobs.Script.Tests/Configuration/CustomHttpHeadersOptionsSetupTests.cs

@@ -50,9 +50,11 @@ public CustomHttpHeadersOptionsSetupTests()
                     }")]
         [InlineData(@"{
                     'version': '2.0',
-                    'http': {
-                        'customHeaders': {
-                            'X-Content-Type-Options': 'nosniff'
+                    'extensions': {
+                            'http': {
+                                'customHeaders': {
+                                    'X-Content-Type-Options': 'nosniff'
+                                }
                             }
                         }
                     }")]
@@ -71,13 +73,15 @@ public void MissingOrValidCustomHttpHeadersConfig_DoesNotThrowException(string h
         public void ValidCustomHttpHeadersConfig_BindsToOptions()
         {
             string hostJsonContent = @"{
-                                         'version': '2.0',
-                                         'http': {
-                                             'customHeaders': {
-                                                 'X-Content-Type-Options': 'nosniff'
-                                             }
-                                         }
-                                     }";
+                                        'version': '2.0',
+                                        'extensions': {
+                                                'http': {
+                                                    'customHeaders': {
+                                                        'X-Content-Type-Options': 'nosniff'
+                                                    }
+                                                }
+                                            }
+                                        }";
             File.WriteAllText(_hostJsonFile, hostJsonContent);
             var configuration = BuildHostJsonConfiguration();
 

test/WebJobs.Script.Tests/Configuration/HostHstsOptionsSetupTests.cs

@@ -55,10 +55,13 @@ public HostHstsOptionsSetupTests()
                     'version': '2.0',
                     }")]
         [InlineData(@"{
-                    'version': '2.0',
-                    'http' : {
-                        'hsts' : {
-                            'isEnabled' : true
+                        'version': '2.0',
+                        'extensions': {
+                            'http': {
+                                'hsts': {
+                                    'isEnabled': true,
+                                    'maxAge': '10'
+                                }
                             }
                         }
                     }")]
@@ -77,14 +80,16 @@ public void MissingOrValidHstsConfig_DoesNotThrowException(string hostJsonConten
         public void ValidHstsConfig_BindsToOptions()
         {
             string hostJsonContent = @"{
-                                         'version': '2.0',
-                                         'http': {
-                                             'hsts': {
-                                                 'isEnabled': true,
-                                                 'maxAge': '10'
-                                             }
-                                         }
-                                     }";
+                                        'version': '2.0',
+                                        'extensions': {
+                                            'http': {
+                                                'hsts': {
+                                                    'isEnabled': true,
+                                                    'maxAge': '10'
+                                                }
+                                            }
+                                        }
+                                    }";
             File.WriteAllText(_hostJsonFile, hostJsonContent);
             var configuration = BuildHostJsonConfiguration();