jets 2.3.17 → 3.0.3

data/lib/jets/builders/lambda_layer.rb

@@ -7,7 +7,7 @@ module Jets::Builders
     # Then replace the binary gems.
     def build
       consolidate_gems_to_opt
-      replace_compiled_gems
+      replace_compiled_gems unless Jets.config.gems.disable
     end
 
     # Also restructure the folder from:
@@ -17,13 +17,13 @@ module Jets::Builders
     #
     # For Lambda Layer structure
     def consolidate_gems_to_opt
-      src = "#{stage_area}/code/vendor/gems/ruby/2.5.0"
-      dest = "#{stage_area}/opt/ruby/gems/2.5.0"
+      src = "#{stage_area}/code/vendor/gems/ruby/#{Jets.ruby_folder}"
+      dest = "#{stage_area}/opt/ruby/gems/#{Jets.ruby_folder}"
       rsync_and_link(src, dest)
 
       return unless Jets.rack?
 
-      src = "#{stage_area}/rack/vendor/gems/ruby/2.5.0"
+      src = "#{stage_area}/rack/vendor/gems/ruby/#{Jets.ruby_folder}"
       rsync_and_link(src, dest)
     end
 
@@ -59,7 +59,6 @@ module Jets::Builders
       project_root = "#{stage_area}/opt"
       headline "Replacing compiled gems with AWS Lambda Linux compiled versions: #{project_root}"
       options = {
-        s3: "lambdagems2",
         build_root: cache_area, # used in jets-gems
         project_root: project_root, # used in gem_replacer and jets-gems
       }

data/lib/jets/builders/ruby_packager.rb

@@ -12,10 +12,9 @@ module Jets::Builders
     def install
       return unless gemfile_exist?
 
-      reconfigure_ruby_version
       clean_old_submodules
       bundle_install
-      setup_bundle_config
+      copy_bundle_config
       copy_cache_gems
     end
 
@@ -46,6 +45,7 @@ module Jets::Builders
       headline "Bundling: running bundle install in cache area: #{cache_area}."
 
       copy_gemfiles(full_project_path)
+      copy_bundled_gems(full_project_path)
 
       # Uncomment out to always remove the cache/vendor/gems to debug
       # FileUtils.rm_rf("#{cache_area}/vendor/gems")
@@ -57,16 +57,17 @@ module Jets::Builders
       #    bundle config gems.myprivatesource.com user:pass
       #
 
-      FileUtils.rm_rf("#{cache_area}/.bundle")
+      create_bundle_config
       require "bundler" # dynamically require bundler so user can use any bundler
       Bundler.with_unbundled_env do
         sh(
           "cd #{cache_area} && " \
-          "env bundle install --path #{cache_area}/vendor/gems --without development test"
+          "env bundle install"
         )
       end
+      create_bundle_config(frozen: true)
 
-      remove_bundled_with("#{cache_area}/Gemfile.lock")
+      rewrite_gemfile_lock("#{cache_area}/Gemfile.lock")
 
       # Copy the Gemfile.lock back to the project in case it was updated.
       # For example we add the jets-rails to the Gemfile.
@@ -94,14 +95,6 @@ module Jets::Builders
       Tidy.new(path).cleanup!
     end
 
-    # This is in case the user has a 2.5.x variant.
-    # Force usage of ruby version that jets supports
-    # The lambda server only has ruby 2.5.0 installed.
-    def reconfigure_ruby_version
-      ruby_version = "#{@full_app_root}/.ruby-version"
-      IO.write(ruby_version, Jets::RUBY_VERSION)
-    end
-
     # When using submodules, bundler leaves old submodules behind. Over time this inflates
     # the size of the the cache gems.  So we'll clean it up.
     def clean_old_submodules
@@ -137,6 +130,12 @@ module Jets::Builders
       end
     end
 
+    def copy_bundled_gems(full_project_path)
+      src = "#{full_project_path}/bundled_gems"
+      return unless File.exist?(src)
+      Jets::Util.cp_r(src, "#{cache_area}/bundled_gems")
+    end
+
     def copy_gemfiles(full_project_path)
       FileUtils.mkdir_p(cache_area)
       FileUtils.cp("#{full_project_path}/Gemfile", "#{cache_area}/Gemfile")
