eventq 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31eddc31f997ed63f4d4fa78994f72650530d3329094ed53a95fc624726a8233
-  data.tar.gz: 67b7a029e4527f5266a6d4cd6d91b6ad8394d415254920e375aae3e2ea2b0114
+  metadata.gz: 694ed72384dbe126f58a0813b002ba2ba597fd4cd0d2f477a3fd68d9f12396bc
+  data.tar.gz: 00eb675d57cd63827d55d59f9af6083d830226dcac7e2db3d281099cf30c8a06
 SHA512:
-  metadata.gz: 8e4179b1738e910c44a000089d207e9234d1350892b5612760f757dcb486e6163c50adf249cc4c1a02f312aa30ce98cc1fbc5b2b37c32fb4d068d8be8ed4d380
-  data.tar.gz: 752895dbf0f9fc1defeee0f93725227d7d8a6cb2a8052643cd5c76b8259dc7c44c7699244a04c155d769c5c0f891530e25ec0fe46847ae096c826f72ddcca8a8
+  metadata.gz: 7e5368f9ac76beb781594a4d058bf4f71dfcf8b406d94af08aa3aee5edf67ff607edcd3eec54dceaa4c5d1f4ecff995500076353c2b4d4be6afaf6c03fb7c92e
+  data.tar.gz: ea183d9565147acaa569cec2c7e8f8ceeb43dc6a152085f28ea31d7e737ee7b2b335340388ace7d84221909934bb66da08cf4cab5286511a3c2ac18e9bcac0c9

data/lib/eventq/eventq_aws/sns.rb

@@ -32,6 +32,7 @@ module EventQ
       end
 
       # Check if a TopicArn exists.  This will check with AWS if necessary and cache the results if one is found
+      #
       # @return TopicArn [String]
       def get_topic_arn(event_type, region = nil)
         _event_type = EventQ.create_event_type(event_type)
@@ -39,8 +40,7 @@ module EventQ
 
         arn = @@topic_arns[topic_key]
         unless arn
-          response = sns.list_topics
-          arn = response.topics.detect { |topic| topic.topic_arn.end_with?(":#{_event_type}") }&.topic_arn
+          arn = find_topic(_event_type)
 
           @@topic_arns[topic_key] = arn if arn
         end
@@ -62,6 +62,32 @@ module EventQ
       def aws_safe_name(name)
         return name[0..79].gsub(/[^a-zA-Z\d_\-]/,'')
       end
+
+      private
+
+      # Finds the given topic, or returns nil if the topic could not be found
+      #
+      # @note Responses to list_topics can be paged, so to check *all* topics
+      # we'll need to request each page of topics using response.next_token for
+      # until the response no longer contains a next_token. Requests to
+      # list_topics are throttled to 30 TPS, so in the future we may need to
+      # handle this if it becomes a problem.
+      #
+      # @param topic_name [String] the name of the topic to find
+      # @return [String]
+      def find_topic(topic_name)
+        response = sns.list_topics
+        topics = response.topics
+        arn = topics.detect { |topic| topic.topic_arn.end_with?(":#{topic_name}") }&.topic_arn
+
+        while arn.nil? && response.next_token
+          response = sns.list_topics(next_token: response.next_token)
+          topics = response.topics
+          arn = topics.detect { |topic| topic.topic_arn.end_with?(":#{topic_name}") }&.topic_arn
+        end
+
+        arn
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - SageOne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler