MovableInkAWS 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe536c901487ed0196cb22c0c03dc62850aeb11ae503b467cd0be73caeacff04
-  data.tar.gz: bdc29c62402c6199ffb2ae84064013ef894fca69f5bd91ea517bd78288e7fabb
+  metadata.gz: 2438d9c7704e6bdb02bd960dc975fa1cbffe715f1c0e104ed7e082bc56e22899
+  data.tar.gz: f1df4d7d7420d40f6b6b4250b9064e12430c5a11974eac727e57ce4ba84d077b
 SHA512:
-  metadata.gz: ccde77e086f1787390314059aa32b11836cefd854518481afbd09ce198da9258c60eb0ed91e075b87fc70bac1fcd9ecb77b0d649c1c1bf90ec9f108becabd9bc
-  data.tar.gz: 682c1979026eb42cdfaa570be510c855412797d1e0ff41e20f644a6486cb27d96488dc34f1c465dd02de0d815f33f4ccd35ef42bf4289b797f182116cb68ab4a
+  metadata.gz: 8c125dca2b9e941bfca2b3f3e8ed259313edcef38ce7c3eb7053007414938ceb994a83ab0f6e9226217f32fc12b744b20d550552be55e6234e45f0851990f0e9
+  data.tar.gz: 7229e62a69815f33100e576983da720f51272ccf2faba390826b2577dd35c443f111e2c7f5e2eab78c40c1e5cf95e3f456ebb66bf845caf3c868805a055ef6ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.0.6)
+    MovableInkAWS (1.0.7)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-core (~> 3)
@@ -18,16 +18,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.238.0)
+    aws-partitions (1.240.0)
     aws-sdk-athena (1.21.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.29.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.76.0)
+    aws-sdk-core (3.77.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.228.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-ec2 (1.115.0)
@@ -42,14 +42,14 @@ GEM
     aws-sdk-route53 (1.30.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.53.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-s3 (1.54.0)
+      aws-sdk-core (~> 3, >= 3.77.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sdk-sns (1.20.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.59.0)
+    aws-sdk-ssm (1.60.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
@@ -63,19 +63,19 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     multi_xml (0.6.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
 
 PLATFORMS
   ruby

data/lib/movable_ink/aws.rb

@@ -65,8 +65,7 @@ module MovableInk
           end
         rescue Aws::Errors::ServiceError => e
           message = "#{e.class}: #{e.message}\nFrom `#{e.backtrace.last.gsub("`","'")}`"
-          notify_slack(subject: 'Unhandled AWS API Error',
-                       message: message)
+          notify_slack(subject: 'Unhandled AWS API Error', message: message)
           puts message
           raise MovableInk::AWS::Errors::ServiceError
         end

data/lib/movable_ink/aws/sns.rb

@@ -72,22 +72,19 @@ module MovableInk
 
         run_with_backoff do
           sns.publish(topic_arn: sns_pagerduty_topic_arn,
-                      subject: add_subject_info(subject: "Unable to drain NSQ"),
+                      subject: "Unable to drain NSQ",
                       message: json_message)
         end
       end
 
-      def add_subject_info(subject:)
+      def notify_slack(subject:, message:)
         instance_link = "<https://#{my_region}.console.aws.amazon.com/ec2/v2/home?region=#{my_region}#Instances:search=#{instance_id};sort=instanceId|#{instance_id}>"
         required_info = "Instance: #{instance_link}, `#{private_ipv4}`, `#{my_region}`"
-        "#{subject.slice(0,99)}\n#{required_info}"
-      end
 
-      def notify_slack(subject:, message:)
         run_with_backoff do
           sns.publish(topic_arn: sns_slack_topic_arn,
-                      subject: add_subject_info(subject: subject),
-                      message: message)
+                      subject: subject.slice(0,99),
+                      message: "#{required_info}\n#{message}")
         end
       end
     end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 end

data/spec/sns_spec.rb

@@ -60,8 +60,8 @@ describe MovableInk::AWS::SNS do
     message = 'Test message'
     subject = "a"*150
     instance_link = "https://us-east-1.console.aws.amazon.com/ec2/v2/home?region=us-east-1#Instances:search=i-987654321;sort=instanceId"
-    expected_subject = "#{"a" * 99}\nInstance: <#{instance_link}|i-987654321>, `10.0.0.1`, `us-east-1`"
-    expect(sns).to receive(:publish).with({:topic_arn=>"slack-aws-alerts", :message=>"Test message", :subject => expected_subject})
+    expected_subject = "#{"a" * 99}"
+    expect(sns).to receive(:publish).with({:topic_arn=>"slack-aws-alerts", :message=>"Instance: <#{instance_link}|i-987654321>, `10.0.0.1`, `us-east-1`\nTest message", :subject => expected_subject})
 
     aws.notify_slack(subject: subject, message: message)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core