From 36d212439c8cd649ef8a006b4bf2fcc49d565f11 Mon Sep 17 00:00:00 2001 From: Anatoli Beliaev Date: Sun, 18 Apr 2021 18:58:32 -0700 Subject: [PATCH 1/3] Use fast local RPC path in Start-NewOrchestration --- .../Microsoft.Azure.Functions.PowerShellWorker.psm1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 index 6c99198e..da2ef5c3 100644 --- a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 +++ b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 @@ -57,8 +57,16 @@ function Start-NewOrchestration { $InstanceId = (New-Guid).Guid + $Uri = + if ($DurableClient.rpcBaseUrl) { + # Fast local RPC path + "$($DurableClient.rpcBaseUrl)orchestrators/$FunctionName$($InstanceId ? "/$InstanceId" : '')" + } else { + # Legacy app frontend path $UriTemplate = $DurableClient.creationUrls.createNewInstancePostUri - $Uri = $UriTemplate.Replace('{functionName}', $FunctionName).Replace('[/{instanceId}]', "/$InstanceId") + $UriTemplate.Replace('{functionName}', $FunctionName).Replace('[/{instanceId}]', "/$InstanceId") + } + $Body = $InputObject | ConvertTo-Json -Compress $null = Invoke-RestMethod -Uri $Uri -Method 'POST' -ContentType 'application/json' -Body $Body From 11b3e47e5716eac5e610d75e5ae620dedac39d8a Mon Sep 17 00:00:00 2001 From: Anatoli Beliaev Date: Sun, 18 Apr 2021 18:59:19 -0700 Subject: [PATCH 2/3] Stop on errors in Start-NewOrchestration --- .../Microsoft.Azure.Functions.PowerShellWorker.psm1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 index da2ef5c3..833d9459 100644 --- a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 +++ b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 @@ -51,6 +51,8 @@ function Start-NewOrchestration { [object] $DurableClient ) + $ErrorActionPreference = 'Stop' + if ($null -eq $DurableClient) { $DurableClient = GetDurableClientFromModulePrivateData } From c0289bfea7a08ab9526052b17e9e4d8a674fc0dc Mon Sep 17 00:00:00 2001 From: Anatoli Beliaev Date: Tue, 20 Apr 2021 23:07:41 -0700 Subject: [PATCH 3/3] Fix formatting --- .../Microsoft.Azure.Functions.PowerShellWorker.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 index 833d9459..a25f7006 100644 --- a/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 +++ b/src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1 @@ -65,7 +65,7 @@ function Start-NewOrchestration { "$($DurableClient.rpcBaseUrl)orchestrators/$FunctionName$($InstanceId ? "/$InstanceId" : '')" } else { # Legacy app frontend path - $UriTemplate = $DurableClient.creationUrls.createNewInstancePostUri + $UriTemplate = $DurableClient.creationUrls.createNewInstancePostUri $UriTemplate.Replace('{functionName}', $FunctionName).Replace('[/{instanceId}]', "/$InstanceId") }