@@ -150,9 +149,10 @@ module Jets::Builders
 
     # Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
     # And this can cause issues with require 'bundler/setup'
-    def remove_bundled_with(gemfile_lock)
+    def rewrite_gemfile_lock(gemfile_lock)
       lines = IO.readlines(gemfile_lock)
 
+      # Remove BUNDLED WITH
       # amount is the number of lines to remove
       new_lines, capture, count, amount = [], true, 0, 2
       lines.each do |l|
@@ -166,13 +166,32 @@ module Jets::Builders
         end
       end
 
+      # Replace things like nokogiri (1.11.1-x86_64-darwin) => nokogiri (1.11.1)
+      lines, new_lines = new_lines, []
+      lines.each do |l|
+        if l.include?("-x86_64-darwin")
+          l = l.sub('-x86_64-darwin','')
+        end
+        new_lines << l
+      end
+
+      # Make sure platform is ruby
+      lines, new_lines, marker = new_lines, [], false
+      lines.each do |l|
+        if marker # the next loop has the platform we want to replace
+          new_lines << "  ruby\n"
+          marker = false
+          next
+        end
+        marker = l.include?('PLATFORMS')
+        new_lines << l
+      end
+
       content = new_lines.join('')
       IO.write(gemfile_lock, content)
     end
 
-    def setup_bundle_config
-      ensure_build_cache_bundle_config_exists!
-
+    def copy_bundle_config
       # Override project's .bundle/config and ensure that .bundle/config matches
       # at these 2 spots:
       #   app_root/.bundle/config
@@ -187,11 +206,12 @@ module Jets::Builders
     # this only happens with ssh debugging, not when the ci.sh script gets ran.
     # But on macosx it exists.
     # Dont know why this is the case.
-    def ensure_build_cache_bundle_config_exists!
+    def create_bundle_config(frozen: false)
+      FileUtils.rm_rf("#{cache_area}/.bundle")
+      frozen_line = %Q|BUNDLE_FROZEN: "true"\n| if frozen
       text =<<-EOL
 ---
-BUNDLE_FROZEN: "true"
-BUNDLE_PATH: "vendor/gems"
+#{frozen_line}BUNDLE_PATH: "vendor/gems"
 BUNDLE_WITHOUT: "development:test"
 EOL
       bundle_config = "#{cache_area}/.bundle/config"

data/lib/jets/builders/tidy.rb

@@ -81,8 +81,7 @@ module Jets::Builders
     # Reason do not remove the cache folder generally is because some gems have
     # actual cache folders that they used.
     def remove_gem_cache
-      ruby_minor_version = Jets::RUBY_VERSION.split('.')[0..1].join('.') + '.0'
-      cache_path = "#{@project_root}/vendor/gems/ruby/#{ruby_minor_version}/cache"
+      cache_path = "#{@project_root}/vendor/gems/ruby/#{Jets.ruby_folder}/cache"
       FileUtils.rm_rf(cache_path)
     end
 

data/lib/jets/bundle.rb

@@ -15,6 +15,7 @@ module Jets
     # Later in Jets::Booter, Bundle.require is called and includes the Jets.env group.
     #
     def setup
+      return unless jets_project?
       return unless bundler_enabled?
       Kernel.require "bundler/setup"
       Bundler.setup # Same as Bundler.setup(:default)
@@ -38,6 +39,7 @@ module Jets
     # rescued gracefully.  This is done in Jets::Commands::RakeTasks.load!  In the case when user is in another
     # project with another Gemfile, the load errors will also be rescued.
     def require
+      return unless jets_project?
       return unless bundler_enabled?
       Kernel.require "bundler/setup"
       Bundler.require(*bundler_groups)
@@ -77,6 +79,10 @@ module Jets
       [:default, Jets.env.to_sym]
     end
 
+    def jets_project?
+      File.exist?("config/application.rb")
+    end
+
     extend self
   end
 end

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

@@ -1,5 +1,6 @@
 module Jets::Cfn::Builders
   class ApiGatewayBuilder
+    extend Memoist
     include Interface
     include Jets::AwsServices
 
@@ -43,22 +44,75 @@ module Jets::Cfn::Builders
     end
 
     def add_domain_name
