jets 0.10.4 → 1.0.0

data/lib/jets/commands/templates/skeleton/config/database.yml.tt

@@ -1,9 +1,13 @@
 default: &default
-  adapter: postgresql
+  adapter: <%= @options[:database] == 'mysql' ? 'mysql2' : 'postgresql' %>
   encoding: utf8
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @project_name %>_dev' %>
+<% if @options[:database] == 'mysql' -%>
+  username: <%%= ENV['DB_USER'] || 'root' %>
+<% else -%>
   username: <%%= ENV['DB_USER'] || ENV['USER'] %>
+<% end -%>
   password: <%%= ENV['DB_PASS'] %>
   host: <%%= ENV["DB_HOST"] %>
   url: <%%= ENV['DATABASE_URL'] %> # takes higher precedence than other settings

data/lib/jets/commands/templates/skeleton/config/environments/development.rb

@@ -0,0 +1,3 @@
+Jets.application.configure do
+  config.ruby.lazy_load = true
+end

data/lib/jets/commands/templates/skeleton/config/environments/production.rb

@@ -0,0 +1,5 @@
+Jets.application.configure do
+  # If your app exceeds the AWS Lambda code size limit then Jets will automatically
+  # enable config.ruby.lazy_load = true regardless of this setting.
+  config.ruby.lazy_load = false
+end

data/lib/jets/commands/templates/skeleton/spec/controllers/posts_controller_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 # Example:
-# RSpec.describe PostsController, type: :controller do
+# describe PostsController, type: :controller do
 #   it "index returns a success response" do
 #     event = payload("posts-index")
 #     controller = PostsController.new(event)

data/lib/jets/commands.rb

@@ -10,6 +10,7 @@ module Jets::Commands
   autoload :Deploy, "jets/commands/deploy"
   autoload :Dynamodb, "jets/commands/dynamodb"
   autoload :Help, "jets/commands/help"
+  autoload :Import, "jets/commands/import"
   autoload :Main, "jets/commands/main"
   autoload :Markdown, "jets/commands/markdown"
   autoload :New, "jets/commands/new"

data/lib/jets/controller/base.rb

@@ -18,7 +18,7 @@ class Jets::Controller
       controller = new(event, context, meth)
 
       Jets.logger.info "  Event: #{event.inspect}"
-      Jets.logger.info "  Parameters: #{controller.params(true).to_h.inspect}"
+      Jets.logger.info "  Parameters: #{controller.params(raw: true).to_h.inspect}"
 
       controller.run_before_actions
       controller.send(meth)

data/lib/jets/controller/layout.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 class Jets::Controller
   module Layout
     extend ActiveSupport::Concern

data/lib/jets/controller/params.rb

@@ -9,12 +9,13 @@ class Jets::Controller
     #   1. path parameters have highest precdence
     #   2. query string parameters
     #   3. body parameters
-    def params(raw=false)
+    def params(raw: false, path_parameters: true)
       query_string_params = event["queryStringParameters"] || {}
       path_params = event["pathParameters"] || {}
       params = body_params
                 .deep_merge(query_string_params)
-                .deep_merge(path_params)
+      params = params.deep_merge(path_params) if path_parameters
+
       if raw
         params
       else

data/lib/jets/controller/request.rb

@@ -51,5 +51,9 @@ class Jets::Controller
       headers["x-requested-with"] == "XMLHttpRequest"
     end
 
+    def path
+      @event["path"]
+    end
+
   end
 end

data/lib/jets/core.rb

@@ -34,15 +34,6 @@ module Jets::Core
   # Ensures trailing slash
   # Useful for appending a './' in front of a path or leaving it alone.
   # Returns: '/path/with/trailing/slash/' or './'
-  # @@root = nil
-  # def root
-  #   return @@root if @@root
-  #   @@root = ENV['JETS_ROOT'].to_s
-  #   @@root = '.' if @@root == ''
-  #   @@root = "#{@@root}/" unless @@root.ends_with?('/')
-  #   @@root = Pathname.new(@@root)
-  # end
-
   def root
     root = ENV['JETS_ROOT'].to_s
     root = '.' if root == ''
@@ -107,15 +98,18 @@ module Jets::Core
 
   # Skip these paths because eager loading doesnt work for them.
   def skip_eager_load_paths?(path)
-    path =~ %r{/templates/} ||
-    path =~ %r{/version} ||
-    path =~ %r{/rails_overrides} ||
-    path =~ %r{/default/application} ||
-    path =~ %r{/internal/app} ||
-    path =~ %r{/webpacker} ||
     path =~ %r{/cli} ||
     path =~ %r{/core_ext} ||
-    path =~ %r{/jets/stack}
+    path =~ %r{/default/application} ||
+    path =~ %r{/functions} ||
+    path =~ %r{/internal/app} ||
+    path =~ %r{/jets/stack} ||
+    path =~ %r{/rackup_wrappers} ||
+    path =~ %r{/rails_overrides} ||
+    path =~ %r{/reconfigure_rails} ||
+    path =~ %r{/templates/} ||
+    path =~ %r{/version} ||
+    path =~ %r{/webpacker}
   end
 
   def class_mappings(class_name)
@@ -129,7 +123,7 @@ module Jets::Core
   def eager_load_app
     Dir.glob("#{Jets.root}app/**/*.rb").select do |path|
       next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
-      next if path.include?('app/shared/functions')
+      next if path.include?('app/functions') || path.include?('app/shared/functions')
 
       class_name = path
                     .sub(/\.rb$/,'') # remove .rb
@@ -163,7 +157,15 @@ module Jets::Core
   end
 
   def project_namespace
-    [config.project_name, config.short_env, config.env_extra].compact.join('-')
+    [config.project_name, config.short_env, config.env_extra].compact.join('-').gsub('_','-')
   end
 
+  def rack?
+    path = "#{Jets.root}rack"
+    File.exist?(path) || File.symlink?(path)
+  end
+
+  def lazy_load?
+    config.ruby.lazy_load
+  end
 end

data/lib/jets/core_ext/kernel.rb

@@ -1,5 +1,7 @@
-# Works with jets/io.rb
+# Works with io.rb
+# IO.flush # flush output and write to disk for node shim
 module Kernel
+  JETS_OUTPUT = "/tmp/jets-output.log"
   @@io_buffer = []
 
   # List from https://ruby-doc.org/core-2.5.1/Kernel.html
@@ -12,8 +14,8 @@ module Kernel
     printf
     putc
     puts
-    sprintf
   ]
+  # NOTE adding sprintf produces #<%s: %s:%s/%s> with puma? So not including sprintf
   OVERRIDE_METHODS.each do |meth|
     # Example of generated code:
     #
@@ -41,12 +43,14 @@ module Kernel
   # Rescue and discard it to keep the process alive.
   def io_flush
     chunk = @@io_buffer.join("\n")
+    chunk += "\n" unless chunk == ''
     begin
-      IO.write("/tmp/jets-output.log", chunk)
+      # since we always append to the file, the node shim is responsible for truncating the file
+      IO.write(JETS_OUTPUT, chunk, mode: 'a') if chunk
     # Writing to log with binary content will crash the process so rescuing it and writing an info message.
     rescue Encoding::UndefinedConversionError
-      IO.write("/tmp/jets-output.log", "[BINARY DATA]")
+      IO.write(JETS_OUTPUT, "[BINARY DATA]\n", mode: 'a')
     end
     @@io_buffer = []
   end
-end
+end

data/lib/jets/default/application.rb

@@ -15,7 +15,7 @@ Jets.application.configure do
 
   # function properties defaults
   config.function = ActiveSupport::OrderedOptions.new
-  config.function.timeout = 10
+  config.function.timeout = 30
   # default memory setting based on:
   # https://medium.com/epsagon/how-to-make-lambda-faster-memory-performance-benchmark-be6ebc41f0fc
   config.function.memory_size = 1536

data/lib/jets/inflections.rb

@@ -3,21 +3,29 @@ module Jets
     class << self
       def load!
         ActiveSupport::Inflector.inflections(:en) do |inflect|
-          base_inflections.each do |k,v|
-            inflect.irregular k,v
-          end
-          # Users can add custom inflections
-          Jets.config.inflections.irregular.each do |k,v|
-            inflect.irregular k,v
-          end
+          load(inflect, base)
+          load(inflect, custom)
         end
       end
 
-      def base_inflections
+      def load(inflect, inflections)
+        inflections.each do |k,v|
+          inflect.irregular k,v
+        end
+      end
+
+      # base custom inflections
+      def base
         {
           sns: 'sns'
         }
       end
+
+      # User defined custom inflections
+      def custom
+        path = "#{Jets.root}config/inflections.yml"
+        File.exist?(path) ? YAML.load_file(path) : {}
+      end
     end
   end
 end

data/lib/jets/internal/app/controllers/jets/public_controller.rb

@@ -5,32 +5,27 @@ class Jets::PublicController < Jets::Controller::Base
   layout false
   internal true
 
-  if Jets::Commands::Build.poly_only?
-    # Use python if poly only so we don't have to upload rubuy
-    python :show
-  else
-    def show
-      catchall = params[:catchall].blank? ? 'index.html' : params[:catchall]
-      public_path = Jets.root + "public"
-      catchall_path = "#{public_path}/#{catchall}"
+  def show
+    catchall = params[:catchall].blank? ? 'index.html' : params[:catchall]
+    public_path = Jets.root + "public"
+    catchall_path = "#{public_path}/#{catchall}"
 
-      if File.exist?(catchall_path)
-        content_type = Rack::Mime.mime_type(File.extname(catchall_path))
-        binary = !MimeMagic.by_path(catchall_path).text?
+    if File.exist?(catchall_path)
+      content_type = Rack::Mime.mime_type(File.extname(catchall_path))
+      binary = !MimeMagic.by_path(catchall_path).text?
 
-        # For binary support to work, the client also has to send the right Accept header.
-        # And the media type has been to added to api gateway.
-        # Cavaet: adding * to as the media type breaks regular form submission.
-        # All form submission gets treated as binary.
-        if binary
-          encoded_content = Base64.encode64(IO.read(catchall_path))
-          render plain: encoded_content, content_type: content_type, base64: true
-        else
-          render file: catchall_path, content_type: content_type
-        end
+      # For binary support to work, the client also has to send the right Accept header.
+      # And the media type has been to added to api gateway.
+      # Cavaet: adding * to as the media type breaks regular form submission.
+      # All form submission gets treated as binary.
+      if binary
+        encoded_content = Base64.encode64(IO.read(catchall_path))
+        render plain: encoded_content, content_type: content_type, base64: true
       else
-        render file: "#{public_path}/404", status: 404
+        render file: catchall_path, content_type: content_type
       end
+    else
+      render file: "#{public_path}/404", status: 404
     end
   end
 end

data/lib/jets/internal/app/controllers/jets/rack_controller.rb

@@ -0,0 +1,15 @@
+class Jets::RackController < Jets::Controller::Base
+  layout false
+  internal true
+
+  # Megamode
+  def process
+    resp = rack_request
+    render(resp)
+  end
+
+private
+  def rack_request
+    Jets::Rack::Request.new(event, self).process
+  end
+end

data/lib/jets/naming.rb

@@ -45,28 +45,5 @@ class Jets::Naming
     def gateway_api_name
       "#{Jets.config.project_namespace}"
     end
-
-    def code_s3_key
-      md5_zipfile = File.basename(md5_code_zipfile)
-      "jets/code/#{md5_zipfile}"
-    end
-
-    # build was already ran and that a file that contains the md5 path exists
-    # at Jets.build_root/code/current-md5-filename.txt
-    #
-    # md5_code_zipfile: /tmp/jets/demo/code/code-2e0e18f6.zip
-    def md5_code_zipfile
-      path = "#{Jets.build_root}/code/current-md5-filename.txt"
-      File.exist?(path) ? IO.read(path) : "current-md5-filename-doesnt-exist"
-    end
-    # The current-md5-filename.txt gets created as a part of CodeBuilder's build
-    # process.
-    # And is required to be used much later for cfn/ship and base_child_builder
-    # They need set an s3_key which requires the md5_zip_dest.
-    # It is a pain to pass this all the way up from the
-    # CodeBuilder class.
-    # We store the "/tmp/jets/demo/code/code-a8a604aa.zip" into a
-    # file that can be read from any places where this is needed.
-    # Can also just generate a "fake file" for specs
   end
 end

data/lib/jets/rack/hash_converter.rb

@@ -0,0 +1,25 @@
+# Thanks https://mensfeld.pl/2012/01/converting-nested-hash-into-http-url-params-hash-version-in-ruby/
+module Jets::Rack
+  module HashConverter
+    def self.encode(value, key = nil, out_hash = {})
+      case value
+      when Hash  then
+        value.each { |k,v| encode(v, append_key(key,k), out_hash) }
+        out_hash
+      when Array then
+        value.each { |v| encode(v, "#{key}[]", out_hash) }
+        out_hash
+      when nil   then ''
+      else
+        out_hash[key] = value
+        out_hash
+      end
+    end
+
+    private
+
+    def self.append_key(root_key, key)
+      root_key.nil? ? :"#{key}" : :"#{root_key}[#{key.to_s}]"
+    end
+  end
+end

data/lib/jets/rack/request.rb

@@ -0,0 +1,71 @@
+require 'net/http'
+
+module Jets::Rack
+  class Request
+    def initialize(event, controller)
+      @event = event
+      @controller = controller # Jets::Controller instance
+    end
+
+    def process
+      http_method = @event['httpMethod'] # GET, POST, PUT, DELETE, etc
+      params = @controller.params(raw: true, path_parameters: false)
+
+      uri = URI("http://localhost:9292#{@controller.request.path}") # local rack server
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      # Rails sets _method=patch or _method=put as workaround
+      # Falls back to GET when testing in lambda console
+      http_class = params['_method'] || http_method || 'GET'
+      http_class.capitalize!
+
+      request_class = "Net::HTTP::#{http_class}".constantize # IE: Net::HTTP::Get
+      request = request_class.new(@controller.request.path)
+      if %w[Post Patch Put].include?(http_class)
+        params = HashConverter.encode(params)
+        request.set_form_data(params)
+      end
+
+      request = set_headers!(request)
+
+      # TODO: handle binary
+      response = http.request(request)
+      {
+        status: response.code.to_i,
+        headers: response.each_header.to_h,
+        body: response.body,
+      }
+    end
+
+    # Set request headers. Forwards original request info from remote API gateway.
+    # By this time, the server/api_gateway.rb middleware.
+    def set_headers!(request)
+      headers = @event['headers'] # from api gateway
+      if headers # remote API Gateway
+        # Forward headers from API Gateway over to the sub http request.
+        # It's important to forward the headers. Here are some examples:
+        #
+        #   "Turbolinks-Referrer"=>"http://localhost:8888/posts/122",
+        #   "Referer"=>"http://localhost:8888/posts/122",
+        #   "Accept-Encoding"=>"gzip, deflate",
+        #   "Accept-Language"=>"en-US,en;q=0.9,pt;q=0.8",
+        #   "Cookie"=>"_demo_session=...",
+        #   "If-None-Match"=>"W/\"9fa479205fc6d24ca826d46f1f6cf461\"",
+        headers.each do |k,v|
+          request[k] = v
+        end
+
+        # Note by the time headers get to rack later in the they get changed to:
+        #
+        #   request['X-Forwarded-Host'] vs env['HTTP_X_FORWARDED_HOST']
+        #
+        request['X-Forwarded-For'] = headers['X-Forwarded-For'] # "1.1.1.1, 2.2.2.2" # can be comma separated list
+        request['X-Forwarded-Host'] = headers['Host'] # uhghn8z6t1.execute-api.us-east-1.amazonaws.com
+        request['X-Forwarded-Port'] = headers['X-Forwarded-Port'] # 443
+        request['X-Forwarded-Proto'] = headers['X-Forwarded-Proto'] # https # scheme
+      end
+
+      request
+    end
+  end
+end

data/lib/jets/rack/server.rb

@@ -0,0 +1,47 @@
+require 'fileutils'
+
+module Jets::Rack
+  class Server
+    def self.start
+      new.start
+    end
+
+    def start
+      puts "Jets::Rack#start"
+      return unless File.exist?("#{rack_project}/config.ru")
+      puts "Starting additional rack server for the project under the rack subfolder..." if ENV['JETS_DEBUG']
+
+      if ENV['FOREGROUND']
+        serve
+        return
+      end
+
+      # Reaching here means we'll run the server in the background.
+      # Handle daemonzing ourselves because it keeps the stdout of the 2nd
+      # rack server. The rackup --daemonize option ends up hiding the output.
+      pid = Process.fork
+      if pid.nil?
+        # we're in the child process
+        serve
+      else
+        # we're in the parent process
+        Process.detach(pid) # dettached but still in the "foreground" since bin/rackup runs in the foreground
+      end
+    end
+
+    # Runs in the child process
+    def serve
+      # Note, looks like stopping jets server with Ctrl-C sends the TERM signal
+      # down to the sub bin/rackup command cleans up the child process fine.
+      Bundler.with_clean_env do
+        command = "cd #{rack_project} && bin/rackup" # leads to the same wrapper rack scripts
+        puts "=> #{command}".colorize(:green)
+        system(command)
+      end
+    end
+
+    def rack_project
+      "#{Jets.root}rack"
+    end
+  end
+end

data/lib/jets/rack.rb

@@ -0,0 +1,7 @@
+module Jets
+  module Rack
+    autoload :Request, 'jets/rack/request'
+    autoload :Server, 'jets/rack/server'
+    autoload :HashConverter, 'jets/rack/hash_converter'
+  end
+end

data/lib/jets/rails_overrides/asset_tag_helper.rb

@@ -5,12 +5,12 @@ module Jets::AssetTagHelper
   include Jets::AwsServices
 
   def javascript_include_tag(*sources, **options)
-    sources = sources.map { |s| s3_asset_url(s, :javascripts) }
+    sources = sources.map { |s| s3_public_url(s, :javascripts) }
     super
   end
 
   def stylesheet_link_tag(*sources, **options)
-    sources = sources.map { |s| s3_asset_url(s, :stylesheets) }
+    sources = sources.map { |s| s3_public_url(s, :stylesheets) }
     super
   end
 
@@ -26,7 +26,7 @@ module Jets::AssetTagHelper
     # mimic original behavior to get /images in source
     source = "/images/#{source}" unless source.starts_with?('/')
     if on_aws?(source)
-      source = "#{s3_base_url}#{source}"
+      source = "#{s3_public}#{source}"
     end
 
     super
@@ -36,7 +36,7 @@ module Jets::AssetTagHelper
     if on_aws?(source) && asset_folder?(source)
       # mimic original behavior to get /images in source
       source = "/images/#{source}" unless source.starts_with?('/')
-      source = "#{s3_base_url}#{source}"
+      source = "#{s3_public}#{source}"
     end
 
     super
@@ -69,25 +69,26 @@ private
   # If there's a / in front then rails will not add the "javascript":
   # So we can add the javascript ourselves and then add the stag with a
   # / in front.
-  def s3_asset_url(url, asset_type)
+  def s3_public_url(url, asset_type)
     unless url.starts_with?('/') or url.starts_with?('http')
       url = "/#{asset_type}/#{url}" # /javascript/asset/test
     end
-    add_s3_base_url(url)
+    add_s3_public(url)
   end
 
   # Example:
   # Url: /packs/application-e7654c50abd78161b641.js
   # Returns: https://s3-us-west-2.amazonaws.com/demo-dev-s3bucket-1jg5o076egkk4/jets/public/packs/application-e7654c50abd78161b641.js
-  def add_s3_base_url(url)
+  def add_s3_public(url)
     return url unless on_aws?(url)
-    "#{s3_base_url}#{url}"
+    "#{s3_public}#{url}"
   end
 
-  def s3_base_url
+  def s3_public
     # s3_base_url.txt is created as part of the build process
-    IO.read("#{Jets.root}config/s3_base_url.txt").strip
+    s3_base_url = IO.read("#{Jets.root}config/s3_base_url.txt").strip
+    "#{s3_base_url}/public"
   end
-  memoize :s3_base_url
+  memoize :s3_public
 end
 ActionView::Helpers.send(:include, Jets::AssetTagHelper)

data/lib/jets/resource/function.rb

@@ -38,9 +38,16 @@ class Jets::Resource
 
     def environment
       env = Jets.config.environment ? Jets.config.environment.to_h : {}
-      jets_env_options = {JETS_ENV: Jets.env.to_s}
-      jets_env_options[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
-      env.deep_merge(jets_env_options)
+      env.deep_merge(jets_env)
+    end
+
+    # These jets env variables are always included
+    def jets_env
+      env = {}
+      env[:JETS_ENV] = Jets.env.to_s
+      env[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
+      env[:JETS_STAGE] = Jets::Resource::ApiGateway::Deployment.stage_name
+      env
     end
 
     # Global properties example:
@@ -49,7 +56,7 @@ class Jets::Resource
     #
     #   Jets.application.configure do
     #     config.function = ActiveSupport::OrderedOptions.new
-    #     config.function.timeout = 10
+    #     config.function.timeout = 30
     #     config.function.runtime = "nodejs8.10"
     #     config.function.memory_size = 1536
     #   end
@@ -182,7 +189,8 @@ class Jets::Resource
     end
 
     def code_s3_key
-      Jets::Naming.code_s3_key
+      checksum = Jets::Builders::Md5.checksums["stage/code"]
+      "jets/code/code-#{checksum}.zip" # s3_key
     end
 
     # Examples:

data/lib/jets/router.rb

@@ -30,7 +30,7 @@ module Jets
     end
 
     def api_mode?
-      unless Jets.config.key?(:mode)
+      if Jets.config.key?(:api_mode) || Jets.config.key?(:api_generator)
         puts <<~EOL.colorize(:yellow)
           DEPRECATED: Jets.config.api_generator
           Instead, please update your config/application.rb to use: