jets 1.2.1 → 1.3.0

data/lib/jets/cfn/builders/interface.rb

@@ -58,7 +58,7 @@ class Jets::Cfn::Builders
       defaults = { Type: "String" }
       options = defaults.merge(options)
       @template[:Parameters] ||= {}
-      @template[:Parameters][name.camelize] = options
+      @template[:Parameters][name.to_s.camelize] = options
     end
 
     def add_outputs(attributes)

data/lib/jets/cfn/builders/parent_builder.rb

@@ -32,6 +32,11 @@ class Jets::Cfn::Builders
       resource = Jets::Resource::Iam::ApplicationRole.new
       add_resource(resource)
       add_outputs(resource.outputs)
+
+      return if Jets.poly_only?
+      resource = Jets::Resource::Lambda::GemLayer.new
+      add_resource(resource)
+      add_outputs(resource.outputs)
     end
 
     def build_child_resources

data/lib/jets/commands/build.rb

@@ -85,7 +85,9 @@ module Jets::Commands
       #   Jets::Cfn::Builders::FunctionBuilder.new(HelloFunction)
       app_class = Jets::Klass.from_path(path)
       builder = builder_class.new(app_class)
-      builder.build
+      unless Jets.poly_only? && app_class == Jets::PreheatJob
+        builder.build
+      end
     end
 
     def build_parent_template
@@ -148,7 +150,7 @@ module Jets::Commands
       has_ruby = app_files.detect do |path|
         app_class = Jets::Klass.from_path(path)  # IE: PostsController, Jets::PublicController
         langs = app_class.tasks.map(&:lang)
-        langs.include?(:ruby)
+        langs.include?(:ruby) && app_class != Jets::PreheatJob
       end
       !!has_ruby
     end

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

@@ -3,6 +3,6 @@ You can configure additional gem sources 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://gems.lambdagems.com"
+        "https://gems2.lambdagems.com"
       ]
     end

data/lib/jets/commands/main.rb

@@ -42,7 +42,7 @@ module Jets::Commands
       puts "=> #{command}".colorize(:green)
       puts Jets::Booter.message
       Jets::Booter.check_config_ru!
-      Jets::Server.start(options) unless ENV['JETS_RACK'] == '0' # rack server runs in background by default
+      Jets::RackServer.start(options) unless ENV['JETS_RACK'] == '0' # rack server runs in background by default
       system(command)
     end
 

data/lib/jets/commands/new.rb

@@ -29,11 +29,13 @@ module Jets::Commands
       # Also had trouble unfreezing it with .dup. So using instance variables instead
       case options[:mode]
       when 'html'
-        @webpacker = options[:webpacker]
         @bootstrap = options[:bootstrap]
+        @database = options[:database]
+        @webpacker = options[:webpacker]
       when 'api', 'job'
-        @webpacker = false
         @bootstrap = false
+        @database = false
+        @webpacker = false
       else
         puts "Invalid mode provided: #{@options[:mode].colorize(:red)}. Please pass in an valid mode: #{VALID_MODES.join(',').colorize(:green)}."
         exit 1

data/lib/jets/commands/sequence.rb

@@ -56,7 +56,7 @@ private
         yarn
         public
       ]
-    elsif !@options[:database]
+    elsif !@database
       # Do not even generated the config/database.yml because
       # jets webpacker:install bombs and tries to load the db since it sees a
       # config/database.yml but has there's no database pg gem configured.

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

@@ -6,10 +6,10 @@ gem "jets"
 # Include webpacker if you are you are building html pages
 gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jets"
 <% end -%>
-<% if @options[:database] == 'postgresql' %>
+<% if @database == 'postgresql' %>
 # Include pg gem if you are using ActiveRecord, remove if you are not
 gem "pg", "~> 1.1.3"
-<% elsif @options[:database] == 'mysql' %>
+<% elsif @database == 'mysql' %>
 # Include mysql2 gem if you are using ActiveRecord, remove if you are not
 gem "mysql2", "~> 0.5.2"
 <% end %>

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

@@ -2,11 +2,6 @@ Jets.application.configure do
   config.project_name = "<%= @project_name %>"
   config.mode = "<%= @options[:mode] %>"
 
