jets 2.3.19 → 3.0.0

data/lib/jets/commands/help/call.md

@@ -53,6 +53,14 @@ Jets figures out what functions to call by evaluating the app code and finds if
 
     jets call admin-related_pages_controller-index --no-guess
 
+If you want to call a function which runs too long time, you can set `read_timeout`.
+
+    jets call some_long_job-index --read_timeout 900
+    
+And you can set `retry_limit`. If you don't want to retry you can set 0.
+
+    jets call some_long_job-index --retry_limit 0
+
 ## Local mode
 
 Instead of calling AWS lambda remote, you can also have `jets call` use the code directly on your machine.  To enable this, use the `--local` flag. Example:

data/lib/jets/commands/help/gems/check.md

@@ -1,8 +1,6 @@
-You can configure additional gem sources in config/application.rb:
+Check if pre-built Lambda gems are available from the gems source. You can configure the gem in config/application.rb:
 
     # Sources for check for pre-compiled Lambda gems. Checks the list in order.
     Jets.application.configure do
-      config.gems.sources = [
-        "https://gems2.lambdagems.com"
-      ]
-    end
+      config.gems.source = "https://api.serverlessgems.com/api/v1"
+    end

data/lib/jets/commands/main.rb

@@ -12,6 +12,12 @@ module Jets::Commands
       Build.new(options).run
     end
 
+    desc "configure [TOKEN]", "configure token and updates ~/.jets/config.yml"
+    long_desc Help.text(:configure)
+    def configure(token=nil)
+      Configure.new(options.merge(token: token)).run
+    end
+
     desc "deploy [environment]", "Builds and deploys project to AWS Lambda"
     long_desc Help.text(:deploy)
     # Note the environment is here to trick the Thor parser to allowing an
@@ -23,7 +29,7 @@ module Jets::Commands
 
     desc "delete", "Delete the Jets project and all its resources"
     long_desc Help.text(:delete)
-    option :sure, type: :boolean, desc: "Skip are you sure prompt."
+    option :yes, aliases: %w[y], type: :boolean, desc: "Skip are you sure prompt."
     option :wait, type: :boolean, default: true, desc: "Wait for stack deletion to complete."
     # Note the environment is here to trick the Thor parser to allowing an
     # environment parameter. It is not actually set here.  It is set earlier
@@ -83,6 +89,8 @@ module Jets::Commands
     option :lambda_proxy, type: :boolean, default: true, desc: "Enables automatic Lambda proxy transformation of the event payload"
     option :guess, type: :boolean, default: true, desc: "Enables guess mode. Uses inference to allows use of all dashes to specify functions. Guess mode verifies that the function exists in the code base."
     option :local, type: :boolean, desc: "Enables local mode. Instead of invoke the AWS Lambda function, the method gets called locally with current app code. With local mode guess mode is always used."
+    option :retry_limit, type: :numeric, default: nil, desc: "Retry count of invoking function. It work with remote call"
+    option :read_timeout, type: :numeric, default: nil, desc: " The number of seconds to wait for response data. It work with remote call"
     def call(function_name, payload='')
       # Printing to stdout can mangle up the response when piping
       # the value to jq. For example:

data/lib/jets/commands/new.rb

@@ -89,6 +89,14 @@ module Jets::Commands
       run(command)
     end
 
+    def update_package_json
+      path = "package.json"
+      return unless File.exist?(path)
+      data = JSON.load(IO.read(path))
+      data["private"] = true
+      IO.write(path, JSON.pretty_generate(data))
+    end
+
     # bootstrap is dependent on webpacker, options[:bootstrap] is used
     # in webpacker_install.
     def bootstrap_install
@@ -106,7 +114,7 @@ JS
       after = "const { environment } = require('@rails/webpacker')\n"
       insert_into_file("config/webpack/environment.js", jquery, after: after)
 
-      run("yarn add bootstrap@4.0.0-beta jquery popper.js postcss-cssnext")
+      run("yarn add bootstrap jquery popper.js postcss-cssnext")
     end
 
     def git_init

data/lib/jets/commands/sequence.rb

@@ -10,6 +10,12 @@ class Jets::Commands::Sequence < Thor::Group
   end
 
 private
+  def jets_minor_version
+    md = Jets::VERSION.match(/(\d+)\.(\d+)\.\d+/)
+    major, minor = md[1], md[2]
+    [major, minor, '0'].join('.')
+  end
+
   def clone_project
     unless git_installed?
       abort "Unable to detect git installation on your system. Git needs to be installed in order to use the --repo option."

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "jets"
+gem "jets", "~> <%= jets_minor_version %>"
 
 <% if @webpacker -%>
 # Include jetpacker if you are building html pages

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -63,7 +63,7 @@ Jets.application.configure do
   # By default logger needs to log to $stderr for CloudWatch to receive Lambda messages, but for
   # local testing environment you may want to log these messages to 'test.log' file to keep your
   # testing suite output readable.
-  # config.logger = Jets::Logger.new($strerr)
+  # config.logger = Jets::Logger.new($stderr)
 
 <% if @options[:mode] == 'api' -%>
   config.controllers.default_protect_from_forgery = false

data/lib/jets/commands/templates/skeleton/public/index.html.tt

@@ -84,7 +84,7 @@
     </div>
     <p class="version">
       <strong>Jets version:</strong> <%= Jets.version %><br />
-      <strong>Ruby version:</strong> <%= Jets::RUBY_VERSION %>
+      <strong>Ruby version:</strong> <%= RUBY_VERSION %>
     </p>
   </div>
 </body>

data/lib/jets/commands/url.rb

@@ -44,6 +44,7 @@ module Jets::Commands
       # domain_name is a method on the Jets::Resource::ApiGateway::Domain instance
       url = "https://#{domain_name.domain_name}"
       puts "Custom Domain: #{url}"
+      puts "App Domain: #{Jets.config.app.domain}" if Jets.config.app.domain
     end
 
     def endpoint_unavailable?

data/lib/jets/controller/base.rb

@@ -76,7 +76,7 @@ class Jets::Controller
     #
     def dispatch!
       t1 = Time.now
-      log_info_start
+      log_start
 
       begin
         if run_before_actions(break_if: -> { @rendered })
@@ -95,13 +95,13 @@ class Jets::Controller
 
       took = Time.now - t1
       status = triplet[0]
-      Jets.logger.info "Completed Status Code #{status} in #{took}s"
+      log_finish(status: status, took: took)
       triplet # status, headers, body
     end
 
-    def log_info_start
+    # 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}"
@@ -109,6 +109,12 @@ class Jets::Controller
       Jets.logger.info "  Parameters: #{JSON.dump(filtered_parameters.to_h)}"
     end
 
+    # Documented interface method, careful not to rename
+    def log_finish(options={})
+      status, took = options[:status], options[:took]
+      Jets.logger.info "Completed Status Code #{status} in #{took}s"
+    end
+
     def event_log
       display_event = @event.dup
 
@@ -141,6 +147,10 @@ class Jets::Controller
       paths
     end
 
+    def controller_name
+      self.class.to_s.underscore
+    end
+
     def action_name
       @meth
     end

data/lib/jets/controller/middleware/main.rb

@@ -40,7 +40,8 @@ module Jets::Controller::Middleware
     end
 
     def jets_host
-      default = "#{@env['rack.url_scheme']}://#{@env['HTTP_HOST']}"
+      protocol = @event.dig('headers', 'X-Forwarded-Proto') || @env['rack.url_scheme']
+      default = "#{protocol}://#{@env['HTTP_HOST']}"
       Jets.config.helpers.host || default
     end
 

data/lib/jets/controller/params.rb

@@ -14,11 +14,9 @@ class Jets::Controller
     #   2. query string parameters
     #   3. body parameters
     def params(raw: false, path_parameters: true, body_parameters: true)
-      path_params = event["pathParameters"] || {}
-
       params = {}
       params = params.deep_merge(body_params) if body_parameters
-      params = params.deep_merge(query_parameters) # always
+      params = params.deep_merge(unescape_recursively(query_params)) # always
       params = params.deep_merge(path_params) if path_parameters
 
       if raw
@@ -29,13 +27,36 @@ class Jets::Controller
       end
     end
 
+    def unescape_recursively(obj)
+      case obj
+      when Hash then obj.map { |k, v| [k, unescape_recursively(v)] }.to_h
+      when Array then obj.map { |v| unescape_recursively(v) }
+      else CGI.unescape(obj.to_s)
+      end
+    end
+
     def filtered_parameters(**kwargs)
       parameter_filter.filter params(**kwargs, raw: true) # Always filter raw hash
     end
 
-    def query_parameters
+    def path_params
+      path_params = event["pathParameters"] || {}
+      path_params = path_params.map { |k, path| [k, CGI.unescape(path)] }.to_h
+    end
+    alias_method :path_parameters, :path_params
+
+    def query_params
       event["queryStringParameters"] || {}
     end
+    alias_method :query_parameters, :query_params
+
+    def request_params
+      {
+        controller: controller_name,
+        action: action_name,
+      }
+    end
+    alias_method :request_parameters, :request_params
 
     def body_params
       body = event['isBase64Encoded'] ? base64_decode(event["body"]) : event["body"]
@@ -58,6 +79,7 @@ class Jets::Controller
       {} # fallback to empty Hash
     end
     memoize :body_params
+    alias_method :body_parameters, :body_params
 
   private
 

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

@@ -13,7 +13,8 @@ module Jets::Controller::Rack
       options = {}
       options = add_top_level(options)
       options = add_http_headers(options)
-      path = @event['path'] || '/' # always set by API Gateway but might not be when testing shim, so setting it to make testing easier
+      path = path_with_base_path || @event['path'] || '/' # always set by API Gateway but might not be when testing shim, so setting it to make testing easier
+
       env = Rack::MockRequest.env_for(path, options)
       if @options[:adapter]
         env['adapter.event'] = @event
@@ -23,6 +24,22 @@ module Jets::Controller::Rack
     end
 
   private
+    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
+        }
+      end
+
+      resource
+    end
+
     def add_top_level(options)
       map = {
         'CONTENT_TYPE' => content_type,

data/lib/jets/controller/rendering.rb

@@ -71,9 +71,12 @@ class Jets::Controller
       add_stage_name(url)
     end
 
+    # Actual host can be headers["origin"] when cloudfront is in front.
+    # Remember to set custom header "origin" header in cloudfront distribution.
+    # Can also override with Jets.config.app.domain.
+    # The actual_host value is used by redirect_to.
     def actual_host
-      # actually host is in headers["origin"] when cloudfront is in front
-      headers["origin"] || headers["host"]
+      Jets.config.app.domain || headers["origin"] || headers["host"]
     end
 
   end

data/lib/jets/controller/rendering/rack_renderer.rb

@@ -63,6 +63,12 @@ module Jets::Controller::Rendering
 
       # Note @options[:method] uses @options vs options on purpose
       @options[:method] = event["httpMethod"].downcase if event["httpMethod"]
+
+      # This is how we pass parameters to actionpack. IE: params to the view.
+      # This is because renderer_options is actually the env that is passed to the rack request.
+      options.merge!("action_dispatch.request.path_parameters" => @controller.path_parameters)
+      options.merge!("action_dispatch.request.query_parameters" => @controller.query_parameters)
+      options.merge!("action_dispatch.request.request_parameters" => @controller.request_parameters)
       options
     end
 
@@ -98,7 +104,7 @@ module Jets::Controller::Rendering
 
     # PostsController => "posts" is the namespace
     def template_namespace
-      @controller.class.to_s.sub('Controller','').underscore.pluralize
+      @controller.class.to_s.sub('Controller','').underscore
     end
 
     # Takes headers and adds HTTP_ to front of the keys because that is what rack

data/lib/jets/core.rb

@@ -139,11 +139,19 @@ module Jets::Core
     rack.wait_for_socket
   end
 
-  def default_gems_source
-    "https://gems2.lambdagems.com"
-  end
-
   def override_lambda_ruby_runtime
     require "jets/overrides/lambda"
   end
+
+  def ruby_folder
+    RUBY_VERSION.split('.')[0..1].join('.') + '.0'
+  end
+
+  # used to configure internal lambda functions
+  # current ruby runtime that user is running
+  # IE: ruby2.5 ruby2.7
+  def ruby_runtime
+    version = RUBY_VERSION.split('.')[0..1].join('.')
+    "ruby#{version}"
+  end
 end

data/lib/jets/dotenv/ssm.rb

@@ -2,7 +2,7 @@ require 'aws-sdk-ssm'
 
 class Jets::Dotenv
   class Ssm
-    SSM_VARIABLE_REGEXP = /^ssm:(.*)/
+    SSM_VARIABLE_REGEXP = /^ssm:(.*)/i
 
     def initialize(variables={})
       @variables = variables
@@ -13,6 +13,8 @@ class Jets::Dotenv
       interpolated_variables = @variables.map do |key, value|
         if value[SSM_VARIABLE_REGEXP]
           value = fetch_ssm_value(key, $1)
+        elsif value == "SSM"
+          value = fetch_ssm_value(key, "SSM")
         end
 
         [key, value]
@@ -26,7 +28,10 @@ class Jets::Dotenv
         interpolated_variables.to_h.sort_by { |k,_| k }.to_h # success
       else
         message = "Error loading .env variables. No matching SSM parameters found for:\n".color(:red)
-        message += @missing.map { |k,v,n| "  #{k}=ssm:#{v} # ssm name: #{n}"}.join("\n")
+        message += @missing.map do |k,v,n|
+          value = v == "SSM" ? v : "ssm:#{v}"
+          "  #{k}=#{value} # ssm name: #{n}"
+        end.join("\n")
         abort message
       end
     end
@@ -34,8 +39,7 @@ class Jets::Dotenv
     def fetch_ssm_value(key, value)
       return "fake-ssm-value" if ENV['JETS_BUILD_NO_INTERNET']
 
-      name = value.start_with?("/") ? value :
-        "/#{Jets.config.project_name}/#{Jets.env}/#{value}"
+      name = ssm_name(key, value)
       response = ssm.get_parameter(name: name, with_decryption: true)
       response.parameter.value
     rescue Aws::SSM::Errors::ParameterNotFound
@@ -43,6 +47,16 @@ class Jets::Dotenv
       ''
     end
 
+    def ssm_name(key, value)
+      if value == "SSM"
+        "/#{Jets.config.project_name}/#{Jets.env}/#{key}"
+      else
+        value.start_with?("/") ?
+          value :
+          "/#{Jets.config.project_name}/#{Jets.env}/#{value}"
+      end
+    end
+
     def ssm
       @ssm ||= Aws::SSM::Client.new
     end

data/lib/jets/generator.rb

@@ -89,9 +89,8 @@ class Jets::Generator
     g = Rails::Configuration::Generators.new
     g.orm             :active_record, migration: true, timestamps: true
     # TODO: support g.orm :dynamodb
-    g.test_framework  false #:test_unit, fixture: false
-    # g.test_framework :rspec # need to
-    # TODO: load rspec configuration to use rspec
+    g.test_framework  nil #:test_unit, fixture: false
+    # g.test_framework :rspec # TODO: load rspec configuration to use rspec
     g.stylesheets     false
     g.javascripts     false
     g.assets          false

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

@@ -1,157 +1,18 @@
-require 'aws-sdk-apigateway'
-require 'aws-sdk-cloudformation'
+require 'bundler/setup'
+require 'cfn_response'
+require 'jets/internal/app/functions/jets/base_path_mapping'
 
 STAGE_NAME = "<%= @stage_name %>"
 
 def lambda_handler(event:, context:)
-  puts("event['RequestType'] #{event['RequestType']}")
-  puts("event: #{JSON.dump(event)}")
-  puts("context: #{JSON.dump(context)}")
-  puts("context.log_stream_name #{context.log_stream_name.inspect}")
-
-  mimic = event['ResourceProperties']['Mimic']
-  physical_id = event['ResourceProperties']['PhysicalId'] || "PhysicalId"
-
-  puts "mimic: #{mimic}"
-  puts "physical_id: #{physical_id}"
-
-  if event['RequestType'] == 'Delete'
-    if mimic == 'FAILED'
-      send_response(event, context, "FAILED")
-    else
-      mapping = BasePathMapping.new(event)
+  cfn = CfnResponse.new(event, context)
+  cfn.response do
+    mapping = BasePathMapping.new(event, STAGE_NAME)
+    case event['RequestType']
+    when "Create", "Update"
+      mapping.update
+    when "Delete"
       mapping.delete(true) if mapping.should_delete?
-      send_response(event, context, "SUCCESS")
     end
-    return # early return
-  end
-
-  mapping = BasePathMapping.new(event)
-  mapping.update
-
-  response_status = mimic == "FAILED" ? "FAILED" : "SUCCESS"
-  response_data = { "Hello" => "World" }
-
-  send_response(event, context, response_status, response_data, physical_id)
-
-# We rescue all exceptions and send an message to CloudFormation so we dont have to
-# wait for over an hour for the stack operation to timeout and rollback.
-rescue Exception => e
-  puts e.message
-  puts e.backtrace
-  sleep 10 # provide delete to make sure that the log gets sent to CloudWatch
-  send_response(event, context, "FAILED")
-end
-
-def send_response(event, context, response_status, response_data={}, physical_id="PhysicalId")
-  response_body = JSON.dump(
-    Status: response_status,
-    Reason: "See the details in CloudWatch Log Stream: #{context.log_stream_name.inspect}",
-    PhysicalResourceId: physical_id,
-    StackId: event['StackId'],
-    RequestId: event['RequestId'],
-    LogicalResourceId: event['LogicalResourceId'],
-    Data: response_data
-  )
-
-  puts "RESPONSE BODY:\n"
-  puts response_body
-
-  url = event['ResponseURL']
-  uri = URI(url)
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.open_timeout = http.read_timeout = 30
-  http.use_ssl = true if uri.scheme == 'https'
-
-
-  # must used url to include the AWSAccessKeyId and Signature
-  req = Net::HTTP::Put.new(url) # url includes query string and uri.path does not, must used url t
-  req.body = response_body
-  req.content_length = response_body.bytesize
-
-  # set headers
-  req['content-type'] = ''
-  req['content-length'] = response_body.bytesize
-
-  res = http.request(req)
-  puts "status code: #{res.code}"
-  puts "headers: #{res.each_header.to_h.inspect}"
-  puts "body: #{res.body}"
-end
-
-
-class BasePathMapping
-  def initialize(event)
-    @event = event
-    @rest_api_id = get_rest_api_id
-    @domain_name = get_domain_name
-    @base_path = ''
-  end
-
-  def update
-    # Cannot use update_base_path_mapping to update the base_mapping because it doesnt
-    # allow us to change the rest_api_id. So we delete and create.
-    delete(true)
-    create
-  end
-
-  # Dont delete the newly created base path mapping unless this is an operation
-  # where we're fully deleting the stack
-  def should_delete?
-    deleting_parent?
-  end
-
-  def delete(fail_silently=false)
-    apigateway.delete_base_path_mapping(
-      domain_name: @domain_name, # required
-      base_path: '(none)',
-    )
-  # https://github.com/tongueroo/jets/issues/255
-  # Used to return: Aws::APIGateway::Errors::NotFoundException
-  # Now returns: Aws::APIGateway::Errors::InternalFailure
-  # So we'll use a more generic error
-  rescue Aws::APIGateway::Errors::ServiceError => e
-    raise(e) unless fail_silently
-  end
-
-  def create
-    apigateway.create_base_path_mapping(
-      domain_name: @domain_name, # required
-      base_path: @base_path,
-      rest_api_id: @rest_api_id, # required
-      stage: STAGE_NAME,
-    )
-  end
-
-  def get_domain_name
-    param = deployment_stack[:parameters].find { |p| p.parameter_key == 'DomainName' }
-    param.parameter_value
-  end
-
-  def deployment_stack
-    @deployment_stack ||= cfn.describe_stacks(stack_name: @event['StackId']).stacks.first
-  end
-
-  def get_rest_api_id
-    param = deployment_stack[:parameters].find { |p| p.parameter_key == 'RestApi' }
-    param.parameter_value
-  end
-
-  def deleting_parent?
-    stack = cfn.describe_stacks(stack_name: parent_stack_name).stacks.first
-    stack.stack_status == 'DELETE_IN_PROGRESS'
-  end
-
-  def parent_stack_name
-    deployment_stack[:root_id]
-  end
-
-private
-  def apigateway
-    @apigateway ||= Aws::APIGateway::Client.new
-  end
-
-  def cfn
-    @cfn ||= Aws::CloudFormation::Client.new
   end
 end