Add legion host identifier

balag0 · balag0 · commit 90438d399d5c · 2022-08-23T17:34:01.000-07:00
Backport #8617
diff --git a/src/WebJobs.Script.WebHost/Configuration/CorsOptionsSetup.cs b/src/WebJobs.Script.WebHost/Configuration/CorsOptionsSetup.cs
@@ -23,7 +23,7 @@ public CorsOptionsSetup(IEnvironment env, IOptions<HostCorsOptions> hostCorsOpti
 
         public void Configure(CorsOptions options)
         {
-            if (_env.IsLinuxConsumption())
+            if (_env.IsAnyLinuxConsumption())
             {
                 string[] allowedOrigins = _hostCorsOptions.Value.AllowedOrigins?.ToArray() ?? Array.Empty<string>();
                 var policyBuilder = new CorsPolicyBuilder(allowedOrigins);
diff --git a/src/WebJobs.Script.WebHost/Configuration/ScriptApplicationHostOptionsSetup.cs b/src/WebJobs.Script.WebHost/Configuration/ScriptApplicationHostOptionsSetup.cs
@@ -76,7 +76,7 @@ private bool IsZipDeployment(out bool isScmRunFromPackage)
                 Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteAltZipDeployment)) ||
                 Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteRunFromPackage));
 
-            if (!_environment.IsLinuxConsumption())
+            if (!_environment.IsAnyLinuxConsumption())
             {
                 isScmRunFromPackage = false;
                 // This check is strong enough for SKUs other than Linux Consumption.
diff --git a/src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerActivityPublisher.cs b/src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerActivityPublisher.cs
@@ -38,7 +38,7 @@ public LinuxContainerActivityPublisher(IOptionsMonitor<StandbyOptions> standbyOp
             IMeshServiceClient meshServiceClient, IEnvironment environment,
             ILogger<LinuxContainerActivityPublisher> logger, int flushIntervalMs = FlushIntervalMs, int initialFlushIntervalMs = InitialFlushIntervalMs)
         {
-            if (!environment.IsLinuxConsumption())
+            if (!environment.IsAnyLinuxConsumption())
             {
                 throw new NotSupportedException(
                     $"{nameof(LinuxContainerActivityPublisher)} is available in Linux consumption environment only");
diff --git a/src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerInitializationHostService.cs b/src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerInitializationHostService.cs
@@ -36,10 +36,14 @@ public async Task StartAsync(CancellationToken cancellationToken)
             _cancellationToken = cancellationToken;
 
             // The service should be registered in Linux Consumption only, but do additional check here.
-            if (_environment.IsLinuxConsumption())
+            if (_environment.IsLinuxConsumptionOnAtlas())
             {
                 await ApplyStartContextIfPresent();
             }
+            else if (_environment.IsLinuxConsumptionOnLegion())
+            {
+                _logger.LogInformation("Container has (re)started. Waiting for specialization");
+            }
         }
 
         private async Task ApplyStartContextIfPresent()
diff --git a/src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs b/src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs
@@ -213,7 +213,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost
 
             // Windows (Dedicated/Consumption)
             // Linux Consumption
-            if ((environment.IsWindowsAzureManagedHosting() || environment.IsLinuxConsumption()) &&
+            if ((environment.IsWindowsAzureManagedHosting() || environment.IsAnyLinuxConsumption()) &&
                 !environment.IsContainerReady())
             {
                 // container ready flag not set yet – site not fully specialized/initialized
diff --git a/src/WebJobs.Script.WebHost/Middleware/HostWarmupMiddleware.cs b/src/WebJobs.Script.WebHost/Middleware/HostWarmupMiddleware.cs
@@ -56,7 +56,7 @@ public async Task WarmupInvoke(HttpContext httpContext)
             if (!_jitTraceHasRun)
             {
                 PreJitPrepare(WarmUpConstants.JitTraceFileName);
-                if (_environment.IsLinuxConsumption())
+                if (_environment.IsAnyLinuxConsumption())
                 {
                     PreJitPrepare(WarmUpConstants.LinuxJitTraceFileName);
                 }
@@ -146,7 +146,7 @@ public async Task WarmUp(HttpRequest request)
         public static bool IsWarmUpRequest(HttpRequest request, bool inStandbyMode, IEnvironment environment)
         {
             return inStandbyMode
-                && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) || environment.IsLinuxConsumption())
+                && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) || environment.IsAnyLinuxConsumption())
                 && (request.Path.StartsWithSegments(_warmupRoutePath) || request.Path.StartsWithSegments(_warmupRouteAlternatePath));
         }
     }
diff --git a/src/WebJobs.Script.WebHost/Program.cs b/src/WebJobs.Script.WebHost/Program.cs
@@ -66,7 +66,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)
                     config.Add(new WebScriptHostConfigurationSource
                     {
                         IsAppServiceEnvironment = SystemEnvironment.Instance.IsAppService(),
-                        IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsLinuxConsumption(),
+                        IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsAnyLinuxConsumption(),
                         IsLinuxAppServiceEnvironment = SystemEnvironment.Instance.IsLinuxAppService()
                     });
                 })
@@ -86,10 +86,15 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)
         /// </summary>
         private static void InitializeProcess()
         {
-            if (SystemEnvironment.Instance.IsLinuxConsumption())
+            if (SystemEnvironment.Instance.IsLinuxConsumptionOnAtlas())
             {
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;
             }
+            else if (SystemEnvironment.Instance.IsLinuxConsumptionOnLegion())
+            {
+                //todo: Replace with legion specific logger.
+                AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;
+            }
             else if (SystemEnvironment.Instance.IsLinuxAppService())
             {
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxAppService;
diff --git a/src/WebJobs.Script.WebHost/Security/KeyManagement/DefaultKeyValueConverterFactory.cs b/src/WebJobs.Script.WebHost/Security/KeyManagement/DefaultKeyValueConverterFactory.cs
@@ -24,7 +24,7 @@ public DefaultKeyValueConverterFactory(bool allowEncryption)
         private static bool IsEncryptionSupported()
         {
             return SystemEnvironment.Instance.IsAppService() ||
-                SystemEnvironment.Instance.IsLinuxConsumption() ||
+                SystemEnvironment.Instance.IsAnyLinuxConsumption() ||
                 SystemEnvironment.Instance.GetEnvironmentVariable(AzureWebsiteLocalEncryptionKey) != null;
         }
 
diff --git a/src/WebJobs.Script.WebHost/WebHostServiceCollectionExtensions.cs b/src/WebJobs.Script.WebHost/WebHostServiceCollectionExtensions.cs
@@ -97,10 +97,15 @@ public static void AddWebJobsScriptHost(this IServiceCollection services, IConfi
             services.AddSingleton<IEventGenerator>(p =>
             {
                 var environment = p.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsLinuxConsumptionOnAtlas())
                 {
                     return new LinuxContainerEventGenerator(environment);
                 }
+                else if (environment.IsLinuxConsumptionOnLegion())
+                {
+                    //todo: Replace with legion specific logger
+                    return new LinuxContainerEventGenerator(environment);
+                }
                 else if (SystemEnvironment.Instance.IsLinuxAppService())
                 {
                     var hostNameProvider = p.GetService<HostNameProvider>();
@@ -205,7 +210,8 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<IHostedService>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                //todo: Replace with legion specific service
+                if (environment.IsAnyLinuxConsumption())
                 {
                     var instanceManager = s.GetService<IInstanceManager>();
                     var logger = s.GetService<ILogger<LinuxContainerInitializationHostService>>();
@@ -233,7 +239,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<IMeshServiceClient>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsAnyLinuxConsumption())
                 {
                     var httpClient = s.GetService<HttpClient>();
                     var logger = s.GetService<ILogger<MeshServiceClient>>();
@@ -246,7 +252,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<LinuxContainerActivityPublisher>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsAnyLinuxConsumption())
                 {
                     var logger = s.GetService<ILogger<LinuxContainerActivityPublisher>>();
                     var meshInitServiceClient = s.GetService<IMeshServiceClient>();
@@ -260,7 +266,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<IHostedService>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsAnyLinuxConsumption())
                 {
                     return s.GetRequiredService<LinuxContainerActivityPublisher>();
                 }
@@ -271,7 +277,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<ILinuxContainerActivityPublisher>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsAnyLinuxConsumption())
                 {
                     return s.GetRequiredService<LinuxContainerActivityPublisher>();
                 }
diff --git a/src/WebJobs.Script.WebHost/WebJobsApplicationBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebJobsApplicationBuilderExtension.cs
@@ -32,7 +32,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder
             builder.UseMiddleware<HttpRequestBodySizeMiddleware>();
             builder.UseMiddleware<SystemTraceMiddleware>();
             builder.UseMiddleware<HostnameFixupMiddleware>();
-            if (environment.IsLinuxConsumption())
+            if (environment.IsAnyLinuxConsumption())
             {
                 builder.UseMiddleware<EnvironmentReadyCheckMiddleware>();
             }
@@ -64,7 +64,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder
             // JobHost/ScriptHost scoped services.
             builder.UseMiddleware<ScriptHostRequestServiceProviderMiddleware>();
 
-            if (environment.IsLinuxConsumption())
+            if (environment.IsAnyLinuxConsumption())
             {
                 builder.UseMiddleware<AppServiceHeaderFixupMiddleware>();
             }
diff --git a/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs
@@ -114,7 +114,7 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                     services.TryAddSingleton<IJobHostMiddlewarePipeline, DefaultMiddlewarePipeline>();
                     services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostHttpMiddleware, CustomHttpHeadersMiddleware>());
                     services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostHttpMiddleware, HstsConfigurationMiddleware>());
-                    if (environment.IsLinuxConsumption())
+                    if (environment.IsAnyLinuxConsumption())
                     {
                         services.AddSingleton<ICorsMiddlewareFactory, CorsMiddlewareFactory>();
                         services.TryAddEnumerable(ServiceDescriptor.Singleton<IJobHostHttpMiddleware, JobHostCorsMiddleware>());
diff --git a/src/WebJobs.Script.WebHost/WebScriptHostHttpRoutesManager.cs b/src/WebJobs.Script.WebHost/WebScriptHostHttpRoutesManager.cs
@@ -40,7 +40,7 @@ public void InitializeHttpFunctionRoutes(IScriptJobHost host)
             WebJobsRouteBuilder proxiesRoutesBuilder = _router.CreateBuilder(new ScriptRouteHandler(_loggerFactory, host, _environment, true), routePrefix: null);
 
             WebJobsRouteBuilder warmupRouteBuilder = null;
-            if (!_environment.IsLinuxConsumption() && !_environment.IsWindowsConsumption())
+            if (!_environment.IsAnyLinuxConsumption() && !_environment.IsWindowsConsumption())
             {
                 warmupRouteBuilder = _router.CreateBuilder(new ScriptRouteHandler(_loggerFactory, host, _environment, isProxy: false, isWarmup: true), routePrefix: "admin");
             }
diff --git a/src/WebJobs.Script/Config/ExtensionBundleConfigurationHelper.cs b/src/WebJobs.Script/Config/ExtensionBundleConfigurationHelper.cs
@@ -34,7 +34,7 @@ public void Configure(ExtensionBundleOptions options)
 
                 string homeDirectory = _environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHomePath);
                 if ((_environment.IsAppService()
-                    || _environment.IsLinuxConsumption()
+                    || _environment.IsAnyLinuxConsumption()
                     || _environment.IsContainer())
                     && !string.IsNullOrEmpty(homeDirectory))
                 {
@@ -77,7 +77,7 @@ private void ConfigureProbingPaths(ExtensionBundleOptions options)
 
             var homeDirectory = _environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHomePath);
             if ((_environment.IsLinuxAppService()
-                || _environment.IsLinuxConsumption()
+                || _environment.IsAnyLinuxConsumption()
                 || _environment.IsContainer())
                 && !string.IsNullOrEmpty(homeDirectory))
             {
diff --git a/src/WebJobs.Script/Description/DotNet/Compilation/DotNetCompilationServiceFactory.cs b/src/WebJobs.Script/Description/DotNet/Compilation/DotNetCompilationServiceFactory.cs
@@ -33,7 +33,7 @@ internal static OptimizationLevel OptimizationLevel
                     string releaseModeSetting = SystemEnvironment.Instance.GetEnvironmentVariable(EnvironmentSettingNames.CompilationReleaseMode);
                     if (!bool.TryParse(releaseModeSetting, out bool releaseMode) &&
                         (SystemEnvironment.Instance.IsAppService() ||
-                        SystemEnvironment.Instance.IsLinuxConsumption()) &&
+                        SystemEnvironment.Instance.IsAnyLinuxConsumption()) &&
                         !SystemEnvironment.Instance.IsRemoteDebuggingEnabled())
                     {
                         // If the release mode setting is not set, we're running in Azure
diff --git a/src/WebJobs.Script/Environment/EnvironmentExtensions.cs b/src/WebJobs.Script/Environment/EnvironmentExtensions.cs
@@ -29,7 +29,7 @@ public static string GetEnvironmentVariableOrDefault(this IEnvironment environme
 
         public static bool IsLinuxMetricsPublishingEnabled(this IEnvironment environment)
         {
-            return environment.IsLinuxConsumption() && string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerStartContext));
+            return environment.IsLinuxConsumptionOnAtlas() && string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerStartContext));
         }
 
         public static bool IsPlaceholderModeEnabled(this IEnvironment environment)
