jets 1.1.5 → 1.2.0

data/lib/jets/mega/request/source.rb

@@ -0,0 +1,21 @@
+class Jets::Mega::Request
+  class Source
+    def initialize(event)
+      @event = event
+      env = Jets::Controller::Rack::Env.new(@event, {}).convert # convert to Rack env
+      @source_request = Rack::Request.new(env)
+    end
+
+    def body
+      if @source_request.body.respond_to?(:read)
+        body = @source_request.body.read
+        @source_request.body.rewind
+      end
+      body
+    end
+
+    def content_length
+      @source_request.content_length.to_i
+    end
+  end
+end

data/lib/jets/middleware/configurator.rb

@@ -1,6 +1,6 @@
 # Based on Rails MiddlewareStackProxy
 #
-# Configurator is a proxy for the Jets middleware stack that allows
+# Configurator is a recorder for the Jets middleware stack that allows
 # you to configure middlewares in your application. It works basically as a
 # command recorder, saving each command to be applied after initialization
 # over the default middleware stack, so you can add, swap, or remove any

data/lib/jets/middleware/default_stack.rb

@@ -8,9 +8,9 @@ module Jets::Middleware
 
     def build_stack
       Stack.new do |middleware|
-        middleware.use Jets::Controller::Middleware::Local # mimics AWS Lambda for local server only
         middleware.use Rack::Runtime
-        middleware.use Rack::MethodOverride
+        middleware.use Rack::MethodOverride # must come before Middleware::Local for multipart post forms to work
+        middleware.use Jets::Controller::Middleware::Local # mimics AWS Lambda for local server only
         middleware.use session_store, session_options # use session_store, session_options
         middleware.use Rack::Head
         middleware.use Rack::ConditionalGet

data/lib/jets/resource.rb

@@ -11,6 +11,7 @@ class Jets::Resource
   autoload :Iam, 'jets/resource/iam'
   autoload :Permission, 'jets/resource/permission'
   autoload :Replacer, 'jets/resource/replacer'
+  autoload :Route53, 'jets/resource/route53'
   autoload :S3, 'jets/resource/s3'
   autoload :Sns, 'jets/resource/sns'
   autoload :Standardizer, 'jets/resource/standardizer'

data/lib/jets/resource/api_gateway.rb

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

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

@@ -0,0 +1,5 @@
+module Jets::Resource::ApiGateway::BasePath
+  autoload :Function, 'jets/resource/api_gateway/base_path/function'
+  autoload :Mapping, 'jets/resource/api_gateway/base_path/mapping'
+  autoload :Role, 'jets/resource/api_gateway/base_path/role'
+end

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

@@ -0,0 +1,42 @@
+module Jets::Resource::ApiGateway::BasePath
+  class Function < Jets::Resource::Base
+    include Jets::Resource::Function::Environment
+
+    def definition
+      {
+        base_path_function: {
+          type: "AWS::Lambda::Function",
+          properties: {
+            function_name: function_name,
+            code: {
+              s3_bucket: "!Ref S3Bucket",
+              s3_key: code_s3_key,
+            },
+            role: "!GetAtt BasePathRole.Arn",
+            handler: handler,
+            runtime: "ruby2.5",
+            timeout: 60,
+            memory_size: 1536,
+            environment: env_properties[:environment],
+          }
+        }
+      }
+    end
+
+    def function_name
+      method = "jets-base-path"
+      # need to add the deployment timestamp because or else function name collides between deploys
+      timestamp = Jets::Resource::ApiGateway::Deployment.timestamp
+      "#{Jets.config.project_namespace}-#{method}-#{timestamp}"
+    end
+
+    def handler
+      "handlers/functions/jets/base_path.lambda_handler"
+    end
+
+    def code_s3_key
+      checksum = Jets::Builders::Md5.checksums["stage/code"]
+      "jets/code/code-#{checksum}.zip" # s3_key
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# CloudFormation Docs AWS::ApiGateway::DomainName: https://amzn.to/2BsrSqo
+#
+# Example:
+#
+#   Type: AWS::ApiGateway::BasePathMapping
+#   Properties:
+#     BasePath: String
+#     DomainName: String
+#     RestApiId: String
+#     Stage: String
+#
+# Currently unable to add base path mapping in-place with CloudFormation.
+# The workaround for this is to do it post deployment with raw API calls outside
+# of CloudFormation.  Leaving this around for now in case there's a workaround
+# to get this into CloudFormation instead of raw API calls. Some notes:
+#   * Also tried to change the domain name of to something like demo-dev-[random].mydomain.com
+#   That does not work because the domain name has to match the route53 record exactly.
+#
+module Jets::Resource::ApiGateway::BasePath
+  class Mapping < Jets::Resource::Base
+    def definition
+      function_logical_id = "BasePathFunction" # lambda function that supports custom resource
+      {
+        base_path_mapping: {
+          type: "Custom::BasePathMapping",
+          properties: {
+            service_token: "!GetAtt #{function_logical_id}.Arn",
+            # base_path: '', # empty path represents root
+            # domain_name: "!Ref DomainName",
+            # rest_api_id: "!Ref RestApi", # since this is in the Deployment template
+            # stage: Deployment.stage_name,
+          },
+          depends_on: Jets::Resource::ApiGateway::Deployment.logical_id,
+        }
+      }
+    end
+
+    def outputs
+      {
+        "BasePathMapping" => "!Ref BasePathMapping",
+      }
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module Jets::Resource::ApiGateway::BasePath
+  class Role < Jets::Resource::Base
+    extend Memoist
+    include Jets::AwsServices
+
+    def definition
+      {
+        base_path_role: {
+          type: "AWS::IAM::Role",
+          properties: {
+            role_name: role_name,
+            path: "/",
+            assume_role_policy_document: {
+              version: "2012-10-17",
+              statement: [{
+                effect: "Allow",
+                principal: {service: ["lambda.amazonaws.com"]},
+                action: ["sts:AssumeRole"]}
+              ]
+            },
+            policies: [
+              policy_name: "#{role_name}-policy",
+              policy_document: policy_document,
+            ]
+          },
+        }
+      }
+    end
+
+    def policy_document
+      project_namespace = Jets.config.project_namespace
+      default_policy_statements = Jets::Application.default_iam_policy # Array of Hashes
+      apigateway = [{
+        action: [ "apigateway:*" ],
+        effect: "Allow",
+        resource: "arn:aws:apigateway:#{Jets.aws.region}::/restapis/*", # scoped to all restapis because this changes
+      },{
+        action: [ "apigateway:*" ],
+        effect: "Allow",
+        resource: "arn:aws:apigateway:#{Jets.aws.region}::/domainnames/*", # scoped to all restapis because this changes
+      }]
+      cloudformation = [{
+        action: ["cloudformation:DescribeStacks"],
+        effect: "Allow",
+        resource: "arn:aws:cloudformation:#{Jets.aws.region}:#{Jets.aws.account}:stack/#{project_namespace}*",
+      }]
+
+      # Combine the statements
+      {
+        version: '2012-10-17',
+        statement: default_policy_statements + apigateway + cloudformation
+      }
+    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
+
+    def role_name
+      # TODO: dont think we should change the role name every time but have to right now because the deployment logical id changes
+      timestamp = Jets::Resource::ApiGateway::Deployment.timestamp
+      "#{Jets.config.project_namespace}-base-path-mapping-#{timestamp}"
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Jets::Resource::ApiGateway
 
           properties: {
             resource_id: "!Ref #{resource_id}",
-            rest_api_id: "!Ref RestApi",
+            rest_api_id: "!Ref #{RestApi.logical_id}",
             authorization_type: authorization_type,
             http_method: "OPTIONS",
             method_responses: [{

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

@@ -6,23 +6,27 @@ module Jets::Resource::ApiGateway
           type: "AWS::ApiGateway::Deployment",
           properties: {
             description: "Version #{timestamp} deployed by jets",
-            rest_api_id: "!Ref RestApi",
+            rest_api_id: "!Ref #{RestApi.logical_id}",
             stage_name: stage_name,
           }
         }
       }
     end
 
-    # value is Description
     def parameters
-      {
+      p = {
+        "IamRole" => "IamRole",
         "RestApi" => "RestApi",
+        "S3Bucket" => "S3Bucket",
       }
+      p[:DomainName] = "DomainName" if Jets.custom_domain?
+      p
     end
 
-    def outputs
+    def outputs(internal=false)
+      rest_api = internal ? RestApi.internal_logical_id : "RestApi"
       {
-        "RestApiUrl" => "!Sub 'https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/#{stage_name}/'",
+        "RestApiUrl" => "!Sub 'https://${#{rest_api}}.execute-api.${AWS::Region}.amazonaws.com/#{stage_name}/'",
       }
     end
 

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

@@ -0,0 +1,56 @@
+# CloudFormation Docs AWS::ApiGateway::DomainName: https://amzn.to/2Bsnmbq
+#
+# Example:
+#
+#   MyDomainName:
+#     Type: 'AWS::ApiGateway::DomainName'
+#     Properties:
+#       DomainName: api.mydomain.com
+#       CertificateArn: arn:aws:acm:us-east-1:111122223333:certificate/fb1b9770-a305-495d-aefb-27e5e101ff3
+#
+module Jets::Resource::ApiGateway
+  class DomainName < Jets::Resource::Base
+    def definition
+      properties = {
+        domain_name: domain_name,
+        endpoint_configuration: {
+          types: endpoint_types
+        }
+      }
+      # Can really only be REGIONAL or EDGE
+      if endpoint_types.include?("REGIONAL")
+        properties[:regional_certificate_arn] = cert_arn
+      end
+      if endpoint_types.include?("EDGE")
+        properties[:certificate_arn] = cert_arn
+      end
+
+      {
+        domain_name: {
+          type: "AWS::ApiGateway::DomainName",
+          properties: properties
+        }
+      }
+    end
+
+    def outputs
+      {
+        "DomainName" => "!Ref DomainName",
+      }
+    end
+
+    def domain_name
+      subdomain = Jets.project_namespace
+      managed_domain_name = "#{subdomain}.#{Jets.config.domain.hosted_zone_name}"
+      Jets.config.domain.name || managed_domain_name
+    end
+
+    def endpoint_types
+      [Jets.config.domain.endpoint_type].flatten
+    end
+
+    def cert_arn
+      Jets.config.domain.cert_arn
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-require "active_support/core_ext/object"
-
 # Converts a Jets::Route to a CloudFormation Jets::Resource::ApiGateway::Method resource
 module Jets::Resource::ApiGateway
   class Method < Jets::Resource::Base
@@ -18,7 +16,7 @@ module Jets::Resource::ApiGateway
           type: "AWS::ApiGateway::Method",
           properties: {
             resource_id: "!Ref #{resource_id}",
-            rest_api_id: "!Ref RestApi",
+            rest_api_id: "!Ref #{RestApi.logical_id}",
             http_method: @route.method,
             request_parameters: {},
             authorization_type: authorization_type,
@@ -47,7 +45,8 @@ module Jets::Resource::ApiGateway
               .gsub(/[^0-9a-z]/i, ' ')
               .gsub(/\s+/, '_')
       path = nil if path == ''
-      [path, "{namespace}_api_method"].compact.join('_')
+      http_verb = @route.method.downcase
+      [path, "{namespace}_#{http_verb}_api_method"].compact.join('_')
     end
 
     def replacements

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

@@ -1,7 +1,8 @@
 module Jets::Resource::ApiGateway
   class Resource < Jets::Resource::Base
-    def initialize(path)
+    def initialize(path, internal: false)
       @path = path # Examples: "posts/:id/edit" or "posts"
+      @internal = internal
     end
 
     def definition
@@ -11,7 +12,7 @@ module Jets::Resource::ApiGateway
           properties: {
             parent_id: parent_id,
             path_part: path_part,
-            rest_api_id: "!Ref RestApi",
+            rest_api_id: "!Ref #{RestApi.logical_id(@internal)}",
           }
         }
       }
@@ -42,7 +43,7 @@ module Jets::Resource::ApiGateway
         parent_logical_id = path_logical_id(parent_path)
         "!Ref #{parent_logical_id}ApiResource"
       else
-        "!GetAtt RestApi.RootResourceId"
+        "!GetAtt #{RestApi.logical_id(@internal)}.RootResourceId"
       end
     end
 

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

@@ -1,32 +1,60 @@
 module Jets::Resource::ApiGateway
   class RestApi < Jets::Resource::Base
+    autoload :ChangeDetection, 'jets/resource/api_gateway/rest_api/change_detection'
+    autoload :LogicalId, 'jets/resource/api_gateway/rest_api/logical_id'
+    autoload :Routes, 'jets/resource/api_gateway/rest_api/routes'
 
     def definition
+      properties = {
+        name: Jets::Naming.gateway_api_name,
+        endpoint_configuration: { types: endpoint_types }
+      }
+      properties[:binary_media_types] = binary_media_types if binary_media_types
+
       {
-        rest_api: {
+        internal_logical_id => {
           type: "AWS::ApiGateway::RestApi",
-          properties: {
-            name: Jets::Naming.gateway_api_name,
-            endpoint_configuration: {
-              types: types
-            }
-            # binary_media_types: ['*/*'], # TODO: comment out, breaking form post
-          }
+          properties: properties
         }
       }
     end
-    
+
+    def internal_logical_id
+      self.class.logical_id(true)
+    end
+
+    def self.logical_id(internal=false)
+      internal ? internal_logical_id : "RestApi"
+    end
+
+    @@internal_logical_id = nil
+    def self.internal_logical_id
+      @@internal_logical_id ||= LogicalId.new.get
+    end
+
     def outputs
       {
-        "RestApi" => "!Ref RestApi",
+        "RestApi" => "!Ref #{internal_logical_id}",
         "Region" => "!Ref AWS::Region",
-        "RootResourceId" => "!GetAtt RestApi.RootResourceId",
+        "RootResourceId" => "!GetAtt #{internal_logical_id}.RootResourceId",
       }
     end
 
-    def types
-      endpoint_type = Jets.config.api.endpoint_type || 'EDGE'
-      [endpoint_type.upcase]
+    def endpoint_types
+      [Jets.config.api.endpoint_type].flatten
+    end
+
+    # TODO: Looks like there's a bug with CloudFormation. On an API Gateway update
+    # we need to pass in the escaped version: multipart~1form-data
+    # On a brand new API Gateway creation, we need to pass in the unescaped form:
+    # multipart/form-data
+    # We are handling this with a full API Gateway replacement instead because it
+    # can be generalized more easily.
+    def binary_media_types
+      types = Jets.config.api.binary_media_types
+      return nil if types.nil? || types.empty?
+
+      [types].flatten
     end
   end
 end