Skip to content

Address bug bash reports #53

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.

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

Merged
merged 6 commits into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/AzureFunctions.PowerShell.Durable.SDK.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.0.1'
ModuleVersion = '0.0.2'

# Supported PSEditions
CompatiblePSEditions = @('Core')
Expand Down
6 changes: 3 additions & 3 deletions src/AzureFunctions.PowerShell.Durable.SDK.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function Start-DurableOrchestration {
$UriTemplate.Replace('{functionName}', $FunctionName).Replace('[/{instanceId}]', "/$InstanceId")
}

$Body = $InputObject | ConvertTo-Json -Compress
$Body = $InputObject | ConvertTo-Json -Compress -Depth 100

$null = Invoke-RestMethod -Uri $Uri -Method 'POST' -ContentType 'application/json' -Body $Body

Expand Down Expand Up @@ -202,7 +202,7 @@ function New-DurableOrchestrationCheckStatusResponse {
$requestHasValidUrl = IsValidUrl $requestUrl
$requestUrlOrigin = GetUrlOrigin $requestUrl

$httpManagementPayload = @{ }
$httpManagementPayload = [ordered]@{ }
foreach ($entry in $DurableClient.managementUrls.GetEnumerator()) {
$value = $entry.Value

Expand Down Expand Up @@ -279,7 +279,7 @@ function Send-DurableExternalEvent {

$RequestUrl = GetRaiseEventUrl -DurableClient $DurableClient -InstanceId $InstanceId -EventName $EventName -TaskHubName $TaskHubName -ConnectionName $ConnectionName

$Body = $EventData | ConvertTo-Json -Compress
$Body = $EventData | ConvertTo-Json -Compress -Depth 100

$null = Invoke-RestMethod -Uri $RequestUrl -Method 'POST' -ContentType 'application/json' -Body $Body
}
Expand Down
1 change: 0 additions & 1 deletion src/DurableEngine/Tasks/DurableTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Collections;
using System.Management.Automation;
using System.Threading.Tasks;
using static System.Collections.Specialized.BitVector32;

namespace DurableEngine.Tasks
{
Expand Down
13 changes: 10 additions & 3 deletions src/DurableEngine/Utilities/DTFxUtilities.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.DurableTask;
using Newtonsoft.Json;
using Microsoft.PowerShell.Commands;
using System;
using System.Collections.Generic;

Expand All @@ -19,13 +19,20 @@ internal JsonDataConverter()
/// <inheritdoc/>
public override string Serialize(object value)
{
return value != null ? JsonConvert.SerializeObject(value) : null;
// JsonObject is used here rather than JsonConvert because of a shared dependency with the PowerShell worker.
// If the PowerShell worker ever changes the JSON serializer, then this repository would need to align with that.
var context = new JsonObject.ConvertToJsonContext(
maxDepth: 100,
enumsAsStrings: false,
compressOutput: true);

return value != null ? JsonObject.ConvertToJson(value, context) : null;
}

/// <inheritdoc/>
public override object Deserialize(string data, Type targetType)
{
return data != null ? JsonConvert.DeserializeObject(data, targetType) : null;
return data != null ? JsonObject.ConvertFromJson(data, error: out _) : null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License. See License.txt in the project root for license information.

using AzureFunctions.PowerShell.Durable.SDK.Tests.E2E;
using Newtonsoft.Json;
using System.Net;
using Xunit;

Expand Down Expand Up @@ -87,6 +88,86 @@ await ValidateDurableWorkflowResults(
});
}

[Fact]
public async Task OrchestratorCanReceiveArrayFromActivity()
{
var initialResponse = await Utilities.GetHttpStartResponse("CanReceiveArrayOrchestrator");
Assert.Equal(HttpStatusCode.Accepted, initialResponse.StatusCode);

var location = initialResponse.Headers.Location;
Assert.NotNull(location);

await ValidateDurableWorkflowResults(
initialResponse,
validateInitialResponse: (dynamic initialStatusResponseBody) =>
{
Assert.NotNull(initialStatusResponseBody.id);
var statusQueryGetUri = (string)initialStatusResponseBody.statusQueryGetUri;
Assert.Equal(location?.ToString(), statusQueryGetUri);
Assert.NotNull(initialStatusResponseBody.sendEventPostUri);
Assert.NotNull(initialStatusResponseBody.purgeHistoryDeleteUri);
Assert.NotNull(initialStatusResponseBody.terminatePostUri);
Assert.NotNull(initialStatusResponseBody.rewindPostUri);
},
validateIntermediateResponse: (dynamic intermediateStatusResponseBody) =>
{
var runtimeStatus = (string)intermediateStatusResponseBody.runtimeStatus;
Assert.True(
runtimeStatus == "Running" || runtimeStatus == "Pending",
$"Unexpected runtime status: {runtimeStatus}");
},
validateFinalResponse: (dynamic finalStatusResponseBody) =>
{
Assert.Equal("Completed", (string)finalStatusResponseBody.runtimeStatus);
Assert.Equal("An", finalStatusResponseBody.output[0].ToString());
Assert.Equal("Array", finalStatusResponseBody.output[1].ToString());
});
}

[Fact]
public async Task CanReceiveDeeplyNestedClientInput()
{
var initialResponse = await Utilities.GetHttpStartResponse("OrchestratorReturnInput", clientRoute: "orchestratorsSendComplexInput");
Assert.Equal(HttpStatusCode.Accepted, initialResponse.StatusCode);

var location = initialResponse.Headers.Location;
Assert.NotNull(location);

await ValidateDurableWorkflowResults(
initialResponse,
validateInitialResponse: (dynamic initialStatusResponseBody) =>
{
Assert.NotNull(initialStatusResponseBody.id);
var statusQueryGetUri = (string)initialStatusResponseBody.statusQueryGetUri;
Assert.Equal(location?.ToString(), statusQueryGetUri);
Assert.NotNull(initialStatusResponseBody.sendEventPostUri);
Assert.NotNull(initialStatusResponseBody.purgeHistoryDeleteUri);
Assert.NotNull(initialStatusResponseBody.terminatePostUri);
Assert.NotNull(initialStatusResponseBody.rewindPostUri);
},
validateIntermediateResponse: (dynamic intermediateStatusResponseBody) =>
{
var runtimeStatus = (string)intermediateStatusResponseBody.runtimeStatus;
Assert.True(
runtimeStatus == "Running" || runtimeStatus == "Pending",
$"Unexpected runtime status: {runtimeStatus}");
},
validateFinalResponse: (dynamic finalStatusResponseBody) =>
{
Assert.Equal("Completed", (string)finalStatusResponseBody.runtimeStatus);
// our input is a JSON 7 levels deep, with a number on each level.
// We check an integer for evidence of each level being preserved
string inputStr = finalStatusResponseBody.input.ToString();
Assert.Contains("1", inputStr);
Assert.Contains("2", inputStr);
Assert.Contains("3", inputStr);
Assert.Contains("4", inputStr);
Assert.Contains("5", inputStr);
Assert.Contains("6", inputStr);
Assert.Contains("7", inputStr);
});
}

[Fact]
public async Task DurableClientTerminatesOrchestration()
{
Expand Down
9 changes: 9 additions & 0 deletions test/E2E/durableApp/CanReceiveArrayOrchestrator/function.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bindings": [
{
"name": "Context",
"type": "orchestrationTrigger",
"direction": "in"
}
]
}
8 changes: 8 additions & 0 deletions test/E2E/durableApp/CanReceiveArrayOrchestrator/run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using namespace System.Net

param($Context)

$ErrorActionPreference = 'Stop'

$output = Invoke-DurableActivity -FunctionName "GetArrayActivity"
return $output
25 changes: 25 additions & 0 deletions test/E2E/durableApp/DurableClientSendComplexInput/function.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"bindings": [
{
"authLevel": "function",
"name": "Request",
"type": "httpTrigger",
"direction": "in",
"route": "orchestratorsSendComplexInput/{FunctionName}",
"methods": [
"post",
"get"
]
},
{
"type": "http",
"direction": "out",
"name": "Response"
},
{
"name": "starter",
"type": "durableClient",
"direction": "in"
}
]
}
35 changes: 35 additions & 0 deletions test/E2E/durableApp/DurableClientSendComplexInput/run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using namespace System.Net

