jets 3.0.15 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e203dbd0ee79c9e7287badab576597b08f0b3f5fd3f1b5309bfa910cbf2858
-  data.tar.gz: 1a29ba9a72f042b156312d47acdeebee565f6dc4a5c3d3ee109931723e59b583
+  metadata.gz: e612ac00d993cb94a8458bbf238abc72e898ddbb4b6205c9d0d7a8d2e5388a6c
+  data.tar.gz: e2d13089ca64351b1b4c0c8672b31b17e0708e1caf817eab40abc957775fccf5
 SHA512:
-  metadata.gz: 6c6f2d06e54b0837f30c9a064e48252330a72a770b1b0f51e1884ab4820291220565b696f505cfe5645a3de2d428a3c380bc2c7f8d8873ae8819f2f5f0c0a6ef
-  data.tar.gz: 95a8262ad30c8a593a2c23fed954528e4d0801cd8260ae81e7c974f89d1e8c05c34c3778a7422f356de30c410bae9a9313ebf677e440d7b06d379aa7580421f8
+  metadata.gz: 4db9003f65f11b9a47101159dd80e6576bb12a34989de95227b27882db575d5b61b8d2c2b11965fd933f50156e7197ae80e30da498c12a10bcd868934e96a2b9
+  data.tar.gz: ca781f60467a266f48abb452cbb1f1aa0ee7c5734315e9d3886786c37d2519466749dc04e28aca50ba470c6260763dc3ef5c2e34ad0a8ee1f883f231db623d0d

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.16] - 2021-09-10
+- [#590](https://github.com/boltops-tools/jets/pull/590) Improve Rate Limit Handling
+
 ## [3.0.15] - 2021-09-05
 - [#587](https://github.com/boltops-tools/jets/pull/587) Fix private method names
 - [#588](https://github.com/boltops-tools/jets/pull/588) custom domain: adjust rate limit for base mapping

data/lib/jets/aws_services.rb

@@ -16,52 +16,80 @@ module Jets::AwsServices
   include StackStatus
 
   def apigateway
-    Aws::APIGateway::Client.new
+    Aws::APIGateway::Client.new(aws_options)
   end
   global_memoize :apigateway
 
   def cfn
-    Aws::CloudFormation::Client.new
+    Aws::CloudFormation::Client.new(aws_options)
   end
   global_memoize :cfn
 
   def dynamodb
-    Aws::DynamoDB::Client.new
+    Aws::DynamoDB::Client.new(aws_options)
   end
   global_memoize :dynamodb
 
   def aws_lambda
-    Aws::Lambda::Client.new
+    Aws::Lambda::Client.new(aws_options)
   end
   global_memoize :aws_lambda
 
   def logs
-    Aws::CloudWatchLogs::Client.new
+    Aws::CloudWatchLogs::Client.new(aws_options)
   end
   global_memoize :logs
 
   def s3
-    Aws::S3::Client.new
+    Aws::S3::Client.new(aws_options)
   end
   global_memoize :s3
 
   def s3_resource
-    Aws::S3::Resource.new
+    Aws::S3::Resource.new(aws_options)
   end
   global_memoize :s3_resource
 
   def sns
-    Aws::SNS::Client.new
+    Aws::SNS::Client.new(aws_options)
   end
   global_memoize :sns
 
   def sqs
-    Aws::SQS::Client.new
+    Aws::SQS::Client.new(aws_options)
   end
   global_memoize :sqs
 
   def sts
-    Aws::STS::Client.new
+    Aws::STS::Client.new(aws_options)
   end
   global_memoize :sts
+
+  # Override the AWS retry settings with Jets AWS clients.
+  #
+  # The aws-sdk-core has exponential backup with this formula:
+  #
+  #   2 ** c.retries * c.config.retry_base_delay
+  #
+  # So the max delay will be 2 ** 7 * 0.6 = 76.8s
+  #
+  # Only scoping this to deploy because dont want to affect people's application that use the aws sdk.
+  #
+  # There is also additional rate backoff logic elsewhere, since this is only scoped to deploys.
+  #
+  # Useful links:
+  #   https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/lib/aws-sdk-core/plugins/retry_errors.rb
+  #   https://docs.aws.amazon.com/apigateway/latest/developerguide/limits.html
+  #
+  def aws_options
+    options = {
+      retry_limit: 7, # default: 3
+      retry_base_delay: 0.6, # default: 0.3
+    }
+    options.merge!(
+      log_level: :debug,
+      logger: Logger.new($stdout),
+    ) if ENV['JETS_DEBUG_AWS_SDK']
+    options
+  end
 end

data/lib/jets/commands/clean/log.rb

@@ -26,20 +26,7 @@ class Jets::Commands::Clean
     end
 
     def delete_log_group(log_group_name)
-      retries = 0
       logs.delete_log_group(log_group_name: log_group_name)
-    rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-      retries += 1
-      seconds = 2 ** retries
-
-      puts "WARN: delete_log_group #{e.class} #{e.message}".color(:yellow)
-      puts "Backing off and will retry in #{seconds} seconds."
-      sleep(seconds)
-      if seconds > 90 # 2 ** 6 is 64 so will give up after 6 retries
-        puts "Giving up after #{retries} retries"
-      else
-        retry
-      end
     end
 
     def clean_deploys

data/lib/jets/commands/delete.rb

@@ -44,27 +44,7 @@ class Jets::Commands::Delete
   end
 
   def confirm_project_exists
-    retries = 0
-    begin
-      cfn.describe_stacks(stack_name: parent_stack_name)
-    rescue Aws::CloudFormation::Errors::ValidationError
-      # Aws::CloudFormation::Errors::ValidationError is thrown when the stack
-      # does not exist
-      puts "The parent stack #{Jets.config.project_namespace.color(:green)} for the project #{Jets.config.project_name.color(:green)} does not exist. So it cannot be deleted."
-      exit 0
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      retries += 1
-      seconds = 2 ** retries
-
-      puts "WARN: confirm_project_exists #{e.class} #{e.message}".color(:yellow)
-      puts "Backing off and will retry in #{seconds} seconds."
-      sleep(seconds)
-      if seconds > 90 # 2 ** 6 is 64 so will give up after 6 retries
-        puts "Giving up after #{retries} retries"
-      else
-        retry
-      end
-    end
+    cfn.describe_stacks(stack_name: parent_stack_name)
   end
 
   def empty_s3_bucket

data/lib/jets/commands/deploy.rb

@@ -9,7 +9,6 @@ module Jets::Commands
     end
 
     def run
-      aws_config_update!
       deployment_env = Jets.config.project_namespace.color(:green)
       puts "Deploying to Lambda #{deployment_env} environment..."
       return if @options[:noop]
@@ -37,29 +36,6 @@ module Jets::Commands
       ship(stack_type: :full, s3_bucket: s3_bucket)
     end
 
-    # Override the AWS retry settings during a deploy.
-    #
-    # The aws-sdk-core has expondential backup with this formula:
-    #
-    #   2 ** c.retries * c.config.retry_base_delay
-    #
-    # So the max delay will be 2 ** 7 * 0.6 = 76.8s
-    #
-    # Only scoping this to deploy because dont want to affect people's application that use the aws sdk.
-    #
-    # There is also additional rate backoff logic elsewhere, since this is only scoped to deploys.
-    #
-    # Useful links:
-    #   https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/lib/aws-sdk-core/plugins/retry_errors.rb
-    #   https://docs.aws.amazon.com/apigateway/latest/developerguide/limits.html
-    #
-    def aws_config_update!
-      Aws.config.update(
-        retry_limit: 7, # default: 3
-        retry_base_delay: 0.6, # default: 0.3
-      )
-    end
-
     def create_s3_event_buckets
       buckets = Jets::Job::Base.s3_events.keys
       buckets.each do |bucket|
@@ -126,28 +102,8 @@ module Jets::Commands
     end
 
     def find_stack(stack_name)
-      retries = 0
       resp = cfn.describe_stacks(stack_name: stack_name)
       resp.stacks.first
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      # example: Stack with id demo-dev does not exist
-      if e.message =~ /Stack with/ && e.message =~ /does not exist/
-        nil
-      else
-        raise
-      end
-    rescue Aws::CloudFormation::Errors::Throttling => e
-      retries += 1
-      seconds = 2 ** retries
-
-      puts "WARN: find_stack #{e.class} #{e.message}".color(:yellow)
-      puts "Backing off and will retry in #{seconds} seconds."
-      sleep(seconds)
-      if seconds > 90 # 2 ** 6 is 64 so will give up after 6 retries
-        puts "Giving up after #{retries} retries"
-      else
-        retry
-      end
     end
 
     # All CloudFormation states listed here: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html

data/lib/jets/resource/api_gateway/rest_api/routes/change/base.rb

@@ -59,26 +59,11 @@ class Jets::Resource::ApiGateway::RestApi::Routes::Change
 
     def method_uri(resource_id, http_method)
       # https://docs.aws.amazon.com/apigateway/latest/developerguide/limits.html
-      retries = 0
-      begin
-        resp = apigateway.get_method(
-          rest_api_id: rest_api_id,
-          resource_id: resource_id,
-          http_method: http_method
-        )
-      rescue Aws::APIGateway::Errors::TooManyRequestsException => e
-        retries += 1
-        seconds = 2 ** retries
-
-        puts "WARN: method_uri #{e.class} #{e.message}".color(:yellow)
-        puts "Backing off and will retry in #{seconds} seconds."
-        sleep(seconds)
-        if seconds > 90 # 2 ** 6 is 64 so will give up after 6 retries
-          puts "Giving up after #{retries} retries"
-        else
-          retry
-        end
-      end
+      resp = apigateway.get_method(
+        rest_api_id: rest_api_id,
+        resource_id: resource_id,
+        http_method: http_method
+      )
       resp.method_integration.uri
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.15"
+  VERSION = "3.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer