MovableInkAWS 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8b5cd511cee342df9b7f9855f352b7f07f66e6acf7fd13aac99316c4ce4316
-  data.tar.gz: b803df59e02733a86769a5f10627347708891fd20763e69e294617f0222ec1fa
+  metadata.gz: 71c6b935514942f31b17b7c3bad0c8e0a856eb3586b977c20a6721ddd6623b8a
+  data.tar.gz: 63144d8ef0655a3df7a5f5768624f2500964a213529de972b286b16d63cc901e
 SHA512:
-  metadata.gz: a52896926328ec012a46647f8f237d6eca2685fa082a16aa426f8129b3dcd88758a4333f8240cfe5208e4f4227e743649036920c385063ac1487fa7aa99acecd
-  data.tar.gz: cd4a365c76df0ee1089ac933e30c1676da4e5787057afed8d4f328c45a17bcb8635581c07834664d9134b77ecef57893cb31186e0a79489552c34cb351500b6e
+  metadata.gz: 430fd3b181252e7c3bc538afd4a621ae8a0ec39e98b2329d03266ccbd06d787f91f2065ba9a68ce09b6b45e79cb8f275fec29e367f056d9296e7d0d1dd345ba9
+  data.tar.gz: 28e155f91856f6bc291aa253cc2c35aa259cf941c7290dda27fd917f8139bc0adbf4e45aa452057ebc817e4ae743a5a1ba10770b1496e6807e92d92655176b55

data/lib/movable_ink/aws/ec2.rb

@@ -28,29 +28,23 @@ module MovableInk
         end
       end
 
-      def thopter_instance
-        @thopter_instance ||= load_thopter_instance
+      def thopter_filter
+        [{
+          name: 'tag:mi:roles',
+          values: ['*thopter*']
+        },
+        {
+          name: 'tag:mi:env',
+          values: [mi_env]
+        },
+        {
+          name: 'instance-state-name',
+          values: ['running']
+        }]
       end
 
-      def load_thopter_instance
-        run_with_backoff do
-          ec2(region: 'us-east-1').describe_instances(filters: [
-            {
-              name: 'tag:mi:roles',
-              values: ['*thopter*']
-            },
-            {
-              name: 'tag:mi:env',
-              values: [mi_env]
-            },
-            {
-              name: 'instance-state-name',
-              values: ['running']
-            }
-          ])
-          .reservations
-          .flat_map(&:instances)
-        end
+      def thopter_instance
+        @thopter_instance ||= load_all_instances('us-east-1', filter: thopter_filter)
       end
 
       def all_instances(region: my_region, no_filter: false)
@@ -58,19 +52,20 @@ module MovableInk
         @all_instances[region] ||= load_all_instances(region, no_filter: no_filter)
       end
 
-      def load_all_instances(region, no_filter: false)
-        filters = if no_filter
-          nil
-        else
-          [{
-            name: 'instance-state-name',
-            values: ['running']
-          },
-          {
-            name: 'tag:mi:env',
-            values: [mi_env]
-          }]
-        end
+      def default_filter
+        [{
+          name: 'instance-state-name',
+          values: ['running']
+        },
+        {
+          name: 'tag:mi:env',
+          values: [mi_env]
+        }]
+      end
+
+      def load_all_instances(region, no_filter: false, filter: nil)
+        filters = no_filter ? nil : (filter || default_filter)
+
         run_with_backoff do
           ec2(region: region).describe_instances(filters: filters).flat_map do |resp|
             resp.reservations.flat_map(&:instances)

data/lib/movable_ink/aws/route53.rb

@@ -34,6 +34,27 @@ module MovableInk
           }).flat_map(&:resource_record_sets)
         end
       end
+
+      def list_health_checks
+        run_with_backoff do
+          route53.list_health_checks().flat_map(&:health_checks)
+        end
+      end
+
+      def get_health_check_tags(health_check_id)
+        run_with_backoff do
+          route53.list_tags_for_resource({
+            resource_type: 'healthcheck',
+            resource_id: health_check_id
+          }).resource_tag_set.tags
+        end
+      end
+
+      def find_health_check_by_tag(key, value)
+        list_health_checks.detect do |health_check|
+          get_health_check_tags(health_check.id).detect { |tag| tag.key == key && tag.value.include?(value) }
+        end
+      end
     end
   end
 end

data/lib/movable_ink/aws.rb

@@ -50,6 +50,7 @@ module MovableInk
                Aws::SNS::Errors::ThrottledException,
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,
+               Aws::Route53::Errors::Throttling,
                Aws::Route53::Errors::ThrottlingException,
                Aws::Route53::Errors::PriorRequestNotComplete,
                Aws::SSM::Errors::TooManyUpdates,

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk