eventq_aws 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060f06ea588d381244367abedaaefa6fa57c6878
-  data.tar.gz: 963b83f40dc3d8a00a4e05804912cf8210e23990
+  metadata.gz: b3a43fdee0194aaa82aeb3374ca25f35fa4ed2ef
+  data.tar.gz: ef028b9511372504e49dadc8dab3e8eb430a91b9
 SHA512:
-  metadata.gz: 62ef5a2468dddb4685ac4e8f486603619a4d86d56ab2cc6babe7255fb6224e439e2202e7358169233f00df0aab867f5525c940f128802d75758c32c71a1b03d9
-  data.tar.gz: 958c3cad03b6408dabd2421e224f8b2236a8a0e26e6ede2281e09fb3d6de6b92f8668ec2982a1d060af49ad1f199cb19e231b4c098bbeae8500b5fb1b7269c30
+  metadata.gz: 15a09b1d55012d00ad57c9d42dc0c702934529dee92064d641e4600047fff9ab9b89a5ae353084174300565d464435aa7dfc46c2b99366e86d8b18cf6b323e2f
+  data.tar.gz: 7bff2fcb71597581c660692090bacab01a2060c445ffacba32e5354975fb5a9d3d2fc1de41873934d84224813d061d49dee3bc075c77475b377a7df4bd255da7

data/lib/eventq_aws/aws_queue_manager.rb

@@ -26,24 +26,19 @@ module EventQ
       end
 
       def get_queue(queue)
-
-        if queue_exists?(queue)
-          update_queue(queue)
-        else
-          create_queue(queue)
+        if queue.dlq
+          queue_exists?(queue.dlq) ? update_queue(queue.dlq) : create_queue(queue.dlq)
         end
 
+        queue_exists?(queue) ? update_queue(queue) : create_queue(queue)
       end
 
       def create_queue(queue)
         _queue_name = EventQ.create_queue_name(queue.name)
         response = @client.sqs.create_queue({
-                                                queue_name: _queue_name,
-                                                attributes: {
-                                                    VISIBILITY_TIMEOUT => @visibility_timeout.to_s,
-                                                    MESSAGE_RETENTION_PERIOD => @message_retention_period.to_s
-                                                }
-                                            })
+          queue_name: _queue_name,
+          attributes: queue_attributes(queue)
+        })
 
         return response.queue_url
       end
@@ -84,15 +79,25 @@ module EventQ
       def update_queue(queue)
         url = @client.get_queue_url(queue)
         @client.sqs.set_queue_attributes({
-                                             queue_url: url, # required
-                                              attributes: {
-                                                  VISIBILITY_TIMEOUT => @visibility_timeout.to_s,
-                                                  MESSAGE_RETENTION_PERIOD => @message_retention_period.to_s
-                                              }
-                                          })
+          queue_url: url, # required
+          attributes: queue_attributes(queue)
+        })
         return url
       end
 
+      def queue_attributes(queue)
+        attributes = {
+          VISIBILITY_TIMEOUT => @visibility_timeout.to_s,
+          MESSAGE_RETENTION_PERIOD => @message_retention_period.to_s
+        }
+
+        if queue.dlq
+          dlq_arn = @client.get_queue_arn(queue.dlq)
+          attributes['RedrivePolicy'] = %Q({"maxReceiveCount":"#{queue.max_receive_count}","deadLetterTargetArn":"#{dlq_arn}"})
+        end
+
+        attributes
+      end
     end
   end
 end

data/lib/eventq_aws/version.rb

@@ -2,6 +2,6 @@
 
 module EventQ
   module Amazon
-    VERSION = "1.17.0"
+    VERSION = "1.18.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
 description: This is the aws implementation for EventQ
 email:
 - vaughan.britton@sage.com