eventq 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a55998f78ac404d51a4278b44b802a23d1b9c322cad2a29b8c1e94950ad4fa
-  data.tar.gz: 92dddbaed323bf8f803a07adc483376a2b255c43ce015c6a5ed59c3b81081478
+  metadata.gz: 59946bde6488da5c2567aec735c8a6f251e3532bc0b2636123a4940c519ce935
+  data.tar.gz: 4b202d8435f23ea6e88a5b7351f9317d91c9179f610651152af9c7b2939a993a
 SHA512:
-  metadata.gz: 45465979d1c58fd6cb0a4f54752a7cb4278c002465cbb12e3f4ee8b6e98538d9f65ab35e15d69cb41ae88d28f00fbc275bb73b7bc45be777e3c576d07384143f
-  data.tar.gz: 7011679b0e5c08fc6a0468067816e6bf136ce24900e411d5e1b1afedd53180c92c454dc9696874a2fad3f0a4d30dcd9a829a55fe4e9fb557b519f33abfec33c8
+  metadata.gz: 93e097eb9be108a117f855260ea2334de8018029ba5027349d587bcd28553ab9a296accaca936abfe209d628c5ced3177bbbcfe435f6e2b5bd550a701a066299
+  data.tar.gz: b83f581d669072a79e378cd93f428628e9896ae0fa8dd09db63c8d3b39505814a29c438690829703cf3ee469b8fc2098b04b50565939323455cf1acdbb0e8c58

data/lib/eventq/eventq_aws/aws_subscription_manager.rb

@@ -12,7 +12,7 @@ module EventQ
         @manager = options[:queue_manager]
       end
 
-      def subscribe(event_type, queue, topic_region = nil, queue_region = nil)
+      def subscribe(event_type, queue, topic_region = nil, queue_region = nil, topic_namespaces = [EventQ.namespace])
         if queue.isolated
           method = :get_topic_arn
         else
@@ -22,24 +22,28 @@ module EventQ
         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
 
-        q = @manager.get_queue(queue)
-        queue_arn = @client.sqs_helper(queue_region).get_queue_arn(queue)
+        queue_arn = configure_queue(queue, queue_region)
 
-        attributes = default_queue_attributes(q, queue_arn)
-        @client.sqs(queue_region).set_queue_attributes(attributes)
+        # subscribe the queue to the topic with the namespaces provided
+        topic_namespaces.each do |namespace|
+          namespaced_topic_arn = topic_arn.gsub(":#{EventQ.namespace}-", ":#{namespace}-")
 
-        # skip subscribe if subscription for given queue/topic already exists
-        # this fixes a localstack issue: https://github.com/localstack/localstack/issues/933
-        return true if existing_subscription?(queue_arn, topic_arn)
+          # 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(topic_region).subscribe(
-          topic_arn: topic_arn,
-          protocol: 'sqs',
-          endpoint: queue_arn
-        )
+          # 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
+          return true if existing_subscription?(queue_arn, namespaced_topic_arn)
 
-        EventQ.logger.debug do
-          "[#{self.class} #subscribe] - Subscribing Queue: #{queue.name} to topic_arn: #{topic_arn}, endpoint: #{queue_arn}"
+          EventQ.logger.debug do
+            "[#{self.class} #subscribe] - Subscribing Queue: #{queue.name} to topic_arn: #{namespaced_topic_arn}, endpoint: #{queue_arn}"
+          end
+
+          @client.sns(topic_region).subscribe(
+            topic_arn: namespaced_topic_arn,
+            protocol: 'sqs',
+            endpoint: queue_arn
+          )
         end
 
         true
@@ -51,6 +55,15 @@ module EventQ
 
       private
 
+      def configure_queue(queue, region)
+        q = @manager.get_queue(queue)
+        queue_arn = @client.sqs_helper(region).get_queue_arn(queue)
+
+        attributes = default_queue_attributes(q, queue_arn)
+        @client.sqs(region).set_queue_attributes(attributes)
+        queue_arn
+      end
+
       def default_queue_attributes(queue, queue_arn)
         {
           queue_url: queue,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - SageOne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: EventQ is a pub/sub system that uses async notifications and message queues