-      domain_name = Jets::Resource::ApiGateway::DomainName.new
-      add_resource(domain_name)
-      add_outputs(domain_name.outputs)
+      add_outputs(create_domain_name)
     end
 
     def add_route53_dns
       dns = Jets::Resource::Route53::RecordSet.new
-      add_resource(dns)
-      add_outputs(dns.outputs)
+      if !existing_domain_name?(dns.domain_name) or existing_dns_record_on_stack? 
+        add_resource(dns)
+        add_outputs(dns.outputs)
+      end
+    end
+
+    def create_domain_name()
+      resource = Jets::Resource::ApiGateway::DomainName.new
+      
+      return {
+        "DomainName" => resource.domain_name
+      } if (existing_domain_name?(resource) and !existing_domain_name_on_stack?)
+      
+      add_resource(resource)
+      return resource.outputs
+    end
+
+    def existing_domain_name?(resource)
+      apigateway.get_domain_name({
+        domain_name: resource.domain_name
+      })
+      return true
+    rescue
+      return false
+    end
+    memoize :existing_domain_name?
+
+    def existing_domain_name_on_stack?
+      cfn.describe_stack_resource({
+        stack_name: api_gateway_physical_resource_id,
+        logical_resource_id: "DomainName"
+      })
+      return true
+    rescue
+      return false
+    end
+
+    def existing_dns_record_on_stack?
+      cfn.describe_stack_resource({
+        stack_name: api_gateway_physical_resource_id,
+        logical_resource_id: "DnsRecord"
+      })
+      return true
+    rescue
+      return false
+    end
+
+    def api_gateway_physical_resource_id
+      cfn.describe_stack_resource({
+        stack_name: Jets::Naming.parent_stack_name,
+        logical_resource_id: "ApiGateway"
+      })
+      .stack_resource_detail
+      .physical_resource_id
+    rescue
+      return nil
     end
+    memoize :api_gateway_physical_resource_id
 
     # Adds route related Resources and Outputs
     # Delegates to ApiResourcesBuilder
-    PAGE_LIMIT = Integer(ENV['JETS_AWS_OUTPUTS_LIMIT'] || 60) # Allow override for testing
+    PAGE_LIMIT = Integer(ENV['JETS_AWS_OUTPUTS_LIMIT'] || 200) # Allow override for testing
     def add_gateway_routes
-      # Reject homepage. Otherwise we have 60 - 1 resources on the first page.
+      # Reject homepage. Otherwise we have 200 - 1 resources on the first page.
       # There's a next call in ApiResources.add_gateway_resources to skip the homepage.
       all_paths = Jets::Router.all_paths.reject { |p| p == '' }
       all_paths.each_slice(PAGE_LIMIT).each_with_index do |paths, i|

data/lib/jets/cfn/ship.rb

@@ -102,7 +102,7 @@ module Jets::Cfn
     end
 
     def clean_deploy_logs
-      Jets::Commands::Clean::Log.new.clean_deploys
+      Jets::Commands::Clean::Log.new(@options).clean_deploys
     end
 
     def endpoint_unavailable?
@@ -146,6 +146,7 @@ module Jets::Cfn
       # 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
 
     # All CloudFormation states listed here:

data/lib/jets/cfn/upload.rb

@@ -7,6 +7,13 @@ module Jets::Cfn
     include ActionView::Helpers::NumberHelper # number_to_human_size
 
     attr_reader :bucket_name
+
+    CONTENT_TYPES_BY_EXTENSION = {
+      '.css' => 'text/css',
+      '.js' => 'application/javascript',
+      '.html' => 'text/html'
+    }
+
     def initialize(bucket_name)
       @bucket_name = bucket_name
     end
