MovableInkAWS 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2127e6bcec465975fe334b3f4f26b595df236502141a02a5f8ece04f079dd2c5
-  data.tar.gz: 0b71197e920ef8356b92e3cb831479920f101f8f129b5b6ba745bfedc558528c
+  metadata.gz: 8da5fcf1d95cc4642ae47bc180040671d9baeb9bbabb3c92bdf8c7a1a387b33b
+  data.tar.gz: ebb0966bf640735e8e5d2e2b0903ac246a8e61f85eb3f21a2950afd935ca338d
 SHA512:
-  metadata.gz: 49adad04149c4af1adad4638c87ccd4d746265fb1051d2dfb002bf1e941398aac584694e527f10a15b5538d80aaec3a872fdb73c771d1665fce80cec4c81a465
-  data.tar.gz: e60ff448613bfe3199ae16d77d256ea122c7f8cba456b5a3c5dbb52f35787f6be83ea8139d569897be404d2c93cd2cf19af2d81e4120d99f8dcc83049695ce80
+  metadata.gz: 635c4fe35a5c3bb404ec5ea1621345a5dca26bb8e85a911e772ad2420cbd6469a0ac896a1311f4f86326948fc25298d006981451521df244333d50d2654c82b1
+  data.tar.gz: af18dbf13eab9fc4b06a3006c593289f7a6323afc779e08fe881f6b3e93a2ce76a0091ef36855653e848b17887d369745750c9d857085ea4816d6070e6b62053

data/.github/workflows/pr-lint.yaml

@@ -0,0 +1,11 @@
+name: PR Lint
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+
+jobs:
+  ch_lint_pr:
+    name: Clubhouse
+    runs-on: ubuntu-latest
+    steps:
+      - uses: movableink/pr-clubhouse-lint-action@release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.0.11)
+    MovableInkAWS (1.0.16)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -19,48 +19,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.3)
-    aws-partitions (1.280.0)
-    aws-sdk-athena (1.22.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.322.0)
+    aws-sdk-athena (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.32.0)
+    aws-sdk-autoscaling (1.36.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.33.0)
+    aws-sdk-cloudwatch (1.37.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.90.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sdk-core (3.96.1)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.147.0)
+    aws-sdk-ec2 (1.163.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.29.0)
+    aws-sdk-elasticache (1.34.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.29.0)
+    aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.78.0)
+    aws-sdk-rds (1.84.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.30.0)
+    aws-sdk-route53 (1.34.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.21.0)
+    aws-sdk-sns (1.23.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.71.0)
+    aws-sdk-ssm (1.78.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
+    aws-sigv4 (1.1.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)
@@ -69,7 +69,7 @@ GEM
     jmespath (1.4.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -93,4 +93,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+## Current Behavior
+
+
+
+## Why do we need this change?
+
+
+
+## Implementation Details
+
+
+
+#### Dependencies (if any)
+
+:house: [chXXXX](https://app.clubhouse.io/movableink/story/XXXX)

data/lib/movable_ink/aws.rb

@@ -59,6 +59,7 @@ module MovableInk
           return yield
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
+               Aws::EC2::Errors::Unavailable,
                Aws::SNS::Errors::ThrottledException,
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,
@@ -76,12 +77,15 @@ module MovableInk
             notify_and_sleep(sleep_time, $!.class)
           end
         rescue Aws::Errors::ServiceError => e
-          message = "#{e.class}: #{e.message}\nFrom `#{e.backtrace.last.gsub("`","'")}`"
+          message = "#{e.class}: #{e.message}\nFrom #{$0}\n```\n#{e.backtrace.first(3).join("\n").gsub("`","'")}\n```"
           notify_slack(subject: 'Unhandled AWS API Error', message: message)
           puts message
           raise MovableInk::AWS::Errors::ServiceError
         end
       end
+      message = "From: #{$0}\n```\n#{Thread.current.backtrace.first(3).join("\n").gsub("`","'")}\n```"
+      notify_slack(subject: "AWS API failed after #{tries} attempts", message: message)
+      puts message
       raise MovableInk::AWS::Errors::FailedWithBackoff
     end
 

data/lib/movable_ink/aws/ec2.rb

@@ -8,8 +8,17 @@ module MovableInk
         @ec2_client[region] ||= Aws::EC2::Client.new(region: region)
       end
 
+      def mi_env_cache_file_path
+        '/etc/movableink/mi_env'
+      end
+
       def mi_env
-        @mi_env ||= load_mi_env
+        @mi_env ||= if File.exist?(mi_env_cache_file_path)
+          value = File.read(mi_env_cache_file_path)
+          value.empty? ? load_mi_env : value
+        else
+          load_mi_env
+        end
       end
 
       def load_mi_env
@@ -20,23 +29,12 @@ module MovableInk
         raise MovableInk::AWS::Errors::NoEnvironmentTagError
       end
 
-      def thopter_filter
-        [{
-          name: 'tag:mi:roles',
-          values: ['*thopter*']
-        },
-        {
-          name: 'tag:mi:env',
-          values: [mi_env]
-        },
-        {
-          name: 'instance-state-name',
-          values: ['running']
-        }]
-      end
-
       def thopter_instance
-        @thopter_instance ||= load_all_instances('us-east-1', filter: thopter_filter)
+        @thopter_instance ||= all_instances(region: 'us-east-1').select do |instance|
+          instance.tags.select{ |tag| tag.key == 'mi:roles' }.detect do |tag|
+            tag.value.include?('thopter')
+          end
+        end
       end
 
       def all_instances(region: my_region, no_filter: false)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.0.11'
+    VERSION = '1.0.16'
   end
 end

data/spec/aws_spec.rb

@@ -42,9 +42,9 @@ describe MovableInk::AWS do
         ec2 = Aws::EC2::Client.new(stub_responses: true)
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
-        expect(aws).to receive(:notify_slack).exactly(9).times
+        expect(aws).to receive(:notify_slack).exactly(10).times
         expect(aws).to receive(:sleep).exactly(9).times.and_return(true)
-        expect(STDOUT).to receive(:puts).exactly(9).times
+        expect(STDOUT).to receive(:puts).exactly(10).times
 
         aws.run_with_backoff { ec2.describe_instances } rescue nil
       end
@@ -64,9 +64,9 @@ describe MovableInk::AWS do
         ec2 = Aws::EC2::Client.new(stub_responses: true)
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
-        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(aws).to receive(:notify_slack).exactly(2).times
         expect(aws).to receive(:sleep).exactly(9).times.and_return(true)
-        expect(STDOUT).to receive(:puts).exactly(1).times
+        expect(STDOUT).to receive(:puts).exactly(2).times
 
         aws.run_with_backoff(quiet: true) { ec2.describe_instances } rescue nil
       end
@@ -77,6 +77,8 @@ describe MovableInk::AWS do
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
         expect(aws).to receive(:notify_and_sleep).exactly(9).times
+        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(STDOUT).to receive(:puts).exactly(1).times
         expect{ aws.run_with_backoff { ec2.describe_instances } }.to raise_error(MovableInk::AWS::Errors::FailedWithBackoff)
       end
     end

data/spec/ec2_spec.rb

@@ -37,6 +37,27 @@ describe MovableInk::AWS::EC2 do
       ])
     }
 
+    it 'will read mi_env from disk when the cache file exists' do
+      f = Tempfile.new('cache')
+      f.write('staging')
+      f.close
+      allow(aws).to receive(:mi_env_cache_file_path).and_return(f.path)
+      expect(aws.mi_env).to eq('staging')
+    end
+
+    it 'will read tag data if the cache file is empty' do
+      ec2.stub_responses(:describe_tags, tag_data)
+      allow(aws).to receive(:my_region).and_return('us-east-1')
+      allow(aws).to receive(:instance_id).and_return('i-12345')
+      allow(aws).to receive(:ec2).and_return(ec2)
+
+      f = Tempfile.new('cache')
+      f.write('')
+      f.close
+      allow(aws).to receive(:mi_env_cache_file_path).and_return(f.path)
+      expect(aws.mi_env).to eq('test')
+    end
+
     it "should find the environment from the current instance's tags" do
       ec2.stub_responses(:describe_tags, tag_data)
       allow(aws).to receive(:my_region).and_return('us-east-1')

data/spec/ssm_spec.rb

@@ -82,6 +82,8 @@ describe MovableInk::AWS::SSM do
       allow(aws).to receive(:ssm_client).and_return(1)
       allow(aws).to receive(:ssm_client_failover).and_return(2)
       allow(aws).to receive(:notify_and_sleep).and_return(nil)
+      allow(aws).to receive(:notify_slack).and_return(nil)
+      allow(STDOUT).to receive(:puts).and_return(nil)
 
       results = []
       calls = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -198,10 +198,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/pr-lint.yaml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MovableInkAWS.gemspec
+- PULL_REQUEST_TEMPLATE.md
 - README.md
 - lib/movable_ink/aws.rb
 - lib/movable_ink/aws/api_gateway.rb