param($Request, $TriggerMetadata)
$ErrorActionPreference = 'Stop'

Write-Host "DurableClient started"

$FunctionName = $Request.Params.FunctionName

$Input = @{
"1" = @{
"2" = @{
"3" = @{
"4" = @{
"5" = @{
"6" = 7
}
}
}
}
}
}
$InstanceId = Start-DurableOrchestration -FunctionName $FunctionName -Input $Input
Write-Host "Started orchestration with ID = '$InstanceId'"

$Response = New-DurableOrchestrationCheckStatusResponse -Request $Request -InstanceId $InstanceId
Push-OutputBinding -Name Response -Value $Response

$Status = Get-DurableStatus -InstanceId $InstanceId
Write-Host "Orchestration $InstanceId status: $($Status | ConvertTo-Json)"
if ($Status.RuntimeStatus -notin 'Pending', 'Running', 'Failed', 'Completed') {
throw "Unexpected orchestration $InstanceId runtime status: $($Status.RuntimeStatus)"
}

Write-Host "DurableClient completed"
9 changes: 9 additions & 0 deletions test/E2E/durableApp/GetArrayActivity/function.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bindings": [
{
"name": "name",
"type": "activityTrigger",
"direction": "in"
}
]
}
3 changes: 3 additions & 0 deletions test/E2E/durableApp/GetArrayActivity/run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
param($name)

@("An", "Array")
9 changes: 9 additions & 0 deletions test/E2E/durableApp/OrchestratorReturnInput/function.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"bindings": [
{
"name": "Context",
"type": "orchestrationTrigger",
"direction": "in"
}
]
}
7 changes: 7 additions & 0 deletions test/E2E/durableApp/OrchestratorReturnInput/run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using namespace System.Net

param($Context)

$ErrorActionPreference = 'Stop'

return $Context.Input