jets 1.1.5 → 1.2.0

data/lib/jets/camelizer.rb

@@ -56,7 +56,8 @@ module Jets
       # Some keys have special mappings
       def special_map
         {
-          "TemplateUrl" => "TemplateURL"
+          "TemplateUrl" => "TemplateURL",
+          "Ttl" => "TTL",
         }
       end
     end

data/lib/jets/cfn/builders.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/hash'
 require 'yaml'
 
 class Jets::Cfn

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

@@ -16,6 +16,33 @@ class Jets::Cfn::Builders
       add_resource(deployment)
       add_parameters(deployment.parameters)
       add_outputs(deployment.outputs)
+
+      add_base_path_mapping
+    end
+
+    # Because Jets generates a new timestamped logical id for the API Deployment
+    # resource it also creates a new root base path mapping and fails.  Additionally,
+    # the base path mapping depends on the API Deploy for the stage name.
+    #
+    # We resolve this by using a custom resource that does an in-place update.
+    #
+    # Note, also tried to change the domain name of to something like demo-dev-[random].mydomain.com
+    # but that does not work because the domain name has to match the route53 record exactly.
+    #
+    def add_base_path_mapping
+      return unless Jets.custom_domain?
+
+      function = Jets::Resource::ApiGateway::BasePath::Function.new
+      add_resource(function)
+      add_outputs(function.outputs)
+
+      mapping = Jets::Resource::ApiGateway::BasePath::Mapping.new
+      add_resource(mapping)
+      add_outputs(mapping.outputs)
+
+      iam_role = Jets::Resource::ApiGateway::BasePath::Role.new
+      add_resource(iam_role)
+      add_outputs(iam_role.outputs)
     end
 
     # template_path is an interface method

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

@@ -13,6 +13,7 @@ class Jets::Cfn::Builders
       return unless @options[:templates] || @options[:stack_type] != :minimal
 
       add_gateway_rest_api
+      add_custom_domain
       add_gateway_routes
     end
 
@@ -33,7 +34,26 @@ class Jets::Cfn::Builders
       add_outputs(rest_api.outputs)
 
       deployment = Jets::Resource::ApiGateway::Deployment.new
-      add_output("RestApiUrl", Value: deployment.outputs["RestApiUrl"])
+      outputs = deployment.outputs(true)
+      add_output("RestApiUrl", Value: outputs["RestApiUrl"])
+    end
+
+    def add_custom_domain
+      return unless Jets.custom_domain?
+      add_domain_name
+      add_route53_dns
+    end
+
+    def add_domain_name
+      domain_name = Jets::Resource::ApiGateway::DomainName.new
+      add_resource(domain_name)
+      add_outputs(domain_name.outputs)
+    end
+
+    def add_route53_dns
+      dns = Jets::Resource::Route53::RecordSet.new
+      add_resource(dns)
+      add_outputs(dns.outputs)
     end
 
     # Adds route related Resources and Outputs
@@ -51,7 +71,7 @@ class Jets::Cfn::Builders
         homepage = path == ''
         next if homepage # handled by RootResourceId output already
 
-        resource = Jets::Resource::ApiGateway::Resource.new(path)
+        resource = Jets::Resource::ApiGateway::Resource.new(path, internal: true)
         add_resource(resource)
         add_outputs(resource.outputs)
       end

data/lib/jets/cfn/ship.rb

@@ -1,5 +1,6 @@
 class Jets::Cfn
   class Ship
+    extend Memoist
     include Jets::AwsServices
 
     def initialize(options)
@@ -32,7 +33,9 @@ class Jets::Cfn
 
       wait_for_stack
       prewarm
+      clean_deploy_logs
       show_api_endpoint
+      show_custom_domain
     end
 
     def save_stack
@@ -89,15 +92,34 @@ class Jets::Cfn
       end
     end
 
-    def show_api_endpoint
-      return unless @options[:stack_type] == :full # s3 bucket is available
-      return if Jets::Router.routes.empty?
-      resp, status = stack_status
-      return if status.include?("ROLLBACK")
+    def clean_deploy_logs
+      Jets::Commands::Clean::Log.new.clean_deploys
+    end
 
+    def endpoint_unavailable?
+      return true unless @options[:stack_type] == :full # s3 bucket is available
+      return true if Jets::Router.routes.empty?
+      _, status = stack_status
+      return true if status.include?("ROLLBACK")
+      return true unless api_gateway
+    end
+
+    # Do not memoize this because on first stack run it will be nil
+    # It only gets called one more time so just let it get called.
+    def api_gateway
       resp = cfn.describe_stack_resources(stack_name: @parent_stack_name)
       resources = resp.stack_resources
