Add legion host identifier

balag0 · balag0 · commit 7b828af76146 · 2022-08-15T19:41:59.000-07:00
Subsequent PRs will customize different services as required. Scope of this PR is to add a way to check if container is running on a Legion host.
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
@@ -37,10 +37,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
@@ -214,7 +214,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);
                 }
@@ -147,7 +147,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
@@ -67,7 +67,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()
                     });
                 })
@@ -87,10 +87,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
@@ -99,10 +99,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>();
@@ -214,7 +219,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>>();
@@ -242,7 +248,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<IMeshServiceClient>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxConsumption())
+                if (environment.IsAnyLinuxConsumption())
                 {
                     var httpClientFactory = s.GetService<IHttpClientFactory>();
                     var logger = s.GetService<ILogger<MeshServiceClient>>();
@@ -255,7 +261,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>();
@@ -269,7 +275,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>();
                 }
@@ -280,7 +286,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
@@ -38,7 +38,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder
             builder.UseMiddleware<HttpRequestBodySizeMiddleware>();
             builder.UseMiddleware<SystemTraceMiddleware>();
             builder.UseMiddleware<HostnameFixupMiddleware>();
-            if (environment.IsLinuxConsumption() || environment.IsKubernetesManagedHosting())
+            if (environment.IsAnyLinuxConsumption() || environment.IsKubernetesManagedHosting())
             {
                 builder.UseMiddleware<EnvironmentReadyCheckMiddleware>();
             }
diff --git a/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs
@@ -123,7 +123,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
@@ -36,7 +36,7 @@ public void InitializeHttpFunctionRoutes(IScriptJobHost host)
             WebJobsRouteBuilder routesBuilder = _router.CreateBuilder(new ScriptRouteHandler(_loggerFactory, host, _environment, false), _httpOptions.Value.RoutePrefix);
 
             WebJobsRouteBuilder warmupRouteBuilder = null;
-            if (!_environment.IsLinuxConsumption() && !_environment.IsWindowsConsumption())
+            if (!_environment.IsAnyLinuxConsumption() && !_environment.IsWindowsConsumption())
             {
                 warmupRouteBuilder = _router.CreateBuilder(new ScriptRouteHandler(_loggerFactory, host, _environment, 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
@@ -30,7 +30,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)
@@ -197,7 +197,7 @@ public static bool IsWindowsConsumption(this IEnvironment environment)
         /// <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 IsWindowsConsumption(environment) || IsLinuxConsumption(environment);
+            return IsWindowsConsumption(environment) || IsAnyLinuxConsumption(environment);
         }
 
         /// <summary>
@@ -254,9 +254,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.IsAppService() && !string.IsNullOrEmpty(environment.GetEnvironmentVariable(ContainerName));
+            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)) &&
+                   !string.IsNullOrEmpty(environment.GetEnvironmentVariable(LegionServiceHost));
         }
 
         /// <summary>
