Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tsuyoshi ushio tsushi/addhostpayload #2

Merged
merged 2 commits into from
May 21, 2021
Merged

Tsuyoshi ushio tsushi/addhostpayload #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47fe198
Unit test for Durable Functinos syncTriggers
cgillum May 21, 2021
2931eb1
Merge pull request #1 from cgillum/cgillum/durable-synctriggers
TsuyoshiUshio May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ string ReplaceMatchedBindingExpression(Match match)
public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText, IDictionary<string, string> appSettings)
{
var triggerBindings = functionsJson
.Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
.SelectMany(i => i);
.Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
.SelectMany(i => i);

return CreateScaleTriggers(triggerBindings, hostJsonText, appSettings);
}
Expand Down
48 changes: 27 additions & 21 deletions Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Kudu.Tests.Core.Function
public class KedaFunctionTriggersProviderTests
{
[Fact]
public void DurableFunctionApp()
public void DurableFunctions_DeployAsZip()
{
// Generate a zip archive with a host.json and the contents of a Durable Function app
string zipFilePath = Path.GetTempFileName();
Expand All @@ -30,33 +30,39 @@ public void DurableFunctionApp()
try
{
IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath);
Assert.Equal(3, result.Count());

ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
string query = Assert.Contains("query", mssqlTrigger.Metadata);
Assert.False(string.IsNullOrEmpty(query));

string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
Assert.False(string.IsNullOrEmpty(targetValue));
Assert.True(double.TryParse(targetValue, out _));

string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
Assert.Equal("SQLDB_Connection", connectionStringName);

ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
Assert.Equal("f4", functionName);

ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
functionName = Assert.Contains("functionName", httpTrigger.Metadata);
Assert.Equal("f5", functionName);
ValidateDurableTriggers(result);
}
finally
{
File.Delete(zipFilePath);
}
}

internal static void ValidateDurableTriggers(IEnumerable<ScaleTrigger> triggers)
{
Assert.Equal(3, triggers.Count());

ScaleTrigger mssqlTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
string query = Assert.Contains("query", mssqlTrigger.Metadata);
Assert.NotNull(query);
Assert.Contains("dt.GetScaleRecommendation", query);

string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
Assert.False(string.IsNullOrEmpty(targetValue));
Assert.True(double.TryParse(targetValue, out _));

string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
Assert.Equal("SQLDB_Connection", connectionStringName);

ScaleTrigger queueTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
Assert.Equal("f4", functionName);

ScaleTrigger httpTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
functionName = Assert.Contains("functionName", httpTrigger.Metadata);
Assert.Equal("f5", functionName);
}

[Theory]
[InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
[InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp,functionapp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
Expand Down
29 changes: 28 additions & 1 deletion Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using Kudu.Core.Functions;
using System;
using System.Collections.Generic;
using System.Linq;
using Kudu.Core.Functions;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Xunit;

Expand All @@ -24,5 +27,29 @@ public void GetScaleTriggersTest(string functionTriggerPayload)
Assert.True(scaleTriggers != null && scaleTriggers.Item1 != null && scaleTriggers.Item1.ToList<ScaleTrigger>().Count > 0);
}
}

[Fact]
public void DurableFunctions_SyncTriggers()
{
// NOTE: Same basic inputs as KedaFunctionTriggersProviderTests.DurableFunctionsApp
JObject syncTriggersPayloadJson = new JObject(
new JProperty("extensions", JObject.Parse(@"{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""mssql"",""connectionStringName"":""SQLDB_Connection""}}}")),
new JProperty("triggers", new JArray(
JObject.Parse(@"{""functionName"":""f1"",""type"":""orchestrationTrigger"",""name"":""context""}"),
JObject.Parse(@"{""functionName"":""f2"",""type"":""entityTrigger"",""name"":""ctx""}"),
JObject.Parse(@"{""functionName"":""f3"",""type"":""activityTrigger"",""name"":""input""}"),
JObject.Parse(@"{""functionName"":""f4"",""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}"),
JObject.Parse(@"{""functionName"":""f5"",""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}"))));

string serializedPayload = syncTriggersPayloadJson.ToString(Formatting.None);

var syncTriggerHandler = new SyncTriggerHandler(null, null, null);
(IEnumerable<ScaleTrigger> triggers, string error) = syncTriggerHandler.GetScaleTriggers(serializedPayload);
Assert.Null(error);
Assert.NotNull(triggers);

// We expect the same output as the other Durable Functions test
KedaFunctionTriggersProviderTests.ValidateDurableTriggers(triggers);
}
}
}