jets 3.0.15 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e203dbd0ee79c9e7287badab576597b08f0b3f5fd3f1b5309bfa910cbf2858
-  data.tar.gz: 1a29ba9a72f042b156312d47acdeebee565f6dc4a5c3d3ee109931723e59b583
+  metadata.gz: 628d962d35e5e497e1e5362ea11d5844c94e28f9e71877295edd046d291e6b81
+  data.tar.gz: 0a353487be640729460d85debb14d71064415847311ec952b5612e8a483e6a63
 SHA512:
-  metadata.gz: 6c6f2d06e54b0837f30c9a064e48252330a72a770b1b0f51e1884ab4820291220565b696f505cfe5645a3de2d428a3c380bc2c7f8d8873ae8819f2f5f0c0a6ef
-  data.tar.gz: 95a8262ad30c8a593a2c23fed954528e4d0801cd8260ae81e7c974f89d1e8c05c34c3778a7422f356de30c410bae9a9313ebf677e440d7b06d379aa7580421f8
+  metadata.gz: b36f4d843a60052f42935df53e4d801e74dba09237b03b2cee11835894d0a4574493b1b26793f2fdbc8e26b040bd911378752000201b0bcfaeda56727936f04f
+  data.tar.gz: ce8b72b84930ccd20727504c1955f4d1f4acf9c36e750207eb85ab2ccee6fd8a9d85e5f1ee6e449bf8a7e7925de3e55a08c3c294dd9eb0c8cb84cf98757412b2

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 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.19] - 2021-10-20
+- [#602](https://github.com/boltops-tools/jets/pull/602) pin zeitwerk to 2.4.x in gemfile
+
+## [3.0.18] - 2021-10-20
+- [#596](https://github.com/boltops-tools/jets/pull/596) Serialize job data correctly
+- [#598](https://github.com/boltops-tools/jets/pull/598) fixing issues when mounting
+- [#599](https://github.com/boltops-tools/jets/pull/599) pin to zeitwerk 2.4.x
+- [#600](https://github.com/boltops-tools/jets/pull/600) method override also on the lambda function side
+
+## [3.0.17] - 2021-09-15
+- [#593](https://github.com/boltops-tools/jets/pull/593) Fix deploy for new projects. Added rescue block back into lib/jets/commands/deploy.rb
+
+## [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/jets.gemspec

@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
-  spec.add_dependency "zeitwerk"
+  spec.add_dependency "zeitwerk", "~> 2.4.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

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,7 +102,6 @@ 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
@@ -136,18 +111,6 @@ module Jets::Commands
       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/commands/templates/skeleton/Gemfile.tt

@@ -18,6 +18,7 @@ gem "mysql2", "~> 0.5.3"
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"
 <% end -%>
+gem "zeitwerk", "~> 2.4.0"
 
 # development and test groups are not bundled as part of the deployment
 group :development, :test do

data/lib/jets/controller/base.rb

@@ -43,7 +43,7 @@ class Jets::Controller
     # Most of the time, you want process! instead of dispatch!
     #
     def process!
-      adapter = Jets::Controller::Rack::Adapter.new(event, context, meth)
+      adapter = Jets::Controller::Rack::Adapter.new(event, context)
       adapter.rack_vars(
         'jets.controller' => self,
         'lambda.context' => context,
@@ -75,6 +75,8 @@ class Jets::Controller
     # dispatch! is useful for megamode or mounted applications
     #
     def dispatch!
+      method_override!
+
       t1 = Time.now
       log_start
 
@@ -99,12 +101,30 @@ class Jets::Controller
       triplet # status, headers, body
     end
 
+    # Override @meth when POST with _method=delete
+    # By the time processing reaches dispatch which calls method_override!
+    # The Rack::MethodOverride middleware has overriden env['REQUEST_METHOD'] with DELETE
+    # and set env['rack.methodoverride.original_method']
+    def method_override!
+      env = request.env
+      if env['rack.methodoverride.original_method'] && env['REQUEST_METHOD'] == 'DELETE'
+        @original_meth = @meth
+        @meth = "delete"
+      end
+    end
+
+    def processing_log
+      processing = "Processing #{self.class.name}##{@meth}"
+      processing << " (original method #{@original_meth})" if @original_meth
+      processing
+    end
+
     # Documented interface method, careful not to rename
     def log_start
       # JSON.dump makes logging look pretty in CloudWatch logs because it keeps it on 1 line
       ip = request.ip
       Jets.logger.info "Started #{@event['httpMethod']} \"#{@event['path']}\" for #{ip} at #{Time.now}"
-      Jets.logger.info "Processing #{self.class.name}##{@meth}"
+      Jets.logger.info processing_log
       Jets.logger.info "  Event: #{event_log}"
       Jets.logger.info "  Parameters: #{JSON.dump(filtered_parameters.to_h)}"
     end

data/lib/jets/controller/rack/adapter.rb

@@ -5,13 +5,13 @@ module Jets::Controller::Rack
     extend Memoist
 
     # Returns back API Gateway response hash structure
-    def self.process(event, context, meth)
-      adapter = new(event, context, meth)
+    def self.process(event, context)
+      adapter = new(event, context)
       adapter.process
     end
 
-    def initialize(event, context, meth)
-      @event, @context, @meth = event, context, meth
+    def initialize(event, context)
+      @event, @context = event, context
     end
 
     # 1. Convert API Gateway event event to Rack env

data/lib/jets/controller/rack/env.rb

@@ -27,12 +27,12 @@ module Jets::Controller::Rack
     def path_with_base_path
       resource = @event['resource']
       pathParameters = @event['pathParameters']
-      
+
       if(!pathParameters.nil? and !resource.nil?)
         resource = pathParameters.reduce(resource) {|resource, parameter|
           key, value = parameter
-          key = key.eql?("catchall") ? "{#{key}+}" : "{#{key}}"
-          resource = resource.gsub(key, value)
+          resource = resource.gsub("{#{key}+}", value)
+          resource = resource.gsub("{#{key}}", value)
           resource
         }
       end
@@ -64,7 +64,9 @@ module Jets::Controller::Rack
     end
 
     def content_type
-      headers['Content-Type'] || Jets::Controller::DEFAULT_CONTENT_TYPE
+      # Rack (local) uses Content-Type and APIGW (remote) uses content-type
+      # Rack::MethodOverride relys on content-type to detect content type properly.
+      headers['Content-Type'] || headers['content-type'] || Jets::Controller::DEFAULT_CONTENT_TYPE
     end
 
     def content_length

data/lib/jets/job/base.rb

@@ -26,13 +26,13 @@ module Jets::Job
       end
 
       def perform_now(meth, event={}, context={})
-        new(event, context, meth).send(meth)
+        new(event.try(:to_unsafe_h), context, meth).send(meth)
       end
 
       def perform_later(meth, event={}, context={})
         if on_lambda?
           function_name = "#{self.to_s.underscore}-#{meth}"
-          call = Jets::Commands::Call.new(function_name, JSON.dump(event), invocation_type: "Event")
+          call = Jets::Commands::Call.new(function_name, JSON.dump(event.try(:to_unsafe_h)), invocation_type: "Event")
           call.run
         else
           puts "INFO: Not on AWS Lambda. In local mode perform_later executes the job with perform_now instead."

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.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.19
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -490,16 +490,16 @@ dependencies:
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -1095,7 +1095,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework