MovableInkAWS 1.2.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7154439aecffd0332803c4aad89b681008e58a3f297116b56a4a3119d531be9b
-  data.tar.gz: a22a422e58c5631efc1ef57d6802dbafd5f8823cb1432769313b088e767ffcd5
+  metadata.gz: 9a4961e67a3f5c3a9a238aaf116e475902b00fe56215ee6ed3349bcab8793fc6
+  data.tar.gz: fcacae59b6af460b0c746c588eeefd3b8281ff5af7a989b5382bb777a142e5ed
 SHA512:
-  metadata.gz: 6d04cbc7a65a5d71459009150197091bdd59137ee6da40e521d275ccfca861f8c85ecc0c3c07dac9741bae004828726341f8509dc0f4eab5ddada36e40309408
-  data.tar.gz: 14e3171ff0d0c041cb88deabfe10a39d43826769436e94b4ae7f8adbd92811a645b7d3ec33e7d4cd1a30a40ae4888c2d9c7b7d40604b03affc3fd2c550bcd863
+  metadata.gz: '09d7bb52636d4255f7a0eb168f0dca79446b02b9410c9b8f8490ea031d5f3d367d0be24e01b9824718618f9110999a86fb0ff8bca1fb9aefbf652f06386ccc42'
+  data.tar.gz: 2ebea47434376fbf2e187b2f72b6da14c620c19dd91837fad282abc096881a85d48ee95c78fb324594cfec76e78567247727549f69e1d4e146f52b3b6b3eb4ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.2.0)
+    MovableInkAWS (1.3.2)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -21,50 +21,50 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.353.0)
-    aws-sdk-athena (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-partitions (1.383.0)
+    aws-sdk-athena (1.33.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.44.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-autoscaling (1.47.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.42.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudwatch (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.3)
+    aws-sdk-core (3.109.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.183.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ec2 (1.200.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.39.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-eks (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticache (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.95.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-rds (1.104.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-route53 (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.76.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.29.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sns (1.33.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.86.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ssm (1.95.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)

data/lib/movable_ink/aws.rb

@@ -64,7 +64,9 @@ module MovableInk
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
                Aws::EC2::Errors::Unavailable,
+               Aws::EKS::Errors::TooManyRequestsException,
                Aws::SNS::Errors::ThrottledException,
+               Aws::SNS::Errors::Throttling,
                Aws::AutoScaling::Errors::Throttling,
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,

data/lib/movable_ink/aws/ec2.rb

@@ -9,13 +9,13 @@ module MovableInk
       end
 
       def mi_env_cache_file_path
-        '/etc/movableink/mi_env'
+        '/etc/movableink/environments.json'
       end
 
       def 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
+          environments = JSON.parse(File.read(mi_env_cache_file_path))
+          environments[my_region] || load_mi_env
         else
           load_mi_env
         end

data/lib/movable_ink/aws/eks.rb

@@ -13,9 +13,11 @@ module MovableInk
         client = eks(region: region)
 
         resp = run_with_backoff do
-          client.describe_cluster({ name: cluster_name })
-        rescue Aws::EKS::Errors::ResourceNotFoundException
-          return nil
+          begin
+            client.describe_cluster({ name: cluster_name })
+          rescue Aws::EKS::Errors::ResourceNotFoundException
+            return nil
+          end
         end
 
         cluster_arn = resp.cluster.arn

data/lib/movable_ink/aws/sns.rb

@@ -11,29 +11,28 @@ module MovableInk
       end
 
       def sns_slack_topic_arn
-        run_with_backoff do
-          sns.list_topics.each do |resp|
-            resp.topics.each do |topic|
-              return topic.topic_arn if topic.topic_arn.include? "slack-aws-alerts"
-            end
+        @sns_slack_topic_arn ||= run_with_backoff do
+          sns_topics.each do |topic|
+            return topic.topic_arn if topic.topic_arn.include? "slack-aws-alerts"
           end
         end
       end
 
       def sns_pagerduty_topic_arn
-        run_with_backoff do
-          sns.list_topics.each do |resp|
-            resp.topics.each do |topic|
-              return topic.topic_arn if topic.topic_arn.include? "pagerduty-custom-alerts"
-            end
+        @sns_pagerduty_topic_arn ||= run_with_backoff do
+          sns_topics.each do |topic|
+            return topic.topic_arn if topic.topic_arn.include? "pagerduty-custom-alerts"
           end
         end
       end
 
+      def sns_topics
+        @sns_topics ||= run_with_backoff { sns.list_topics.flat_map(&:topics) }
+      end
+
       def notify_and_sleep(seconds, error_class)
         message = "Throttled by AWS. Sleeping #{seconds} seconds, (#{error_class})"
-        notify_slack(subject: 'API Throttled',
-                     message: message)
+        notify_slack(subject: 'API Throttled', message: message)
         puts message
         sleep seconds
       end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.2.0'
+    VERSION = '1.3.2'
   end
 end

data/spec/ec2_spec.rb

@@ -32,26 +32,14 @@ describe MovableInk::AWS::EC2 do
     }
 
     it 'will read mi_env from disk when the cache file exists' do
+      allow(aws).to receive(:my_region).and_return('us-east-2')
       f = Tempfile.new('cache')
-      f.write('staging')
+      f.write(JSON.generate({ "us-east-1": "production", "us-west-2": "production", "us-east-2": "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.2.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core