jets 3.0.14 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571efa758f33bf44042d6e8be73c933011680217cd4e87b0324f85b5fc7c37dc
-  data.tar.gz: fac7b4ceae0b9d7e0fe8f494f57cf409d71a08d26dbd259424800d3a9feb268b
+  metadata.gz: 30209fb06ab88c5a593d26b7d20bf15f1164b5915a40f23ea8f61b2f7538361a
+  data.tar.gz: 5c68efddc6c6b6c183c2191f23f5729c094247031ff88c3d0d73db2ea1e992e2
 SHA512:
-  metadata.gz: 3ee364750aaa8c1f74a92ec9da2363e77cd7af84db97977b54a40cb087a32bbbec4e413b5cac5117018468c84b23ed18646f5416b9aaf3d425e668dabfb21b6c
-  data.tar.gz: 446e82b01a2d07679d1f51f8dd7e461d7ddfd67a46759fc22fa59c740fe8f6011a711a7acdc80ea1d4e62786f8e79eec7596c283f3758fd9734546d2bb555953
+  metadata.gz: 843dac414dc95a7aefc8ff4e02df7dc652319fdffefb1b61ce44043955021d6f438cc0877eb814e5b160220a17744b349120484a8633da18744158360e68ded1
+  data.tar.gz: 2b5b0dfb86f76f09d9bcc9f2a167a7af0cd260fde702fd4c6b7dc5db4f7af9d949a04fd77d2fb2e54ce0f3681a606064c249f7e6944d565d4d6a38b8c41afb9d

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.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
+- [#589](https://github.com/boltops-tools/jets/pull/589) Ujs
+
 ## [3.0.14] - 2021-09-01
 - [#583](https://github.com/boltops-tools/jets/pull/583) Don't overwrite content_type  when rendering json or xml with content_type specified
 - [#584](https://github.com/boltops-tools/jets/pull/584) Adds an override flag to change behaviour when Jets is behind an ELB running Jets Server

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

@@ -114,7 +114,14 @@ JS
       after = "const { environment } = require('@rails/webpacker')\n"
       insert_into_file("config/webpack/environment.js", jquery, after: after)
 
-      run("yarn add bootstrap jquery popper.js postcss-cssnext @rails/ujs")
+      jets_ujs =<<-JS
+import Jets from "@rubyonjets/ujs-compat"
+Jets.start()
+JS
+      after = "Rails.start()\n"
+      insert_into_file("app/javascript/packs/application.js", jets_ujs, after: after)
+
+      run("yarn add bootstrap jquery popper.js postcss-cssnext @rails/ujs @rubyonjets/ujs-compat")
     end
 
     def git_init

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/middleware/local/route_matcher.rb

@@ -5,17 +5,17 @@ class Jets::Controller::Middleware::Local
     end
 
     def find_route
-      Jets::Router::Finder.new(method, path).run
+      Jets::Router::Finder.new(path, method).run
     end
 
   private
     attr_reader :env
 
-    def path
+    def method
       env["REQUEST_METHOD"] || "GET"
     end
 
-    def method
+    def path
       env["PATH_INFO"].sub(/^\//,'')
     end
   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/generator/templates/rails/scaffold_controller/controller.rb

@@ -56,7 +56,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def delete
     @<%= orm_instance.destroy %>
     if request.xhr?
-      render json: {success: true}
+      render json: {success: true, location: <%= table_name %>_path}
     else
       redirect_to <%= table_name %>_path
     end

data/lib/jets/internal/app/functions/jets/base_path_mapping.rb

@@ -4,6 +4,25 @@ require 'aws-sdk-cloudformation'
 class BasePathMapping
   def initialize(event, stage_name)
     @event, @stage_name = event, stage_name
+    aws_config_update!
+  end
+
+  # Override the AWS retry settings. 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
+  #
+  # 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
 
   # Cannot use update_base_path_mapping to update the base_mapping because it doesnt

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.14"
+  VERSION = "3.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.18
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 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