sensu-transport-snssqs-ng 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92289e5673d6c1523eaff67ba2c13811d224b0b
-  data.tar.gz: 53a04fd08f78ec57eea0e4c07c447809bedc1641
+  metadata.gz: 27e2deb012e3d5cb4dd49a1877e847a895adf688
+  data.tar.gz: 219f46c7147f5fa6599833dfb9b06bd181a11097
 SHA512:
-  metadata.gz: dcf918e8f291f21ec353df00d6dc24c76151e7a21fb9e2c12bcf4eca8d53054446439219d81fe7c3cb532b7d70d91772be59c41bd75fb70409f2e2770a8a7693
-  data.tar.gz: 1879be3c160435f6724390b10fc1f29cd4c38b06d0ff0c4965f176040f148d9a05f9bf6c5ce9d366290fea74284f10741c99583e449dbff3f482737c17681237
+  metadata.gz: 5b701d5a370992d39986cb9042d1de281707e60dcefff2441b5c675450d5706c18e63a09bcaf370bd6f511f4dc9a1d191ab03cced2e8cbc2e3b89bc0be848705
+  data.tar.gz: dfc9800a01dd284780f467de14cf39ed436ad6f84467e1502366bdf0a7b53fc80ea2484994b82ca932cf93aa542efe44ac7543176f55a9b319c3d4ea2bca00c1

data/lib/sensu/transport/snssqs.rb

@@ -36,8 +36,13 @@ module Sensu
         @keepalives_callback = proc {}
         # Sensu Windows install does not include a valid cert bundle for AWS
         Aws.use_bundled_cert! if Gem.win_platform?
-        @sqs = Aws::SQS::Client.new(region: @settings[:region])
-        @sns = Aws::SNS::Client.new(region: @settings[:region])
+        aws_client_settings = {region: @settings[:region]}
+        unless @settings[:access_key_id].nil?
+          aws_client_settings[:access_key_id] = @settings[:access_key_id]
+          aws_client_settings[:secret_access_key] = @settings[:secret_access_key]
+        end
+        @sqs = Aws::SQS::Client.new aws_client_settings
+        @sns = Aws::SNS::Client.new aws_client_settings
 
         # connect to statsd, if necessary
         @statsd = nil
@@ -175,7 +180,33 @@ module Sensu
             wait_time_seconds: @settings[:wait_time_seconds],
             max_number_of_messages: @settings[:max_number_of_messages],
           )
-          resp.messages
+          resp.messages.select do |msg|
+            # switching whether to transform the message based on the existance of message_attributes
+            # if this is a raw SNS message, it exists in the root of the message and no conversion is needed
+            # if it doesn't, it is an encapsulated messsage (meaning the SNS message is a stringified JSON in the body of the SQS message)
+            begin
+              if !msg.key? 'message_attributes'
+                # extracting original SNS message
+                tmp_body = JSON.parse msg.body
+                # if there is no Message, this isn't a SNS message and something has gone terribly wrong
+                next if tmp_body.key? 'Message'
+                # replacing the body with the SNS message (as it would be in a raw delivered SNS-SQS message)
+                msg.body = tmp_body['Message']
+                msg.message_attributes = {}
+                # discarding messages without attributes, since this would lead to an exception in subscribe
+                next if tmp_body.key? 'MessageAttributes'
+                # parsing the message_attributes
+                tmp_body['MessageAttributes'].each do |name, value|
+                  msg.message_attributes[name] = Aws::SQS::Types::MessageAttributeValue.new
+                  msg.message_attributes[name].string_value = value['Value']
+                  msg.message_attributes[name].data_type = 'String'
+                end
+              end
+              msg
+            rescue JSON::JSONError => e
+              self.logger.info(e)
+            end
+          end
         rescue Aws::SQS::Errors::ServiceError => e
           self.logger.info(e)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport-snssqs-ng
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Troy Ready
@@ -31,7 +31,7 @@ cert_chain:
   SDfvq2xI1v+iTmBkyYqft23MKnTcc5jJ5Gh0a11a2zUstWaH1XHelXYCx44ZLCtC
   Q6k=
   -----END CERTIFICATE-----
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk