MovableInkAWS 2.5.2 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363e1c1c55ce4788534ff1c245a354e862e9320d179770c9ccacc54fd335177c
-  data.tar.gz: d453d58d25b0ec69b236d0e5aa3392615099b526294eac9966cebd46bf068b2f
+  metadata.gz: fb359b343b37bc026f547aa8edc0dcd01fc85786947ef5dc8a6d9ef8b6da05d1
+  data.tar.gz: f0c0c888ac995d1f1c895ae359ff19bc93e46b3ea621852733b39475cad138e1
 SHA512:
-  metadata.gz: 2d305359f482dc45af20f878acf18f6569438356121fe63c9f8861277b5cb8a192d65e41c3de9f6dbbf47c0e368b235671f172749a08ad0dc61cbfb1d1c500a3
-  data.tar.gz: 3a2bc49178a06fae7316ed380f693ad86502db0e0df71be9e6144fd10bfe888a625c756e4e631d7b47ef24cb5efe3237b075cecda011c4087c32e82950818042
+  metadata.gz: 698f828137a5d649ebe788b5d9c4ab42f333e0a80eeca47708044121703c8afa79248bd86ab8ec0f6afac221c8506d3e52e10356a6f2a3213a09a45926d2d4f0
+  data.tar.gz: 2d68a15e5b41f608411a498fad5db04ec837cdf88791605a73f285e64d1f58964bb7b6d49d7ff6d570e8c919f3c280f607bf6bbc84554339cfbf1ea29eb8de88

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.5.2)
+    MovableInkAWS (2.6.2)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -9,6 +9,7 @@ PATH
       aws-sdk-ec2 (~> 1)
       aws-sdk-eks (~> 1)
       aws-sdk-elasticache (~> 1)
+      aws-sdk-iam (~> 1)
       aws-sdk-rds (~> 1)
       aws-sdk-route53 (~> 1)
       aws-sdk-s3 (~> 1)
@@ -48,6 +49,9 @@ GEM
     aws-sdk-elasticache (1.76.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-iam (1.68.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.55.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -117,4 +121,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.11

data/MovableInkAWS.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-ec2', '~> 1'
   s.add_runtime_dependency 'aws-sdk-eks', '~> 1'
   s.add_runtime_dependency 'aws-sdk-elasticache', '~> 1'
+  s.add_runtime_dependency 'aws-sdk-iam', '~> 1'
   s.add_runtime_dependency 'aws-sdk-rds', '~> 1'
   s.add_runtime_dependency 'aws-sdk-route53', '~> 1'
   s.add_runtime_dependency 'aws-sdk-s3', '~> 1'

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/aws.rb

@@ -12,6 +12,7 @@ require_relative 'aws/elasticache'
 require_relative 'aws/api_gateway'
 require_relative 'consul/consul'
 require 'aws-sdk-cloudwatch'
+require 'aws-sdk-iam'
 
 
 module MovableInk
@@ -84,7 +85,10 @@ module MovableInk
                Aws::SSM::Errors::Http503Error,
                Aws::SSM::Errors::Http502Error,
                Aws::Athena::Errors::ThrottlingException,
-               MovableInk::AWS::Errors::NoEnvironmentTagError
+               MovableInk::AWS::Errors::NoEnvironmentTagError,
+               Aws::IAM::Errors::LimitExceededException,
+               Aws::IAM::Errors::RequestLimitExceeded,
+               Aws::IAM::Errors::Throttling
           sleep_time = (num+1)**2 + rand(10)
           if quiet
             (num >= tries - 1) ? notify_and_sleep(sleep_time, $!.class) : sleep(sleep_time)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.5.2'
+    VERSION = '2.6.2'
   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.2
+  version: 2.6.2
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-iam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-rds
   requirement: !ruby/object:Gem::Requirement