eventq 2.5.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59946bde6488da5c2567aec735c8a6f251e3532bc0b2636123a4940c519ce935
-  data.tar.gz: 4b202d8435f23ea6e88a5b7351f9317d91c9179f610651152af9c7b2939a993a
+  metadata.gz: c24153f000dd45ba6279ed183820bfe3848eded189017dd04f508d9c30608897
+  data.tar.gz: a5a709991c74cfb090434c80534483a194332f893943cd0af170705190372fac
 SHA512:
-  metadata.gz: 93e097eb9be108a117f855260ea2334de8018029ba5027349d587bcd28553ab9a296accaca936abfe209d628c5ced3177bbbcfe435f6e2b5bd550a701a066299
-  data.tar.gz: b83f581d669072a79e378cd93f428628e9896ae0fa8dd09db63c8d3b39505814a29c438690829703cf3ee469b8fc2098b04b50565939323455cf1acdbb0e8c58
+  metadata.gz: 97e28e78fb129e611b473a9fde30e5815d885a44177935ca14eb386988f7b64b78bd4dcf0329ed3150ace7e823d24dc0553021fe155bc8431b29b0c441ba0c30
+  data.tar.gz: c35141ebe0d1cbeab1393f5284d0cac4a6def35d8eb193fe03856da584ec1578dd58886d3f3013b1b83e09a146a5efb1dae3ceacb4810833eaabb4fd719a513a

data/lib/eventq/eventq_aws/aws_eventq_client.rb

@@ -15,25 +15,37 @@ module EventQ
         @serialization_manager = EventQ::SerializationProviders::Manager.new
         @signature_manager = EventQ::SignatureProviders::Manager.new
 
-        # this array is used to record known event types
-        @known_event_types = []
-
+        # this hash is used to record known event types:
+        # key = event_type / name
+        # value = topic arn
+        @known_event_types = {}
       end
 
+      # Returns true if the event has already been registerd, or false
+      # otherwise.
+      #
+      # @param [String] event_type
+      # @param [String] region
+      #
+      # @return [Boolean]
       def registered?(event_type, region = nil)
         topic_key = "#{region}:#{event_type}"
-        @known_event_types.include?(topic_key)
+        @known_event_types.key?(topic_key)
       end
 
+      # Registers the event event_type and returns its topic arn.
+      #
+      # @param [String] event_type
+      # @param [String] region
+      #
+      # @return [String]
       def register_event(event_type, region = nil)
-        if registered?(event_type, region)
-          return true
-        end
-
         topic_key = "#{region}:#{event_type}"
-        @client.sns_helper(region).create_topic_arn(event_type, region)
-        @known_event_types << topic_key
-        true
+        return @known_event_types[topic_key] if registered?(event_type, region)
+
+        topic_arn = @client.sns_helper(region).create_topic_arn(event_type, region)
+        @known_event_types[topic_key] = topic_arn
+        topic_arn
       end
 
       def publish(topic:, event:, context: {}, region: nil)

data/lib/eventq/eventq_aws/aws_queue_worker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'aws-sdk'
+require 'aws-sdk-sns'
+require 'aws-sdk-sqs'
 
 module EventQ
   module Amazon

data/lib/eventq/eventq_aws/aws_subscription_manager.rb

@@ -20,7 +20,7 @@ module EventQ
         end
 
         topic_arn = @client.sns_helper(topic_region).public_send(method, event_type, topic_region)
-        raise Exceptions::EventTypeNotFound, 'SNS topic not found, unable to subscribe' unless topic_arn
+        raise Exceptions::EventTypeNotFound, "SNS topic not found, unable to subscribe to #{event_type}" unless topic_arn
 
         queue_arn = configure_queue(queue, queue_region)
 
@@ -29,7 +29,7 @@ module EventQ
           namespaced_topic_arn = topic_arn.gsub(":#{EventQ.namespace}-", ":#{namespace}-")
 
           # create the sns topic - this method is idempotent & returns the topic arn if it already exists
-          @client.sns.create_topic(name: "#{namespace}-#{event_type}".delete('.')) unless queue.isolated
+          @client.sns_helper.create_topic_arn("#{namespace}-#{event_type}".delete('.')) unless queue.isolated
 
           # skip subscribe if subscription for given queue/topic already exists
           # this is a workaround for a localstack issue: https://github.com/localstack/localstack/issues/933

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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eventq
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.1.0
 platform: ruby
 authors:
 - SageOne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,35 +123,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
+        version: '1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-sns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: class_kit
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redlock
+  name: class_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: openssl
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: redlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -268,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: EventQ is a pub/sub system that uses async notifications and message queues