jets 3.0.13 → 3.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e4fbbeb4ae84a9c2f7d3c6fac9fdbb6cdcda684ae9387ba8c09b4f7c07cb7e
-  data.tar.gz: 0ca4432001005d29d4104cf48c2e92d68abb6d3018e2fdc15f3cc5f50769a703
+  metadata.gz: a03ac914d64e082dd8973795f04e9e4ebd3878b0eb04663e97ef368eecc19eb3
+  data.tar.gz: 56fe08319ec68002c7990d140dd26e90cdd7ff13b503702bf94dcddb60e12e4a
 SHA512:
-  metadata.gz: 79ac35eaf167a60a3bd6ab384fd5cd2cee55adaf3726d72d2c2648103af4153c7906560ac6977b270f55d69e4ce641582bd8f8e8e9a102af9ecbaffa071b50bd
-  data.tar.gz: 0df8301c1d590dc62119baf244eedd93d152b5d23d2149304d4223d28f7fd4b733eb05f9fcd69c8faba5df873e0023c4d88de694717d0493d30b627091110d2a
+  metadata.gz: 9bdcb8d9549179d4adf082abaa0b7353b758b4168019dc43a5208e427186462875bc2e843378461747b756f976d2b62ee175714a7081455ddacb532b4f1b6e2f
+  data.tar.gz: 5d79ca553952a1413abf1ac4a143f6b905bf1067662c4642e598932ff5ee15b135334d57fbb3530171e63f8322c9e46dc60e6349c1d2e3c06b1416ce386a2821

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.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
+- [#585](https://github.com/boltops-tools/jets/pull/585) add_stage controller method
+- [#586](https://github.com/boltops-tools/jets/pull/586) JETS_ELB env var flag
+
 ## [3.0.13] - 2021-08-17
 - [#582](https://github.com/boltops-tools/jets/pull/582) use Shotgun::Static middleware always
 

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

@@ -70,6 +70,7 @@ module Jets::Controller::Middleware
 
     def on_aws?(env)
       return false if Jets.env.test? # usually with test we're passing in full API Gateway fixtures with the HTTP_X_AMZN_TRACE_ID
+      return false if ENV['JETS_ELB'] # If we're using an ELB and Jets is inside a container running jets server, we don't want to pretend we're on AWS.
       on_cloud9 = !!(env['HTTP_HOST'] =~ /cloud9\..*\.amazonaws\.com/)
       !!env['HTTP_X_AMZN_TRACE_ID'] && !on_cloud9
     end

data/lib/jets/controller/redirection.rb

@@ -7,16 +7,7 @@ class Jets::Controller
         raise "redirect_to url parameter must be a String. Please pass in a string"
       end
 
-      uri = URI.parse(url)
-      # if no location.host, we been provided a relative host
-      if !uri.host && actual_host
-        url = "/#{url}" unless url.starts_with?('/')
-        url = add_stage_name(url)
-        redirect_url = actual_host + url
-      else
-        redirect_url = url
-      end
-
+      redirect_url = add_stage(url)
       redirect_url = ensure_protocol(redirect_url)
 
       aws_proxy = Rendering::RackRenderer.new(self,

data/lib/jets/controller/rendering.rb

@@ -33,6 +33,8 @@ class Jets::Controller
     end
 
     def adjust_content_type!(options)
+      return if options.key?(:content_type)
+
       if options.key?(:json)
         options[:content_type] = "application/json"
       elsif options.key?(:xml)
@@ -60,15 +62,26 @@ class Jets::Controller
       rest.merge(template: template)
     end
 
-    # Add API Gateway Stage Name
-    def add_stage_name(url)
+    # Example usage:
+    #
+    #   render json: {success: true, location: add_stage(posts_path)}
+    #
+    def add_stage(url)
       return url unless actual_host
 
-      Jets::Controller::Stage.add(actual_host, url)
+      uri = URI.parse(url)
+      # if no location.host, we been provided a relative host
+      if !uri.host && actual_host
+        url = "/#{url}" unless url.starts_with?('/')
+        url = Jets::Controller::Stage.add(actual_host, url)
+        actual_host + url
+      else
+        url
+      end
     end
 
     def url_for(url)
-      add_stage_name(url)
+      add_stage(url)
     end
 
     # Actual host can be headers["origin"] when cloudfront is in front.

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/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.13"
+  VERSION = "3.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.17
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -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