-      api_gateway = resources.find { |resource| resource.logical_resource_id == "ApiGateway" }
+      resources.find { |resource| resource.logical_resource_id == "ApiGateway" }
+    end
+    memoize :api_gateway
+
+    def endpoint_available?
+      !endpoint_unavailable?
+    end
+
+    def show_api_endpoint
+      return unless endpoint_available?
+
       stack_id = api_gateway["physical_resource_id"]
 
       resp = cfn.describe_stacks(stack_name: stack_id)
@@ -107,6 +129,16 @@ class Jets::Cfn
       puts "API Gateway Endpoint: #{endpoint}"
     end
 
+    def show_custom_domain
+      return unless endpoint_available? && Jets.custom_domain?
+
+      domain_name = Jets::Resource::ApiGateway::DomainName.new
+      # Looks funny but its right.
+      # domain_name is a method on the Jets::Resource::ApiGateway::Domain instance
+      url = "https://#{domain_name.domain_name}"
+      puts "Custom Domain: #{url}"
+    end
+
     # All CloudFormation states listed here:
     # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html
     def stack_status

data/lib/jets/commands/call.rb

@@ -1,6 +1,5 @@
 require "base64"
 require "json"
-require "active_support/core_ext/string"
 
 class Jets::Commands::Call
   autoload :BaseGuesser, "jets/commands/call/base_guesser"

data/lib/jets/commands/call/guesser.rb

@@ -1,6 +1,3 @@
-require "active_support/core_ext/hash"
-require "active_support/core_ext/object"
-
 # Guesser transforms the user provided function name to the actual lambda
 # function name.
 #

data/lib/jets/commands/clean/log.rb

@@ -25,6 +25,24 @@ class Jets::Commands::Clean
       say "Removed CloudWatch logs for #{prefix_guess}"
     end
 
+    def clean_deploys
+      groups = deploy_log_groups.sort_by do |g|
+        g.log_group_name
+      end
+      # Keep the last 2 recent log groups so we can see the deleted logic
+      groups = groups[0..-3]
+      groups.each do |g|
+        logs.delete_log_group(log_group_name: g.log_group_name) unless @options[:noop]
+      end
+    end
+
+    def deploy_log_groups
+      log_groups.select do |g|
+        !keep_log_group?(g.log_group_name) &&
+        g.log_group_name.include?('jets-base-path')
+      end
+    end
+
   private
     def prefix_guess
       Jets::Naming.parent_stack_name

data/lib/jets/commands/console.rb

@@ -1,7 +1,7 @@
 class Jets::Commands::Console
   def self.run
     puts Jets::Booter.message
-    Jets.eager_load!
+    Jets.boot
 
     # Thanks: https://mutelight.org/bin-console
     require "irb"

data/lib/jets/commands/import/sequence.rb

@@ -1,8 +1,7 @@
-require 'fileutils'
+require 'bundler'
 require 'colorize'
-require 'active_support/core_ext/string'
+require 'fileutils'
 require 'thor'
-require 'bundler'
 
 class Jets::Commands::Import
   class Sequence < Thor::Group

data/lib/jets/commands/runner.rb

@@ -1,6 +1,6 @@
 class Jets::Commands::Runner
   def self.run(code)
-    Jets.eager_load!
+    Jets.boot
 
     if code =~ %r{^file://}
       path = code.sub('file://', '')

data/lib/jets/commands/sequence.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'colorize'
-require 'active_support/core_ext/string'
 require 'thor'
 require 'bundler'
 

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

@@ -47,4 +47,15 @@ Jets.application.configure do
   # config.assets.cache_control = nil # IE: "public, max-age=3600" # override max_age for more fine-grain control.
   # config.assets.base_url = nil # IE: https://cloudfront.com/my/base/path, defaults to the s3 bucket url
   #                                IE: https://s3-us-west-2.amazonaws.com/demo-dev-s3bucket-1inlzkvujq8zb
+
+  # config.api.endpoint_type = 'PRIVATE' # Default is 'EDGE' https://amzn.to/2r0Iu2L
+  # config.api.authorization_type = "AWS_IAM" # default is 'NONE' https://amzn.to/2qZ7zLh
+
+
+  # config.domain.hosted_zone_name = "example.com"
+  # us-west-2 REGIONAL endpoint
+  # config.domain.cert_arn = "arn:aws:acm:us-west-2:112233445566:certificate/8d8919ce-a710-4050-976b-b33da991e123"
+  # us-east-1 EDGE endpoint
+  # config.domain.cert_arn = "arn:aws:acm:us-east-1:112233445566:certificate/d68472ba-04f8-45ba-b9db-14f839d57123"
+  # config.domain.endpoint_type = "EDGE"
 end

data/lib/jets/commands/url.rb

@@ -16,14 +16,16 @@ module Jets::Commands
       stack = cfn.describe_stacks(stack_name: stack_name).stacks.first
 
       api_gateway_stack_arn = lookup(stack[:outputs], "ApiGateway")
-      if api_gateway_stack_arn
-        STDOUT.puts get_url(api_gateway_stack_arn)
+      if api_gateway_stack_arn && endpoint_available?
+        api_gateway_endpoint = get_gateway_endpoint(api_gateway_stack_arn)
+        STDOUT.puts "API Gateway Endpoint: #{api_gateway_endpoint}"
+        show_custom_domain
       else
         puts "API Gateway not found. This jets app does have an API Gateway associated with it.  Please double check your config/routes.rb if you were expecting to see a url for the app. Also check that #{stack_name.colorize(:green)} is a jets app."
       end
     end
 
-    def get_url(api_gateway_stack_arn)
+    def get_gateway_endpoint(api_gateway_stack_arn)
       stack = cfn.describe_stacks(stack_name: api_gateway_stack_arn).stacks.first
       rest_api = lookup(stack[:outputs], "RestApi")
       region_id = lookup(stack[:outputs], "Region")
@@ -34,10 +36,33 @@ module Jets::Commands
       "https://#{rest_api}.execute-api.#{region_id}.amazonaws.com/#{stage_name}"
     end
 
-    # Lookup output value
-    def lookup(outputs, key)
-      out = outputs.find { |o| o.output_key == key }
-      out&.output_value
+    def show_custom_domain
+      return unless endpoint_available? && Jets.custom_domain?
+
+      domain_name = Jets::Resource::ApiGateway::DomainName.new
+      # Looks funny but its right.
+      # domain_name is a method on the Jets::Resource::ApiGateway::Domain instance
+      url = "https://#{domain_name.domain_name}"
+      puts "Custom Domain: #{url}"
+    end
+
+    def endpoint_unavailable?
+      return false if Jets::Router.routes.empty?
+      resp, status = stack_status
+      return false if status.include?("ROLLBACK")
+    end
+
+    def endpoint_available?
+      !endpoint_unavailable?
+    end
+
+    # All CloudFormation states listed here:
+    # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html
+    def stack_status
+      resp = cfn.describe_stacks(stack_name: @parent_stack_name)
+      status = resp.stacks[0].stack_status
+      [resp, status]
     end
+
   end
 end

data/lib/jets/controller/base.rb

@@ -1,5 +1,3 @@
-require "active_support/core_ext/hash"
-require "active_support/core_ext/object"
 require "json"
 require "rack/utils" # Rack::Utils.parse_nested_query
 
@@ -37,9 +35,7 @@ class Jets::Controller
 
     def dispatch!
       t1 = Time.now
-      Jets.logger.info "Processing by #{self.class.name}##{@meth}"
-      Jets.logger.info "  Event: #{@event.inspect}"
-      Jets.logger.info "  Parameters: #{params(raw: true).to_h.inspect}"
+      log_info_start
 
       run_before_actions
       send(@meth)
@@ -53,6 +49,26 @@ class Jets::Controller
       triplet # status, headers, body
     end
 
+    def log_info_start
+      display_event = @event.dup
+      display_event['body'] = '[BASE64_ENCODED]' if @event['isBase64Encoded']
+      # Interesting, JSON.dump makes logging look like JSON.pretty_generate in
+      # CloudWatch but not locally. This is what we want.
+      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 "  Event: #{json_dump(display_event)}"
+      Jets.logger.info "  Parameters: #{JSON.dump(params(raw: true).to_h)}"
+    end
+
+    # Handles binary data safely
+    def json_dump(data)
+      JSON.dump(data)
+    rescue Encoding::UndefinedConversionError
+      data['body'] = '[BINARY]'
+      JSON.dump(data)
+    end
+
     def self.process(event, context={}, meth)
       controller = new(event, context, meth)
       # Using send because process! is private method in Jets::RackController so

data/lib/jets/controller/layout.rb

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

data/lib/jets/controller/middleware/local/api_gateway.rb

@@ -63,10 +63,10 @@ class Jets::Controller::Middleware::Local
           h[key] = v
           h
         end
-      # Content type is not prepended with HTTP_ but is part of Lambda's event headers thankfully
+      # Content type is not prepended with HTTP_
       headers["Content-Type"] = @env["CONTENT_TYPE"] if @env["CONTENT_TYPE"]
 
-      # Adjust the casing so it matches the Lambda AWS Proxy's structure
+      # Adjust the casing so it matches the Lambda AWS Proxy structure
       CASING_MAP.each do |nice_casing, bad_casing|
         if headers.key?(nice_casing)
           headers[bad_casing] = headers.delete(nice_casing)
@@ -83,9 +83,6 @@ class Jets::Controller::Middleware::Local
     # To get the post body:
     #   rack.input: #<StringIO:0x007f8ccf8db9a0>
     def get_body
-      # @env["rack.input"] is always provided by rack and we should make
-      # the test data always have rack.input to mimic rack defaulting to
-      # StringIO.new to help make testing easier
       input = @env["rack.input"] || StringIO.new
       body = input.read
       input.rewind # IMPORTANT or else it screws up other middlewares that use the body

data/lib/jets/controller/middleware/local/mimic_aws_call.rb

@@ -27,12 +27,12 @@ class Jets::Controller::Middleware::Local
     end
 
     def event
-      ApiGateway.new(@route, @env).event
+      @env['adapter.event'] || ApiGateway.new(@route, @env).event
     end
     memoize :event
 
     def context
-      {}
+      @env['adapter.context'] || {"fake" => "context in mimic_aws_call.rb"}
     end
   end
 end

data/lib/jets/controller/params.rb

@@ -1,8 +1,11 @@
 require "action_controller/metal/strong_parameters"
+require "action_dispatch"
 require "rack"
 
 class Jets::Controller
   module Params
+    extend Memoist
+
     # Merge all the parameters together for convenience.  Users still have
     # access via events.
     #
@@ -10,46 +13,75 @@ class Jets::Controller
     #   1. path parameters have highest precdence
     #   2. query string parameters
     #   3. body parameters
-    def params(raw: false, path_parameters: true)
-      query_string_params = event["queryStringParameters"] || {}
+    def params(raw: false, path_parameters: true, body_parameters: true)
       path_params = event["pathParameters"] || {}
-      params = body_params
-                .deep_merge(query_string_params)
+
+      params = {}
+      params = params.deep_merge(body_params) if body_parameters
+      params = params.deep_merge(query_parameters) # always
       params = params.deep_merge(path_params) if path_parameters
 
       if raw
         params
       else
+        params = ActionDispatch::Request::Utils.normalize_encode_params(params) # for file uploads
         ActionController::Parameters.new(params)
       end
     end
 
-  private
+    def query_parameters
+      event["queryStringParameters"] || {}
+    end
+
     def body_params
-      body = event["body"]
+      body = event['isBase64Encoded'] ? base64_decode(event["body"]) : event["body"]
       return {} if body.nil?
 
-      # Try json parsing
       parsed_json = parse_json(body)
       return parsed_json if parsed_json
 
-
-      # For content-type application/x-www-form-urlencoded CGI.parse the body
       headers = event["headers"] || {}
-      headers = headers.transform_keys { |key| key.downcase }
       # API Gateway seems to use either: content-type or Content-Type
+      headers = headers.transform_keys { |key| key.downcase }
       content_type = headers["content-type"]
+
       if content_type.to_s.include?("application/x-www-form-urlencoded")
         return ::Rack::Utils.parse_nested_query(body)
+      elsif content_type.to_s.include?("multipart/form-data")
+        return parse_multipart(body)
       end
 
       {} # fallback to empty Hash
     end
+    memoize :body_params
+
+  private
+
+    def parse_multipart(body)
+      boundary = ::Rack::Multipart::Parser.parse_boundary(headers["content-type"])
+      options = multipart_options(body, boundary)
+      env = ::Rack::MockRequest.env_for("/", options)
+      ::Rack::Multipart.parse_multipart(env) # params Hash
+    end
+
+    def multipart_options(data, boundary = "AaB03x")
+      type = %(multipart/form-data; boundary=#{boundary})
+      length = data.bytesize
+
+      { "CONTENT_TYPE" => type,
+        "CONTENT_LENGTH" => length.to_s,
+        :input => StringIO.new(data) }
+    end
 
     def parse_json(text)
       JSON.parse(text)
     rescue JSON::ParserError
       nil
     end
+
+    def base64_decode(body)
+      return nil if body.nil?
+      Base64.decode64(body)
+    end
   end
 end