EES-5367 Update to Microsoft.Azure.Functions.Worker.Extensions.DurableTask 1.1.4

Author: benoutram

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests/Functions/ProcessCompletionOfNextDataSetVersionImportFunctionTests.cs

@@ -7,10 +7,8 @@
 using GovUk.Education.ExploreEducationStatistics.Public.Data.Services.Interfaces;
 using Microsoft.DurableTask;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
-using Moq.Protected;
 using static GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils.MockUtils;
 
 namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests.Functions;
@@ -32,7 +30,7 @@ public abstract class ProcessCompletionOfNextDataSetVersionImportFunctionTests(
         LocationOptionsTable.ParquetFile,
         TimePeriodsTable.ParquetFile
     ];
-    
+
     public class ProcessCompletionOfNextDataSetVersionImportTests(
         ProcessorFunctionsIntegrationTestFixture fixture)
         : ProcessCompletionOfNextDataSetVersionImportFunctionTests(fixture)
@@ -102,25 +100,18 @@ await function.ProcessCompletionOfNextDataSetVersion(
                 new ProcessDataSetVersionContext { DataSetVersionId = Guid.NewGuid() });
         }
 
-        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(
-            Guid? instanceId = null,
-            bool isReplaying = false)
+        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(Guid? instanceId = null)
         {
             var mock = new Mock<TaskOrchestrationContext>(MockBehavior.Strict);
 
-            mock
-                .Protected()
-                .Setup<ILoggerFactory>("LoggerFactory")
-                .Returns(NullLoggerFactory.Instance);
+            mock.Setup(context =>
+                    context.CreateReplaySafeLogger(
+                        nameof(ProcessCompletionOfNextDataSetVersionFunction.ProcessCompletionOfNextDataSetVersion)))
+                .Returns(NullLogger.Instance);
 
-            mock
-                .SetupGet(context => context.InstanceId)
+            mock.SetupGet(context => context.InstanceId)
                 .Returns(instanceId?.ToString() ?? Guid.NewGuid().ToString());
 
-            mock
-                .SetupGet(context => context.IsReplaying)
-                .Returns(isReplaying);
-
             return mock;
         }
     }

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests/Functions/ProcessInitialDataSetVersionFunctionTests.cs

@@ -9,10 +9,8 @@
 using Microsoft.DurableTask;
 using Microsoft.DurableTask.Entities;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
-using Moq.Protected;
 using static GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils.MockUtils;
 
 namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests.Functions;
@@ -112,25 +110,18 @@ await function.ProcessInitialDataSetVersion(
                 new ProcessDataSetVersionContext { DataSetVersionId = Guid.NewGuid() });
         }
 
-        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(
-            Guid? instanceId = null,
-            bool isReplaying = false)
+        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(Guid? instanceId = null)
         {
-            var mock = new Mock<TaskOrchestrationContext>(MockBehavior.Strict);
+            var mock = new Mock<TaskOrchestrationContext>();
 
-            mock
-                .Protected()
-                .Setup<ILoggerFactory>("LoggerFactory")
-                .Returns(NullLoggerFactory.Instance);
+            mock.Setup(context =>
+                    context.CreateReplaySafeLogger(
+                        nameof(ProcessInitialDataSetVersionFunction.ProcessInitialDataSetVersion)))
+                .Returns(NullLogger.Instance);
 
-            mock
-                .SetupGet(context => context.InstanceId)
+            mock.SetupGet(context => context.InstanceId)
                 .Returns(instanceId?.ToString() ?? Guid.NewGuid().ToString());
 
-            mock
-                .SetupGet(context => context.IsReplaying)
-                .Returns(isReplaying);
-
             return mock;
         }
     }

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests/Functions/ProcessNextDataSetVersionMappingsFunctionTests.cs

@@ -9,10 +9,8 @@
 using GovUk.Education.ExploreEducationStatistics.Public.Data.Services.Interfaces;
 using Microsoft.DurableTask;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
-using Moq.Protected;
 using static GovUk.Education.ExploreEducationStatistics.Common.Tests.Utils.MockUtils;
 
 namespace GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.Tests.Functions;
@@ -90,25 +88,17 @@ await function.ProcessNextDataSetVersionMappings(
                 new ProcessDataSetVersionContext { DataSetVersionId = Guid.NewGuid() });
         }
 
-        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(
-            Guid? instanceId = null,
-            bool isReplaying = false)
+        private static Mock<TaskOrchestrationContext> DefaultMockOrchestrationContext(Guid? instanceId = null)
         {
             var mock = new Mock<TaskOrchestrationContext>(MockBehavior.Strict);
 
-            mock
-                .Protected()
-                .Setup<ILoggerFactory>("LoggerFactory")
-                .Returns(NullLoggerFactory.Instance);
+            mock.Setup(context => context.CreateReplaySafeLogger(
+                    nameof(ProcessNextDataSetVersionMappingsFunction.ProcessNextDataSetVersionMappings)))
+                .Returns(NullLogger.Instance);
 
-            mock
-                .SetupGet(context => context.InstanceId)
+            mock.SetupGet(context => context.InstanceId)
                 .Returns(instanceId?.ToString() ?? Guid.NewGuid().ToString());
 
-            mock
-                .SetupGet(context => context.IsReplaying)
-                .Returns(isReplaying);
-
             return mock;
         }
     }

src/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor/GovUk.Education.ExploreEducationStatistics.Public.Data.Processor.csproj

@@ -19,7 +19,7 @@
         <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.2.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
-        <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.2" />
+        <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.4" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.2.1" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.2" />