@@ -225,9 +225,15 @@ public static bool IsDynamicSku(this IEnvironment environment)
             return environment.IsConsumptionSku() || environment.IsWindowsElasticPremium();
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the application is running in a Windows or Linux Consumption (dynamic)
+        /// App Service environment.
+        /// </summary>
+        /// <param name="environment">The environment to verify</param>
+        /// <returns><see cref="true"/> if running in a Windows or Linux Consumption App Service app; otherwise, false.</returns>
         public static bool IsConsumptionSku(this IEnvironment environment)
         {
-            return environment.IsWindowsConsumption() || environment.IsLinuxConsumption();
+            return environment.IsWindowsConsumption() || environment.IsAnyLinuxConsumption();
         }
 
         /// <summary>
@@ -247,9 +253,23 @@ public static bool IsWindowsAzureManagedHosting(this IEnvironment environment)
         /// </summary>
         /// <param name="environment">The environment to verify</param>
         /// <returns><see cref="true"/> if running in a Linux Consumption App Service app; otherwise, false.</returns>
-        public static bool IsLinuxConsumption(this IEnvironment environment)
+        public static bool IsAnyLinuxConsumption(this IEnvironment environment)
+        {
+            return environment.IsLinuxConsumptionOnAtlas() || environment.IsLinuxConsumptionOnLegion();
+        }
+
+        public static bool IsLinuxConsumptionOnAtlas(this IEnvironment environment)
+        {
+            return !environment.IsAppService() &&
+                   !string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerName)) &&
+                   string.IsNullOrEmpty(environment.GetEnvironmentVariable(LegionServiceHost));
+        }
+
+        public static bool IsLinuxConsumptionOnLegion(this IEnvironment environment)
         {
-            return !environment.IsAppService() && !string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerName));
+            return !environment.IsAppService() &&
+                   !string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerName)) &&
+                   !string.IsNullOrEmpty(environment.GetEnvironmentVariable(LegionServiceHost));
         }
 
         /// <summary>
@@ -271,7 +291,7 @@ public static bool IsLinuxAppService(this IEnvironment environment)
         /// <returns><see cref="true"/> if running in a Linux Azure managed hosting environment; otherwise, false.</returns>
         public static bool IsLinuxAzureManagedHosting(this IEnvironment environment)
         {
-            return environment.IsLinuxConsumption() || environment.IsLinuxAppService();
+            return environment.IsAnyLinuxConsumption() || environment.IsLinuxAppService();
         }
 
         /// <summary>
@@ -362,7 +382,7 @@ public static string GetAntaresVersion(this IEnvironment environment)
         /// </summary>
         public static string GetInstanceId(this IEnvironment environment)
         {
-            if (environment.IsLinuxConsumption())
+            if (environment.IsAnyLinuxConsumption())
             {
                 return environment.GetEnvironmentVariableOrDefault(ContainerName, string.Empty);
             }
diff --git a/src/WebJobs.Script/Environment/EnvironmentSettingNames.cs b/src/WebJobs.Script/Environment/EnvironmentSettingNames.cs
@@ -29,6 +29,7 @@ public static class EnvironmentSettingNames
         public const string FunctionsExtensionVersion = "FUNCTIONS_EXTENSION_VERSION";
         public const string FunctionWorkerRuntime = "FUNCTIONS_WORKER_RUNTIME";
         public const string ContainerName = "CONTAINER_NAME";
+        public const string LegionServiceHost = "LEGION_SERVICE_HOST";
         public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
         public const string WebSiteAuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
diff --git a/src/WebJobs.Script/ExtensionBundle/ExtensionBundleManager.cs b/src/WebJobs.Script/ExtensionBundle/ExtensionBundleManager.cs
@@ -96,7 +96,7 @@ private async Task<string> GetBundle(HttpClient httpClient)
 
             if ((_environment.IsAppService()
                 || _environment.IsCoreTools()
-                || _environment.IsLinuxConsumption()
+                || _environment.IsAnyLinuxConsumption()
                 || _environment.IsContainer())
                 && (!bundleFound || _options.EnsureLatest))
             {
diff --git a/src/WebJobs.Script/Host/ScriptHostIdProvider.cs b/src/WebJobs.Script/Host/ScriptHostIdProvider.cs
@@ -61,7 +61,7 @@ internal static HostIdResult GetDefaultHostId(IEnvironment environment, ScriptAp
                     hostId = uniqueSlotName;
                 }
             }
-            else if (environment.IsLinuxConsumption())
+            else if (environment.IsAnyLinuxConsumption())
             {
                 // The hostid is derived from the hostname for Linux consumption.
                 string hostName = environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHostName);
diff --git a/src/WebJobs.Script/ScriptHostBuilderExtensions.cs b/src/WebJobs.Script/ScriptHostBuilderExtensions.cs
@@ -164,7 +164,7 @@ public static IHostBuilder AddScriptHostCore(this IHostBuilder builder, ScriptAp
                             // Validate the config for anything that needs the Scale Controller.
                             // Including Core Tools as a warning during development time.
                             if (environment.IsWindowsConsumption() ||
-                                environment.IsLinuxConsumption() ||
+                                environment.IsAnyLinuxConsumption() ||
                                 (environment.IsWindowsElasticPremium() && !environment.IsRuntimeScaleMonitoringEnabled()) ||
                                 environment.IsCoreTools())
                             {
diff --git a/src/WebJobs.Script/Utility.cs b/src/WebJobs.Script/Utility.cs
diff --git a/src/WebJobs.Script/Workers/Http/HttpWorkerProcess.cs b/src/WebJobs.Script/Workers/Http/HttpWorkerProcess.cs
diff --git a/test/WebJobs.Script.Tests.Integration/ContainerManagement/LinuxContainerInitializationHostServiceTests.cs b/test/WebJobs.Script.Tests.Integration/ContainerManagement/LinuxContainerInitializationHostServiceTests.cs
diff --git a/test/WebJobs.Script.Tests.Integration/Controllers/ControllerScenarioTestFixture.cs b/test/WebJobs.Script.Tests.Integration/Controllers/ControllerScenarioTestFixture.cs
diff --git a/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyManagerE2ETests_Linux.cs b/test/WebJobs.Script.Tests.Integration/Host/StandbyManager/StandbyManagerE2ETests_Linux.cs
diff --git a/test/WebJobs.Script.Tests/Environment/EnvironmentTests.cs b/test/WebJobs.Script.Tests/Environment/EnvironmentTests.cs
diff --git a/test/WebJobs.Script.Tests/FunctionsSyncServiceTests.cs b/test/WebJobs.Script.Tests/FunctionsSyncServiceTests.cs
diff --git a/test/WebJobs.Script.Tests/Middleware/HostWarmupMiddlewareTests.cs b/test/WebJobs.Script.Tests/Middleware/HostWarmupMiddlewareTests.cs

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public CorsOptionsSetup(IEnvironment env, IOptions<HostCorsOptions> hostCorsOpti`
`23`	`23`
`24`	`24`	`public void Configure(CorsOptions options)`
`25`	`25`	`{`
`26`		`- if (_env.IsLinuxConsumption())`
	`26`	`+ if (_env.IsAnyLinuxConsumption())`
`27`	`27`	`{`
`28`	`28`	`string[] allowedOrigins = _hostCorsOptions.Value.AllowedOrigins?.ToArray() ?? Array.Empty<string>();`
`29`	`29`	`var policyBuilder = new CorsPolicyBuilder(allowedOrigins);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private bool IsZipDeployment(out bool isScmRunFromPackage)`
`76`	`76`	`Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteAltZipDeployment)) \|\|`
`77`	`77`	`Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteRunFromPackage));`
`78`	`78`
`79`		`- if (!_environment.IsLinuxConsumption())`
	`79`	`+ if (!_environment.IsAnyLinuxConsumption())`
`80`	`80`	`{`
`81`	`81`	`isScmRunFromPackage = false;`
`82`	`82`	`// This check is strong enough for SKUs other than Linux Consumption.`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public LinuxContainerActivityPublisher(IOptionsMonitor<StandbyOptions> standbyOp`
`38`	`38`	`IMeshServiceClient meshServiceClient, IEnvironment environment,`
`39`	`39`	`ILogger<LinuxContainerActivityPublisher> logger, int flushIntervalMs = FlushIntervalMs, int initialFlushIntervalMs = InitialFlushIntervalMs)`
`40`	`40`	`{`
`41`		`- if (!environment.IsLinuxConsumption())`
	`41`	`+ if (!environment.IsAnyLinuxConsumption())`
`42`	`42`	`{`
`43`	`43`	`throw new NotSupportedException(`
`44`	`44`	`$"{nameof(LinuxContainerActivityPublisher)} is available in Linux consumption environment only");`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,14 @@ public async Task StartAsync(CancellationToken cancellationToken)`
`36`	`36`	`_cancellationToken = cancellationToken;`
`37`	`37`
`38`	`38`	`// The service should be registered in Linux Consumption only, but do additional check here.`
`39`		`- if (_environment.IsLinuxConsumption())`
	`39`	`+ if (_environment.IsLinuxConsumptionOnAtlas())`
`40`	`40`	`{`
`41`	`41`	`await ApplyStartContextIfPresent();`
`42`	`42`	`}`
	`43`	`+ else if (_environment.IsLinuxConsumptionOnLegion())`
	`44`	`+ {`
	`45`	`+ _logger.LogInformation("Container has (re)started. Waiting for specialization");`
	`46`	`+ }`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`private async Task ApplyStartContextIfPresent()`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost`
`213`	`213`
`214`	`214`	`// Windows (Dedicated/Consumption)`
`215`	`215`	`// Linux Consumption`
`216`		`- if ((environment.IsWindowsAzureManagedHosting() \|\| environment.IsLinuxConsumption()) &&`
	`216`	`+ if ((environment.IsWindowsAzureManagedHosting() \|\| environment.IsAnyLinuxConsumption()) &&`
`217`	`217`	`!environment.IsContainerReady())`
`218`	`218`	`{`
`219`	`219`	`// container ready flag not set yet – site not fully specialized/initialized`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public async Task WarmupInvoke(HttpContext httpContext)`
`56`	`56`	`if (!_jitTraceHasRun)`
`57`	`57`	`{`
`58`	`58`	`PreJitPrepare(WarmUpConstants.JitTraceFileName);`
`59`		`- if (_environment.IsLinuxConsumption())`
	`59`	`+ if (_environment.IsAnyLinuxConsumption())`
`60`	`60`	`{`
`61`	`61`	`PreJitPrepare(WarmUpConstants.LinuxJitTraceFileName);`
`62`	`62`	`}`
`@@ -146,7 +146,7 @@ public async Task WarmUp(HttpRequest request)`
`146`	`146`	`public static bool IsWarmUpRequest(HttpRequest request, bool inStandbyMode, IEnvironment environment)`
`147`	`147`	`{`
`148`	`148`	`return inStandbyMode`
`149`		`- && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) \|\| environment.IsLinuxConsumption())`
	`149`	`+ && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) \|\| environment.IsAnyLinuxConsumption())`
`150`	`150`	`&& (request.Path.StartsWithSegments(_warmupRoutePath) \|\| request.Path.StartsWithSegments(_warmupRouteAlternatePath));`
`151`	`151`	`}`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)`
`66`	`66`	`config.Add(new WebScriptHostConfigurationSource`
`67`	`67`	`{`
`68`	`68`	`IsAppServiceEnvironment = SystemEnvironment.Instance.IsAppService(),`
`69`		`- IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsLinuxConsumption(),`
	`69`	`+ IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsAnyLinuxConsumption(),`
