Logic app scaler bugfix and zipdeploy k8se deploy try add instead of …

…add (#205) * Logic app scaler bugfix and zipdeploy k8se deploy try add instead of add * Update workflowapp test Co-authored-by: Hamza Assyad <haassyad@microsoft.com>
Azure-App-Service · May 13, 2021 · a17a854 · a17a854
1 parent 17ce521
commit a17a854
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -316,7 +316,7 @@ internal static bool TryGetWorkflowKedaTrigger(string hostJsonText, string appNa
                     // NOTE(haassyad): We only have one queue partition in single tenant.
                     ["queueName"] = StringHelper.GetWorkflowQueueNameInternal(queuePrefix, 1),
                     ["queueLength"] = queueLength,
-                    ["connectionStringFromEnv"] = "AzureWebJobsStorage",
+                    ["connectionFromEnv"] = "AzureWebJobsStorage",
                 }
             };
 

diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -171,7 +171,7 @@ public static void UpdateContextWithAppSettings(HttpContext context)
                 var key = setting.Key.Substring(appSettingsPrefix.Length);
                 appSettings[key] = setting.Value;
             }
-            context.Items.Add("appSettings", appSettings);
+            context.Items.TryAdd("appSettings", appSettings);
         }
 
         private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
@@ -64,18 +64,18 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             // Cache the App Environment for this request
-            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appType));
+            context.Items.TryAdd("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appType));
 
             // Cache the appName for this request
-            context.Items.Add("appName", appName);
+            context.Items.TryAdd("appName", appName);
 
             // Add All AppSettings to the context.
             K8SEDeploymentHelper.UpdateContextWithAppSettings(context);
 
             // Cache the appNamenamespace for this request if it's not empty or null
             if (!string.IsNullOrEmpty(appNamenamespace))
             {
-                context.Items.Add("appNamespace", appNamenamespace);
+                context.Items.TryAdd("appNamespace", appNamenamespace);
             }
 
             string[] pathParts = context.Request.Path.ToString().Split("/");

diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -82,7 +82,7 @@ public void WorkflowApp( string expectedQueueName, string expectedQueueLength, s
                 var actualQueueLength = Assert.Contains("queueLength", queueTrigger.Metadata);
                 Assert.Equal(actualQueueLength, expectedQueueLength);
 
-                string connectionStringFromEnv = Assert.Contains("connectionStringFromEnv", queueTrigger.Metadata);
+                string connectionStringFromEnv = Assert.Contains("connectionFromEnv", queueTrigger.Metadata);
                 Assert.Equal("AzureWebJobsStorage", connectionStringFromEnv);
             }
             finally