eventq 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5bfee3e1fd027189bc32012b22e94f4d7bd81707ef3811d1748f9ee09a4887
-  data.tar.gz: 0f32197796b9c7b5bf5b7f57146bdd8ca992931fecadd594455e72cd2213ef93
+  metadata.gz: 2ff7c42a020c9dcd1c69286c86121aa5c1479f7b7cb2338e46a257cab1826d8b
+  data.tar.gz: b02d13924c3619d54ea0a5e8b75bb103457a6001550608d739a9f257e8ad87ef
 SHA512:
-  metadata.gz: b0133ee80992c77a7105a22a720bc8ca4d17da12849ed02b56b0640056646f3a30c401dfc4ab789b964a843b0e0cdfcdde765f225b936e1ac94e874e73fcd0a4
-  data.tar.gz: a4c024e13ff25f62fc6497af126871a9aa6de1d1369b11bed51dddcd87829d7950600f4fea8c9e030bf54bc0376427d8e40276fe2f0f8e8478f073d556a3acc6
+  metadata.gz: 07c73cb255746f3059981a488e19a81bee3a593eefda8db954ddc35f53b0f3803cd8da4dc27a4764b736b09f25eb19fea89136dfc25bd0612c4eb41851626391
+  data.tar.gz: 48f78d71377237644e0bb0b28329a6f5dfa468e5b4c00700bf60d6798691e10eeb0978f435bc6ca88bc29ec57dc7b89995d9eb15a99512259c9c088dd6192713

data/README.md

@@ -266,7 +266,7 @@ This method is called to configure the NonceManager, and must be called before s
 
  - **server** [String] [Required] This is redis server url.
  - **timeout** [Integer] [Optional] [Default=10000 (10 seconds)] This is the time in milliseconds that should be used for the initial nonce lock (this value should be low so as to not affect failure retries but long enough to cover the processing of the received message).
- - **lifespan** [Integer] [Optional] [Default=3600000 (60 minutes)] This is the length of time the nonce should be kept for after processing of a message has completed.
+ - **lifespan** [Integer] [Optional] [Default=3600 (60 minutes)] This is the length of time the nonce should be kept for after processing of a message has completed.
 
 **Example**
 

data/lib/eventq/eventq_aws/aws_eventq_client.rb

@@ -15,35 +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
+        # this array is used to record known event types
         @known_event_types = []
 
       end
 
-      def registered?(event_type)
-        @known_event_types.include?(event_type)
+      def registered?(event_type, region = nil)
+        topic_key = "#{region}:#{event_type}"
+        @known_event_types.include?(topic_key)
       end
 
-      def register_event(event_type)
-        if registered?(event_type)
+      def register_event(event_type, region = nil)
+        if registered?(event_type, region)
           return true
         end
 
-        @client.sns_helper.create_topic_arn(event_type)
-        @known_event_types << event_type
+        topic_key = "#{region}:#{event_type}"
+        @client.sns_helper(region).create_topic_arn(event_type, region)
+        @known_event_types << topic_key
         true
       end
 
-      def publish(topic:, event:, context: {})
-        raise_event(topic, event, context)
+      def publish(topic:, event:, context: {}, region: nil)
+        raise_event(topic, event, context, region)
       end
 
-      def raise_event(event_type, event, context = {})
-        register_event(event_type)
+      def raise_event(event_type, event, context = {}, region = nil)
+        register_event(event_type, region)
 
         with_prepared_message(event_type, event, context) do |message|
-          topic_arn = topic_arn(event_type)
-          response = @client.sns.publish(
+          topic_arn = topic_arn(event_type, region)
+          response = @client.sns(region).publish(
             topic_arn: topic_arn,
             message: message,
             subject: event_type
@@ -60,7 +62,6 @@ module EventQ
       def raise_event_in_queue(event_type, event, queue, delay, context = {})
         queue_url = @client.sqs_helper.get_queue_url(queue)
         with_prepared_message(event_type, event, context) do |message|
-
           response = @client.sqs.send_message(
             queue_url: queue_url,
             message_body: sqs_message_body_for(message),
@@ -108,8 +109,8 @@ module EventQ
         serialization_provider.serialize(queue_message)
       end
 
-      def topic_arn(event_type)
-        @client.sns_helper.get_topic_arn(event_type)
+      def topic_arn(event_type, region = nil)
+        @client.sns_helper(region).get_topic_arn(event_type, region)
       end
 
       def sqs_message_body_for(payload_message)

data/lib/eventq/eventq_aws/aws_queue_client.rb

@@ -4,7 +4,7 @@ module EventQ
   module Amazon
     class QueueClient
       def initialize(options = {})
-        invalid_keys = options.keys - [:sns_keep_alive_timeout, :sns_continue_timeout ]
+        invalid_keys = options.keys - %i[sns_keep_alive_timeout sns_continue_timeout]
         raise(OptionParser::InvalidOption, invalid_keys) unless invalid_keys.empty?
 
         @sns_keep_alive_timeout = options[:sns_keep_alive_timeout] || 30
@@ -12,21 +12,37 @@ module EventQ
       end
 
       # Returns the AWS SQS Client
-      def sqs
-        @sqs ||= sqs_client
+      def sqs(region = nil)
+        if region.nil?
+          @sqs ||= sqs_client
+        else
+          sqs_client(region)
+        end
       end
 
       # Returns the AWS SNS Client
-      def sns
-        @sns ||= sns_client
+      def sns(region = nil)
+        if region.nil?
+          @sns ||= sns_client
+        else
+          sns_client(region)
+        end
       end
 
-      def sqs_helper
-        @sqs_helper ||= Amazon::SQS.new(sqs)
+      def sqs_helper(region = nil)
+        if region.nil?
+          @sqs_helper ||= Amazon::SQS.new(sqs)
+        else
+          Amazon::SQS.new(sqs_client(region))
+        end
       end
 
-      def sns_helper
-        @sns_helper ||= Amazon::SNS.new(sns)
+      def sns_helper(region = nil)
+        if region.nil?
+          @sns_helper ||= Amazon::SNS.new(sns)
+        else
+          Amazon::SNS.new(sns_client(region))
+        end
       end
 
       private
@@ -37,9 +53,10 @@ module EventQ
         { endpoint: aws_env } unless aws_env.empty?
       end
 
-      def sqs_client
+      def sqs_client(region = nil)
         options = custom_endpoint('sqs')
-        options.merge!(verify_checksums: false) if options
+        options[:verify_checksums] = false if options
+        options[:region] = region if region
 
         if options
           Aws::SQS::Client.new(options)
@@ -48,7 +65,7 @@ module EventQ
         end
       end
 
-      def sns_client
+      def sns_client(region = nil)
         custom_endpoint('sns')
         options = {
           http_idle_timeout: @sns_keep_alive_timeout,
@@ -56,6 +73,7 @@ module EventQ
         }
         endpoint = custom_endpoint('sns')
         options.merge!(endpoint) if endpoint
+        options[:region] = region if region
 
         Aws::SNS::Client.new(options)
       end

data/lib/eventq/eventq_aws/aws_subscription_manager.rb

@@ -3,9 +3,8 @@
 module EventQ
   module Amazon
     class SubscriptionManager
-
       def initialize(options)
-        mandatory = [:client, :queue_manager]
+        mandatory = %i[client queue_manager]
         missing = mandatory - options.keys
         raise "[#{self.class}] - Missing options #{missing} must be specified." unless missing.empty?
 
@@ -13,27 +12,26 @@ module EventQ
         @manager = options[:queue_manager]
       end
 
-      def subscribe(event_type, queue)
-        topic_arn = @client.sns_helper.create_topic_arn(event_type)
+      def subscribe(event_type, queue, topic_region = nil, queue_region = nil)
+        topic_arn = @client.sns_helper(topic_region).create_topic_arn(event_type, topic_region)
 
         q = @manager.get_queue(queue)
-        queue_arn = @client.sqs_helper.get_queue_arn(queue)
+        queue_arn = @client.sqs_helper(queue_region).get_queue_arn(queue)
+
+        @client.sqs(queue_region).set_queue_attributes(
+          queue_url: q,
+          attributes:
+            {
+              'Policy' => queue_policy(queue_arn)
+            }
+        )
 
-        @client.sqs.set_queue_attributes(
-          {
-            queue_url: q,
-            attributes:
-              {
-                'Policy' => queue_policy(queue_arn)
-              }
-          }
+        @client.sns(topic_region).subscribe(
+          topic_arn: topic_arn,
+          protocol: 'sqs',
+          endpoint: queue_arn
         )
 
-        @client.sns.subscribe({
-                                  topic_arn: topic_arn,
-                                  protocol: 'sqs',
-                                  endpoint: queue_arn
-                              })
         EventQ.logger.debug do
           "[#{self.class} #subscribe] - Subscribing Queue: #{queue.name} to topic_arn: #{topic_arn}, endpoint: #{queue_arn}"
         end
@@ -41,24 +39,24 @@ module EventQ
         true
       end
 
-      def unsubscribe(queue)
+      def unsubscribe(_queue)
         raise "[#{self.class}] - Not implemented. Please unsubscribe the queue from the topic inside the AWS Management Console."
       end
 
       def queue_policy(queue_arn)
-'{
-  "Version": "2012-10-17",
-  "Id": "SNStoSQS",
-  "Statement": [
-    {
-      "Sid":"rule1",
-      "Effect": "Allow",
-      "Principal": "*",
-      "Action": "sqs:*",
-      "Resource": "' + queue_arn + '"
-    }
-  ]
-}'
+        '{
+          "Version": "2012-10-17",
+          "Id": "SNStoSQS",
+          "Statement": [
+            {
+              "Sid":"rule1",
+              "Effect": "Allow",
+              "Principal": "*",
+              "Action": "sqs:*",
+              "Resource": "' + queue_arn + '"
+            }
+          ]
+        }'
       end
     end
   end

data/lib/eventq/eventq_aws/sns.rb

@@ -17,14 +17,15 @@ module EventQ
       # Create a TopicArn. if one already exists, it will return a pre-existing ARN from the cache.
       # Even in the event of multiple threads trying to create one with AWS, AWS is idempotent and won't create
       # duplicates
-      def create_topic_arn(event_type)
+      def create_topic_arn(event_type, region = nil)
         _event_type = EventQ.create_event_type(event_type)
+        topic_key = "#{region}:#{_event_type}"
 
-        arn = get_topic_arn(event_type)
+        arn = get_topic_arn(event_type, region)
         unless arn
           response = sns.create_topic(name: aws_safe_name(_event_type))
           arn = response.topic_arn
-          @@topic_arns[_event_type] = arn
+          @@topic_arns[topic_key] = arn
         end
 
         arn
@@ -32,26 +33,28 @@ module EventQ
 
       # 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)
+      def get_topic_arn(event_type, region = nil)
         _event_type = EventQ.create_event_type(event_type)
+        topic_key = "#{region}:#{_event_type}"
 
-        arn = @@topic_arns[_event_type]
+        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
 
-          @@topic_arns[_event_type] = arn if arn
+          @@topic_arns[topic_key] = arn if arn
         end
 
         arn
       end
 
-      def drop_topic(event_type)
-        topic_arn = get_topic_arn(event_type)
+      def drop_topic(event_type, region = nil)
+        topic_arn = get_topic_arn(event_type, region)
         sns.delete_topic(topic_arn: topic_arn)
 
         _event_type = EventQ.create_event_type(event_type)
-        @@topic_arns.delete(_event_type)
+        topic_key = "#{region}:#{_event_type}"
+        @@topic_arns.delete(topic_key)
 
         true
       end

data/lib/eventq/eventq_base/nonce_manager.rb

@@ -1,7 +1,7 @@
 module EventQ
   class NonceManager
 
-    def self.configure(server:,timeout:10000,lifespan:3600000)
+    def self.configure(server:,timeout:10000,lifespan:3600)
       @server_url = server
       @timeout = timeout
       @lifespan = lifespan
@@ -54,4 +54,4 @@ module EventQ
       @lifespan = nil
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - SageOne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -266,8 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: EventQ is a pub/sub system that uses async notifications and message queues