Updating environment extension method names for clarity

Author: fabiocav

src/WebJobs.Script.WebHost/Configuration/HttpOptionsSetup.cs

@@ -19,12 +19,12 @@ public HttpOptionsSetup(IEnvironment environment)
 
         public void Configure(HttpOptions options)
         {
-            if (_environment.IsDynamic())
+            if (_environment.IsWindowsConsumption())
             {
                 // when running under dynamic, we choose some default
                 // throttle settings.
                 // these can be overridden by the user in host.json
-                if (_environment.IsAppServiceEnvironment())
+                if (_environment.IsAppService())
                 {
                     // dynamic throttles are based on sandbox counters
                     // which only exist in AppService

src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerInitializationHostService.cs

@@ -34,7 +34,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             _cancellationToken = cancellationToken;
 
             // The service should be registered in IsLinuxContainerEnvironment only. But do additional check here.
-            if (_environment.IsLinuxContainerEnvironment())
+            if (_environment.IsLinuxConsumption())
             {
                 await ApplyContextIfPresent();
             }

src/WebJobs.Script.WebHost/Controllers/HostController.cs

@@ -239,7 +239,7 @@ public async Task<IActionResult> SetState([FromBody] string state)
             }
             else if (desiredState == ScriptHostState.Running && currentState == ScriptHostState.Offline)
             {
-                if (_environment.FileSystemIsReadOnly())
+                if (_environment.IsFileSystemReadOnly())
                 {
                     return BadRequest();
                 }
@@ -249,7 +249,7 @@ public async Task<IActionResult> SetState([FromBody] string state)
             }
             else if (desiredState == ScriptHostState.Offline && currentState != ScriptHostState.Offline)
             {
-                if (_environment.FileSystemIsReadOnly())
+                if (_environment.IsFileSystemReadOnly())
                 {
                     return BadRequest();
                 }
@@ -278,7 +278,7 @@ public async Task<IActionResult> SetState([FromBody] string state)
         [Authorize(Policy = PolicyNames.AdminAuthLevel)]
         public IActionResult GetAdminToken()
         {
-            if (!_environment.IsLinuxContainerEnvironment())
+            if (!_environment.IsLinuxConsumption())
             {
                 return BadRequest("Endpoint is only available when running in Linux Container");
             }

src/WebJobs.Script.WebHost/DependencyInjection/JobHostServiceProvider.cs

@@ -63,7 +63,7 @@ private Container BuildContainer(IServiceCollection descriptors)
             // preferInterpretation will be set to true to significanly improve cold start in consumption mode
             // it will be set to false for premium and appservice plans to make sure throughput is not impacted
             // there is no throughput drop in consumption with this setting.
-            var preferInterpretation = SystemEnvironment.Instance.IsDynamic() ? true : false;
+            var preferInterpretation = SystemEnvironment.Instance.IsWindowsConsumption() ? true : false;
             var container = new Container(r => rules, preferInterpretation: preferInterpretation);
 
             container.Populate(descriptors);

src/WebJobs.Script.WebHost/DependencyInjection/WebHostServiceProvider.cs

@@ -32,7 +32,7 @@ public WebHostServiceProvider(IServiceCollection descriptors)
             // preferInterpretation will be set to true to significanly improve cold start in consumption mode
             // it will be set to false for premium and appservice plans to make sure throughput is not impacted
             // there is no throughput drop in consumption with this setting.
-            var preferInterpretation = SystemEnvironment.Instance.IsDynamic() ? true : false;
+            var preferInterpretation = SystemEnvironment.Instance.IsWindowsConsumption() ? true : false;
             _container = new Container(_defaultContainerRules, preferInterpretation: preferInterpretation);
             _container.Populate(descriptors);
             _container.UseInstance<IServiceProvider>(this);

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

@@ -137,7 +137,7 @@ public async Task<SyncTriggersResult> TrySyncTriggersAsync(bool checkHash = fals
 
         internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHostEnvironment, IEnvironment environment)
         {
-            if (environment.IsCoreToolsEnvironment())
+            if (environment.IsCoreTools())
             {
                 // don't sync triggers when running locally or not running in a cloud
                 // hosted environment
@@ -160,7 +160,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost
 
             // Windows (Dedicated/Consumption)
             // Linux Consumption
-            if ((environment.IsAppServiceWindowsEnvironment() || environment.IsLinuxContainerEnvironment()) &&
+            if ((environment.IsWindowsAzureManagedHosting() || environment.IsLinuxConsumption()) &&
                 !environment.IsContainerReady())
             {
                 // container ready flag not set yet – site not fully specialized/initialized

src/WebJobs.Script.WebHost/Middleware/HostWarmupMiddleware.cs

@@ -48,7 +48,7 @@ public async Task WarmUp(HttpRequest request)
         public static bool IsWarmUpRequest(HttpRequest request, IScriptWebHostEnvironment webHostEnvironment, IEnvironment environment)
         {
             return webHostEnvironment.InStandbyMode &&
-                ((environment.IsAppServiceEnvironment() && request.IsAppServiceInternalRequest(environment)) || environment.IsLinuxContainerEnvironment()) &&
+                ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) || environment.IsLinuxConsumption()) &&
                 (request.Path.StartsWithSegments(new PathString($"/api/{WarmUpConstants.FunctionName}")) ||
                 request.Path.StartsWithSegments(new PathString($"/api/{WarmUpConstants.AlternateRoute}")));
         }

src/WebJobs.Script.WebHost/Program.cs

@@ -59,9 +59,9 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)
 
                     config.Add(new WebScriptHostConfigurationSource
                     {
-                        IsAppServiceEnvironment = SystemEnvironment.Instance.IsAppServiceEnvironment(),
-                        IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsLinuxContainerEnvironment(),
-                        IsLinuxAppServiceEnvironment = SystemEnvironment.Instance.IsLinuxAppServiceEnvironment()
+                        IsAppServiceEnvironment = SystemEnvironment.Instance.IsAppService(),
+                        IsLinuxContainerEnvironment = SystemEnvironment.Instance.IsLinuxConsumption(),
+                        IsLinuxAppServiceEnvironment = SystemEnvironment.Instance.IsLinuxAppService()
                     });
                 })
                 .ConfigureLogging((context, loggingBuilder) =>
@@ -80,7 +80,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args = null)
         /// </summary>
         private static void InitializeProcess()
         {
-            if (SystemEnvironment.Instance.IsLinuxContainerEnvironment())
+            if (SystemEnvironment.Instance.IsLinuxConsumption())
             {
                 // Linux containers always start out in placeholder mode
                 SystemEnvironment.Instance.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "1");
@@ -94,7 +94,7 @@ private static void InitializeProcess()
                 SystemEnvironment.Instance.SetEnvironmentVariable(DataProtectionCostants.AzureWebsiteEnvironmentMachineKey, authEncryptionKey);
             }
 
-            ConfigureMinimumThreads(SystemEnvironment.Instance.IsDynamic());
+            ConfigureMinimumThreads(SystemEnvironment.Instance.IsWindowsConsumption());
         }
 
         private static void ConfigureMinimumThreads(bool isDynamicSku)

src/WebJobs.Script.WebHost/Security/KeyManagement/DefaultKeyValueConverterFactory.cs

@@ -23,8 +23,8 @@ public DefaultKeyValueConverterFactory(bool allowEncryption)
 
         private static bool IsEncryptionSupported()
         {
-            return SystemEnvironment.Instance.IsAppServiceEnvironment() ||
-                SystemEnvironment.Instance.IsLinuxContainerEnvironment() ||
+            return SystemEnvironment.Instance.IsAppService() ||
+                SystemEnvironment.Instance.IsLinuxConsumption() ||
                 SystemEnvironment.Instance.GetEnvironmentVariable(AzureWebsiteLocalEncryptionKey) != null;
         }
 

src/WebJobs.Script.WebHost/WebHostServiceCollectionExtensions.cs

@@ -85,11 +85,11 @@ public static void AddWebJobsScriptHost(this IServiceCollection services, IConfi
             services.AddSingleton<IEventGenerator>(p =>
             {
                 var environment = p.GetService<IEnvironment>();
-                if (environment.IsLinuxContainerEnvironment())
+                if (environment.IsLinuxConsumption())
                 {
                     return new LinuxContainerEventGenerator(environment);
                 }
-                else if (SystemEnvironment.Instance.IsLinuxAppServiceEnvironment())
+                else if (SystemEnvironment.Instance.IsLinuxAppService())
                 {
                     return new LinuxAppServiceEventGenerator(new LinuxAppServiceFileLoggerFactory());
                 }
@@ -161,7 +161,7 @@ private static void AddLinuxContainerServices(this IServiceCollection services)
             services.AddSingleton<IHostedService>(s =>
             {
                 var environment = s.GetService<IEnvironment>();
-                if (environment.IsLinuxContainerEnvironment())
+                if (environment.IsLinuxConsumption())
                 {
                     var instanceManager = s.GetService<IInstanceManager>();
                     var logger = s.GetService<ILogger<LinuxContainerInitializationHostService>>();