@@ -90,8 +97,17 @@ module Jets::Cfn
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      puts "Uploading s3://#{bucket_name}/#{key}" # uncomment to see and debug
-      obj.upload_file(full_path, acl: "public-read", cache_control: cache_control)
+      puts "Uploading and setting content type for s3://#{bucket_name}/#{key}" # uncomment to see and debug
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type_headers(full_path)))
+    end
+
+    def content_type_headers(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      if content_type
+        { content_type: content_type }
+      else
+        {}
+      end
     end
 
     def s3_key(full_path)

data/lib/jets/cli.rb

@@ -135,12 +135,17 @@ class Jets::CLI
       return Jets::Commands::Base.klass_from_namespace(namespace)
     end
 
+    return unless jets_project?
     rake_task_found = Jets::Commands::RakeCommand.namespaced_commands.include?(full_command)
     if rake_task_found
       return Jets::Commands::RakeCommand
     end
   end
 
+  def jets_project?
+    File.exist?("config/application.rb")
+  end
+
   # ["-h", "-?", "--help", "-D", "help"]
   def help_flags
     Thor::HELP_MAPPINGS + ["help"]
@@ -161,7 +166,7 @@ class Jets::CLI
     shell.say "Commands:"
     shell.print_table(thor_list, :indent => 2, :truncate => true)
 
-    unless rake_list.empty?
+    if jets_project? && !rake_list.empty?
       shell.say "\nCommands via rake:"
       shell.print_table(rake_list, :indent => 2, :truncate => true)
     end

data/lib/jets/commands/base.rb

@@ -138,7 +138,7 @@ class Jets::Commands::Base < Thor
     def eager_load!
       return if Jets::Turbo.afterburner?
 
-      Jets::Autoloaders.once.eager_load
+      Jets::Autoloaders.cli.eager_load
     end
     memoize :eager_load!
   end

data/lib/jets/commands/call.rb

@@ -59,8 +59,9 @@ class Jets::Commands::Call
       payload: transformed_event, # "fileb://file-path/input.json", <= JSON
       qualifier: @qualifier, # "1",
     }
+
     begin
-      resp = aws_lambda.invoke(options)
+      resp = lambda_client.invoke(options)
     rescue Aws::Lambda::Errors::ResourceNotFoundException
       puts "The function #{function_name} was not found.  Maybe check the spelling or the AWS_PROFILE?".color(:red)
       return
@@ -166,4 +167,16 @@ class Jets::Commands::Call
     $stderr.puts(text)
   end
 
+  def lambda_client
+    opt = {}
+    opt = opt.merge({retry_limit: @options[:retry_limit]}) if @options[:retry_limit].present?
+    opt = opt.merge({http_read_timeout: @options[:read_timeout]}) if @options[:read_timeout].present?
+
+    if opt.empty?
+      aws_lambda
+    else
+      Aws::Lambda::Client.new(opt)
+    end
+  end
+
 end

data/lib/jets/commands/clean.rb

@@ -2,7 +2,7 @@ module Jets::Commands
   class Clean < Jets::Commands::Base
     class_option :noop, type: :boolean, desc: "noop or dry-run mode"
     class_option :mute, type: :boolean, desc: "mute output"
-    class_option :sure, type: :boolean, desc: "bypass are you sure prompt"
+    class_option :yes, type: :boolean, desc: "bypass are you sure prompt"
 
     desc "log", "Cleans CloudWatch log groups assocated with app"
     long_desc Help.text('clean:log')

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

@@ -11,7 +11,7 @@ class Jets::Commands::Clean
     end
 
     def are_you_sure?(message)
-      return true if @options[:sure]
+      return true if @options[:yes]
 
       puts "Are you sure that you want to #{message}? (y/N)"
       yes = $stdin.gets.strip

data/lib/jets/commands/configure.rb

@@ -0,0 +1,51 @@
+module Jets::Commands
+  class Configure
+    extend Memoist
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      data = load_yaml
+      data['key'] = token
+      FileUtils.mkdir_p(File.dirname(path))
+      IO.write(path, YAML.dump(data))
+      puts "Updated #{pretty(path)}"
+    end
+
+    def load_yaml
+      if File.exist?(path)
+        YAML.load_file(path)
+      else
+        {}
+      end
+    rescue Psych::SyntaxError => e
+      puts "WARN: There was an error reading #{pretty(path)}".color(:yellow)
+      puts "WARN: #{e.class} #{e.message}".color(:yellow)
+      {}
+    end
+
+    def pretty(path)
+      path.sub(ENV['HOME'], '~')
+    end
+
+    def path
+      "#{ENV['HOME']}/.jets/config.yml"
+    end
+
+    def token
+      @options[:token] || prompt
+    end
+    memoize :token
+
+    def prompt
+      puts <<~EOL
+        You are about to configure your ~/.jets/config.yml
+        You can get a token from serverlessgems.com
+      EOL
+      print "Please provide your token: "
+      $stdin.gets.strip
+    end
+  end
+end