jets 3.1.0 → 5.0.0

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

@@ -0,0 +1,27 @@
+# Detects route changes
+class Jets::Cfn::Resource::ApiGateway::RestApi::Routes
+  class Change
+    include Jets::AwsServices
+
+    def changed?
+      return false unless parent_stack_exists?
+      return true if reset?
+
+      # Note: Variable.changed? will likely always true in one_apigw_method_for_all_routes mode
+      # since parent variables are allowed to vary in Jets v5.
+      if Jets.config.cfn.build.routes == "one_apigw_method_for_all_routes"
+        MediaTypes.changed? || To.changed?
+      else
+        MediaTypes.changed? || To.changed? || Variable.changed? || Page.changed?
+      end
+    end
+
+    def reset?
+      ENV['JETS_RESET'] || ENV['JETS_API_REPLACE'] || ENV['JETS_REPLACE_API']
+    end
+
+    def parent_stack_exists?
+      stack_exists?(Jets::Names.parent_stack_name)
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/api_gateway/rest_api/routes/collision/variable_exception.rb

@@ -1,4 +1,4 @@
-class Jets::Resource::ApiGateway::RestApi::Routes::Collision
+class Jets::Cfn::Resource::ApiGateway::RestApi::Routes::Collision
   class VariableException < RuntimeError
     def initialize(message="Route variable collisions")
       super(message)

data/lib/jets/{resource → cfn/resource}/api_gateway/rest_api/routes/collision.rb

@@ -1,5 +1,5 @@
 # Detects path variable collisions
-class Jets::Resource::ApiGateway::RestApi::Routes
+class Jets::Cfn::Resource::ApiGateway::RestApi::Routes
   class Collision
     attr_reader :collisions
     def initialize

data/lib/jets/{resource → cfn/resource}/api_gateway/rest_api/routes.rb

@@ -1,4 +1,4 @@
-class Jets::Resource::ApiGateway::RestApi
+class Jets::Cfn::Resource::ApiGateway::RestApi
   class Routes
     def self.changed?
       Change.new.changed?

data/lib/jets/{resource → cfn/resource}/api_gateway/rest_api.rb

@@ -1,17 +1,18 @@
-module Jets::Resource::ApiGateway
-  class RestApi < Jets::Resource::Base
+module Jets::Cfn::Resource::ApiGateway
+  class RestApi < Jets::Cfn::Base
     def definition
       properties = {
-        name: Jets::Naming.gateway_api_name,
-        endpoint_configuration: { types: endpoint_types }
+        Name: Jets::Names.gateway_api_name,
+        EndpointConfiguration: { Types: endpoint_types }
       }
-      properties[:binary_media_types] = binary_media_types if binary_media_types
-      properties[:policy] = endpoint_policy if endpoint_policy
+      properties[:EndpointConfiguration][:VpcEndpointIds] = vpce_ids if vpce_ids
+      properties[:BinaryMediaTypes] = binary_media_types if binary_media_types
+      properties[:Policy] = endpoint_policy if endpoint_policy
 
       {
         internal_logical_id => {
-          type: "AWS::ApiGateway::RestApi",
-          properties: properties
+          Type: "AWS::ApiGateway::RestApi",
+          Properties: properties
         }
       }
     end
@@ -31,9 +32,9 @@ module Jets::Resource::ApiGateway
 
     def outputs
       {
-        "RestApi" => "!Ref #{internal_logical_id}",
-        "Region" => "!Ref AWS::Region",
-        "RootResourceId" => "!GetAtt #{internal_logical_id}.RootResourceId",
+        RestApi: "!Ref #{internal_logical_id}",
+        Region: "!Ref AWS::Region",
+        RootResourceId: "!GetAtt #{internal_logical_id}.RootResourceId",
       }
     end
 
@@ -60,5 +61,14 @@ module Jets::Resource::ApiGateway
 
       endpoint_policy
     end
+
+    private
+
+    def vpce_ids
+      ids = Jets.config.api.vpc_endpoint_ids
+      return nil if ids.nil? || ids.empty?
+
+      ids
+    end
   end
-end
+end

data/lib/jets/{resource → cfn/resource}/associated.rb

@@ -1,6 +1,6 @@
 # Does not do full expansion, mainly a container that holds the definition and
 # standardizes it without camelizing it.
-class Jets::Resource
+class Jets::Cfn::Resource
   class Associated
     extend Memoist
 

data/lib/jets/{resource → cfn/resource}/config/config_rule.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::Config
-  class ConfigRule < Jets::Resource::Base
+module Jets::Cfn::Resource::Config
+  class ConfigRule < Jets::Cfn::Base
     def initialize(app_class, meth, props={})
       @app_class = app_class.to_s
       @meth = meth
@@ -9,35 +9,35 @@ module Jets::Resource::Config
     def definition
       base = {
         config_rule_logical_id => {
-          type: "AWS::Config::ConfigRule",
-          properties: definition_properties
+          Type: "AWS::Config::ConfigRule",
+          Properties: definition_properties
         }
       }
 
       # Explicitly set depends_on to help with CloudFormation random race condition.
       # Seems to be a new CloudFormation and AWS Config resource issue.
-      if definition_properties[:source][:owner] == 'CUSTOM_LAMBDA'
-        base[config_rule_logical_id][:depends_on] = "{namespace}Permission"
+      if definition_properties[:Source][:Owner] == 'CUSTOM_LAMBDA'
+        base[config_rule_logical_id][:DependsOn] = "{namespace}Permission"
       end
 
       base
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def definition_properties
       {
-        config_rule_name: config_rule_name,
-        source: {
-          owner: "CUSTOM_LAMBDA",
-          source_identifier: "!GetAtt {namespace}LambdaFunction.Arn",
-          source_details: [
+        ConfigRuleName: config_rule_name,
+        Source: {
+          Owner: "CUSTOM_LAMBDA",
+          SourceIdentifier: "!GetAtt {namespace}LambdaFunction.Arn",
+          SourceDetails: [
             {
-              event_source: "aws.config",
-              message_type: "ConfigurationItemChangeNotification"
+              EventSource: "aws.config",
+              MessageType: "ConfigurationItemChangeNotification"
             },
             {
-              event_source: "aws.config",
-              message_type: "OversizedConfigurationItemChangeNotification"
+              EventSource: "aws.config",
+              MessageType: "OversizedConfigurationItemChangeNotification"
             }
           ]
         },
@@ -45,7 +45,7 @@ module Jets::Resource::Config
     end
 
     def config_rule_logical_id
-      "{namespace}_config_rule"
+      "{namespace}ConfigRule"
     end
 
     def config_rule_name
@@ -65,7 +65,7 @@ module Jets::Resource::Config
       end
 
       if namespace.nil?
-        Jets.config.project_namespace
+        Jets.project_namespace
       else
         namespace
       end

data/lib/jets/{resource → cfn/resource}/config/managed_rule.rb

@@ -1,13 +1,13 @@
 # ManagedRule is just different enough to be a separate class vs being part of the
 # ConfigRule class itself.
-module Jets::Resource::Config
+module Jets::Cfn::Resource::Config
   class ManagedRule < ConfigRule
     def definition_properties
       {
-        config_rule_name: config_rule_name,
-        source: {
-          owner: "AWS",
-          source_identifier: @meth.upcase,
+        ConfigRuleName: config_rule_name,
+        Source: {
+          Owner: "AWS",
+          SourceIdentifier: @meth.upcase,
         },
       }.deep_merge(@props)
     end

data/lib/jets/{resource → cfn/resource}/events/rule.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::Events
-  class Rule < Jets::Resource::Base
+module Jets::Cfn::Resource::Events
+  class Rule < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -7,25 +7,25 @@ module Jets::Resource::Events
     def definition
       {
         rule_logical_id => {
-          type: "AWS::Events::Rule",
-          properties: merged_properties
+          Type: "AWS::Events::Rule",
+          Properties: merged_properties
         }
       }
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def merged_properties
       {
-        state: "ENABLED",
-        targets: [{
-          arn: "!GetAtt {namespace}LambdaFunction.Arn",
-          id: "{namespace}RuleTarget"
+        State: "ENABLED",
+        Targets: [{
+          Arn: "!GetAtt {namespace}LambdaFunction.Arn",
+          Id: "{namespace}RuleTarget"
         }]
       }.deep_merge(@props)
     end
 
     def rule_logical_id
-      "{namespace}_events_rule"
+      "{namespace}EventsRule"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/iam/application_role.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::Iam
-  class ApplicationRole < Jets::Resource::Base
+module Jets::Cfn::Resource::Iam
+  class ApplicationRole < Jets::Cfn::Base
     include BaseRoleDefinition
 
     def initialize
@@ -11,11 +11,11 @@ module Jets::Resource::Iam
     end
 
     def role_logical_id
-      "iam_role"
+      "IamRole"
     end
 
     def policy_name
-      "#{Jets.config.project_namespace}-application-policy"
+      "#{Jets.project_namespace}-application-policy"
     end
 
     def outputs

data/lib/jets/cfn/resource/iam/base_role_definition.rb

@@ -0,0 +1,56 @@
+module Jets::Cfn::Resource::Iam
+  module BaseRoleDefinition
+    attr_reader :policy_definitions, :managed_policy_definitions
+
+    def definition
+      logical_id = role_logical_id
+
+      # Do not assign pretty role_name because long controller names might hit the 64-char
+      # limit. Also, IAM roles are global, so assigning role names prevents cross region deploys.
+      definition = {
+        logical_id => {
+          Type: "AWS::IAM::Role",
+          Properties: {
+            Path: "/",
+            AssumeRolePolicyDocument: {
+              Version: "2012-10-17",
+              Statement: [{
+                Effect: "Allow",
+                Principal: {Service: ["lambda.amazonaws.com"]},
+                Action: ["sts:AssumeRole"]}
+              ]
+            }
+          }
+        }
+      }
+
+      # Add vpc permissions to all policies
+      definition[logical_id][:Properties][:Policies] = [
+        PolicyName: "vpc", # required, limited to 128-chars
+        PolicyDocument: vpc_policy_document,
+      ] if vpc_policy_document
+
+      unless managed_policy_arns.empty?
+        definition[logical_id][:Properties][:ManagedPolicyArns] = managed_policy_arns
+      end
+
+      definition
+    end
+
+    def vpc_policy_document
+      if Jets.config.function.vpc_config
+        {
+          Statement: [Jets.config.vpc_iam_policy_statement]
+        }
+      end
+    end
+
+    def policy_document
+      PolicyDocument.new(@policy_definitions.flatten.uniq).policy_document
+    end
+
+    def managed_policy_arns
+      ManagedPolicy.new(@managed_policy_definitions.flatten.uniq).arns
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/iam/class_role.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::Iam
-  class ClassRole < Jets::Resource::Base
+module Jets::Cfn::Resource::Iam
+  class ClassRole < Jets::Cfn::Base
     include BaseRoleDefinition
 
     def initialize(app_class)
@@ -9,12 +9,12 @@ module Jets::Resource::Iam
     end
 
     def role_logical_id
-      "{namespace}_iam_role".underscore
+      "{namespace}IamRole"
     end
 
     def policy_name
       class_namespace = replacements[:namespace].underscore.dasherize
-      "#{Jets.config.project_namespace}-#{class_namespace}-policy" # camelized because used as template value
+      "#{Jets.project_namespace}-#{class_namespace}-policy" # camelized because used as template value
     end
 
     def replacements
@@ -41,7 +41,7 @@ module Jets::Resource::Iam
     end
 
     def application_role
-      Jets::Resource::Iam::ApplicationRole.new
+      Jets::Cfn::Resource::Iam::ApplicationRole.new
     end
     memoize :application_role
 

data/lib/jets/{resource → cfn/resource}/iam/function_role.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::Iam
-  class FunctionRole < Jets::Resource::Base
+module Jets::Cfn::Resource::Iam
+  class FunctionRole < Jets::Cfn::Base
     include BaseRoleDefinition
 
     def initialize(task)
@@ -9,12 +9,12 @@ module Jets::Resource::Iam
     end
 
     def role_logical_id
-      "{namespace}_iam_role".underscore
+      "{namespace}IamRole"
     end
 
     def policy_name
       funcion_namespace = replacements[:namespace].underscore.dasherize
-      "#{Jets.config.project_namespace}-#{funcion_namespace}-policy" # camelized because used as template value
+      "#{Jets.project_namespace}-#{funcion_namespace}-policy" # camelized because used as template value
     end
 
     def replacements
@@ -42,12 +42,12 @@ module Jets::Resource::Iam
     end
 
     def class_role
-      Jets::Resource::Iam::ClassRole.new(@task.class_name.constantize)
+      Jets::Cfn::Resource::Iam::ClassRole.new(@task.class_name.constantize)
     end
     memoize :class_role
 
     def application_role
-      Jets::Resource::Iam::ApplicationRole.new
+      Jets::Cfn::Resource::Iam::ApplicationRole.new
     end
     memoize :application_role
   end

data/lib/jets/{resource → cfn/resource}/iam/managed_policy.rb

@@ -1,4 +1,4 @@
-module Jets::Resource::Iam
+module Jets::Cfn::Resource::Iam
   class ManagedPolicy
     extend Memoist
 

data/lib/jets/cfn/resource/iam/policy.rb

@@ -0,0 +1,31 @@
+module Jets::Cfn::Resource::Iam
+  class Policy < Jets::Cfn::Base
+    def initialize(role)
+      @role = role
+    end
+    delegate :policy_document, :policy_name, :role_logical_id, :replacements, to: :@role
+
+    def policy_logical_id
+      role_logical_id.sub(/Role$/, "Policy")
+    end
+
+    def definition
+      logical_id = policy_logical_id
+
+      # Do not assign pretty role_name because long controller names might hit the 64-char
+      # limit. Also, IAM roles are global, so assigning role names prevents cross region deploys.
+      definition = {
+        logical_id => {
+          Type: "AWS::IAM::Policy",
+          Properties: {
+            Roles: [Ref: role_logical_id.camelize],
+            PolicyName: "#{policy_name[0..127]}", # required, limited to 128-chars
+            PolicyDocument: policy_document,
+          }
+        }
+      }
+
+      definition
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/iam/policy_document.rb

@@ -1,20 +1,21 @@
-module Jets::Resource::Iam
+module Jets::Cfn::Resource::Iam
   class PolicyDocument
     extend Memoist
+    include Jets::Util::Camelize
 
     attr_reader :definitions
     def initialize(*definitions)
       @definitions = definitions.flatten
       # empty starting policy that will be altered
       @policy = {
-        version: "2012-10-17",
-        statement: []
+        Version: "2012-10-17",
+        Statement: []
       }
     end
 
     def policy_document
       definitions.map { |definition| standardize(definition) }
-      Jets::Camelizer.transform(@policy)
+      camelize(@policy)
     end
     memoize :policy_document # only process policy_document once
 
@@ -23,17 +24,17 @@ module Jets::Resource::Iam
       when String
         # Expands simple string from: logs => logs:*
         definition = "#{definition}:*" unless definition.include?(':')
-        @policy[:statement] << {
-          action: [definition],
-          effect: "Allow",
-          resource: "*",
+        @policy[:Statement] << {
+          Action: [definition],
+          Effect: "Allow",
+          Resource: "*",
         }
       when Hash
         definition = definition.stringify_keys
         if definition.key?("Version") # special case where we replace the policy entirely
           @policy = definition
         else
-          @policy[:statement] << definition
+          @policy[:Statement] << definition
         end
       end
     end

data/lib/jets/{resource → cfn/resource}/iot/topic_rule.rb

@@ -1,6 +1,6 @@
 # CloudFormation AWS::IoT::TopicRule docs: https://amzn.to/2SMBOVm
-module Jets::Resource::Iot
-  class TopicRule < Jets::Resource::Base
+module Jets::Cfn::Resource::Iot
+  class TopicRule < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,27 +8,27 @@ module Jets::Resource::Iot
     def definition
       {
         topic_logical_id => {
-          type: "AWS::IoT::TopicRule",
-          properties: merged_properties,
+          Type: "AWS::IoT::TopicRule",
+          Properties: merged_properties,
         }
       }
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def merged_properties
       {
         # required properties
-        topic_rule_payload: {
-          actions: [{
-            lambda: { function_arn: "!GetAtt {namespace}LambdaFunction.Arn" }
+        TopicRulePayload: {
+          Actions: [{
+            Lambda: { FunctionArn: "!GetAtt {namespace}LambdaFunction.Arn" }
           }],
-          rule_disabled: 'true',
+          RuleDisabled: 'false',
         }
       }.deep_merge(@props)
     end
 
     def topic_logical_id
-      "{namespace}_iot_topic_rule"
+      "{namespace}IotTopicRule"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/lambda/event_source_mapping.rb

@@ -1,6 +1,6 @@
 # Note the Lambda function timeout must be less than or equal to the sqs queue default timeout.
-module Jets::Resource::Lambda
-  class EventSourceMapping < Jets::Resource::Base
+module Jets::Cfn::Resource::Lambda
+  class EventSourceMapping < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,18 +8,18 @@ module Jets::Resource::Lambda
     def definition
       # CloudFormation Docs: https://amzn.to/2WM6165
       properties = {
-        # batch_size: 10, # Defaults: Kinesis 100, DynamoDB Streams: 100, SQS: 10
-        # enabled: boolean,
-        # event_source_arn: string, # required
-        function_name: "!Ref {namespace}LambdaFunction",
-        # starting_position: string # reqiured for Required for Amazon Kinesis and Amazon DynamoDB Streams sources
+        # BatchSize: 10, # Defaults: Kinesis 100, DynamoDB Streams: 100, SQS: 10
+        # Enabled: boolean,
+        # EventSourceArn: string, # required
+        FunctionName: "!Ref {namespace}LambdaFunction",
+        # StartingPosition: string # reqiured for Required for Amazon Kinesis and Amazon DynamoDB Streams sources
       }
       properties.merge!(@props)
 
       {
         event_source_mapping_logical_id => {
-          type: "AWS::Lambda::EventSourceMapping",
-          properties: properties
+          Type: "AWS::Lambda::EventSourceMapping",
+          Properties: properties
         }
       }
     end

data/lib/jets/cfn/resource/lambda/function/controller.rb

@@ -0,0 +1,21 @@
+# Handles one_lambda_per_controller
+class Jets::Cfn::Resource::Lambda::Function
+  class Controller < Jets::Cfn::Resource::Lambda::Function
+    # override
+    def combined_properties
+      props = env_properties
+        .deep_merge(global_properties)
+        .deep_merge(class_properties)
+        # .deep_merge(function_properties) # comment left to emphasize controller cannot have function_properties
+      finalize_properties!(props)
+    end
+
+    # override
+    def permission
+      Jets::Cfn::Resource::Lambda::Permission.new(replacements, self,
+        Principal: "apigateway.amazonaws.com",
+        SourceArn: "!Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/*",
+      )
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/lambda/function/environment.rb

@@ -1,14 +1,14 @@
-class Jets::Resource::Lambda::Function
+class Jets::Cfn::Resource::Lambda::Function
   module Environment
     def env_properties
       env_vars = Jets::Dotenv.load!(true)
       variables = environment.merge(env_vars)
       check_reserved_variables!(variables)
-      {environment: { variables: variables }}
+      {Environment: { Variables: variables }}
     end
 
     def environment
-      env = Jets.config.environment ? Jets.config.environment.to_h : {}
+      env = Jets.config.function.environment ? Jets.config.function.environment.to_h : {}
       env.deep_merge(jets_env)
     end
 
@@ -16,9 +16,9 @@ class Jets::Resource::Lambda::Function
     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_EXTRA] = Jets.extra if Jets.extra
       env[:JETS_PROJECT_NAME] = ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME']
-      env[:JETS_STAGE] = Jets::Resource::ApiGateway::Deployment.stage_name
+      env[:JETS_STAGE] = Jets::Cfn::Resource::ApiGateway::Deployment.stage_name
       env[:JETS_AWS_ACCOUNT] = Jets.aws.account
       env
     end
@@ -36,21 +36,23 @@ class Jets::Resource::Lambda::Function
       exit 1
     end
 
-    # https://docs.aws.amazon.com/lambda/latest/dg/current-supported-versions.html#lambda-environment-variables
+    # https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html
     def reserved_variables
       %w[
         _HANDLER
+        AWS_DEFAULT_REGION
         AWS_REGION
         AWS_EXECUTION_ENV
         AWS_LAMBDA_FUNCTION_NAME
         AWS_LAMBDA_FUNCTION_MEMORY_SIZE
         AWS_LAMBDA_FUNCTION_VERSION
+        AWS_LAMBDA_INITIALIZATION_TYPE
         AWS_LAMBDA_LOG_GROUP_NAME
         AWS_LAMBDA_LOG_STREAM_NAME
+        AWS_ACCESS_KEY
         AWS_ACCESS_KEY_ID
         AWS_SECRET_ACCESS_KEY
         AWS_SESSION_TOKEN
-        TZ
         LAMBDA_TASK_ROOT
         LAMBDA_RUNTIME_DIR
         AWS_LAMBDA_RUNTIME_API