jets 2.3.19 → 3.0.4

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

@@ -1,5 +1,5 @@
 require "rack/mime"
-require "mimemagic"
+require "mini_mime"
 
 class Jets::PublicController < Jets::Controller::Base
   layout false
@@ -12,7 +12,7 @@ class Jets::PublicController < Jets::Controller::Base
 
     if File.exist?(catchall_path)
       content_type = Rack::Mime.mime_type(File.extname(catchall_path))
-      binary = !MimeMagic.by_path(catchall_path).text?
+      binary = !MiniMime.lookup_by_filename(catchall_path).content_type.include?("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.

data/lib/jets/internal/app/functions/jets/base_path.rb

@@ -1,157 +1,18 @@
-require 'aws-sdk-apigateway'
-require 'aws-sdk-cloudformation'
+require 'bundler/setup'
+require 'cfn_response'
+require 'jets/internal/app/functions/jets/base_path_mapping'
 
 STAGE_NAME = "<%= @stage_name %>"
 
 def lambda_handler(event:, context:)
-  puts("event['RequestType'] #{event['RequestType']}")
-  puts("event: #{JSON.dump(event)}")
-  puts("context: #{JSON.dump(context)}")
-  puts("context.log_stream_name #{context.log_stream_name.inspect}")
-
-  mimic = event['ResourceProperties']['Mimic']
-  physical_id = event['ResourceProperties']['PhysicalId'] || "PhysicalId"
-
-  puts "mimic: #{mimic}"
-  puts "physical_id: #{physical_id}"
-
-  if event['RequestType'] == 'Delete'
-    if mimic == 'FAILED'
-      send_response(event, context, "FAILED")
-    else
-      mapping = BasePathMapping.new(event)
+  cfn = CfnResponse.new(event, context)
+  cfn.response do
+    mapping = BasePathMapping.new(event, STAGE_NAME)
+    case event['RequestType']
+    when "Create", "Update"
+      mapping.update
+    when "Delete"
       mapping.delete(true) if mapping.should_delete?
-      send_response(event, context, "SUCCESS")
     end
-    return # early return
-  end
-
-  mapping = BasePathMapping.new(event)
-  mapping.update
-
-  response_status = mimic == "FAILED" ? "FAILED" : "SUCCESS"
-  response_data = { "Hello" => "World" }
-
-  send_response(event, context, response_status, response_data, physical_id)
-
-# We rescue all exceptions and send an message to CloudFormation so we dont have to
-# wait for over an hour for the stack operation to timeout and rollback.
-rescue Exception => e
-  puts e.message
-  puts e.backtrace
-  sleep 10 # provide delete to make sure that the log gets sent to CloudWatch
-  send_response(event, context, "FAILED")
-end
-
-def send_response(event, context, response_status, response_data={}, physical_id="PhysicalId")
-  response_body = JSON.dump(
-    Status: response_status,
-    Reason: "See the details in CloudWatch Log Stream: #{context.log_stream_name.inspect}",
-    PhysicalResourceId: physical_id,
-    StackId: event['StackId'],
-    RequestId: event['RequestId'],
-    LogicalResourceId: event['LogicalResourceId'],
-    Data: response_data
-  )
-
-  puts "RESPONSE BODY:\n"
-  puts response_body
-
-  url = event['ResponseURL']
-  uri = URI(url)
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.open_timeout = http.read_timeout = 30
-  http.use_ssl = true if uri.scheme == 'https'
-
-
-  # must used url to include the AWSAccessKeyId and Signature
-  req = Net::HTTP::Put.new(url) # url includes query string and uri.path does not, must used url t
-  req.body = response_body
-  req.content_length = response_body.bytesize
-
-  # set headers
-  req['content-type'] = ''
-  req['content-length'] = response_body.bytesize
-
-  res = http.request(req)
-  puts "status code: #{res.code}"
-  puts "headers: #{res.each_header.to_h.inspect}"
-  puts "body: #{res.body}"
-end
-
-
-class BasePathMapping
-  def initialize(event)
-    @event = event
-    @rest_api_id = get_rest_api_id
-    @domain_name = get_domain_name
-    @base_path = ''
-  end
-
-  def update
-    # Cannot use update_base_path_mapping to update the base_mapping because it doesnt
-    # allow us to change the rest_api_id. So we delete and create.
-    delete(true)
-    create
-  end
-
-  # Dont delete the newly created base path mapping unless this is an operation
-  # where we're fully deleting the stack
-  def should_delete?
-    deleting_parent?
-  end
-
-  def delete(fail_silently=false)
-    apigateway.delete_base_path_mapping(
-      domain_name: @domain_name, # required
-      base_path: '(none)',
-    )
-  # https://github.com/tongueroo/jets/issues/255
-  # Used to return: Aws::APIGateway::Errors::NotFoundException
-  # Now returns: Aws::APIGateway::Errors::InternalFailure
-  # So we'll use a more generic error
-  rescue Aws::APIGateway::Errors::ServiceError => e
-    raise(e) unless fail_silently
-  end
-
-  def create
-    apigateway.create_base_path_mapping(
-      domain_name: @domain_name, # required
-      base_path: @base_path,
-      rest_api_id: @rest_api_id, # required
-      stage: STAGE_NAME,
-    )
-  end
-
-  def get_domain_name
-    param = deployment_stack[:parameters].find { |p| p.parameter_key == 'DomainName' }
-    param.parameter_value
-  end
-
-  def deployment_stack
-    @deployment_stack ||= cfn.describe_stacks(stack_name: @event['StackId']).stacks.first
-  end
-
-  def get_rest_api_id
-    param = deployment_stack[:parameters].find { |p| p.parameter_key == 'RestApi' }
-    param.parameter_value
-  end
-
-  def deleting_parent?
-    stack = cfn.describe_stacks(stack_name: parent_stack_name).stacks.first
-    stack.stack_status == 'DELETE_IN_PROGRESS'
-  end
-
-  def parent_stack_name
-    deployment_stack[:root_id]
-  end
-
-private
-  def apigateway
-    @apigateway ||= Aws::APIGateway::Client.new
-  end
-
-  def cfn
-    @cfn ||= Aws::CloudFormation::Client.new
   end
 end

data/lib/jets/internal/app/functions/jets/base_path_mapping.rb

@@ -0,0 +1,81 @@
+require 'aws-sdk-apigateway'
+require 'aws-sdk-cloudformation'
+
+class BasePathMapping
+  def initialize(event, stage_name)
+    @event, @stage_name = event, stage_name
+  end
+
+  # Cannot use update_base_path_mapping to update the base_mapping because it doesnt
+  # allow us to change the rest_api_id. So we delete and create.
+  def update
+    delete(true)
+    create
+  end
+
+  # Dont delete the newly created base path mapping unless this is an operation
+  # where we're fully deleting the stack
+  def should_delete?
+    deleting_parent?
+  end
+
+  def delete(fail_silently=false)
+    apigateway.delete_base_path_mapping(
+      domain_name: domain_name, # required
+      base_path: base_path.empty? ? '(none)' : base_path,
+    )
+  # https://github.com/tongueroo/jets/issues/255
+  # Used to return: Aws::APIGateway::Errors::NotFoundException
+  # Now returns: Aws::APIGateway::Errors::InternalFailure
+  # So we'll use a more generic error
+  rescue Aws::APIGateway::Errors::ServiceError => e
+    raise(e) unless fail_silently
+  end
+
+  def create
+    apigateway.create_base_path_mapping(
+      domain_name: domain_name, # required
+      base_path: base_path,
+      rest_api_id: rest_api_id, # required
+      stage: @stage_name,
+    )
+  end
+
+  def deployment_stack
+    @deployment_stack ||= cfn.describe_stacks(stack_name: @event['StackId']).stacks.first
+  end
+
+  def rest_api_id
+    @rest_api_id ||= parameter_value('RestApi')
+  end
+
+  def domain_name
+    @domain_name ||= parameter_value('DomainName')
+  end
+
+  def base_path
+    @base_path ||= parameter_value('BasePath') || ''
+  end
+
+  def parameter_value(parameter_key)
+    param = deployment_stack[:parameters].find { |p| p.parameter_key == parameter_key }
+    param&.parameter_value # possible for this to be nil when removing the config: IE: config.domain.name = nil
+  end
+
+  def deleting_parent?
+    stack = cfn.describe_stacks(stack_name: parent_stack_name).stacks.first
+    stack.stack_status == 'DELETE_IN_PROGRESS'
+  end
+
+  def parent_stack_name
+    deployment_stack[:root_id]
+  end
+
+  def apigateway
+    @apigateway ||= Aws::APIGateway::Client.new
+  end
+
+  def cfn
+    @cfn ||= Aws::CloudFormation::Client.new
+  end
+end

data/lib/jets/internal/app/shared/functions/jets/s3_bucket_config.rb

@@ -1,33 +1,23 @@
-require "active_support/all"
-require "aws-sdk-s3"
-require "cfnresponse"
-include Cfnresponse
+require 'bundler/setup'
+require 'active_support/core_ext/hash'
+require 'cfn_response'
 
 def lambda_handler(event:, context:)
-  # Print out debugging info immediately just in case
-  puts "event: #{json_pretty(event)}"
-  puts "context: #{json_pretty(context)}"
-
-  if %w[Create Update].include?(event['RequestType'])
-    properties = event["ResourceProperties"].dup
-    # After deleting ServiceToken, the rest of the values is the bucket configuration properties.
-    properties.delete("ServiceToken")
-    configurator = BucketConfigurator.new
-    configurator.put(properties)
+  cfn = CfnResponse.new(event, context)
+  cfn.response do
+    case event['RequestType']
+    when "Create", "Update"
+      properties = event["ResourceProperties"].dup
+      # After deleting ServiceToken, the rest of the values are the bucket configuration properties.
+      properties.delete("ServiceToken")
+      configurator = BucketConfigurator.new
+      configurator.put(properties)
+    end
   end
-
-  send_response(event, context, "SUCCESS")
-
-# We rescue all exceptions and send an message to CloudFormation so we dont have to
-# wait for over an hour for the stack operation to timeout and rollback.
-rescue Exception => e
-  puts e.message
-  puts e.backtrace
-  sleep 10 # a little time for logs to be sent to CloudWatch
-  send_response(event, context, "FAILED")
 end
 
 ########################################################
+require "aws-sdk-s3"
 
 class BucketConfigurator
   def put(props={})

data/lib/jets/overrides/rails/migration_checker.rb

@@ -1,11 +1,15 @@
 module ActiveRecord
   module MigrationChecker
     def prepare_test_db
-      current_config = ::ActiveRecord::Base.connection_config
+      current_config = ::ActiveRecord::Base.connection_db_config
       all_configs = ::ActiveRecord::Base.configurations.configs_for(env_name: Jets.env)
 
       needs_update = !all_configs.all? do |db_config|
-        ::ActiveRecord::Tasks::DatabaseTasks.schema_up_to_date?(db_config.config, ::ActiveRecord::Base.schema_format, nil, Jets.env, db_config.spec_name)
+        ::ActiveRecord::Tasks::DatabaseTasks.schema_up_to_date?(
+          db_config.configuration_hash, 
+          ::ActiveRecord::Base.schema_format, 
+          nil
+        )
       end
 
       if needs_update

data/lib/jets/resource/api_gateway/base_path/function.rb

@@ -14,15 +14,20 @@ module Jets::Resource::ApiGateway::BasePath
             },
             role: "!GetAtt BasePathRole.Arn",
             handler: handler,
