Use proper regular expression for policy pattern (#1708)

Author: bording

src/NServiceBus.Transport.RabbitMQ.Tests/BrokerVerifierTests.cs

@@ -75,7 +75,7 @@ public async Task ValidateDeliveryLimit_Should_Update_Old_Unlimited_Policy_Creat
             Assert.Ignore("Test not valid for broker versions before 4.0.0");
         }
 
-        var queueName = nameof(ValidateDeliveryLimit_Should_Set_Delivery_Limit_Policy);
+        var queueName = nameof(ValidateDeliveryLimit_Should_Update_Old_Unlimited_Policy_Created_By_Transport);
         var policyName = $"nsb.{queueName}.delivery-limit";
 
         var oldUnlimitedPolicy = new Policy
@@ -133,6 +133,79 @@ public async Task ValidateDeliveryLimit_Should_Update_Old_Unlimited_Policy_Creat
         Assert.Fail($"Policy '{policyName}' was not applied to queue '{queueName}'.");
     }
 
+    [Test]
+    public async Task ValidateDeliveryLimit_Should_Update_Old_Overeager_Policy()
+    {
+        var managementClient = new ManagementClient(connectionConfiguration);
+        using var brokerVerifier = new BrokerVerifier(managementClient, BrokerRequirementChecks.None, true);
+        await brokerVerifier.Initialize();
+
+        if (brokerVerifier.BrokerVersion < BrokerVerifier.BrokerVersion4)
+        {
+            Assert.Ignore("Test not valid for broker versions before 4.0.0");
+        }
+
+        var queueName = nameof(ValidateDeliveryLimit_Should_Update_Old_Overeager_Policy);
+        var policyName = $"nsb.{queueName}.delivery-limit";
+
+        var oldQueueName = queueName[..^7];
+        var oldPolicyName = $"nsb.{oldQueueName}.delivery-limit";
+
+        var oldPolicy = new Policy
+        {
+            ApplyTo = PolicyTarget.QuorumQueues,
+            Definition = new PolicyDefinition { DeliveryLimit = -1 },
+            Pattern = oldQueueName,
+            Priority = 0
+        };
+
+        await CreateQueue(queueName);
+        await managementClient.CreatePolicy(oldPolicyName, oldPolicy);
+
+        // It can take some time for updated policies to be applied, so we need to wait.
+        // If this test is randomly failing, consider increasing the attempts
+        var attempts = 20;
+
+        int deliveryLimit = 0;
+
+        for (int i = 0; i < attempts; i++)
+        {
+            var queue = await managementClient.GetQueue(queueName);
+            deliveryLimit = queue.GetDeliveryLimit();
+
+            if (deliveryLimit == -1 && queue.AppliedPolicyName == oldPolicyName)
+            {
+                // Policy applied successfully
+                break;
+            }
+
+            await Task.Delay(TimeSpan.FromSeconds(3));
+        }
+
+        if (deliveryLimit != -1)
+        {
+            Assert.Fail($"Old Policy '{oldPolicyName}' was not applied to queue '{queueName}'.");
+        }
+
+        await brokerVerifier.ValidateDeliveryLimit(queueName);
+
+        for (int i = 0; i < attempts; i++)
+        {
+            var queue = await managementClient.GetQueue(queueName);
+            deliveryLimit = queue.GetDeliveryLimit();
+
+            if (deliveryLimit == Queue.BigValueInsteadOfActuallyUnlimited && queue.AppliedPolicyName == policyName)
+            {
+                // Policy applied successfully
+                return;
+            }
+
+            await Task.Delay(TimeSpan.FromSeconds(3));
+        }
+
+        Assert.Fail($"Policy '{policyName}' was not applied to queue '{queueName}'.");
+    }
+
     [Test]
     public async Task ValidateDeliveryLimit_Should_Throw_When_Queue_Does_Not_Exist()
     {
@@ -195,7 +268,7 @@ public async Task ValidateDeliveryLimit_Should_Throw_When_A_Policy_On_Queue_Has_
 
         await managementClient.CreatePolicy(policyName, policy).ConfigureAwait(false);
 
-        // If this test appears flaky, the delay should be increased to give the broker more time to apply the oldUnlimitedPolicy before calling ValidateDeliveryLimit
+        // If this test appears flaky, the delay should be increased to give the broker more time to apply the policy before calling ValidateDeliveryLimit
         await Task.Delay(TimeSpan.FromSeconds(30));
 
         var exception = Assert.ThrowsAsync<InvalidOperationException>(async () => await brokerVerifier.ValidateDeliveryLimit(queueName));

src/NServiceBus.Transport.RabbitMQ/Administration/BrokerVerifier.cs

@@ -5,6 +5,7 @@ namespace NServiceBus.Transport.RabbitMQ;
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using NServiceBus.Transport.RabbitMQ.ManagementApi;
@@ -176,7 +177,7 @@ bool ShouldOverrideDeliveryLimit(Queue queue)
             return false;
         }
 
-        if (limit == -1 && queue.AppliedPolicyName == $"nsb.{queue.Name}.delivery-limit")
+        if (limit == -1 && IsTransportPolicy(queue.AppliedPolicyName))
         {
             return true;
         }
@@ -196,18 +197,18 @@ async Task SetDeliveryLimitViaPolicy(Queue queue, CancellationToken cancellation
             throw new InvalidOperationException($"Cannot create unlimited delivery limit policies in RabbitMQ versions prior to 4.0. The version is: {brokerVersion}.");
         }
 
-        var policyName = $"nsb.{queue.Name}.delivery-limit";
-
-        if (!string.IsNullOrEmpty(queue.AppliedPolicyName) && queue.AppliedPolicyName != policyName)
+        if (!string.IsNullOrEmpty(queue.AppliedPolicyName) && !IsTransportPolicy(queue.AppliedPolicyName))
         {
             throw new InvalidOperationException($"An unlimited delivery limit policy cannot be applied to the '{queue.Name}' queue because it already has a '{queue.AppliedPolicyName}' policy applied.");
         }
 
+        var policyName = $"nsb.{queue.Name}.delivery-limit";
+
         var policy = new Policy
         {
             ApplyTo = PolicyTarget.QuorumQueues,
             Definition = new PolicyDefinition { DeliveryLimit = Queue.BigValueInsteadOfActuallyUnlimited },
-            Pattern = queue.Name,
+            Pattern = $"^{Regex.Escape(queue.Name)}$",
             Priority = 0
         };
 
@@ -221,6 +222,8 @@ async Task SetDeliveryLimitViaPolicy(Queue queue, CancellationToken cancellation
         }
     }
 
+    static bool IsTransportPolicy(string? policyName) => policyName is not null && policyName.StartsWith("nsb.") && policyName.EndsWith(".delivery-limit");
+
     static void LogWarning(string message)
     {
 #if !COMMANDLINE