-  # Lazy loads ruby and gems as part of first request. Prewarming will handles
-  # this. This also keeps the code package size small and allows us to use the
-  # Lambda console for inline code editing.
-  # config.ruby.lazy_load = true # default is true
-
   # config.prewarm.enable = true # default is true
   # config.prewarm.rate = '30 minutes' # default is '30 minutes'
   # config.prewarm.concurrency = 2 # default is 2

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

@@ -1,9 +1,9 @@
 default: &default
-  adapter: <%= @options[:database] == 'mysql' ? 'mysql2' : 'postgresql' %>
+  adapter: <%= @database == 'mysql' ? 'mysql2' : 'postgresql' %>
   encoding: utf8
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @project_name %>_development' %>
-<% if @options[:database] == 'mysql' -%>
+<% if @database == 'mysql' -%>
   username: <%%= ENV['DB_USER'] || 'root' %>
 <% else -%>
   username: <%%= ENV['DB_USER'] || ENV['USER'] %>

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

@@ -1,3 +1,4 @@
 Jets.application.configure do
-  config.ruby.lazy_load = true
+  # Example:
+  # config.function.memory_size = 1536
 end

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

@@ -1,5 +1,4 @@
 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
+  # Example:
+  # config.function.memory_size = 2048
 end

data/lib/jets/commands/upgrade/v1.rb

@@ -13,6 +13,7 @@ class Jets::Commands::Upgrade
       update_routes
       update_mode_setting
       update_config_ru
+      remove_ruby_lazy_load
       puts "Upgrade complete."
     end
 
@@ -79,5 +80,25 @@ class Jets::Commands::Upgrade
       puts "Update: config.ru"
       FileUtils.cp(src, dest)
     end
+
+    def remove_ruby_lazy_load
+      app_config = "#{Jets.root}config/application.rb"
+      remove_ruby_lazy_load_for(app_config)
+      Dir.glob("#{Jets.root}config/environments/*.rb").each do |env_config|
+        remove_ruby_lazy_load_for(env_config)
+      end
+    end
+
+    def remove_ruby_lazy_load_for(path)
+      lines = IO.readlines(path)
+      new_lines = lines.reject do |l|
+        l =~ %r{config.ruby.lazy_load}
+      end
+      return unless lines != new_lines
+
+      content = new_lines.join("")
+      IO.write(path, content)
+      puts "Update: #{path}"
+    end
   end
 end

data/lib/jets/controller/renderers/template_renderer.rb

@@ -117,7 +117,7 @@ module Jets::Controller::Renderers
     class << self
       def setup!
         require "action_controller"
-        require "jets/rails_overrides"
+        require "jets/overrides/rails"
 
         # Load helpers
         # Assign local variable because scoe in the `:action_view do` changes

data/lib/jets/controller/rendering.rb

@@ -71,10 +71,7 @@ class Jets::Controller
     end
 
     def url_for(url)
-      # No longer need to add stage name, think this is due to rack middleware support
-      # Leaving in as comment for now just in case.
-      # add_stage_name(url)
-      url
+      add_stage_name(url)
     end
 
     def actual_host

data/lib/jets/core.rb

@@ -92,7 +92,7 @@ module Jets::Core
     path =~ %r{/internal/app} ||
     path =~ %r{/jets/stack} ||
     path =~ %r{/rackup_wrappers} ||
-    path =~ %r{/rails_overrides} ||
+    path =~ %r{/overrides} ||
     path =~ %r{/reconfigure_rails} ||
     path =~ %r{/templates/} ||
     path =~ %r{/version} ||
@@ -152,11 +152,6 @@ module Jets::Core
     File.exist?(path) || File.symlink?(path)
   end
 
-  def lazy_load?
-    return false if poly_only? # no need to lazy load when poly_only?
-    config.ruby.lazy_load
-  end
-
   def poly_only?
     return true if ENV['JETS_POLY_ONLY'] # bypass to allow rapid development of handlers
     Jets::Commands::Build.poly_only?
@@ -174,4 +169,48 @@ module Jets::Core
   def custom_domain?
     Jets.config.domain.hosted_zone_name
   end
