MovableInkAWS 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de21c0fdb46ad5c3506f242a6a2732abe711831fbde4b70c72ad24147e37bce
-  data.tar.gz: 035f21cb39b733f31bc05b86e877cf81cc62b7c2e7a5a80832df2d2ce147053b
+  metadata.gz: d7b1d77334dfeeb0283ce569cb62b7bce8a2518de96c73156f2b25693f0a2168
+  data.tar.gz: 56b60538a821c7fab3e55ad7ee0a80ac85312ff003521764e0721dcf86d5577c
 SHA512:
-  metadata.gz: 65af327d97a4fddc422eac4b212ff9444b4d70e82c045baf4c96627e37152415fa183417399a189aa6c47f26176fab07640662e7a092063f48665bf214b9f13c
-  data.tar.gz: b91d80649d4f32bd8b878125e1c2d4a9c7fd6825194b82d563c43017897a85b3e784ff2cc6e6c3cb28f714f17a49d0bec57da754b67eea67698a4663cdc9c4a8
+  metadata.gz: 4132433dd73377d07d141297180ec17f983c4f124811ef45e474a78aa31d493d44ec2df98ed393707d13b095821182e54fcbcf23eff61f924d915aaf4eec1edd
+  data.tar.gz: e317ad0ac916a54ffd6042310906310ea5be40f3b6b88f83b3f8c6b45364bcea3df1282c5106a5d9032cf1804137e1c03002fd0cbc7942142ca2f7ec45245798

data/.github/workflows/test.yaml

@@ -0,0 +1,39 @@
+name: test
+
+on:
+  push:
+    branches: ['**']
+    tags: ['v*']
+  pull_request:
+    branches: [$default-branch]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+
+    - name: Install dependencies
+      run: bundle install --retry=3
+
+    - name: Run tests
+      run: bundle exec rspec spec/
+
+    - name: Publish to RubyGems
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.1.2)
+    MovableInkAWS (2.2.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)

data/lib/movable_ink/aws/sns.rb

@@ -29,42 +29,27 @@ module MovableInk
         sleep seconds
       end
 
-      def notify_nsq_can_not_be_drained
-        notify_slack(subject: 'NSQ not drained',
-                     message: "Unable to drain NSQ for instance <https://#{my_region}.console.aws.amazon.com/ec2/v2/home?region=#{my_region}#Instances:search=#{instance_id};sort=instanceId|#{instance_id}>")
-        notify_pagerduty(region: my_region, instance_id: instance_id)
-      end
-
-      def notify_pagerduty(region:, instance_id:)
-        summary = "Unable to drain NSQ for instance #{instance_id} in region #{region}"
-
-        # the PagerDuty integration key is added to the payload in the AWS integration
-        json_message = {
-          pagerduty: {
-            event_action: 'trigger',
-            payload: {
-              source: 'MovableInkAWS',
-              summary: summary,
-              timestamp: Time.now.utc.iso8601,
-              severity: 'error',
-              component: 'nsq',
-              group: 'nsq',
-              custom_details: {
-                InstanceId: instance_id,
-              },
-            },
-            dedup_key: "nsq-not-draining-#{instance_id}",
-            links: [{
-              href: "https://#{region}.console.aws.amazon.com/ec2/v2/home?region=#{region}#Instances:search=#{instance_id};sort=instanceId",
-              text: 'View Instance'
-            }],
-          }
-        }.to_json
-
+      def send_alert(
+        source: instance_id,
+        links: [],
+        custom_details: {},
+        summary:,
+        dedup_key:
+      )
         run_with_backoff do
-          sns.publish(topic_arn: sns_pagerduty_topic_arn,
-                      subject: "Unable to drain NSQ",
-                      message: json_message)
+          message_json = pd_message_json({
+            source: source,
+            summary: summary,
+            links: links,
+            custom_details: custom_details,
+            dedup_key: dedup_key,
+          })
+
+          sns.publish({
+            topic_arn: sns_pagerduty_topic_arn,
+            subject: summary,
+            message: message_json
+          })
         end
       end
 
@@ -78,6 +63,33 @@ module MovableInk
                       message: "#{required_info}\n#{message}")
         end
       end
+
+      private
+
+      def pd_message_json(
+        source:,
+        summary:,
+        links:,
+        custom_details:,
+        dedup_key:
+      )
+        {
+          pagerduty: {
+            event_action: 'trigger',
+            payload: {
+              source: source,
+              summary: summary,
+              timestamp: Time.now.utc.iso8601,
+              severity: 'error',
+              component: source,
+              group: source,
+              custom_details: custom_details,
+            },
+            dedup_key: dedup_key,
+            links: links,
+          }
+        }.to_json
+      end
     end
   end
 end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.1.2'
+    VERSION = '2.2.0'
   end
 end

data/spec/sns_spec.rb

@@ -47,7 +47,7 @@ describe MovableInk::AWS::SNS do
     allow(aws).to receive(:sns).and_return(sns)
     allow(aws).to receive(:private_ipv4).and_return('10.0.0.1')
 
-    expect(aws.notify_pagerduty(region: 'us-east-1', instance_id: 'i-987654321').message_id).to eq('messageId')
+    expect(aws.send_alert(summary: 'Something bad happened', dedup_key: 'i-987654321').message_id).to eq('messageId')
   end
 
   it "should truncate subjects longer than 100 characters" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -227,7 +227,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/pr-lint.yaml"
-- ".travis.yml"
+- ".github/workflows/test.yaml"
 - Gemfile
 - Gemfile.lock
 - MovableInkAWS.gemspec
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AWS Utility methods for MovableInk

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6
-
-bundler_args: "--retry=3"
-
-script:
-  - rspec spec/
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: NAHVFo9MwOnAYhq1NzZz22/2p34Iw/L71ZNt2WHSbWuMVnA/xyvVu7Ja/S25aQmaV/btNkxTYtbJbf83QZTO9/IwkashWFcWJtLiptZkBRdpkiunMPWX9Gw3Ap5fODUIPxLFyLYWd53huNBJppBCVQTUPwkLEcWJcQZP4MU7dkhW5QKdQgmyNTlMy8epxyMqCQe7V0n98LCwreUsHxHMToe6/V0FemysjYjpnyNvcFpGFa9kf28VQw8ZpDR0iobw9hg6qs61Xj69Y3ns9fWI3sdnk8VjY29M+V415/ksyn7kzCjYiQsGGCFerzjMffIt/4PXqX81GRvcymxmpXWwtikJYP95kiHYbLGFUNS5GJngbyVgO5+amjx7vSZfaBGSXcUCSkxLV1Ki4QfMYnA4ihogwTdQhIALSEV9GzOfFt147lUok2LgZDzNfn9nCPL+qKMBNaBRe7/YoWGuvLQG/smYjunPYhis0ynAQ1Sytc7lgtbdEtLFzfET87ITVS4Y2F9TQ+z1fxROAn/YwMmdSPyiaXVLEOIUc/gx0BjJneTl43M4l6ZId8Q6maJTNG2Fd0yK0hwLJcsN/257HbnPEiTTgkXBcg58E6/ABfZqwDnJrP3sQPem85M4BxLJIPUvfBkYzyeAEV+ALYDJx+KLaqYCCgavF9M+41VbkkNZyKU=
-  gem: MovableInkAWS
-  on:
-    tags: true
-    repo: movableink/awslib