jets 0.8.0 → 0.8.1

data/lib/jets/cfn/{template_builders → builders}/rule_builder.rb

@@ -1,9 +1,9 @@
-class Jets::Cfn::TemplateBuilders
+class Jets::Cfn::Builders
   class RuleBuilder < BaseChildBuilder
     def compose
       add_common_parameters
       add_functions
-      add_associated_resources
+      add_resources
       add_managed_rules
     end
 
@@ -11,10 +11,9 @@ class Jets::Cfn::TemplateBuilders
     # List of AWS Config Managed Rules: https://amzn.to/2BOt9KN
     def add_managed_rules
       @app_klass.managed_rules.each do |rule|
-        creator = Jets::Resource::Creator.new(rule[:definition], rule[:task])
-        add_associated_resource(creator.resource)
+        resource = Jets::Resource.new(rule[:definition], rule[:replacements])
+        add_resource(resource)
       end
     end
   end
 end
-

data/lib/jets/commands/base.rb

@@ -64,7 +64,7 @@ class Jets::Commands::Base < Thor
         class_name.sub!(/Task$/, "Tasks") # special rule here for Tasks class
         # NOTE: Weird thing where Jets::Commands::Db::Task => Thor::Command
         # because Task is a class available to Thor I believe.
-        puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
+        # puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
         class_name.constantize # dont have to worry about order.
       end
     end

data/lib/jets/commands/build.rb

@@ -41,8 +41,7 @@ module Jets::Commands
 
     def build_all_templates
       clean_templates
-      # TODO: Maybe  move this tbuild.rb template related logic to cfn/builder.rb
-      ## CloudFormation templates
+      # CloudFormation templates
       puts "Building Lambda functions as CloudFormation templates."
       # 1. Shared templates - child templates needs them
       build_api_gateway_templates
@@ -53,15 +52,12 @@ module Jets::Commands
     end
 
     def build_minimal_template
-      parent = Jets::Cfn::TemplateBuilders::ParentBuilder.new(@options)
-      parent.build
+      Jets::Cfn::Builders::ParentBuilder.new(@options).build
     end
 
     def build_api_gateway_templates
-      gateway = Jets::Cfn::TemplateBuilders::ApiGatewayBuilder.new(@options)
-      gateway.build
-      deployment = Jets::Cfn::TemplateBuilders::ApiGatewayDeploymentBuilder.new(@options)
-      deployment.build
+      Jets::Cfn::Builders::ApiGatewayBuilder.new(@options).build
+      Jets::Cfn::Builders::ApiDeploymentBuilder.new(@options).build
     end
 
     def build_child_templates
@@ -79,21 +75,21 @@ module Jets::Commands
 
       md = path.match(%r{app/(.*?)/}) # extract: controller, job or function
       process_class = md[1].classify
-      builder_class = "Jets::Cfn::TemplateBuilders::#{process_class}Builder".constantize
+      builder_class = "Jets::Cfn::Builders::#{process_class}Builder".constantize
 
       # Examples:
-      #   Jets::Cfn::TemplateBuilders::JobBuilder.new(EasyJob)
-      #   Jets::Cfn::TemplateBuilders::ControllerBuilder.new(PostsController)
-      #   Jets::Cfn::TemplateBuilders::FunctionBuilder.new(Hello)
-      #   Jets::Cfn::TemplateBuilders::FunctionBuilder.new(HelloFunction)
+      #   Jets::Cfn::Builders::ControllerBuilder.new(PostsController)
+      #   Jets::Cfn::Builders::JobBuilder.new(EasyJob)
+      #   Jets::Cfn::Builders::RuleBuilder.new(CheckRule)
+      #   Jets::Cfn::Builders::FunctionBuilder.new(Hello)
+      #   Jets::Cfn::Builders::FunctionBuilder.new(HelloFunction)
       app_klass = Jets::Klass.from_path(path)
       builder = builder_class.new(app_klass)
       builder.build
     end
 
     def build_parent_template
-      parent = Jets::Cfn::TemplateBuilders::ParentBuilder.new(@options)
-      parent.build
+      Jets::Cfn::Builders::ParentBuilder.new(@options).build
     end
 
     def clean_templates

data/lib/jets/commands/delete.rb

@@ -74,6 +74,7 @@ class Jets::Commands::Delete
 
   def s3_bucket_name
     return @s3_bucket_name if defined?(@s3_bucket_name)
+    return unless bucket_exists?
 
     resp = cfn.describe_stacks(stack_name: parent_stack_name)
     outputs = resp.stacks[0].outputs
