MovableInkAWS 2.5.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf00286ca6df97b28e2721514ae975f5033f1c1645270b787acdade801895431
-  data.tar.gz: 18cced6b07a7ed5b683c6ccfe037aabadd6d54eb58eee399eb23cb2d0a2e152a
+  metadata.gz: 238d21eb16377f58da3db182b93157e34f26e05b5a12a8f233039153e581ab1a
+  data.tar.gz: 55249c69017ffb581c53478eedb109c026fce69fde1dec5f60580d66b42970af
 SHA512:
-  metadata.gz: d690d05079f5d2b51b87003e5de4a6322110897935e8a2a5fa387fe12a242b017ed0b6fcad3dfbd9976a50d81c22a78788009bf2c52bce25c338ad784a5aa753
-  data.tar.gz: 9026ea88eecfaa54abfbe18df7856d2e481279d4dd2ada91c1ed60b94a883b8cf527d402f513c24622227adb9b669bb2acbf43033a2f47b8841ba196e461ef85
+  metadata.gz: 365976f0e0e1ba918bfd8875e95e0d78d3ce59cf83ab6896b3c001250046cf5081e2cfe09b192196e01f7daef60c41523e647d720a5b8356980e2fca3900dfe2
+  data.tar.gz: 2fed258445a35f69973085710a2465e09845a1e98068f1f535551cefb3e1ebd11af9fdaed90781055b4757961eb107f8b92745bb4a0f3443cb25ebe95d7c8b75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.5.1)
+    MovableInkAWS (2.6.1)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -24,48 +24,48 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
-    aws-sdk-athena (1.37.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-partitions (1.573.0)
+    aws-sdk-athena (1.52.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.60.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-autoscaling (1.78.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.51.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-cloudwatch (1.62.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.126.1)
+    aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.234.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ec2 (1.305.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.51.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-eks (1.74.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.55.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-elasticache (1.76.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.43.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.118.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-rds (1.142.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.49.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-route53 (1.62.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sdk-sns (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.39.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.108.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ssm (1.134.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -82,10 +82,10 @@ GEM
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    jmespath (1.6.0)
-    mime-types (3.3.1)
+    jmespath (1.6.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     public_suffix (4.0.5)

data/lib/movable_ink/aws/metadata.rb

@@ -20,7 +20,7 @@ module MovableInk
           request['X-aws-ec2-metadata-token'] = imds_token
           response = http(timeout_seconds: num * 3).request(request)
           return response.body
-        rescue Net::OpenTimeout, Net::ReadTimeout, Errno::EHOSTDOWN
+        rescue Net::OpenTimeout, Net::ReadTimeout, Errno::EHOSTDOWN, Errno::ECONNREFUSED
           sleep(num * 2)
         end
 

data/lib/movable_ink/aws/route53.rb

@@ -3,21 +3,21 @@ require 'aws-sdk-route53'
 module MovableInk
   class AWS
     module Route53
-      def route53
-        @route53_client ||= Aws::Route53::Client.new(region: 'us-east-1')
+      def route53(client = nil)
+        @route53_client ||= (client) ? client : Aws::Route53::Client.new(region: 'us-east-1')
       end
 
-      def resource_record_sets(hosted_zone_id)
+      def resource_record_sets(hosted_zone_id, client = nil)
         @resource_record_sets ||= {}
-        @resource_record_sets[hosted_zone_id] ||= list_all_r53_resource_record_sets(hosted_zone_id)
+        @resource_record_sets[hosted_zone_id] ||= list_all_r53_resource_record_sets(hosted_zone_id, client)
       end
 
-      def get_resource_record_sets_by_instance_name(zone, instance_name)
-        resource_record_sets(zone).select{|rrs| rrs.set_identifier == instance_name}.first.to_h
+      def get_resource_record_sets_by_instance_name(zone, instance_name, client = nil)
+        resource_record_sets(zone, client).select{|rrs| rrs.set_identifier == instance_name}.first.to_h
       end
 
-      def delete_resource_record_sets(zone, instance_name)
-        resource_record_set = get_resource_record_sets_by_instance_name(zone, instance_name)
+      def delete_resource_record_sets(zone, instance_name, client = nil)
+        resource_record_set = get_resource_record_sets_by_instance_name(zone, instance_name, client)
         return if resource_record_set.empty?
 
         change_batch = {
@@ -28,36 +28,36 @@ module MovableInk
         }
 
         run_with_backoff do
-          route53.change_resource_record_sets({change_batch: change_batch, hosted_zone_id: zone})
+          route53(client).change_resource_record_sets({change_batch: change_batch, hosted_zone_id: zone})
         end
       end
 
-      def list_all_r53_resource_record_sets(hosted_zone_id)
+      def list_all_r53_resource_record_sets(hosted_zone_id, client = nil)
         run_with_backoff do
-          route53.list_resource_record_sets({
+          route53(client).list_resource_record_sets({
             hosted_zone_id: hosted_zone_id
           }).flat_map(&:resource_record_sets)
         end
       end
 
-      def list_health_checks
+      def list_health_checks(client = nil)
         run_with_backoff do
-          route53.list_health_checks().flat_map(&:health_checks)
+          route53(client).list_health_checks().flat_map(&:health_checks)
         end
       end
 
-      def get_health_check_tags(health_check_id)
+      def get_health_check_tags(health_check_id, client = nil)
         run_with_backoff do
-          route53.list_tags_for_resource({
+          route53(client).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) }
+      def find_health_check_by_tag(key, value, client = nil)
+        list_health_checks(client).detect do |health_check|
+          get_health_check_tags(health_check.id, client).detect { |tag| tag.key == key && tag.value.include?(value) }
         end
       end
     end

data/lib/movable_ink/aws/ssm.rb

@@ -3,26 +3,29 @@ require 'aws-sdk-ssm'
 module MovableInk
   class AWS
     module SSM
-      def ssm_client
-        @ssm_client ||= Aws::SSM::Client.new(region: 'us-east-1')
+
+      def ssm_client(region = nil)
+        @ssm_clients_map ||= {}
+        @ssm_clients_map[region] ||= Aws::SSM::Client.new(region: (region.nil?) ? 'us-east-1' : region)
       end
 
-      def ssm_client_failover
-        @ssm_client_failover ||= Aws::SSM::Client.new(region: 'us-west-2')
+      def ssm_client_failover(failregion = nil)
+        @ssm_failover_clients_map ||= {}
+        @ssm_failover_clients_map[failregion] ||= Aws::SSM::Client.new(region: (failregion.nil?) ? 'us-west-2' : failregion)
       end
 
-      def run_with_backoff_and_client_fallback(&block)
+      def run_with_backoff_and_client_fallback(region = nil, failregion = nil, &block)
         run_with_backoff do
-          block.call(ssm_client)
+          block.call(ssm_client(region))
         end
       rescue MovableInk::AWS::Errors::FailedWithBackoff => e
         run_with_backoff(tries: 3) do
-          block.call(ssm_client_failover)
+          block.call(ssm_client_failover(failregion))
         end
       end
 
-      def get_secret(environment: mi_env, role:, attribute:)
-        run_with_backoff_and_client_fallback do |ssm|
+      def get_secret(environment: mi_env, role:, attribute:, region: nil, failregion: nil)
+        run_with_backoff_and_client_fallback(region, failregion) do |ssm|
           begin
             resp = ssm.get_parameter(
                       name: "/#{environment}/#{role}/#{attribute}",
@@ -35,9 +38,9 @@ module MovableInk
         end
       end
 
-      def get_role_secrets(environment: mi_env, role:)
+      def get_role_secrets(environment: mi_env, role:, region: nil, failregion: nil)
         path = "/#{environment}/#{role}"
-        run_with_backoff_and_client_fallback do |ssm|
+        run_with_backoff_and_client_fallback(region, failregion) do |ssm|
           ssm.get_parameters_by_path(
             path: path,
             with_decryption: true

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.5.1'
+    VERSION = '2.6.1'
   end
 end

data/spec/ssm_spec.rb

@@ -68,6 +68,11 @@ describe MovableInk::AWS::SSM do
       expect(Aws::SSM::Client).to receive(:new).with({ region: 'us-east-1' })
       aws.ssm_client
     end
+
+    it 'Allows region to be defined as a parameter' do
+      expect(Aws::SSM::Client).to receive(:new).with({ region: 'us-east-2' })
+      aws.ssm_client('us-east-2')
+    end
   end
 
   describe 'ssm_client_failover' do
@@ -75,6 +80,11 @@ describe MovableInk::AWS::SSM do
       expect(Aws::SSM::Client).to receive(:new).with({ region: 'us-west-2' })
       aws.ssm_client_failover
     end
+
+    it 'fails over to parameter defined region' do
+      expect(Aws::SSM::Client).to receive(:new).with({ region: 'us-west-1' })
+      aws.ssm_client_failover('us-west-1')
+    end
   end
 
   describe 'run_with_backoff_and_client_fallback' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core