Merge branch 'v3.x' into use-next-available-port

Author: PramodValavala-MSFT

build/BuildSteps.cs

@@ -616,7 +616,7 @@ public static void CreateIntegrationTestsBuildManifest()
 
         private static List<Package> GetV3PackageList()
         {
-            const string CoreToolsBuildPackageList = "https://raw.githubusercontent.com/Azure/azure-functions-integration-tests/dev/integrationTestsBuild/V3/CoreToolsBuild2.json";
+            const string CoreToolsBuildPackageList = "https://raw.githubusercontent.com/Azure/azure-functions-integration-tests/main/integrationTestsBuild/V3/CoreToolsBuild.json";
             Uri address = new Uri(CoreToolsBuildPackageList);
 
             string content = null;

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

@@ -453,7 +453,7 @@ internal static async Task CheckNonOptionalSettings(IEnumerable<KeyValuePair<str
                     .All(t => Constants.TriggersWithoutStorage.Any(tws => tws.Equals(t, StringComparison.OrdinalIgnoreCase)));
 
                 if (!skipAzureWebJobsStorageCheck && string.IsNullOrWhiteSpace(azureWebJobsStorage) && 
-                    !StorageConnectionExists(secrets, storageConnectionKey) && !allNonStorageTriggers) 
+                    !ConnectionExists(secrets, storageConnectionKey) && !allNonStorageTriggers) 
                 {
                     throw new CliException($"Missing value for AzureWebJobsStorage in {SecretsManager.AppSettingsFileName}. " +
                         $"This is required for all triggers other than {string.Join(", ", Constants.TriggersWithoutStorage)}. "
@@ -473,7 +473,8 @@ internal static async Task CheckNonOptionalSettings(IEnumerable<KeyValuePair<str
                                 {
                                     ColoredConsole.WriteLine(WarningColor($"Warning: '{token.Key}' property in '{filePath}' is empty."));
                                 }
-                                else if (!secrets.Any(v => v.Key.Equals(appSettingName, StringComparison.OrdinalIgnoreCase)))
+                                else if (token.Key == "connection" && !ConnectionExists(secrets, appSettingName) ||
+                                        token.Key != "connection" && !secrets.Any(v => v.Key.Equals(appSettingName, StringComparison.OrdinalIgnoreCase)))
                                 {
                                     ColoredConsole
                                         .WriteLine(WarningColor($"Warning: Cannot find value named '{appSettingName}' in {SecretsManager.AppSettingsFileName} that matches '{token.Key}' property set on '{binding["type"]?.ToString()}' in '{filePath}'. " +
@@ -494,7 +495,7 @@ internal static async Task CheckNonOptionalSettings(IEnumerable<KeyValuePair<str
             }
         }
 
-        internal static bool StorageConnectionExists(IEnumerable<KeyValuePair<string, string>> secrets, string connectionStringKey)
+        internal static bool ConnectionExists(IEnumerable<KeyValuePair<string, string>> secrets, string connectionStringKey)
         {
             // convert secrets into IConfiguration object, check for storage connection in config section
             var convertedEnv = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

src/Azure.Functions.Cli/Helpers/GlobalCoreToolsSettings.cs

@@ -44,6 +44,10 @@ public static void Init(ISecretsManager secretsManager, string[] args)
                 {
                     _currentWorkerRuntime = WorkerRuntime.dotnet;
                 }
+                else if (args.Contains("--dotnet-isolated"))
+                {
+                    _currentWorkerRuntime = WorkerRuntime.dotnetIsolated;
+                }
                 else if (args.Contains("--javascript"))
                 {
                     _currentWorkerRuntime = WorkerRuntime.node;

src/Azure.Functions.Cli/Kubernetes/KEDA/V2/KedaV2Resource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Azure.Functions.Cli.Kubernetes.KEDA.Models;
 using Azure.Functions.Cli.Kubernetes.KEDA.V2.Models;
@@ -47,31 +48,38 @@ public override IKubernetesResource GetKubernetesResource(string name, string @n
             };
         }
 
-        private static bool IsDurable(JToken trigger) => 
+        private static bool IsDurable(JToken trigger) =>
             trigger["type"].ToString().Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
             trigger["type"].ToString().Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
             trigger["type"].ToString().Equals("entityTrigger", StringComparison.OrdinalIgnoreCase);
 
         private static IEnumerable<ScaledObjectTriggerV1Alpha1> GetDurableScalar(JObject hostJson)
         {
             // Reference: https://docs.microsoft.com/azure/azure-functions/durable/durable-functions-bindings#durable-functions-2-0-host-json
-            JObject storageProviderConfig = hostJson.SelectToken("extensions.durableTask.storageProvider") as JObject;
-            string storageType = storageProviderConfig?["type"]?.ToString();
+            DurableTaskConfig durableTaskConfig = hostJson.SelectToken("extensions.durableTask")?.ToObject<DurableTaskConfig>();
+            string storageType = durableTaskConfig?.StorageProvider?["type"]?.ToString();
 
             // Custom storage types are supported starting in Durable Functions v2.4.2
             if (string.Equals(storageType, "MicrosoftSQL", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(storageType, "mssql", StringComparison.OrdinalIgnoreCase))
             {
+                // By default, max 10 orchestrations and 1 activity per replica
+                string query = string.Format(
+                    CultureInfo.InvariantCulture,
+                    "SELECT dt.GetScaleRecommendation({0}, {1})",
+                    durableTaskConfig.MaxConcurrentOrchestratorFunctions,
+                    durableTaskConfig.MaxConcurrentActivityFunctions);
+
                 yield return new ScaledObjectTriggerV1Alpha1
                 {
                     // MSSQL scaler reference: https://keda.sh/docs/2.2/scalers/mssql/
                     Type = "mssql",
                     Metadata = new Dictionary<string, string>
                     {
                         // Durable SQL scaling: https://microsoft.github.io/durabletask-mssql/#/scaling?id=worker-auto-scale
-                        ["query"] = "SELECT dt.GetScaleRecommendation(10, 1)", // max 10 orchestrations and 1 activity per replica
+                        ["query"] = query,
                         ["targetValue"] = "1",
-                        ["connectionStringFromEnv"] = storageProviderConfig?["connectionStringName"]?.ToString(),
+                        ["connectionStringFromEnv"] = durableTaskConfig.StorageProvider["connectionStringName"]?.ToString(),
                     }
                 };
             }

src/Azure.Functions.Cli/Kubernetes/Models/DurableTaskConfig.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel;
+
+namespace Azure.Functions.Cli.Kubernetes.Models
+{
+    internal class DurableTaskConfig
+    {
+        [JsonProperty("maxConcurrentOrchestratorFunctions")]
+        public int MaxConcurrentOrchestratorFunctions { get; set; } = 10;
+
+        [JsonProperty("maxConcurrentActivityFunctions")]
+        public int MaxConcurrentActivityFunctions { get; set; } = 1;
+
+        [JsonProperty("storageProvider")]
+        public JObject StorageProvider { get; set; }
+    }
+}