[Storage][Webjobs] Honor custom value of QueueOptions.MaxPollingInterval in Development env.

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Common/tests/TestHelpers.cs

@@ -29,18 +29,24 @@ public static class TestHelpers
         /// <param name="configure">Delegate used to configure the target extension.</param>
         /// <param name="configValues">Set of test configuration values to apply.</param>
         /// <returns></returns>
-        public static TOptions GetConfiguredOptions<TOptions>(Action<IWebJobsBuilder> configure, Dictionary<string, string> configValues) where TOptions : class, new()
+        public static TOptions GetConfiguredOptions<TOptions>(Action<IWebJobsBuilder> configure, Dictionary<string, string> configValues, string env = default) where TOptions : class, new()
         {
-            IHost host = new HostBuilder()
+            IHostBuilder hostBuilder = new HostBuilder()
                 .ConfigureDefaultTestHost<TestProgram>(b =>
                 {
                     configure(b);
                 })
                 .ConfigureAppConfiguration(cb =>
                 {
                     cb.AddInMemoryCollection(configValues);
-                })
-                .Build();
+                });
+
+            if (env != default)
+            {
+                hostBuilder.UseEnvironment(env);
+            }
+
+            IHost host = hostBuilder.Build();
 
             TOptions options = host.Services.GetRequiredService<IOptions<TOptions>>().Value;
             return options;

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Release History
 
 ## 5.0.0-beta.5 (Unreleased)
+- QueuesOptions.MaxPollingInterval other than default is now honored in "Development" environment.
 
 
 ## 5.0.0-beta.4 (2021-05-18)

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/StorageQueuesWebJobsBuilderExtensions.cs

@@ -55,7 +55,7 @@ public static IWebJobsBuilder AddAzureStorageQueues(this IWebJobsBuilder builder
             builder.Services.AddOptions<QueuesOptions>()
                 .Configure<IHostingEnvironment>((options, env) =>
                 {
-                    if (env.IsDevelopment())
+                    if (env.IsDevelopment() && options.MaxPollingInterval == QueuePollingIntervals.DefaultMaximum)
                     {
                         options.MaxPollingInterval = TimeSpan.FromSeconds(2);
                     }

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/tests/StorageQueuesWebJobsBuilderExtensionsTests.cs

@@ -61,5 +61,37 @@ public void ConfigureOptions_AppliesValuesCorrectly_Queues()
             Assert.AreEqual(10, options.MaxDequeueCount);
             Assert.AreEqual(TimeSpan.FromSeconds(15), options.VisibilityTimeout);
         }
+
+        [Test]
+        public void ConfigureOptions_SetsPollingIntervalToTwoSecondsInDevelopment()
+        {
+            var values = new Dictionary<string, string>
+            {
+            };
+
+            QueuesOptions options = TestHelpers.GetConfiguredOptions<QueuesOptions>(b =>
+            {
+                b.AddAzureStorageQueues();
+            }, values, env: "Development");
+
+            Assert.AreEqual(TimeSpan.FromSeconds(2), options.MaxPollingInterval);
+        }
+
+        [Test]
+        public void ConfigureOptions_HonorsExplicitlySetPollingIntervalInDevelopment()
+        {
+            string extensionPath = "AzureWebJobs:Extensions:Queues";
+            var values = new Dictionary<string, string>
+            {
+                { $"{extensionPath}:MaxPollingInterval", "00:00:42" },
+            };
+
+            QueuesOptions options = TestHelpers.GetConfiguredOptions<QueuesOptions>(b =>
+            {
+                b.AddAzureStorageQueues();
+            }, values, env: "Development");
+
+            Assert.AreEqual(TimeSpan.FromSeconds(42), options.MaxPollingInterval);
+        }
     }
 }