jets 1.1.5 → 1.2.0

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

@@ -0,0 +1,42 @@
+class Jets::Resource::ApiGateway::RestApi
+  class ChangeDetection
+    extend Memoist
+    include Jets::AwsServices
+
+    def changed?
+      return false unless parent_stack_exists?
+      current_binary_media_types != new_binary_media_types ||
+      Routes.changed?
+    end
+
+    def new_binary_media_types
+      rest_api = Jets::Resource::ApiGateway::RestApi.new
+      rest_api.binary_media_types
+    end
+    memoize :new_binary_media_types
+
+    # Duplicated in rest_api/change_detection.rb, base_path/role.rb, rest_api/routes.rb
+    def current_binary_media_types
+      return nil unless parent_stack_exists?
+
+      stack = cfn.describe_stacks(stack_name: parent_stack_name).stacks.first
+
+      api_gateway_stack_arn = lookup(stack[:outputs], "ApiGateway")
+
+      stack = cfn.describe_stacks(stack_name: api_gateway_stack_arn).stacks.first
+      rest_api_id = lookup(stack[:outputs], "RestApi")
+
+      resp = apigateway.get_rest_api(rest_api_id: rest_api_id)
+      resp.binary_media_types
+    end
+    memoize :current_binary_media_types
+
+    def parent_stack_exists?
+      stack_exists?(parent_stack_name)
+    end
+
+    def parent_stack_name
+      Jets::Naming.parent_stack_name
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+class Jets::Resource::ApiGateway::RestApi
+  class LogicalId
+    extend Memoist
+    include Jets::AwsServices
+
+    def get
+      return default unless stack_exists?(parent_stack_name) && api_gateway_exists?
+
+      change_detection = ChangeDetection.new
+      if change_detection.changed?
+        new_id
+      else
+        current
+      end
+    end
+
+    # Takes current logical id and increments the number that is appended to it.
+    #
+    # Examples:
+    #
+    #   RestApi => RestApi1
+    #   RestApi1 => RestApi2
+    #   RestApi2 => RestApi3
+    #   RestApi7 => RestApi8
+    def new_id
+      regexp = /(\d+)/
+      md = current.match(regexp)
+      if md
+        current.gsub(regexp,'') + (md[1].to_i + 1).to_s
+      else
+        current + "1"
+      end
+    end
+
+    def current
+      resources = cfn.describe_stack_resources(stack_name: api_gateway_stack_arn).stack_resources
+      rest_api = resources.find { |r| r.resource_type == 'AWS::ApiGateway::RestApi' }
+      rest_api.logical_resource_id
+    end
+    memoize :current
+
+    def api_gateway_stack_arn
+      stack = cfn.describe_stacks(stack_name: parent_stack_name).stacks.first
+      lookup(stack[:outputs], "ApiGateway") # api_gateway_stack_arn
+    end
+
+    def api_gateway_exists?
+      !!api_gateway_stack_arn
+    end
+
+    def parent_stack_name
+      Jets::Naming.parent_stack_name
+    end
+
+    def default
+      "RestApi"
+    end
+  end
+end

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

@@ -0,0 +1,127 @@
+class Jets::Resource::ApiGateway::RestApi
+  class Routes
+    extend Memoist
+    include Jets::AwsServices
+
+    def self.changed?
+      new.changed?
+    end
+
+    def changed?
+      deployed_routes = build
+      deployed_routes.each do |deployed_route|
+        new_route = find_comparable_route(deployed_route)
+        if new_route && new_route.to != deployed_route.to
+          # change in already deployed route has been detected, requires bluegreen deploy
+          return true
+        end
+      end
+      false # Reaching here means no routes have been changed in a way that requires a bluegreen deploy
+    end
+
+    # Build up deployed routes from the existing CloudFormation resources.
+    def build
+      routes = []
+
+      resources, position = [], true
+      while position
+        position = nil if position == true # start of loop
+        resp = apigateway.get_resources(
+          rest_api_id: rest_api_id,
+          position: position,
+        )
+        resources += resp.items
+        position = resp.position
+      end
+
+      resources.each do |resource|
+        resource_methods = resource.resource_methods
+        next if resource_methods.nil?
+
+        resource_methods.each do |http_verb, resource_method|
+          # puts "#{http_verb} #{resource.path} | resource.id #{resource.id}"
+          # puts to(resource.id, http_verb)
+
+          # Test changing config.cors and CloudFormation does an in-place update
+          # on the resource. So no need to do bluegreen deployments for OPTIONS.
+          next if http_verb == "OPTIONS"
+
+          path = recreate_path(resource.path)
+          method = http_verb.downcase.to_sym
+          to = to(resource.id, http_verb)
+          route = Jets::Route.new(path: path, method: method, to: to)
+          routes << route
+        end
+      end
+      routes
+    end
+
+    # Find a route that has the same path and method. This is a comparable route
+    # Then we will compare the to or controller action to see if an already
+    # deployed route has been changed.
+    def find_comparable_route(deployed_route)
+      new_routes.find do |new_route|
+        new_route.path == deployed_route.path &&
+        new_route.method == deployed_route.method
+      end
+    end
+
+    def new_routes
+      Jets::Router.routes
+    end
+    memoize :new_routes
+
+    def recreate_path(path)
+      path = path.gsub(%r{^/},'')
+      path = path.sub(/{(.*)\+}/, '*\1')
+      path.sub(/{(.*)}/, ':\1')
+    end
+
+    def to(resource_id, http_method)
+      uri = method_uri(resource_id, http_method)
+      recreate_to(uri) unless uri.nil?
+    end
+
+    def method_uri(resource_id, http_method)
+      resp = apigateway.get_method(
+        rest_api_id: rest_api_id,
+        resource_id: resource_id,
+        http_method: http_method
+      )
+      resp.method_integration.uri
+    end
+
+    # Parses method uri and recreates a Route to argument.
+    # So:
+    #   "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:112233445566:function:demo-test-posts_controller-new/invocations"
+    # Returns:
+    #   posts#new
+    def recreate_to(method_uri)
+      md = method_uri.match(/function:(.*)\//)
+      function_name = md[1] # IE: demo-dev-posts_controller-new
+      controller_action = function_name.sub("#{Jets.project_namespace}-", '')
+      md = controller_action.match(/(.*)_controller-(.*)/)
+      controller = md[1]
+      controller = controller.gsub('-','/')
+      action = md[2]
+      "#{controller}##{action}" # IE: posts#new
+    end
+
+    # Duplicated in rest_api/change_detection.rb, base_path/role.rb, rest_api/routes.rb
+    def rest_api_id
+      stack_name = Jets::Naming.parent_stack_name
+      return default unless stack_exists?(stack_name)
+
+      stack = cfn.describe_stacks(stack_name: stack_name).stacks.first
+
+      api_gateway_stack_arn = lookup(stack[:outputs], "ApiGateway")
+
+      # resources = cfn.describe_stack_resources(stack_name: api_gateway_stack_arn).stack_resources
+      stack = cfn.describe_stacks(stack_name: api_gateway_stack_arn).stacks.first
+      rest_api_id = lookup(stack[:outputs], "RestApi")
+    end
+    memoize :rest_api_id
+
+    # apigateway.get_rest_api(rest_api_id: rest_api_id) # resp
+  end
+end

data/lib/jets/resource/child_stack/api_deployment.rb

@@ -19,9 +19,13 @@ module Jets::Resource::ChildStack
     end
 
     def parameters
-      {
+      p = {
+        IamRole: "!GetAtt IamRole.Arn",
         RestApi: "!GetAtt ApiGateway.Outputs.RestApi",
+        S3Bucket: "!Ref S3Bucket",
       }
+      p[:DomainName] = "!GetAtt ApiGateway.Outputs.DomainName" if Jets.custom_domain?
+      p
     end
 
     def depends_on

data/lib/jets/resource/function.rb

@@ -1,5 +1,8 @@
 class Jets::Resource
   class Function < Jets::Resource::Base
+    autoload :Environment, 'jets/resource/function/environment'
+    include Environment
+
     def initialize(task)
       @task = task
       @app_class = task.class_name.to_s
@@ -30,26 +33,6 @@ class Jets::Resource
       finalize_properties!(props)
     end
 
-    def env_properties
-      env_vars = Jets::Dotenv.load!(true)
-      variables = environment.merge(env_vars)
-      {environment: { variables: variables }}
-    end
-
-    def environment
-      env = Jets.config.environment ? Jets.config.environment.to_h : {}
-      env.deep_merge(jets_env)
-    end
-
-    # These jets env variables are always included
-    def jets_env
-      env = {}
-      env[:JETS_ENV] = Jets.env.to_s
-      env[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
-      env[:JETS_STAGE] = Jets::Resource::ApiGateway::Deployment.stage_name
-      env
-    end
-
     # Global properties example:
     # jets defaults are in jets/default/application.rb.
     # Your application's default config/application.rb then get used. Example:

data/lib/jets/resource/function/environment.rb

@@ -0,0 +1,23 @@
+class Jets::Resource::Function
+  module Environment
+    def env_properties
+      env_vars = Jets::Dotenv.load!(true)
+      variables = environment.merge(env_vars)
+      {environment: { variables: variables }}
+    end
+
+    def environment
+      env = Jets.config.environment ? Jets.config.environment.to_h : {}
+      env.deep_merge(jets_env)
+    end
+
+    # These jets env variables are always included
+    def jets_env
+      env = {}
+      env[:JETS_ENV] = Jets.env.to_s
+      env[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
+      env[:JETS_STAGE] = Jets::Resource::ApiGateway::Deployment.stage_name
+      env
+    end
+  end
+end

data/lib/jets/resource/iam/application_role.rb

@@ -15,7 +15,7 @@ module Jets::Resource::Iam
     end
 
     def role_name
-      "#{Jets.config.project_namespace}-application-role" # camelized because used as template value
+      "#{Jets.config.project_namespace}-application-role"
     end
 
     def outputs

data/lib/jets/resource/route53.rb

@@ -0,0 +1,3 @@
+module Jets::Resource::Route53
+  autoload :RecordSet, 'jets/resource/route53/record_set'
+end

data/lib/jets/resource/route53/record_set.rb

@@ -0,0 +1,70 @@
+# CloudFormation Docs AWS::Route53::RecordSet: https://amzn.to/2BtP9s5
+#
+# Example:
+#
+#   DnsRecord:
+#     Type: AWS::Route53::RecordSet
+#     Properties:
+#       HostedZoneName: !Ref 'HostedZoneResource'
+#       Comment: DNS name for my instance.
+#       Name: !Join ['', [!Ref 'Ec2Instance', ., !Ref 'AWS::Region', ., !Ref 'HostedZone', .]]
+#       Type: A
+#       TTL: '900'
+#       ResourceRecords:
+#       - !GetAtt Ec2Instance.PublicIp
+module Jets::Resource::Route53
+  class RecordSet < Jets::Resource::Base
+    def definition
+      {
+        dns_record: {
+          type: "AWS::Route53::RecordSet",
+          properties: {
+            hosted_zone_name: hosted_zone_name,
+            comment: "DNS record managed by Jets",
+            name: name,
+            type: "CNAME",
+            ttl: "60",
+            resource_records: [
+              cname,
+            ],
+          }
+        }
+      }
+    end
+
+    def cname
+      if endpoint_types.include?("REGIONAL")
+        "!GetAtt DomainName.RegionalDomainName"
+      else
+        "!GetAtt DomainName.DistributionDomainName"
+      end
+    end
+
+    def domain_name
+      Jets::Resource::ApiGateway::DomainName.new
+    end
+    memoize :domain_name
+
+    def endpoint_types
+      domain_name.endpoint_types
+    end
+
+    # IE: demo-dev.mydomain.com
+    def name
+      # Weird looking but correct: domain_name is object and domain_name is also method
+      domain_name.domain_name
+    end
+
+    # IE: mydomain.com
+    def hosted_zone_name
+      name = Jets.config.domain.hosted_zone_name
+      name.ends_with?('.') ? name : "#{name}." # add trailing period if missing
+    end
+
+    def outputs
+      {
+        "DnsRecord" => "!Ref DnsRecord",
+      }
+    end
+  end
+end

data/lib/jets/router.rb

@@ -26,6 +26,8 @@ module Jets
       post "#{name}", to: "#{name}#create"
       get "#{name}/:id/edit", to: "#{name}#edit" unless api_mode?
       put "#{name}/:id", to: "#{name}#update"
+      post "#{name}/:id", to: "#{name}#update" # for binary uploads
+      patch "#{name}/:id", to: "#{name}#update"
       delete "#{name}/:id", to: "#{name}#delete"
     end
 

data/lib/jets/ruby_server.rb

@@ -17,7 +17,6 @@ module Jets
 
     def run
       Jets.boot(stringio: true) # outside of child process for COW
-      Jets.eager_load!
 
       # INT - ^C
       trap('INT') do
@@ -94,9 +93,10 @@ module Jets
       loop do
         client = server.accept    # Wait for a client to connect
 
-        input_completed, event, handler = nil, nil, nil
+        input_completed, event, context, handler = nil, nil, nil
         unless input_completed
           event = client.gets&.strip # text or nil
+          context = client.gets&.strip # text or nil
           handler = client.gets&.strip # text or nil
           # The event is nil when a client connects and immediately disconnects without sending data
           if event.nil?
@@ -107,9 +107,12 @@ module Jets
           input_completed = true
         end
 
+        # puts "ruby_server.rb event: #{event.inspect}"
+        # puts "ruby_server.rb context: #{context.inspect}"
+
         result = event['_prewarm'] ?
           prewarm_request(event) :
-          standard_request(event, '{}', handler)
+          standard_request(event, context, handler)
 
         Jets::IO.flush # flush output and write to disk for node shim
 

data/lib/jets/stack.rb

@@ -1,5 +1,3 @@
-require 'active_support/concern'
-
 module Jets
   class Stack
     autoload :Definition, 'jets/stack/definition' # Registration and definitions
@@ -75,7 +73,7 @@ module Jets
 
       def eager_load_shared_resources!
         ActiveSupport::Dependencies.autoload_paths += ["#{Jets.root}app/shared/resources"]
-        Dir.glob("#{Jets.root}app/shared/resources/*.rb").select do |path|
+        Dir.glob("#{Jets.root}app/shared/resources/**/*.rb").select do |path|
           next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
 
           class_name = path