Changed restartUri to restartPostUri (#1586)

amdeel · web-flow · commit aec878b22c8e · 2020-11-25T14:00:51.000-08:00
diff --git a/src/WebJobs.Extensions.DurableTask/HttpApiHandler.cs b/src/WebJobs.Extensions.DurableTask/HttpApiHandler.cs
@@ -115,7 +115,7 @@ internal HttpResponseMessage CreateCheckStatusResponse(
                 httpManagementPayload.SendEventPostUri,
                 httpManagementPayload.TerminatePostUri,
                 httpManagementPayload.PurgeHistoryDeleteUri,
-                httpManagementPayload.RestartUri);
+                httpManagementPayload.RestartPostUri);
         }
 
         // /orchestrators/{functionName}/{instanceId?}
@@ -248,7 +248,7 @@ internal async Task<HttpResponseMessage> WaitForCompletionOrCreateCheckStatusRes
                         httpManagementPayload.SendEventPostUri,
                         httpManagementPayload.TerminatePostUri,
                         httpManagementPayload.PurgeHistoryDeleteUri,
-                        httpManagementPayload.RestartUri);
+                        httpManagementPayload.RestartPostUri);
                 }
             }
         }
@@ -1092,7 +1092,7 @@ private HttpManagementPayload GetClientResponseLinks(
                 TerminatePostUri = instancePrefix + "/" + TerminateOperation + "?reason={text}&" + querySuffix,
                 RewindPostUri = instancePrefix + "/" + RewindOperation + "?reason={text}&" + querySuffix,
                 PurgeHistoryDeleteUri = instancePrefix + "?" + querySuffix,
-                RestartUri = instancePrefix + "/" + RestartOperation + "?" + querySuffix,
+                RestartPostUri = instancePrefix + "/" + RestartOperation + "?" + querySuffix,
             };
 
             if (returnInternalServerErrorOnFailure)
@@ -1110,7 +1110,7 @@ private HttpResponseMessage CreateCheckStatusResponseMessage(
             string sendEventPostUri,
             string terminatePostUri,
             string purgeHistoryDeleteUri,
-            string restartUri)
+            string restartPostUri)
         {
             HttpResponseMessage response = request.CreateResponse(
                 HttpStatusCode.Accepted,
@@ -1121,7 +1121,7 @@ private HttpResponseMessage CreateCheckStatusResponseMessage(
                     sendEventPostUri,
                     terminatePostUri,
                     purgeHistoryDeleteUri,
-                    restartUri,
+                    restartPostUri,
                 });
 
             // Implement the async HTTP 202 pattern.
diff --git a/src/WebJobs.Extensions.DurableTask/HttpManagementPayload.cs b/src/WebJobs.Extensions.DurableTask/HttpManagementPayload.cs
@@ -70,7 +70,7 @@ public class HttpManagementPayload
         /// <value>
         /// The HTTP URL for restarting an orchestration instance.
         /// </value>
-        [JsonProperty("restartUri")]
-        public string RestartUri { get; internal set; }
+        [JsonProperty("restartPostUri")]
+        public string RestartPostUri { get; internal set; }
     }
 }
diff --git a/src/WebJobs.Extensions.DurableTask/Microsoft.Azure.WebJobs.Extensions.DurableTask-net461.xml b/src/WebJobs.Extensions.DurableTask/Microsoft.Azure.WebJobs.Extensions.DurableTask-net461.xml
diff --git a/src/WebJobs.Extensions.DurableTask/Microsoft.Azure.WebJobs.Extensions.DurableTask.xml b/src/WebJobs.Extensions.DurableTask/Microsoft.Azure.WebJobs.Extensions.DurableTask.xml
diff --git a/test/Common/DurableTaskEndToEndTests.cs b/test/Common/DurableTaskEndToEndTests.cs
@@ -5405,7 +5405,7 @@ private static void ValidateHttpManagementPayload(HttpManagementPayload httpMana
                 httpManagementPayload.TerminatePostUri);
             Assert.Equal(
                 $"{notificationUrl}/instances/{instanceId}/restart?taskHub={taskHubName}&connection=AzureWebJobsStorage&code=mykey",
-                httpManagementPayload.RestartUri);
+                httpManagementPayload.RestartPostUri);
         }
 
         [DataContract]
diff --git a/test/Common/HttpApiHandlerTests.cs b/test/Common/HttpApiHandlerTests.cs
@@ -97,7 +97,7 @@ public async Task CreateCheckStatusResponse_Returns_Correct_HTTP_202_Response()
                 (string)status["purgeHistoryDeleteUri"]);
             Assert.Equal(
                 $"{TestConstants.NotificationUrlBase}/instances/7b59154ae666471993659902ed0ba742/restart?taskHub=SampleHubVS&connection=Storage&code=mykey",
-                (string)status["restartUri"]);
+                (string)status["restartPostUri"]);
         }
 
         [Fact]
@@ -122,7 +122,7 @@ public void CreateCheckStatus_Returns_Correct_HttpManagementPayload_based_on_def
                 httpManagementPayload.PurgeHistoryDeleteUri);
             Assert.Equal(
                $"{TestConstants.NotificationUrlBase}/instances/7b59154ae666471993659902ed0ba742/restart?taskHub=DurableFunctionsHub&connection=Storage&code=mykey",
-               httpManagementPayload.RestartUri);
+               httpManagementPayload.RestartPostUri);
         }
 
         [Fact]
@@ -147,7 +147,7 @@ public void CreateCheckStatus_Returns_Correct_HttpManagementPayload_based_on_cus
                 httpManagementPayload.PurgeHistoryDeleteUri);
             Assert.Equal(
                 $"{TestConstants.NotificationUrlBase}/instances/7b59154ae666471993659902ed0ba742/restart?taskHub=SampleHubVS&connection=Storage&code=mykey",
-                httpManagementPayload.RestartUri);
+                httpManagementPayload.RestartPostUri);
         }
 
         [Fact]
@@ -172,7 +172,7 @@ public void CreateCheckStatus_Returns_Correct_HttpManagementPayload_based_on_cus
                 httpManagementPayload.PurgeHistoryDeleteUri);
             Assert.Equal(
                 $"{TestConstants.NotificationUrlBase}/instances/7b59154ae666471993659902ed0ba742/restart?taskHub=DurableFunctionsHub&connection=TestConnection&code=mykey",
-                httpManagementPayload.RestartUri);
+                httpManagementPayload.RestartPostUri);
         }
 
         [Fact]
@@ -197,7 +197,7 @@ public void CreateCheckStatus_Returns_Correct_HttpManagementPayload_based_on_cus
                 httpManagementPayload.PurgeHistoryDeleteUri);
             Assert.Equal(
                 $"{TestConstants.NotificationUrlBase}/instances/7b59154ae666471993659902ed0ba742/restart?taskHub=SampleHubVS&connection=TestConnection&code=mykey",
-                httpManagementPayload.RestartUri);
+                httpManagementPayload.RestartPostUri);
         }
 
         [Fact]
@@ -278,7 +278,7 @@ public async Task WaitForCompletionOrCreateCheckStatusResponseAsync_Returns_HTTP
                 (string)status["purgeHistoryDeleteUri"]);
             Assert.Equal(
                 $"{TestConstants.NotificationUrlBase}/instances/9b59154ae666471993659902ed0ba749/restart?taskHub=SampleHubVS&connection=Storage&code=mykey",
-                (string)status["restartUri"]);
+                (string)status["restartPostUri"]);
             Assert.True(stopWatch.Elapsed > TimeSpan.FromSeconds(30));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public class HttpManagementPayload`
`70`	`70`	`/// <value>`
`71`	`71`	`/// The HTTP URL for restarting an orchestration instance.`
`72`	`72`	`/// </value>`
`73`		`- [JsonProperty("restartUri")]`
`74`		`- public string RestartUri { get; internal set; }`
	`73`	`+ [JsonProperty("restartPostUri")]`
	`74`	`+ public string RestartPostUri { get; internal set; }`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5405,7 +5405,7 @@ private static void ValidateHttpManagementPayload(HttpManagementPayload httpMana`
`5405`	`5405`	`httpManagementPayload.TerminatePostUri);`
`5406`	`5406`	`Assert.Equal(`
`5407`	`5407`	`$"{notificationUrl}/instances/{instanceId}/restart?taskHub={taskHubName}&connection=AzureWebJobsStorage&code=mykey",`
`5408`		`- httpManagementPayload.RestartUri);`
	`5408`	`+ httpManagementPayload.RestartPostUri);`
`5409`	`5409`	`}`
`5410`	`5410`
`5411`	`5411`	`[DataContract]`