From 924b1205558fd0971611ae6b738170ebaa2c40c5 Mon Sep 17 00:00:00 2001 From: Andy Staples Date: Wed, 6 Nov 2024 16:46:51 -0800 Subject: [PATCH 1/2] Use rpcBaseUrl in durable operations when possible --- ...soft.Azure.Functions.PowerShellWorker.psm1 | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) 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 ba2a6373..7c1c5396 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 @@ -46,7 +46,11 @@ function Get-DurableStatus { $DurableClient = GetDurableClientFromModulePrivateData } - $requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId" + if ($DurableClient.rpcBaseUrl) { + $requestUrl = "$($DurableClient.rpcBaseUrl)/instances/$InstanceId" + } else { + $requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId" + } $query = @() if ($ShowHistory.IsPresent) { @@ -158,8 +162,12 @@ function Stop-DurableOrchestration { $DurableClient = GetDurableClientFromModulePrivateData } - $requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))" - + if ($DurableClient.rpcBaseUrl) { + $requestUrl = "$($DurableClient.rpcBaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))" + } else { + $requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))" + } + Invoke-RestMethod -Uri $requestUrl -Method 'POST' } @@ -297,7 +305,12 @@ function GetRaiseEventUrl( [string] $ConnectionName, [string] $AppCode) { - $RequestUrl = $DurableClient.BaseUrl + "/instances/$InstanceId/raiseEvent/$EventName" + + if ($DurableClient.rpcBaseUrl) { + $RequestUrl = $DurableClient.rpcBaseUrl + "/instances/$InstanceId/raiseEvent/$EventName" + } else { + $RequestUrl = $DurableClient.BaseUrl + "/instances/$InstanceId/raiseEvent/$EventName" + } $query = @() if ($null -eq $TaskHubName) { From d2794af2b7b2aa9279e65d6b4ff546f3eaa1451b Mon Sep 17 00:00:00 2001 From: Andy Staples Date: Wed, 6 Nov 2024 16:50:54 -0800 Subject: [PATCH 2/2] Update release_notes.md --- release_notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release_notes.md b/release_notes.md index e69de29b..9af61cc8 100644 --- a/release_notes.md +++ b/release_notes.md @@ -0,0 +1 @@ +* Use rpcBaseUrl in Durable operations when possible \ No newline at end of file