Skip to content

Commit 0030907

Browse files
riezeboschriezebosch
committed
chore(durable): ugprade to durable functions v2
1 parent 6d9bb0f commit 0030907

15 files changed

+23
-30
lines changed

‎AzureFunctions.TestHelpers.Tests.DemoFunctions/Activities/Activity.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.Azure.WebJobs;
2+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
23

34
namespace AzureFunctions.TestHelpers.Activities
45
{
@@ -12,6 +13,6 @@ public Activity(IInjectable injectable)
1213
}
1314

1415
[FunctionName(nameof(Activity))]
15-
public void Run([ActivityTrigger]DurableActivityContextBase context) => _injectable.Execute();
16+
public void Run([ActivityTrigger]IDurableOrchestrationClient context) => _injectable.Execute();
1617
}
1718
}

‎AzureFunctions.TestHelpers.Tests.DemoFunctions/AzureFunctions.TestHelpers.Tests.DemoFunctions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="[1.7,2)" />
9+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="[2.0.0,3)" />
1010
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="[1.0.29,2)" />
1111
</ItemGroup>
1212
</Project>

‎AzureFunctions.TestHelpers.Tests.DemoFunctions/Orchestrators/Orchestration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using System.Threading.Tasks;
22
using AzureFunctions.TestHelpers.Activities;
33
using Microsoft.Azure.WebJobs;
4+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
45

56
namespace AzureFunctions.TestHelpers.Orchestrators
67
{
78
public static class Orchestration
89
{
910
[FunctionName(nameof(Orchestration))]
10-
public static async Task Run([OrchestrationTrigger] DurableOrchestrationContextBase context)
11+
public static async Task Run([OrchestrationTrigger] IDurableOrchestrationContext context)
1112
{
1213
await context.CallActivityAsync(nameof(Activity), null);
1314
}

‎AzureFunctions.TestHelpers.Tests.DemoFunctions/Starters/Starter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Threading.Tasks;
22
using AzureFunctions.TestHelpers.Orchestrators;
33
using Microsoft.Azure.WebJobs;
4+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
45

56
namespace AzureFunctions.TestHelpers.Starters
67
{
@@ -9,7 +10,7 @@ public static class Starter
910
[FunctionName(nameof(Starter))]
1011
public static async Task Run([TimerTrigger("0 0 1 * * *")]
1112
TimerInfo timerInfo,
12-
[OrchestrationClient] DurableOrchestrationClientBase orchestrationClient)
13+
[DurableClient] IDurableOrchestrationClient orchestrationClient)
1314
{
1415
await orchestrationClient.StartNewAsync(nameof(Orchestration), null);
1516
}

‎AzureFunctions.TestHelpers.Tests.DemoFunctions/Startup.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Microsoft.Azure.WebJobs;
22
using Microsoft.Azure.WebJobs.Hosting;
3-
using Microsoft.Extensions.DependencyInjection;
43

54
namespace AzureFunctions.TestHelpers
65
{

‎AzureFunctions.TestHelpers.Tests/AzureFunctions.TestHelpers.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<PackageReference Include="xunit" Version="[2.3,3)" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="[2.3,3)" />
1818
<PackageReference Include="FluentAssertions" Version="[5.7,6)" />
19-
<PackageReference Include="Flurl.Http" Version="[2.4.2,3)" />
20-
<PackageReference Include="Newtonsoft.Json" Version="[12.0.2,13)" />
21-
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="[1.0.0,2)" />
2219
</ItemGroup>
2320

2421
<ItemGroup>

‎AzureFunctions.TestHelpers.Tests/DurableFunctionsHelpers.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ public HostFixture()
165165
Mock = Substitute.For<IInjectable>();
166166
_host = new HostBuilder()
167167
.ConfigureWebJobs(builder => builder
168-
.AddDurableTask(options =>
169-
{
170-
options.HubName = nameof(DurableFunctionsHelper);
171-
options.MaxQueuePollingInterval = TimeSpan.FromSeconds(2);
172-
})
168+
.AddDurableTask(options => options.HubName = nameof(DurableFunctionsHelper))
173169
.AddAzureStorageCoreServices()
174170
.ConfigureServices(services => services.AddSingleton(Mock)))
175171
.Build();

‎AzureFunctions.TestHelpers/AzureFunctions.TestHelpers.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2,3)" />
10-
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3,4)" />
11-
<PackageReference Include="Microsoft.Azure.WebJobs.Core" Version="3.0.14" />
12-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="[1.8,2)" />
10+
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3.0.14,4)" />
11+
<PackageReference Include="Microsoft.Azure.WebJobs.Core" Version="[3.0.14,4)" />
12+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="[2.0.0,3)" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>
1616
<Authors>Manuel Riezebosch</Authors>
1717
<NeutralLanguage>en-US</NeutralLanguage>
1818
<AssemblyTitle>AzureFunctions.TestHelpers</AssemblyTitle>
1919
<Description>Spin up integration tests on your Azure Functions!</Description>
20-
<PackageReleaseNotes>Wait, ThrowIfFailed and Purge separated.</PackageReleaseNotes>
20+
<PackageReleaseNotes>Upgrade to durable task v2</PackageReleaseNotes>
2121
<PackageTags>azure;functions;serverless;integration;testing;tdd</PackageTags>
2222
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2323
<RepositoryType>git</RepositoryType>

‎AzureFunctions.TestHelpers/PurgeFunction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
using System;
2-
using System.Linq;
32
using System.Threading.Tasks;
43
using DurableTask.Core;
54
using Microsoft.Azure.WebJobs;
5+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
66

77
namespace AzureFunctions.TestHelpers
88
{
99
public static class PurgeFunction
1010
{
1111
[FunctionName(nameof(PurgeFunction))]
12-
public static async Task Run([OrchestrationClient]DurableOrchestrationClientBase client)
12+
public static async Task Run([DurableClient]IDurableOrchestrationClient client)
1313
{
1414
await client.PurgeInstanceHistoryAsync(
1515
DateTime.MinValue,

‎AzureFunctions.TestHelpers/RuntimeStatusExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.Azure.WebJobs;
1+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
22

33
namespace AzureFunctions.TestHelpers
44
{

‎AzureFunctions.TestHelpers/TerminateFunction.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
using System;
2-
using System.Linq;
31
using System.Threading.Tasks;
4-
using DurableTask.Core;
52
using Microsoft.Azure.WebJobs;
3+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
64

75
namespace AzureFunctions.TestHelpers
86
{
97
public static class TerminateFunction
108
{
119
[FunctionName(nameof(TerminateFunction))]
12-
public static async Task Run([OrchestrationClient]DurableOrchestrationClientBase client)
10+
public static async Task Run([DurableClient]IDurableOrchestrationClient client)
1311
{
1412
var orchestrations = await client.GetStatusAsync();
1513
foreach (var orchestration in orchestrations)

‎AzureFunctions.TestHelpers/ThrowIfFailedFunction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq;
43
using System.Threading.Tasks;
54
using Microsoft.Azure.WebJobs;
5+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
66

77
namespace AzureFunctions.TestHelpers
88
{
99
public static class ThrowIfFailedFunction
1010
{
1111
[FunctionName(nameof(ThrowIfFailedFunction))]
12-
public static async Task Run([OrchestrationClient]DurableOrchestrationClientBase client)
12+
public static async Task Run([DurableClient]IDurableOrchestrationClient client)
1313
{
1414
var failed = (await client.GetStatusAsync()).Where(x => x.RuntimeStatus == OrchestrationRuntimeStatus.Failed).ToList();
1515
if (failed.Any())

‎AzureFunctions.TestHelpers/WaitForCompletion.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
using System.Threading;
44
using System.Threading.Tasks;
55
using Microsoft.Azure.WebJobs;
6+
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
67

78
namespace AzureFunctions.TestHelpers
89
{
910
public static class WaitForCompletion
1011
{
1112
[FunctionName(nameof(WaitForCompletion))]
1213
[NoAutomaticTrigger]
13-
public static async Task Run([OrchestrationClient]DurableOrchestrationClientBase client, TimeSpan? timeout)
14+
public static async Task Run([DurableClient]IDurableOrchestrationClient client, TimeSpan? timeout)
1415
{
1516
using (var cts = new CancellationTokenSource())
1617
{
@@ -19,7 +20,7 @@ public static async Task Run([OrchestrationClient]DurableOrchestrationClientBase
1920
}
2021
}
2122

22-
private static async Task Wait(DurableOrchestrationClientBase client, CancellationToken token)
23+
private static async Task Wait(IDurableOrchestrationClient client, CancellationToken token)
2324
{
2425
while (!token.IsCancellationRequested)
2526
{

‎AzureFunctions.TestHelpers/WebJobsBuilderExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using Microsoft.Azure.WebJobs;
3-
using Microsoft.Azure.WebJobs.Extensions.DurableTask;
43
using Microsoft.Extensions.DependencyInjection;
54

65
namespace AzureFunctions.TestHelpers

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.1.{build}
1+
version: 3.0.{build}
22
pull_requests:
33
do_not_increment_build_number: true
44
image: Previous Ubuntu1804

0 commit comments

Comments
 (0)