MovableInkAWS 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc729fe87d17cc2276485195788a711624461c93e3f1a12295cc18f61682167
-  data.tar.gz: 2a8e6828125fa200cf5519f9798b7c87c384631bfbb12d41cd697b72d8b77724
+  metadata.gz: 68e65c324f0ef9ce4d4c2607ecc050ff7ee04070b819200e3ad34805e56f3d0f
+  data.tar.gz: 2868c07278470a371c0ac88eb13985566d4a881eb2d944b63a118d45d033844e
 SHA512:
-  metadata.gz: 0db5532736c7aee4b4c153c2d33460a866b557fdf74ba1eaee6e2db70f594aac4b5690a0b186f45619e211d80ef2b216840db95d8a89e287508b063dfc9b155d
-  data.tar.gz: dda1cc313c0a3f04445dba83d7a0497816bd1058400f91b77f04913a4454c1c7a8e4568e6df9d4812fdaf482dd68e8f6dd7fbee80f14fcd73751ab0d1aee49f4
+  metadata.gz: e1da5c8861b8cec7a0b60056177b6e1b5121e9c87108bb4385edc4c32786a33f4ad306a0735eb1327c28b32302e26bb9303e61422488cb3010bf2d9b0524203b
+  data.tar.gz: bb5bfc766d27391c49e8f981efd0abac83cedb7bac6446dc6b399706b91dc77dc8586c72ae482eb04b4b7734ed398ee620ba9fa8095a3f1ef5e83543f84b463a

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,13 +1,14 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.0.8)
+    MovableInkAWS (1.0.15)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
       aws-sdk-core (~> 3)
       aws-sdk-ec2 (~> 1)
       aws-sdk-elasticache (~> 1)
+      aws-sdk-rds (~> 1)
       aws-sdk-route53 (~> 1)
       aws-sdk-s3 (~> 1)
       aws-sdk-sns (~> 1)
@@ -18,54 +19,57 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.3)
-    aws-partitions (1.240.0)
-    aws-sdk-athena (1.21.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.321.0)
+    aws-sdk-athena (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.29.0)
+    aws-sdk-autoscaling (1.36.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.30.0)
+    aws-sdk-cloudwatch (1.37.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.78.0)
-      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.116.0)
+    aws-sdk-ec2 (1.163.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticache (1.34.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.29.0)
+    aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.25.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.55.0)
-      aws-sdk-core (~> 3, >= 3.77.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.20.0)
+    aws-sdk-sns (1.23.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.61.0)
+    aws-sdk-ssm (1.78.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     jmespath (1.4.0)
-    mime-types (3.3)
+    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)
@@ -89,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

@@ -34,8 +34,18 @@ module MovableInk
       end
     end
 
-    def initialize(environment: nil, global_service: nil)
+    def initialize(
+      ipv4: nil,
+      environment: nil,
+      global_service: nil,
+      instance_id: nil,
+      availability_zone: nil
+    )
       @mi_env = environment
+      @ipv4 = ipv4
+      @instance_id = instance_id
+      @availability_zone = availability_zone
+
       if global_service
         @availability_zone = 'us-east-1a'
         @instance_id = global_service
@@ -49,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,

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.10'
+    VERSION = '1.0.15'
   end
 end

data/spec/aws_spec.rb

@@ -7,10 +7,14 @@ describe MovableInk::AWS do
       allow(aws).to receive(:`).with('ec2metadata --instance-id 2>/dev/null').and_return("")
       allow(aws).to receive(:`).with('ec2metadata --availability-zone 2>/dev/null').and_return("")
 
-
       expect{ aws.instance_id }.to raise_error(MovableInk::AWS::Errors::EC2Required)
       expect{ aws.availability_zone }.to raise_error(MovableInk::AWS::Errors::EC2Required)
     end
+
+    it 'doesnt raise an error if instance_id is set' do
+      aws = MovableInk::AWS.new(instance_id: 'i-987654321')
+      expect(aws.instance_id).to eq('i-987654321')
+    end
   end
 
   context "inside EC2" do

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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2020-05-27 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