+
+  def process(event, context, handler)
+    if event['_prewarm']
+      Jets.increase_prewarm_count
+      Jets.logger.info("Prewarm request")
+      {prewarmed_at: Time.now.to_s}
+    else
+      Jets::Processors::MainProcessor.new(event, context, handler).run
+    end
+  end
+
+  # Example: Jets.handler(self, "handlers/controllers/posts_controller.index")
+  def handler(lambda_context, handler)
+    meth = handler.split('.').last
+    lambda_context.send(:define_method, meth) do |event:, context:|
+      Jets.process(event, context, handler)
+    end
+  end
+
+  def once
+    boot
+    override_lambda_ruby_runtime
+    tmp_load!
+    start_rack_server
+  end
+
+  def tmp_load!
+    Jets::TmpLoader.load!
+  end
+
+  # Megamode support
+  def start_rack_server(options={})
+    rack = Jets::RackServer.new(options)
+    rack.start
+    rack.wait_for_socket
+  end
+
+  def default_gems_source
+    "https://gems2.lambdagems.com"
+  end
+
+  def override_lambda_ruby_runtime
+    require "jets/overrides/lambda"
+  end
 end

data/lib/jets/internal/app/jobs/jets/preheat_job.rb

@@ -22,43 +22,41 @@ class Jets::PreheatJob < ApplicationJob
     }
   )
 
-  unless Jets.poly_only?
-    rate(PREWARM_RATE) if torching
-    def torch
-      threads = []
-      CONCURRENCY.times do
-        threads << Thread.new do
-          # intentionally calling remote lambda for concurrency
-          # avoid passing the _prewarm=1 flag because we want the PreheatJob#warm
-          # to run it's normal workload.
-          # Do not use Jets::Preheat.warm(function_name) here as that passes the _prewarm=1.
-          function_name = "jets-preheat_job-warm"
-          event_json = JSON.dump(event)
-          options = call_options(event[:quiet])
-          Jets::Commands::Call.new(function_name, event_json, options).run unless ENV['TEST']
-        end
+  rate(PREWARM_RATE) if torching
+  def torch
+    threads = []
+    CONCURRENCY.times do
+      threads << Thread.new do
+        # intentionally calling remote lambda for concurrency
+        # avoid passing the _prewarm=1 flag because we want the PreheatJob#warm
+        # to run it's normal workload.
+        # Do not use Jets::Preheat.warm(function_name) here as that passes the _prewarm=1.
+        function_name = "jets-preheat_job-warm"
+        event_json = JSON.dump(event)
+        options = call_options(event[:quiet])
+        Jets::Commands::Call.new(function_name, event_json, options).run unless ENV['TEST']
       end
-      threads.each { |t| t.join }
-      "Finished prewarming your application with a concurrency of #{CONCURRENCY}."
     end
+    threads.each { |t| t.join }
+    "Finished prewarming your application with a concurrency of #{CONCURRENCY}."
+  end
 
-    rate(PREWARM_RATE) if warming
-    def warm
-      options = call_options(event[:quiet])
-      Jets::Preheat.warm_all(options)
-      "Finished prewarming your application."
-    end
+  rate(PREWARM_RATE) if warming
+  def warm
+    options = call_options(event[:quiet])
+    Jets::Preheat.warm_all(options)
+    "Finished prewarming your application."
+  end
 
-  private
-    def call_options(quiet)
-      options = {}
-      options.merge!(mute: true, mute_output: true) if quiet
-      # All the methods in this Job class leads to Jets::Commands::Call.
-      # This is true for the Jets::Preheat.warm_all also.
-      # These jobs delegate out to Lambda function calls. We do not need/want
-      # the invocation type: RequestResponse in this case.
-      options.merge!(invocation_type: "Event")
-      options
-    end
+private
+  def call_options(quiet)
+    options = {}
+    options.merge!(mute: true, mute_output: true) if quiet
+    # All the methods in this Job class leads to Jets::Commands::Call.
+    # This is true for the Jets::Preheat.warm_all also.
+    # These jobs delegate out to Lambda function calls. We do not need/want
+    # the invocation type: RequestResponse in this case.
+    options.merge!(invocation_type: "Event")
+    options
   end
 end

data/lib/jets/mega/request.rb

@@ -4,6 +4,7 @@ require 'rack'
 module Jets::Mega
   class Request
     autoload :Source, 'jets/mega/request/source'
+    JETS_OUTPUT = "/tmp/jets-output.log"
 
     extend Memoist
 
@@ -45,6 +46,8 @@ module Jets::Mega
       # Make request
       response = http.request(request)
 
+      puts_rack_output
+
       {
         status: response.code.to_i,
         headers: response.each_header.to_h,
@@ -52,6 +55,14 @@ module Jets::Mega
       }
     end
 
+    # Grab the rack output from the /tmp/jets-output.log and puts it back in the
+    # main process' stdout
+    def puts_rack_output
+      return unless File.exist?(JETS_OUTPUT)
+      puts IO.readlines(JETS_OUTPUT)
+      File.truncate(JETS_OUTPUT, 0)
+    end
+
     def get_uri
       url = "http://localhost:9292#{@controller.request.path}" # local rack server
       unless @controller.query_parameters.empty?

data/lib/jets/overrides/lambda.rb

@@ -0,0 +1 @@
+require "jets/overrides/lambda/marshaller"

data/lib/jets/overrides/lambda/marshaller.rb

@@ -0,0 +1,31 @@
+require 'json'
+
+# Hack AwsLambda Ruby Runtime to fix .to_json issue collision with ActiveSupport.
+# To reproduce:
+#   Create a shared resource from the docs and call sns.publish
+#
+# Causes an infinite loop when calling sns.publish somehow.
+# Overriding with JSON.dump and follow up with AWS ticket.
+module AwsLambda
+  class Marshaller
+    class << self
+      # By default, just runs #to_json on the method's response value.
+      # This can be overwritten by users who know what they are doing.
+      # The response is an array of response, content-type.
+      # If returned without a content-type, it is assumed to be application/json
+      # Finally, StringIO/IO is used to signal a response that shouldn't be
+      # formatted as JSON, and should get a different content-type header.
+      def marshall_response(method_response)
+        case method_response
+        when StringIO, IO
+          [method_response, 'application/unknown']
+        else
+          # Orignal method calls .to_json but this collides with ActiveSupport's to_json
+          # method_response.to_json # application/json is assumed
+          JSON.dump(method_response)
+        end
+      end
+
+    end
+  end
+end

data/lib/jets/overrides/rails.rb

@@ -0,0 +1,4 @@
+require "jets/overrides/rails/common_methods"
+require "jets/overrides/rails/url_helper"
+require "jets/overrides/rails/rendering_helper"
+require "jets/overrides/rails/asset_tag_helper"

data/lib/jets/poly_fun/base_executor.rb

@@ -116,7 +116,7 @@ class Jets::PolyFun
     def handler
       # Must use the generated CloudFormation template to get the handler because
       # the handler is derived from mutiple sources.
-      resource = Jets::Resource::Function.new(@task)
+      resource = Jets::Resource::Lambda::Function.new(@task)
       full_handler = resource.properties["Handler"] # full handler here
       File.extname(full_handler).sub(/^./,'') # the extension of the full handler is the handler
     end

data/lib/jets/preheat.rb

@@ -18,6 +18,7 @@ module Jets
     def initialize(options)
       @options = options # passed to Call.new options
       @options[:mute_output] = true if @options[:mute_output].nil?
+      @options[:lambda_proxy] = false # do not transform controller event from {"event": "1"} to {"queryStringParameters":{"_prewarm":"1"}}
     end
 
     # Makes remote call to the Lambda function.

data/lib/jets/processors/main_processor.rb

@@ -5,9 +5,8 @@ require 'stringio'
 class Jets::Processors::MainProcessor
   attr_reader :event, :context, :handler
   def initialize(event, context, handler)
-    # assume valid json from Lambda
-    @event = JSON.parse(event)
-    @context = JSON.parse(context)
+    @event = event
+    @context = context
     @handler = handler
   end
 
@@ -38,13 +37,7 @@ class Jets::Processors::MainProcessor
         result["headers"]["x-jets-prewarm-count"] = Jets.prewarm_count
       end
 
-      # Puts the return value of project code to stdout because this is
-      # what eventually gets used by API Gateway.
-      # Explicitly using $stdout since puts has been redirected to $stderr.
-      #
-      # JSON.dump is pretty robust.  If it cannot dump the structure into a
-      # json string, it just dumps it to a plain text string.
-      Jets::Util.normalize_result(result) # resp is a String
+      result
     rescue Exception => e
       unless ENV['TEST']
         # Customize error message slightly so nodejs shim can process the