[release_4.0] Set the inproc net8 executable name based on operating …

…system. (#3730) (#3733)

* Set the inproc net8 executable name based on operating system. (#3730)

* adding more increased timeouts

* increasing the timeout of node test because 'npm install' is taking longer

---------

Co-authored-by: azfuncgh <azfuncgh@github.com>

src/Azure.Functions.Cli/Actions/HostActions/StartHostAction.cs

@@ -41,6 +41,9 @@ internal class StartHostAction : BaseAction
         private const int DefaultPort = 7071;
         private const int DefaultTimeout = 20;
         private const string Net6FrameworkDescriptionPrefix = ".NET 6.0";
+        private const string WindowsExecutableName = "func.exe";
+        private const string LinuxExecutableName = "func";
+        private const string InProc8DirectoryName = "in-proc8";
         private readonly ISecretsManager _secretsManager;
         private readonly IProcessManager _processManager;
         private IConfigurationRoot _hostJsonConfig;
@@ -472,7 +475,8 @@ public override async Task RunAsync()
                 // Checking if in Limelight - it should have a `AzureDevSessionsRemoteHostName` value in local.settings.json.
                 var forwardedHttpUrl = _secretsManager.GetSecrets().FirstOrDefault(
                     s => s.Key.Equals(Constants.AzureDevSessionsRemoteHostName, StringComparison.OrdinalIgnoreCase)).Value;
-                if (forwardedHttpUrl != null){
+                if (forwardedHttpUrl != null)
+                {
                     var baseUrl = forwardedHttpUrl.Replace(Constants.AzureDevSessionsPortSuffixPlaceholder, Port.ToString(), StringComparison.OrdinalIgnoreCase);
                     baseUri = new Uri(baseUrl);
                 }
@@ -486,6 +490,14 @@ public override async Task RunAsync()
             await runTask;
         }
 
+        private static string GetInProcNet8ExecutablePath()
+        {
+            var funcExecutableDirectory = Path.GetDirectoryName(typeof(StartHostAction).Assembly.Location)!;
+            var executableName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? WindowsExecutableName : LinuxExecutableName;
+
+            return Path.Combine(funcExecutableDirectory, InProc8DirectoryName, executableName);
+        }
+
         private Task StartInProc8AsChildProcessAsync()
         {
             if (VerboseLogging == true)
@@ -495,8 +507,8 @@ private Task StartInProc8AsChildProcessAsync()
 
             var commandLineArguments = string.Join(" ", Environment.GetCommandLineArgs().Skip(1));
             var tcs = new TaskCompletionSource();
-            var funcExecutableDirectory = Path.GetDirectoryName(typeof(StartHostAction).Assembly.Location)!;
-            var inProc8FuncExecutablePath = Path.Combine(funcExecutableDirectory, "in-proc8", "func.exe");
+
+            var inProc8FuncExecutablePath = GetInProcNet8ExecutablePath();
 
             EnsureNet8FuncExecutablePresent(inProc8FuncExecutablePath);
 

test/Azure.Functions.Cli.Tests/E2E/CreateFunctionTests.cs

@@ -61,7 +61,7 @@ await CliTester.Run(new RunConfiguration
                 {
                     "Authorization level is applicable to templates that use Http trigger, Allowed values: [function, anonymous, admin]. Authorization level is not enforced when running functions from core tools"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -157,7 +157,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"http trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -210,7 +210,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"httptrigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -229,7 +229,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.js",
                     "The function \"testfunc\" was created successfully from the \"httptrigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -296,7 +296,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.ts",
                     "The function \"testfunc\" was created successfully from the \"http trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -364,7 +364,7 @@ await CliTester.Run(new RunConfiguration
                     "\\src\\functions\\testfunc.ts",
                     "The function \"testfunc\" was created successfully from the \"azure Blob Storage trigger\" template."
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 

test/Azure.Functions.Cli.Tests/E2E/InitTests.cs

@@ -155,7 +155,7 @@ public Task init_with_worker_runtime_and_model(string workerRuntime, string prog
                     $".vscode{Path.DirectorySeparatorChar}extensions.json",
                 },
                 OutputDoesntContain = new[] { "Initialized empty Git repository" },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -278,6 +278,7 @@ public Task init_with_no_source_control()
                 {
                     new DirectoryResult { Name = ".git", Exists = false }
                 },
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -298,7 +299,7 @@ public Task init_with_Dockerfile(string workerRuntime, string version)
                         ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/{workerRuntime}:{version}" }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
                 OutputContains = new[] { "Dockerfile" }
             }, _output);
         }
@@ -480,7 +481,7 @@ public Task init_ts_app_using_lang(string initCommand)
                     "Writing Dockerfile",
                     "Writing .dockerignore"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -510,7 +511,7 @@ public Task javascript_adds_packagejson()
                     "Writing local.settings.json",
                     $".vscode{Path.DirectorySeparatorChar}extensions.json",
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -581,7 +582,7 @@ public Task init_docker_only_for_existing_project(string workerRuntime, string v
                     }
                 },
                 OutputContains = new[] { "Dockerfile" },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -714,7 +715,7 @@ public Task init_function_app_contains_logging_config()
                 {
                     "Writing host.json"
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 

test/Azure.Functions.Cli.Tests/E2E/SettingsTests.cs

@@ -33,7 +33,7 @@ await CliTester.Run(new RunConfiguration
                         }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -66,7 +66,7 @@ await CliTester.Run(new RunConfiguration[]
                             }
                         }
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120)
+                    CommandTimeout = TimeSpan.FromSeconds(300)
                 },
                 new RunConfiguration
                 {

test/Azure.Functions.Cli.Tests/E2E/StartTests.cs

@@ -56,7 +56,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test!", because: "response from default function should be 'Hello, {name}!'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -93,7 +93,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -118,7 +118,7 @@ await CliTester.Run(new RunConfiguration
                     await Task.Delay(TimeSpan.FromSeconds(15));
                     p.Kill();
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
 
         }
@@ -145,7 +145,7 @@ await CliTester.Run(new RunConfiguration
                     await Task.Delay(TimeSpan.FromSeconds(15));
                     p.Kill();
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -257,6 +257,7 @@ await CliTester.Run(new RunConfiguration[]
                         string hostJsonContent = "{\"version\": \"2.0\",\"logging\": {\"logLevel\": {\"Default\": \"None\"}}}";
                         await File.WriteAllTextAsync(filePath, hostJsonContent);
                     },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -278,7 +279,8 @@ await CliTester.Run(new RunConfiguration[]
                         // give the host time to load functions and print any errors
                         await Task.Delay(TimeSpan.FromSeconds(10));
                         p.Kill();
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
             }, _output, startHost: true);
         }
@@ -307,7 +309,7 @@ await CliTester.Run(new RunConfiguration
                         result.Should().Be("Hello, Test. This HTTP triggered function executed successfully.", because: "response from default function should be 'Hello, {name}. This HTTP triggered function executed successfully.'");
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -342,7 +344,7 @@ await CliTester.Run(new RunConfiguration
                         }
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120),
+                CommandTimeout = TimeSpan.FromSeconds(300),
             }, _output);
         }
 
@@ -366,7 +368,8 @@ await CliTester.Run(new RunConfiguration[]
                         var functionJson = await File.ReadAllTextAsync(filePath);
                         functionJson = functionJson.Replace("\"type\": \"http\"", "\"type\": \"http2\"");
                         await File.WriteAllTextAsync(filePath, functionJson);
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -478,7 +481,7 @@ await CliTester.Run(new RunConfiguration
                     ExpectExit = true,
                     ExitInError = true,
                     ErrorContains = new[] { "Port 8081 is unavailable" },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 }, _output);
             }
             finally
@@ -506,7 +509,8 @@ await CliTester.Run(new RunConfiguration[]
                         var content = File.ReadAllText(settingsFile);
                         content = content.Replace("EMPTY_VALUE", "");
                         File.WriteAllText(settingsFile,content);
-                    }
+                    },
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 },
                 new RunConfiguration
                 {
@@ -540,7 +544,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "Skipping 'emptySetting' from local settings as it's already defined in current environment variables."
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                 }
             }, _output);
         }
@@ -603,7 +607,7 @@ await CliTester.Run(new RunConfiguration
                         p.Kill();
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }
 
@@ -669,7 +673,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "Using for user secrets file configuration."
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                     Test = async (workingDir, p) =>
                     {
                         using (var client = new HttpClient() { BaseAddress = new Uri("http://localhost:7071/") })
@@ -743,7 +747,7 @@ await CliTester.Run(new RunConfiguration[]
                     {
                         "start --functions http1 --csharp",
                     },
-                    CommandTimeout = TimeSpan.FromSeconds(120),
+                    CommandTimeout = TimeSpan.FromSeconds(300),
                     ExpectExit = true,
                     ExitInError = true,
                     ErrorContains = new[] { "Missing value for AzureWebJobsStorage in local.settings.json and User Secrets. This is required for all triggers other than httptrigger, kafkatrigger. You can run 'func azure functionapp fetch-app-settings <functionAppName>' or specify a connection string in local.settings.json or User Secrets." },

test/Azure.Functions.Cli.Tests/ExtensionsTests/ExtensionBundleTests.cs

@@ -28,7 +28,7 @@ public Task BundleConfiguredByDefault_no_action()
                 {
                     "No action performed"
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
 
@@ -47,7 +47,7 @@ public Task BundleConfiguredByDefault_findsBundlePath()
                 {
                     bundlePath
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
 
@@ -66,7 +66,7 @@ public Task BundleNotConfiguredByDefault_showsErrorMessage()
                 {
                     "Extension bundle not configured."
                 },
-                CommandTimeout = TimeSpan.FromMinutes(3)
+                CommandTimeout = TimeSpan.FromMinutes(300)
             }, _output);
         }
     }

test/Azure.Functions.Cli.Tests/ExtensionsTests/InstallExtensionsTests.cs

@@ -40,7 +40,7 @@ public Task try_install_with_no_valid_trigger()
                         Exists = false
                     }
                 },
-                CommandTimeout = TimeSpan.FromSeconds(120)
+                CommandTimeout = TimeSpan.FromSeconds(300)
             }, _output);
         }