Update default version handling

Signed-off-by: Hal Spang <halspang@microsoft.com>

Author: halspang

src/Worker/Core/DurableTaskWorkerWorkItemFilters.cs

@@ -35,18 +35,25 @@ public class DurableTaskWorkerWorkItemFilters
     /// <returns>A new instance of <see cref="DurableTaskWorkerWorkItemFilters"/> constructed from the provided registry.</returns>
     internal static DurableTaskWorkerWorkItemFilters FromDurableTaskRegistry(DurableTaskRegistry registry, DurableTaskWorkerOptions? workerOptions)
     {
-        // TODO: Support multiple versions per orchestration/activity. For now, grab the worker version from the options.
+        // TODO: Support multiple versions per orchestration/activity.
+        // For now, fetch the version based on the versioning match strategy if defined. If undefined, default to null (all versions match).
+        IReadOnlyList<string> versions = [];
+        if (workerOptions?.Versioning?.MatchStrategy == DurableTaskWorkerOptions.VersionMatchStrategy.Strict)
+        {
+            versions = [workerOptions.Versioning.Version];
+        }
+
         return new DurableTaskWorkerWorkItemFilters
         {
             Orchestrations = registry.Orchestrators.Select(orchestration => new OrchestrationFilter
             {
                 Name = orchestration.Key,
-                Versions = workerOptions?.Versioning != null ? [workerOptions.Versioning.Version] : [],
+                Versions = versions,
             }).ToList(),
             Activities = registry.Activities.Select(activity => new ActivityFilter
             {
                 Name = activity.Key,
-                Versions = workerOptions?.Versioning != null ? [workerOptions.Versioning.Version] : [],
+                Versions = versions,
             }).ToList(),
             Entities = registry.Entities.Select(entity => new EntityFilter
             {

test/Worker/Core.Tests/DependencyInjection/UseWorkItemFiltersTests.cs

@@ -111,7 +111,7 @@ public void WorkItemFilters_DefaultWithEntity_WhenNoExplicitFiltersConfigured()
     }
 
     [Fact]
-    public void WorkItemFilters_DefaultWithVersioning_WhenNoExplicitFiltersConfigured()
+    public void WorkItemFilters_DefaultNullWithVersioningCurrentOrOlder_WhenNoExplicitFiltersConfigured()
     {
         // Arrange
         ServiceCollection services = new();
@@ -126,7 +126,74 @@ public void WorkItemFilters_DefaultWithVersioning_WhenNoExplicitFiltersConfigure
             {
                 options.Versioning = new DurableTaskWorkerOptions.VersioningOptions
                 {
-                    Version = "1.0"
+                    Version = "1.0",
+                    MatchStrategy = DurableTaskWorkerOptions.VersionMatchStrategy.CurrentOrOlder,
+                };
+            });
+        });
+
+        // Act
+        ServiceProvider provider = services.BuildServiceProvider();
+        IOptionsMonitor<DurableTaskWorkerWorkItemFilters> filtersMonitor =
+            provider.GetRequiredService<IOptionsMonitor<DurableTaskWorkerWorkItemFilters>>();
+        DurableTaskWorkerWorkItemFilters actual = filtersMonitor.Get("test");
+
+        // Assert
+        actual.Orchestrations.Should().ContainSingle(o => o.Name == nameof(TestOrchestrator) && o.Versions.Count == 0);
+        actual.Activities.Should().ContainSingle(a => a.Name == nameof(TestActivity) && a.Versions.Count == 0);
+    }
+
+    [Fact]
+    public void WorkItemFilters_DefaultNullWithVersioningNone_WhenNoExplicitFiltersConfigured()
+    {
+        // Arrange
+        ServiceCollection services = new();
+        services.AddDurableTaskWorker("test", builder =>
+        {
+            builder.AddTasks(registry =>
+            {
+                registry.AddOrchestrator<TestOrchestrator>();
+                registry.AddActivity<TestActivity>();
+            });
+            builder.Configure(options =>
+            {
+                options.Versioning = new DurableTaskWorkerOptions.VersioningOptions
+                {
+                    Version = "1.0",
+                    MatchStrategy = DurableTaskWorkerOptions.VersionMatchStrategy.None,
+                };
+            });
+        });
+
+        // Act
+        ServiceProvider provider = services.BuildServiceProvider();
+        IOptionsMonitor<DurableTaskWorkerWorkItemFilters> filtersMonitor =
+            provider.GetRequiredService<IOptionsMonitor<DurableTaskWorkerWorkItemFilters>>();
+        DurableTaskWorkerWorkItemFilters actual = filtersMonitor.Get("test");
+
+        // Assert
+        actual.Orchestrations.Should().ContainSingle(o => o.Name == nameof(TestOrchestrator) && o.Versions.Count == 0);
+        actual.Activities.Should().ContainSingle(a => a.Name == nameof(TestActivity) && a.Versions.Count == 0);
+    }
+
+    [Fact]
+    public void WorkItemFilters_DefaultVersionWithVersioningStrict_WhenNoExplicitFiltersConfigured()
+    {
+        // Arrange
+        ServiceCollection services = new();
+        services.AddDurableTaskWorker("test", builder =>
+        {
+            builder.AddTasks(registry =>
+            {
+                registry.AddOrchestrator<TestOrchestrator>();
+                registry.AddActivity<TestActivity>();
+            });
+            builder.Configure(options =>
+            {
+                options.Versioning = new DurableTaskWorkerOptions.VersioningOptions
+                {
+                    Version = "1.0",
+                    MatchStrategy = DurableTaskWorkerOptions.VersionMatchStrategy.Strict,
                 };
             });
         });