@@ -278,7 +292,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>
@@ -369,7 +383,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
@@ -31,6 +31,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
@@ -163,7 +163,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
@@ -982,7 +982,7 @@ public static bool IsValidZipUrl(string appSetting)
         public static FunctionAppContentEditingState GetFunctionAppContentEditingState(IEnvironment environment, IOptions<ScriptApplicationHostOptions> applicationHostOptions)
         {
             // For now, host can determine with certainty if contents are editable only for Linux Consumption apps. Return unknown for other SKUs.
-            if (!environment.IsLinuxConsumption())
+            if (!environment.IsAnyLinuxConsumption())
             {
                 return FunctionAppContentEditingState.Unknown;
             }
diff --git a/src/WebJobs.Script/Workers/Http/HttpWorkerProcess.cs b/src/WebJobs.Script/Workers/Http/HttpWorkerProcess.cs
@@ -60,7 +60,7 @@ internal override Process CreateWorkerProcess()
             workerContext.EnvironmentVariables.Add(HttpWorkerConstants.CustomHandlerWorkerIdEnvVarName, _workerId);
             workerContext.EnvironmentVariables.Add(HttpWorkerConstants.FunctionAppRootVarName, _scriptRootPath);
             Process workerProcess = _processFactory.CreateWorkerProcess(workerContext);
-            if (_environment.IsLinuxConsumption())
+            if (_environment.IsAnyLinuxConsumption())
             {
                 AssignUserExecutePermissionsIfNotExists(workerProcess.StartInfo.FileName);
             }
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
`@@ -37,10 +37,14 @@ public async Task StartAsync(CancellationToken cancellationToken)`
`37`	`37`	`_cancellationToken = cancellationToken;`
`38`	`38`
`39`	`39`	`// The service should be registered in Linux Consumption only, but do additional check here.`
`40`		`- if (_environment.IsLinuxConsumption())`
	`40`	`+ if (_environment.IsLinuxConsumptionOnAtlas())`
`41`	`41`	`{`
`42`	`42`	`await ApplyStartContextIfPresent();`
`43`	`43`	`}`
	`44`	`+ else if (_environment.IsLinuxConsumptionOnLegion())`
	`45`	`+ {`
	`46`	`+ _logger.LogInformation("Container has (re)started. Waiting for specialization");`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`private async Task ApplyStartContextIfPresent()`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost`
`214`	`214`
`215`	`215`	`// Windows (Dedicated/Consumption)`
`216`	`216`	`// Linux Consumption`
`217`		`- if ((environment.IsWindowsAzureManagedHosting() \|\| environment.IsLinuxConsumption()) &&`
	`217`	`+ if ((environment.IsWindowsAzureManagedHosting() \|\| environment.IsAnyLinuxConsumption()) &&`
`218`	`218`	`!environment.IsContainerReady())`
`219`	`219`	`{`
`220`	`220`	`// 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`	`}`
`@@ -147,7 +147,7 @@ public async Task WarmUp(HttpRequest request)`
`147`	`147`	`public static bool IsWarmUpRequest(HttpRequest request, bool inStandbyMode, IEnvironment environment)`
`148`	`148`	`{`
`149`	`149`	`return inStandbyMode`
`150`		`- && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) \|\| environment.IsLinuxConsumption())`
	`150`	`+ && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) \|\| environment.IsAnyLinuxConsumption())`
`151`	`151`	`&& (request.Path.StartsWithSegments(_warmupRoutePath) \|\| request.Path.StartsWithSegments(_warmupRouteAlternatePath));`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)`
`67`	`67`	`config.Add(new WebScriptHostConfigurationSource`
`68`	`68`	`{`
`69`	`69`	`IsAppServiceEnvironment = SystemEnvironment.Instance.IsAppService(),`
`70`		`- IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsLinuxConsumption(),`
	`70`	`+ IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsAnyLinuxConsumption(),`
`71`	`71`	`IsLinuxAppServiceEnvironment = SystemEnvironment.Instance.IsLinuxAppService()`
`72`	`72`	`});`
`73`	`73`	`})`
`@@ -87,10 +87,15 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)`
`87`	`87`	`/// </summary>`
`88`	`88`	`private static void InitializeProcess()`
`89`	`89`	`{`
`90`		`- if (SystemEnvironment.Instance.IsLinuxConsumption())`
	`90`	`+ if (SystemEnvironment.Instance.IsLinuxConsumptionOnAtlas())`
`91`	`91`	`{`
`92`	`92`	`AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;`
`93`	`93`	`}`
	`94`	`+ else if (SystemEnvironment.Instance.IsLinuxConsumptionOnLegion())`
	`95`	`+ {`
	`96`	`+ //todo: Replace with legion specific logger.`
	`97`	`+ AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledExceptionInLinuxConsumption;`
	`98`	`+ }`
`94`	`99`	`else if (SystemEnvironment.Instance.IsLinuxAppService())`
`95`	`100`	`{`
`96`	`101`	`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
`@@ -99,10 +99,15 @@ public static void AddWebJobsScriptHost(this IServiceCollection services, IConfi`
`99`	`99`	`services.AddSingleton<IEventGenerator>(p =>`
`100`	`100`	`{`
`101`	`101`	`var environment = p.GetService<IEnvironment>();`
`102`		`- if (environment.IsLinuxConsumption())`
	`102`	`+ if (environment.IsLinuxConsumptionOnAtlas())`
`103`	`103`	`{`
`104`	`104`	`return new LinuxContainerEventGenerator(environment);`
`105`	`105`	`}`
	`106`	`+ else if (environment.IsLinuxConsumptionOnLegion())`
	`107`	`+ {`
	`108`	`+ //todo: Replace with legion specific logger`
	`109`	`+ return new LinuxContainerEventGenerator(environment);`
	`110`	`+ }`
`106`	`111`	`else if (SystemEnvironment.Instance.IsLinuxAppService())`
`107`	`112`	`{`
`108`	`113`	`var hostNameProvider = p.GetService<HostNameProvider>();`
`@@ -214,7 +219,8 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`214`	`219`	`services.AddSingleton<IHostedService>(s =>`
`215`	`220`	`{`
`216`	`221`	`var environment = s.GetService<IEnvironment>();`
`217`		`- if (environment.IsLinuxConsumption())`
	`222`	`+ //todo: Replace with legion specific service`
	`223`	`+ if (environment.IsAnyLinuxConsumption())`
`218`	`224`	`{`
`219`	`225`	`var instanceManager = s.GetService<IInstanceManager>();`
`220`	`226`	`var logger = s.GetService<ILogger<LinuxContainerInitializationHostService>>();`
`@@ -242,7 +248,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`242`	`248`	`services.AddSingleton<IMeshServiceClient>(s =>`
`243`	`249`	`{`
`244`	`250`	`var environment = s.GetService<IEnvironment>();`
`245`		`- if (environment.IsLinuxConsumption())`
	`251`	`+ if (environment.IsAnyLinuxConsumption())`
`246`	`252`	`{`
`247`	`253`	`var httpClientFactory = s.GetService<IHttpClientFactory>();`
`248`	`254`	`var logger = s.GetService<ILogger<MeshServiceClient>>();`
`@@ -255,7 +261,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`255`	`261`	`services.AddSingleton<LinuxContainerActivityPublisher>(s =>`
`256`	`262`	`{`
`257`	`263`	`var environment = s.GetService<IEnvironment>();`
`258`		`- if (environment.IsLinuxConsumption())`
	`264`	`+ if (environment.IsAnyLinuxConsumption())`
`259`	`265`	`{`
`260`	`266`	`var logger = s.GetService<ILogger<LinuxContainerActivityPublisher>>();`
`261`	`267`	`var meshInitServiceClient = s.GetService<IMeshServiceClient>();`
`@@ -269,7 +275,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`269`	`275`	`services.AddSingleton<IHostedService>(s =>`
`270`	`276`	`{`
`271`	`277`	`var environment = s.GetService<IEnvironment>();`
`272`		`- if (environment.IsLinuxConsumption())`
	`278`	`+ if (environment.IsAnyLinuxConsumption())`
`273`	`279`	`{`
`274`	`280`	`return s.GetRequiredService<LinuxContainerActivityPublisher>();`
`275`	`281`	`}`
`@@ -280,7 +286,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)`
`280`	`286`	`services.AddSingleton<ILinuxContainerActivityPublisher>(s =>`
`281`	`287`	`{`
`282`	`288`	`var environment = s.GetService<IEnvironment>();`
`283`		`- if (environment.IsLinuxConsumption())`
	`289`	`+ if (environment.IsAnyLinuxConsumption())`
`284`	`290`	`{`
`285`	`291`	`return s.GetRequiredService<LinuxContainerActivityPublisher>();`
`286`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static IApplicationBuilder UseWebJobsScriptHost(this IApplicationBuilder`
`38`	`38`	`builder.UseMiddleware<HttpRequestBodySizeMiddleware>();`
`39`	`39`	`builder.UseMiddleware<SystemTraceMiddleware>();`
`40`	`40`	`builder.UseMiddleware<HostnameFixupMiddleware>();`
`41`		`- if (environment.IsLinuxConsumption() \|\| environment.IsKubernetesManagedHosting())`
	`41`	`+ if (environment.IsAnyLinuxConsumption() \|\| environment.IsKubernetesManagedHosting())`
`42`	`42`	`{`
`43`	`43`	`builder.UseMiddleware<EnvironmentReadyCheckMiddleware>();`
`44`	`44`	`}`