@@ -84,6 +85,17 @@ class Jets::Commands::Delete
     end
   end
 
+  # Thanks: https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/s3-example-does-bucket-exist.html
+  def bucket_exists?
+    bucket_exists = false
+    begin
+      resp = s3.head_bucket(bucket: @s3_bucket_name, use_accelerate_endpoint: false)
+      bucket_exists = true
+    rescue
+    end
+    bucket_exists
+  end
+
   def parent_stack_name
     Jets::Naming.parent_stack_name
   end

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

@@ -12,6 +12,7 @@ gem "webpacker", git: "https://github.com/tongueroo/webpacker.git", branch: "jet
 <% end -%>
 # Include pg gem if you are using ActiveRecord
 gem "pg", "~> 0.21"
+gem "mimemagic"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

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

@@ -9,7 +9,7 @@ Jets.application.configure do
   config.cors = true # for '*''
   # config.cors = '*.mydomain.com' # for specific domain
 
-  config.function.timeout = 10
+  config.function.timeout = 20
   # config.function.role = "arn:aws:iam::#{Jets.aws.account}:role/service-role/pre-created"
   # config.function.memory_size= 1536
 

data/lib/jets/commands/url.rb

@@ -8,18 +8,18 @@ module Jets::Commands
 
     def display
       stack_name = Jets::Naming.parent_stack_name
-      stack = cfn.describe_stacks(stack_name: stack_name).stacks.first
-
-      unless stack
-        puts "Stack for '#{Jets.config.project_name} project for environment #{Jets.env}.  Couldn't find '#{stack_name}' stack."
+      unless stack_exists?(stack_name)
+        puts "Stack for #{Jets.config.project_name.colorize(:green)} project for environment #{Jets.env.colorize(:green)}.  Couldn't find #{stack_name.colorize(:green)} stack."
         exit
       end
 
+      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)
       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."
+        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
 
@@ -27,19 +27,17 @@ module Jets::Commands
       stack = cfn.describe_stacks(stack_name: api_gateway_stack_arn).stacks.first
       rest_api = lookup(stack[:outputs], "RestApi")
       region_id = lookup(stack[:outputs], "Region")
-      # Abusing ApiGatewayDeploymentMapper
-      #   set path=nil,s3_bucket=nil
-      #   not using any methods that rely on the initialization parameters
-      map = Jets::Cfn::TemplateMappers::ApiGatewayDeploymentMapper.new(path=nil,s3_bucket=nil)
+      stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
+
       # https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-call-api.html
       # https://my-api-id.execute-api.region-id.amazonaws.com/stage-name/{resourcePath}
-      "https://#{rest_api}.execute-api.#{region_id}.amazonaws.com/#{map.stage_name}"
+      "https://#{rest_api}.execute-api.#{region_id}.amazonaws.com/#{stage_name}"
     end
 
     # Lookup output value
     def lookup(outputs, key)
-      o = outputs.find { |o| o.output_key == key }
-      o.output_value
+      out = outputs.find { |o| o.output_key == key }
+      out&.output_value
     end
   end
 end

data/lib/jets/controller/base.rb

@@ -25,8 +25,8 @@ class Jets::Controller
       resp = controller.ensure_render
       controller.run_after_actions
 
-      time = Time.now - t1
-      Jets.logger.info "Completed Status Code #{resp["statusCode"]} in #{time}s"
+      took = Time.now - t1
+      Jets.logger.info "Completed Status Code #{resp["statusCode"]} in #{took}s"
 
       resp
     end

data/lib/jets/core.rb

@@ -135,7 +135,7 @@ module Jets::Core
                     .sub(/^\.\//,'') # remove ./
                     .sub(/app\/\w+\//,'') # remove app/controllers or app/jobs etc
                     .classify
-      puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
+      # puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
       class_name.constantize # use constantize instead of require so dont have to worry about order.
     end
   end

data/lib/jets/core_ext/kernel.rb

@@ -16,8 +16,18 @@ module Kernel
     @@io_buffer
   end
 
+  # Note: Writing binary data to the log will crash the process with an error like this:
+  #   jets/lib/jets/core_ext/kernel.rb:20:in `write': "\x89" from ASCII-8BIT to UTF-8 (Encoding::UndefinedConversionError)
+  # Rescue and discard it to keep the process alive.
   def io_flush
-    IO.write("/tmp/jets-output.log", @@io_buffer.join("\n"))
+    chunk = @@io_buffer.join("\n")
+    begin
+      IO.write("/tmp/jets-output.log", chunk)
+    # Writing to log with binary content will crash the process so rescuing it and writing an info message.
+    rescue Encoding::UndefinedConversionError => e
+      error_message = "Encoding::UndefinedConversionError: Binary data was written to Jets::IO buffer. Writing binary data to the log will crash the process, so discarding it.  This is an info message only. If you want to return binary data please base64 encode the data."
+      IO.write("/tmp/jets-output.log", error_message)
+    end
     @@io_buffer = []
   end
 end

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

@@ -1,26 +1,29 @@
 require "rack/mime"
+require "mimemagic"
 
-# Works for utf8 text files.
-# TODO: Add support to public_controller for binary data like images.
-# Tricky because API Gateway is not respecting the Accept header the same way as browsers.
 class Jets::PublicController < Jets::Controller::Base
   layout false
   internal true
 
-  # # Use python until ruby support is added.
-  # python :show
-
   if Jets::Commands::Build.poly_only?
     # Use python if poly only so we don't have to upload rubuy
     python :show
   else
-    # TODO: When ruby support is relesed, switch to it only.
     def show
       public_path = Jets.root + "public"
       catchall_path = "#{public_path}/#{params[:catchall]}"
       if File.exist?(catchall_path)
         content_type = Rack::Mime.mime_type(File.extname(catchall_path))
-        render file: catchall_path, content_type: content_type
+        binary = !MimeMagic.by_path(catchall_path).text?
+        puts "content_type #{content_type.inspect}"
+        puts "binary #{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
       else
         render file: "#{public_path}/404", status: 404
       end

data/lib/jets/lambda/dsl.rb

@@ -218,7 +218,7 @@ module Jets::Lambda::Dsl
         all_tasks.values
       end
 
-      # Used in Jets::Cfn::TemplateBuilders::Interface#build
+      # Used in Jets::Cfn::Builders::Interface#build
       # Overridden in rule/dsl.rb
       def build?
         !tasks.empty?

data/lib/jets/lambda/task.rb

@@ -2,7 +2,7 @@ class Jets::Lambda::Task
   attr_accessor :class_name, :type
   attr_reader :meth, :resources, :properties, :iam_policy, :managed_iam_policy, :lang
   def initialize(class_name, meth, options={})
-    @class_name = class_name.to_s # use at EventsRuleMapper#full_task_name
+    @class_name = class_name.to_s
     @meth = meth
     @options = options
     @type = options[:type] || get_type  # controller, job, or function
@@ -81,4 +81,12 @@ class Jets::Lambda::Task
   def poly_src_path
     handler_path.sub("handlers/", "app/")
   end
+
+  ###
+  # Useful for Jets::Resource late building.
+  def replacements
+    {
+      namespace: "#{@class_name.gsub('::','')}#{@meth.to_s.camelize}", # camelized because used in not just keys but also values
+    }
+  end
 end

data/lib/jets/naming.rb

@@ -23,8 +23,8 @@ class Jets::Naming
       "#{template_path_prefix}-api-gateway.yml"
     end
 
-    def api_gateway_deployment_template_path
-      "#{template_path_prefix}-api-gateway-deployment.yml"
+    def api_deployment_template_path
+      "#{template_path_prefix}-api-deployment.yml"
     end
 
     def parent_stack_name

data/lib/jets/pascalize.rb

@@ -43,7 +43,15 @@ module Jets
 
       def pascalize_string(s)
         s = s.to_s.camelize
-        s.slice(0,1).capitalize + s.slice(1..-1) # capitalize first letter only
+        s = s.slice(0,1).capitalize + s.slice(1..-1) # capitalize first letter only
+        special_map[s] || s
+      end
+
+      # Some keys have special mappings
+      def special_map
+        {
+          "TemplateUrl" => "TemplateURL"
+        }
       end
     end
   end

data/lib/jets/poly_fun/base_executor.rb

@@ -118,8 +118,8 @@ class Jets::PolyFun
       # the mutiple sources of how the handler can get set.
       # puts "handler path #{@task.handler_path}"
       #
-      # IE: Jets::Cfn::TemplateBuilders::FunctionProperties::PythonBuilder
-      builder_class = "Jets::Cfn::TemplateBuilders::FunctionProperties::#{@task.lang.to_s.classify}Builder".constantize
+      # IE: Jets::Cfn::Builders::FunctionProperties::PythonBuilder
+      builder_class = "Jets::Cfn::Builders::FunctionProperties::#{@task.lang.to_s.classify}Builder".constantize
       builder = builder_class.new(@task)
       full_handler = builder.properties["Handler"] # full handler here
       File.extname(full_handler).sub(/^./,'') # the extension of the full handler is the handler

data/lib/jets/preheat.rb

@@ -20,12 +20,12 @@ module Jets
       @options[:mute_output] = true if @options[:mute_output].nil?
     end
 
+    # Makes remote call to the Lambda function.
     def warm(function_name)
       Jets::Commands::Call.new(function_name, '{"_prewarm": "1"}', @options).run unless ENV['TEST']
     end
 
-    # loop through all methods fo each class
-    # make the special prewarm call to keep them warm
+    # Loop through all methods for each class and makes special prewarm call to each method.
     def warm_all
       threads = []
       all_functions.each do |function_name|

data/lib/jets/rails_overrides/common_methods.rb

@@ -4,7 +4,7 @@ module Jets::CommonMethods
     if request.host.include?("amazonaws.com") &&
             url.starts_with?('/') &&
             !url.starts_with?('http')
-      stage_name = Jets::Cfn::TemplateMappers::ApiGatewayDeploymentMapper.stage_name
+      stage_name = Jets::Resource::ApiGateway::Deployment.stage_name
       url = "/#{stage_name}#{url}"
     end
 

data/lib/jets/resource.rb

@@ -1,7 +1,57 @@
-module Jets::Resource
-  autoload :Attributes, 'jets/resource/attributes'
-  autoload :Creator, 'jets/resource/creator'
-  autoload :Permission, 'jets/resource/permission'
+class Jets::Resource
+  extend Memoist
+
+  autoload :Base, 'jets/resource/base'
   autoload :Replacer, 'jets/resource/replacer'
-  autoload :Route, 'jets/resource/route'
+  autoload :Permission, 'jets/resource/permission'
+  autoload :ApiGateway, 'jets/resource/api_gateway'
+  autoload :ChildStack, 'jets/resource/child_stack'
+  autoload :Function, 'jets/resource/function'
+  autoload :Iam, 'jets/resource/iam'
+  autoload :S3, 'jets/resource/s3'
+
+  attr_reader :definition, :replacements
+  def initialize(definition, replacements={})
+    @definition = definition
+    @replacements = replacements
+  end
+
+  def logical_id
+    id = definition.keys.first
+    # replace possible {namespace} in the logical id
+    id = replacer.replace_value(id)
+    Jets::Pascalize.pascalize_string(id)
+  end
+
+  def type
+    attributes['Type']
+  end
+
+  def properties
+    attributes['Properties']
+  end
+
+  def attributes
+    attributes = definition.values.first
+    attributes = replacer.replace_placeholders(attributes)
+    Jets::Pascalize.pascalize(attributes)
+  end
+
+  def parameters
+    {}
+  end
+
+  def outputs
+    {}
+  end
+
+  def replacer
+    Replacer.new(replacements)
+  end
+  memoize :replacer
+
+  def permission
+    Permission.new(replacements, self)
+  end
+  memoize :permission
 end

data/lib/jets/resource/api_gateway.rb

@@ -0,0 +1,7 @@
+module Jets::Resource::ApiGateway
+  autoload :Resource, 'jets/resource/api_gateway/resource'
+  autoload :RestApi, 'jets/resource/api_gateway/rest_api'
+  autoload :Deployment, 'jets/resource/api_gateway/deployment'
+  autoload :Method, 'jets/resource/api_gateway/method'
+  autoload :Cors, 'jets/resource/api_gateway/cors'
+end

data/lib/jets/resource/{route → api_gateway}/cors.rb

@@ -1,8 +1,10 @@
-class Jets::Resource::Route
-  class Cors < Jets::Resource::Route
-    def attributes
-      attributes = {
-        "#{resource_logical_id}CorsApiMethod" => {
+module Jets::Resource::ApiGateway
+  # Might be weird inheriting from Method because Method has Method#cors also
+  # but Cors is essentially a Method class.
+  class Cors < Method
+    def definition
+      {
+        cors_logical_id => {
           type: "AWS::ApiGateway::Method",
 
           properties: {
@@ -41,12 +43,11 @@ class Jets::Resource::Route
             } # closes integration
           } # closes properties
         } # closes logical id
-      } # closes attributes
+      } # closes definition
+    end
 
-      definitions = attributes # to emphasize that its the same thing
-      task = Jets::Lambda::Task.new(@route.controller_name, @route.action_name,
-               resources: definitions)
-      Attributes.new(attributes, task)
+    def cors_logical_id
+      "#{resource_logical_id}_cors_api_method"
     end
 
     def allow_origin