-            runtime: "ruby2.5",
+            runtime: Jets.ruby_runtime,
             timeout: 60,
             memory_size: 1536,
             environment: env_properties[:environment],
+            layers: layers,
           }
         }
       }
     end
 
+    def layers
+      ["!Ref GemLayer"]
+    end
+
     def function_name
       method = "jets-base-path"
       # need to add the deployment timestamp because or else function name collides between deploys

data/lib/jets/resource/api_gateway/deployment.rb

@@ -15,11 +15,13 @@ module Jets::Resource::ApiGateway
 
     def parameters
       p = {
+        "GemLayer" => "GemLayer",
         "IamRole" => "IamRole",
         "RestApi" => "RestApi",
         "S3Bucket" => "S3Bucket",
       }
       p[:DomainName] = "DomainName" if Jets.custom_domain?
+      p[:BasePath] = "BasePath" unless Jets.config.domain.base_path.nil?
       p
     end
 

data/lib/jets/resource/api_gateway/rest_api/logical_id.rb

@@ -8,12 +8,46 @@ class Jets::Resource::ApiGateway::RestApi
       return default unless stack_exists?(parent_stack_name) && api_gateway_exists?
 
       if changed?
+        auto_replace_prompt
         new_id
       else
         current
       end
     end
 
+    def auto_replace_prompt
+      return if ENV['JETS_API_AUTO_REPLACE']
+      return unless ARGV[0] == "deploy"
+      case Jets.config.api.auto_replace
+      when nil
+        puts message.routes_changed
+        puts message.custom_domain
+        print "Would you like to continue the deployment? (y/N) "
+        answer = get_answer
+        exit 1 unless answer =~ /^y/
+      when false
+        puts message.routes_changed
+        puts message.auto_replace_disabled
+        exit 1
+      end
+    end
+
+    def message
+      Message.new
+    end
+    memoize :message
+
+    TIMEOUT_PERIOD = 120
+    def get_answer
+      Timeout::timeout(TIMEOUT_PERIOD) do
+        $stdin.gets
+      end
+    rescue Timeout::Error => e
+      puts "#{e.class}: #{e.message}".color(:red)
+      puts "Deployment timeout after #{TIMEOUT_PERIOD}s. Waited too long answer. Exiting."
+      exit 1
+    end
+
     def changed?
       change_detection = ChangeDetection.new
       change_detection.changed?

data/lib/jets/resource/api_gateway/rest_api/logical_id/message.rb

@@ -0,0 +1,49 @@
+class Jets::Resource::ApiGateway::RestApi::LogicalId
+  class Message
+    def routes_changed
+      <<~EOL
+      Routes Change Detection: Jets has detected that a new brand API Gateway is required to be deployed.
+      IMPORTANT: This will result in the API Gateway endpoint changing.
+      EOL
+    end
+
+    def custom_domain
+      api = Jets::Resource::ApiGateway::DomainName.new
+      domain_name = api.domain_name
+      if domain_name
+        <<~EOL
+        It looks like you have already set up a custom domain.
+        The domain name: #{domain_name}
+
+        So you should be good to go as the custom domain will be updated with the new API Gateway endpoint.
+        To avoid this prompt in the future, you can configure:
+
+        config/application.rb
+
+            config.api.auto_replace = true
+
+        More info: custom domain docs: https://rubyonjets.com/docs/routing/custom-domain/
+        EOL
+      else
+        "Please set up a custom domain https://rubyonjets.com/docs/routing/custom-domain/"
+      end
+    end
+
+    def auto_replace_disabled
+      <<~EOL
+      It looks like `config.api.auto_replace = false`. IE:
+
+      config/application.rb
+
+          config.api.auto_replace = false
+
+      The deploy will not continue. See:
+
+      * https://rubyonjets.com/docs/app-config/reference/
+      * https://rubyonjets.com/docs/routing/custom-domain/
+
+      EOL
+    end
+  end
+end
+