Skip to content

Commit 5d97916

Browse files
authored
Use rpcBaseUrl in durable operations when possible (#1098)
* Use rpcBaseUrl in durable operations when possible * Update release_notes.md
1 parent d76ab45 commit 5d97916

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

release_notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* Use rpcBaseUrl in Durable operations when possible

src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ function Get-DurableStatus {
4646
$DurableClient = GetDurableClientFromModulePrivateData
4747
}
4848

49-
$requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId"
49+
if ($DurableClient.rpcBaseUrl) {
50+
$requestUrl = "$($DurableClient.rpcBaseUrl)/instances/$InstanceId"
51+
} else {
52+
$requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId"
53+
}
5054

5155
$query = @()
5256
if ($ShowHistory.IsPresent) {
@@ -158,8 +162,12 @@ function Stop-DurableOrchestration {
158162
$DurableClient = GetDurableClientFromModulePrivateData
159163
}
160164

161-
$requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))"
162-
165+
if ($DurableClient.rpcBaseUrl) {
166+
$requestUrl = "$($DurableClient.rpcBaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))"
167+
} else {
168+
$requestUrl = "$($DurableClient.BaseUrl)/instances/$InstanceId/terminate?reason=$([System.Web.HttpUtility]::UrlEncode($Reason))"
169+
}
170+
163171
Invoke-RestMethod -Uri $requestUrl -Method 'POST'
164172
}
165173

@@ -297,7 +305,12 @@ function GetRaiseEventUrl(
297305
[string] $ConnectionName,
298306
[string] $AppCode) {
299307

300-
$RequestUrl = $DurableClient.BaseUrl + "/instances/$InstanceId/raiseEvent/$EventName"
308+
309+
if ($DurableClient.rpcBaseUrl) {
310+
$RequestUrl = $DurableClient.rpcBaseUrl + "/instances/$InstanceId/raiseEvent/$EventName"
311+
} else {
312+
$RequestUrl = $DurableClient.BaseUrl + "/instances/$InstanceId/raiseEvent/$EventName"
313+
}
301314

302315
$query = @()
303316
if ($null -eq $TaskHubName) {

0 commit comments

Comments
 (0)