`70`	`70`	`IsLinuxAppServiceEnvironment = SystemEnvironment.Instance.IsLinuxAppService()`
`71`	`71`	`});`
`72`	`72`	`})`
`@@ -86,10 +86,15 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)`
`86`	`86`	`/// </summary>`
`87`	`87`	`private static void InitializeProcess()`
`88`	`88`	`{`
`89`		`- if (SystemEnvironment.Instance.IsLinuxConsumption())`
	`89`	`+ if (SystemEnvironment.Instance.IsLinuxConsumptionOnAtlas())`
`90`	`90`	`{`
`91`	`91`	`AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;`
`92`	`92`	`}`
	`93`	`+ else if (SystemEnvironment.Instance.IsLinuxConsumptionOnLegion())`
	`94`	`+ {`
	`95`	`+ //todo: Replace with legion specific logger.`
	`96`	`+ AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;`
	`97`	`+ }`
`93`	`98`	`else if (SystemEnvironment.Instance.IsLinuxAppService())`
`94`	`99`	`{`
`95`	`100`	`AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxAppService;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public DefaultKeyValueConverterFactory(bool allowEncryption)`
`24`	`24`	`private static bool IsEncryptionSupported()`
`25`	`25`	`{`
`26`	`26`	`return SystemEnvironment.Instance.IsAppService() \|\|`
`27`		`- SystemEnvironment.Instance.IsLinuxConsumption() \|\|`
	`27`	`+ SystemEnvironment.Instance.IsAnyLinuxConsumption() \|\|`
`28`	`28`	`SystemEnvironment.Instance.GetEnvironmentVariable(AzureWebsiteLocalEncryptionKey) != null;`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,15 @@ public static void AddWebJobsScriptHost(this IServiceCollection services, IConfi`
`97`	`97`	`services.AddSingleton<IEventGenerator>(p =>`
`98`	`98`	`{`
`99`	`99`	`var environment = p.GetService<IEnvironment>();`
`100`		`- if (environment.IsLinuxConsumption())`
	`100`	`+ if (environment.IsLinuxConsumptionOnAtlas())`
`101`	`101`	`{`
`102`	`102`	`return new LinuxContainerEventGenerator(environment);`
`103`	`103`	`}`
	`104`	`+ else if (environment.IsLinuxConsumptionOnLegion())`
	`105`	`+ {`
	`106`	`+ //todo: Replace with legion specific logger`
	`107`	`+ return new LinuxContainerEventGenerator(environment);`
	`108`	`+ }`
`104`	`109`	`else if (SystemEnvironment.Instance.IsLinuxAppService())`
`105`	`110`	`{`
`106`	`111`	`var hostNameProvider = p.GetService<HostNameProvider>();`
`@@ -205,7 +210,8 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`205`	`210`	`services.AddSingleton<IHostedService>(s =>`
`206`	`211`	`{`
`207`	`212`	`var environment = s.GetService<IEnvironment>();`
`208`		`- if (environment.IsLinuxConsumption())`
	`213`	`+ //todo: Replace with legion specific service`
	`214`	`+ if (environment.IsAnyLinuxConsumption())`
`209`	`215`	`{`
`210`	`216`	`var instanceManager = s.GetService<IInstanceManager>();`
`211`	`217`	`var logger = s.GetService<ILogger<LinuxContainerInitializationHostService>>();`
`@@ -233,7 +239,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`233`	`239`	`services.AddSingleton<IMeshServiceClient>(s =>`
`234`	`240`	`{`
`235`	`241`	`var environment = s.GetService<IEnvironment>();`
`236`		`- if (environment.IsLinuxConsumption())`
	`242`	`+ if (environment.IsAnyLinuxConsumption())`
`237`	`243`	`{`
`238`	`244`	`var httpClient = s.GetService<HttpClient>();`
`239`	`245`	`var logger = s.GetService<ILogger<MeshServiceClient>>();`
`@@ -246,7 +252,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`246`	`252`	`services.AddSingleton<LinuxContainerActivityPublisher>(s =>`
`247`	`253`	`{`
`248`	`254`	`var environment = s.GetService<IEnvironment>();`
`249`		`- if (environment.IsLinuxConsumption())`
	`255`	`+ if (environment.IsAnyLinuxConsumption())`
`250`	`256`	`{`
`251`	`257`	`var logger = s.GetService<ILogger<LinuxContainerActivityPublisher>>();`
`252`	`258`	`var meshInitServiceClient = s.GetService<IMeshServiceClient>();`
`@@ -260,7 +266,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`260`	`266`	`services.AddSingleton<IHostedService>(s =>`
`261`	`267`	`{`
`262`	`268`	`var environment = s.GetService<IEnvironment>();`
`263`		`- if (environment.IsLinuxConsumption())`
	`269`	`+ if (environment.IsAnyLinuxConsumption())`
`264`	`270`	`{`
`265`	`271`	`return s.GetRequiredService<LinuxContainerActivityPublisher>();`
`266`	`272`	`}`
`@@ -271,7 +277,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`271`	`277`	`services.AddSingleton<ILinuxContainerActivityPublisher>(s =>`
`272`	`278`	`{`
`273`	`279`	`var environment = s.GetService<IEnvironment>();`
`274`		`- if (environment.IsLinuxConsumption())`
	`280`	`+ if (environment.IsAnyLinuxConsumption())`
`275`	`281`	`{`
`276`	`282`	`return s.GetRequiredService<LinuxContainerActivityPublisher>();`
`277`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder`
`32`	`32`	`builder.UseMiddleware<HttpRequestBodySizeMiddleware>();`
`33`	`33`	`builder.UseMiddleware<SystemTraceMiddleware>();`
`34`	`34`	`builder.UseMiddleware<HostnameFixupMiddleware>();`
`35`		`- if (environment.IsLinuxConsumption())`
	`35`	`+ if (environment.IsAnyLinuxConsumption())`
`36`	`36`	`{`
`37`	`37`	`builder.UseMiddleware<EnvironmentReadyCheckMiddleware>();`
`38`	`38`	`}`
`@@ -64,7 +64,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder`
`64`	`64`	`// JobHost/ScriptHost scoped services.`
`65`	`65`	`builder.UseMiddleware<ScriptHostRequestServiceProviderMiddleware>();`
`66`	`66`
`67`		`- if (environment.IsLinuxConsumption())`
	`67`	`+ if (environment.IsAnyLinuxConsumption())`
`68`	`68`	`{`
`69`	`69`	`builder.UseMiddleware<AppServiceHeaderFixupMiddleware>();`
`70`	`70`	`}`