Added missing pagination to get all SNS topics. Added marking the mes…

…sage as failed if topic not found. (#765)
dotnetcore · Jan 14, 2021 · 83d623c · 83d623c
1 parent 6383321
commit 83d623c
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/DotNetCore.CAP.AmazonSQS/ITransport.AmazonSQS.cs b/src/DotNetCore.CAP.AmazonSQS/ITransport.AmazonSQS.cs
@@ -62,12 +62,15 @@ public async Task<OperateResult> SendAsync(TransportMessage message)
                     await _snsClient.PublishAsync(request);
 
                     _logger.LogDebug($"SNS topic message [{message.GetName().NormalizeForAws()}] has been published.");
+                    return OperateResult.Success;
                 }
-                else
+
+                _logger.LogWarning($"Can't be found SNS topics for [{message.GetName().NormalizeForAws()}]");
+                return OperateResult.Failed(new OperateError
                 {
-                    _logger.LogWarning($"Can't be found SNS topics for [{message.GetName().NormalizeForAws()}]");
-                }
-                return OperateResult.Success;
+                    Code = "SNS",
+                    Description = $"Can't be found SNS topics for [{message.GetName().NormalizeForAws()}]"
+                });
             }
             catch (Exception ex)
             {
@@ -100,12 +103,21 @@ public async Task<bool> TryAddTopicArns()
                 if (_topicArnMaps == null)
                 {
                     _topicArnMaps = new Dictionary<string, string>();
-                    var topics = await _snsClient.ListTopicsAsync();
-                    topics.Topics.ForEach(x =>
+
+                    string nextToken = null;
+                    do
                     {
-                        var name = x.TopicArn.Split(':').Last();
-                        _topicArnMaps.Add(name, x.TopicArn);
-                    });
+                        var topics = nextToken == null
+                            ? await _snsClient.ListTopicsAsync()
+                            : await _snsClient.ListTopicsAsync(nextToken);
+                        topics.Topics.ForEach(x =>
+                        {
+                            var name = x.TopicArn.Split(':').Last();
+                            _topicArnMaps.Add(name, x.TopicArn);
+                        });
+                        nextToken = topics.NextToken;
+                    }
+                    while (!string.IsNullOrEmpty(nextToken));
 
                     return true;
                 }