Allow submission to different queue/topic

Author: kyurkchyan

ServiceBusToolset/Commands/ResubmitDlqCommand.cs

@@ -145,7 +145,8 @@ private async Task<int> ExecuteResubmitAsync(
         string entityDescription,
         CancellationToken cancellationToken)
     {
-        Output.Info($"Resubmitting DLQ messages for {entityDescription}...");
+        var targetInfo = GetTargetInfo(options);
+        Output.Info($"Resubmitting DLQ messages for {entityDescription}{targetInfo}...");
 
         if (options.BeforeEnqueueTime.HasValue)
         {
@@ -166,8 +167,9 @@ private async Task<int> ExecuteFullResubmitAsync(
                                                      options.Topic,
                                                      options.Subscription,
                                                      ServiceBusReceiveMode.PeekLock);
-        await using var sender = CreateSender(client, options.Queue, options.Topic);
+        await using var sender = CreateSender(client, options.EffectiveTarget);
 
+        var targetInfo = GetTargetInfo(options);
         var totalResubmitted = 0;
         var emptyBatches = 0;
 
@@ -196,7 +198,7 @@ private async Task<int> ExecuteFullResubmitAsync(
         }
 
         Console.WriteLine();
-        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription}");
+        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription}{targetInfo}");
         return 0;
     }
 
@@ -211,8 +213,9 @@ private async Task<int> ExecuteFilteredResubmitAsync(
                                                      options.Topic,
                                                      options.Subscription,
                                                      ServiceBusReceiveMode.PeekLock);
-        await using var sender = CreateSender(client, options.Queue, options.Topic);
+        await using var sender = CreateSender(client, options.EffectiveTarget);
 
+        var targetInfo = GetTargetInfo(options);
         var totalResubmitted = 0;
         var totalSkipped = 0;
         var emptyBatches = 0;
@@ -267,7 +270,7 @@ private async Task<int> ExecuteFilteredResubmitAsync(
         }
 
         Console.WriteLine();
-        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription} (skipped {totalSkipped} newer messages)");
+        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription}{targetInfo} (skipped {totalSkipped} newer messages)");
         return 0;
     }
 
@@ -320,12 +323,13 @@ private async Task<int> ExecuteInteractiveResubmitAsync(
             totalToResubmit += cat.Count;
         }
 
-        Output.Info($"Resubmitting {totalToResubmit} messages from {selectedIndices.Count} categories...");
+        var targetInfo = GetTargetInfo(options);
+        Output.Info($"Resubmitting {totalToResubmit} messages from {selectedIndices.Count} categories{targetInfo}...");
 
         var totalResubmitted = await ResubmitByCategoriesAsync(client, options, selectedCategories, cancellationToken);
 
         Console.WriteLine();
-        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription}.");
+        Output.Success($"Resubmitted {totalResubmitted} messages from DLQ for {entityDescription}{targetInfo}.");
         return 0;
     }
 
@@ -414,7 +418,7 @@ private async Task<int> ResubmitByCategoriesAsync(
                                                      options.Topic,
                                                      options.Subscription,
                                                      ServiceBusReceiveMode.PeekLock);
-        await using var sender = CreateSender(client, options.Queue, options.Topic);
+        await using var sender = CreateSender(client, options.EffectiveTarget);
 
         var totalResubmitted = 0;
         var totalSkipped = 0;
@@ -498,5 +502,17 @@ private static ServiceBusMessage CreateResubmitMessage(ServiceBusReceivedMessage
         return message;
     }
 
-    private static ServiceBusSender CreateSender(ServiceBusClient client, string? queueName, string? topicName) => client.CreateSender(!string.IsNullOrEmpty(queueName) ? queueName : topicName!);
+    private static ServiceBusSender CreateSender(ServiceBusClient client, string targetEntity) => client.CreateSender(targetEntity);
+
+    private static string GetTargetInfo(ResubmitDlqOptions options)
+    {
+        var hasCustomTarget = !string.IsNullOrEmpty(options.TargetQueue) || !string.IsNullOrEmpty(options.TargetTopic);
+        if (!hasCustomTarget)
+        {
+            return string.Empty;
+        }
+
+        var targetType = !string.IsNullOrEmpty(options.TargetQueue) ? "queue" : "topic";
+        return $" to {targetType} '{options.EffectiveTarget}'";
+    }
 }

ServiceBusToolset/Options/ResubmitDlqOptions.cs

@@ -47,9 +47,21 @@ public class ResubmitDlqOptions
             HelpText = "Interactive mode: show categories and select which to resubmit")]
     public bool Interactive { get; set; }
 
+    [Option("target-queue", HelpText = "Target queue to resubmit messages to (defaults to source queue)")]
+    public string? TargetQueue { get; set; }
+
+    [Option("target-topic", HelpText = "Target topic to resubmit messages to (defaults to source topic)")]
+    public string? TargetTopic { get; set; }
+
     public bool IsQueueMode => !string.IsNullOrEmpty(Queue);
     public bool IsSubscriptionMode => !string.IsNullOrEmpty(Topic) && !string.IsNullOrEmpty(Subscription);
 
+    /// <summary>
+    /// Gets the effective target entity name for resubmission.
+    /// Returns target-queue/target-topic if specified, otherwise falls back to source queue/topic.
+    /// </summary>
+    public string EffectiveTarget => TargetQueue ?? TargetTopic ?? Queue ?? Topic!;
+
     public string? Validate()
     {
         if (!IsQueueMode && !IsSubscriptionMode)
@@ -67,6 +79,11 @@ public class ResubmitDlqOptions
             return "When --subscription is specified, --topic is also required.";
         }
 
+        if (!string.IsNullOrEmpty(TargetQueue) && !string.IsNullOrEmpty(TargetTopic))
+        {
+            return "Cannot specify both --target-queue and --target-topic.";
+        }
+
         return null;
     }
 }

docs/resubmit-dlq.md

@@ -16,6 +16,8 @@ dotnet run -- resubmit-dlq -n <namespace> (-q <queue> | -t <topic> -s <subscript
 | `--queue` | `-q` | Queue name |
 | `--topic` | `-t` | Topic name (requires `--subscription`) |
 | `--subscription` | `-s` | Subscription name (requires `--topic`) |
+| `--target-queue` | | Target queue to resubmit to (defaults to source queue) |
+| `--target-topic` | | Target topic to resubmit to (defaults to source topic) |
 | `--before` | | Only resubmit messages enqueued before this UTC datetime (ISO 8601) |
 | `--dry-run` | | Preview message count without resubmitting |
 | `--interactive` | `-i` | Interactive mode: view and select categories to resubmit |
@@ -26,13 +28,23 @@ dotnet run -- resubmit-dlq -n <namespace> (-q <queue> | -t <topic> -s <subscript
 ### Resubmit All Messages
 
 ```bash
-# From a queue DLQ back to the queue
+# From a queue DLQ back to the same queue
 dotnet run -- resubmit-dlq -n mynamespace.servicebus.windows.net -q myqueue
 
-# From a topic subscription DLQ back to the topic
+# From a topic subscription DLQ back to the same topic
 dotnet run -- resubmit-dlq -n mynamespace.servicebus.windows.net -t mytopic -s mysub
 ```
 
+### Resubmit to a Different Destination
+
+```bash
+# Resubmit from queue DLQ to a different queue
+dotnet run -- resubmit-dlq -n mynamespace.servicebus.windows.net -q myqueue --target-queue other-queue
+
+# Resubmit from subscription DLQ to a different topic
+dotnet run -- resubmit-dlq -n mynamespace.servicebus.windows.net -t mytopic -s mysub --target-topic other-topic
+```
+
 ### Dry Run
 
 Preview message count without resubmitting: