jets 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cdf110e35fa56fc847cdd8e6a6941a2fba176a407916f089e25d5b82ac1259
-  data.tar.gz: 485c1e5b430899c6335c7d62709993ed8d837155864ae2cda36ad73db0097857
+  metadata.gz: 1428541d12995e263e9e59799ac44ddad7aaa4c1edbec777efe3a9ea346f605c
+  data.tar.gz: 1a31efb43f051e6edb9e02fc644b784cabccc73d9a9b52e2d95c83f6dfe7cd9c
 SHA512:
-  metadata.gz: 27e0359780451354ecacfe9a65ae4fd0cc3498b855d1cda2d2956699f93dd0c0df7aeda611fce6d77023b7c18b94b99f56a109e667d5c7e24686aac6e061e7ce
-  data.tar.gz: 898c00749dea09e1962e7a5a178398e98e1035249e6f3cb9b65b93e44fdecba376b2445f54e67d6b8a73294f1282b2f3aa0f59f6771dc336fb59767a6358d2ac
+  metadata.gz: aa853515fa883f4c731cb34b52cbe4a24f2885330d4efe0c8db19cd6688c52cf19b26bb35f2eb8e7aac528aaa2fe9e5f380f99d85371113bdabe526c5dbbb521
+  data.tar.gz: 66c0ea47767db050eaf5481614cf53d2c63ab5ac44edb2eb9171d759a2d4b91a3e5052a4aa8f619e04eed0f36e5e9c56e681ad34a677e9ba979c4e2fd0d8c6be

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.8.0]
+- Introduce core resource, pull request #20
+- Future template generation will lead to core resource. Start the move away from the older cfn template generator logic.
+- Allows for more control and customization of the associated resources with the lambda functions.
+- Allows multiple associated resources to be connected to a lambda function.
+- Support for CloudWatch event patterns, not just scheduled expression
+
 ## [0.7.1]
 - fix application-wide config.iam_policy ability
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.7.1)
+    jets (0.8.0)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets.rb

@@ -46,6 +46,8 @@ module Jets
   autoload :RubyServer, "jets/ruby_server"
   autoload :IO, "jets/io"
   autoload :Logger, "jets/logger"
+
+  autoload :Resource, "jets/resource"
 end
 
 require "jets/core_ext/kernel"

data/lib/jets/cfn/ship.rb

@@ -97,6 +97,8 @@ class Jets::Cfn
     def show_api_endpoint
       return unless @options[:stack_type] == :full # s3 bucket is available
       return if Jets::Router.routes.empty?
+      resp, status = stack_status
+      return if status.include?("ROLLBACK")
 
       resp = cfn.describe_stack_resources(stack_name: @parent_stack_name)
       resources = resp.stack_resources

data/lib/jets/cfn/template_builders/base_child_builder.rb

@@ -54,5 +54,19 @@ class Jets::Cfn::TemplateBuilders
       properties = map.properties
       add_resource(logical_id, "AWS::IAM::Role", properties)
     end
+
+    def add_associated_resources
+      @app_klass.tasks.each do |task|
+        task.resources.each do |definition|
+          creator = Jets::Resource::Creator.new(definition, task)
+          add_associated_resource(creator.resource)
+          add_associated_resource(creator.resource.permission.attributes)
+        end
+      end
+    end
+
+    def add_associated_resource(resource)
+      add_resource(resource.logical_id, resource.type, resource.properties)
+    end
   end
 end

data/lib/jets/cfn/template_builders/controller_builder.rb

@@ -20,83 +20,13 @@ class Jets::Cfn::TemplateBuilders
 
     def add_routes
       scoped_routes.each_with_index do |route, i|
-        map = Jets::Cfn::TemplateMappers::GatewayMethodMapper.new(route)
-        add_route(route, map)
-        add_cors(map)
-        add_permission(map)
+        resource_route = Jets::Resource::Route.new(route)
+        add_associated_resource(resource_route.resource)
+        add_associated_resource(resource_route.resource.permission.attributes)
+        add_associated_resource(resource_route.resource.cors(route).attributes) if Jets.config.cors
       end
     end
 
-    def add_route(route, map)
-      # AWS::ApiGateway::Method
-      # Example map.logical_id: ApiGatewayMethodPostsControllerIndex
-      add_resource(map.logical_id, "AWS::ApiGateway::Method",
-        HttpMethod: route.method,
-        RequestParameters: {},
-        ResourceId: "!Ref #{map.gateway_resource_logical_id}",
-        RestApiId: "!Ref RestApi",
-        AuthorizationType: "NONE",
-        Integration: {
-          IntegrationHttpMethod: "POST",
-          Type: "AWS_PROXY",
-          Uri: "!Sub arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${#{map.lambda_function_logical_id}.Arn}/invocations"
-        },
-        MethodResponses:[]
-      )
-    end
-
-    def add_cors(map)
-      # TODO: provide a way to allow specify CORs domains
-      return unless Jets.config.cors
-
-      add_resource(map.cors_logical_id, "AWS::ApiGateway::Method",
-        AuthorizationType: "NONE",
-        HttpMethod: "OPTIONS",
-        MethodResponses: [
-          {
-            StatusCode: "200",
-            ResponseParameters: {
-              "method.response.header.Access-Control-AllowOrigin" => true,
-              "method.response.header.Access-Control-AllowHeaders" => true,
-              "method.response.header.Access-Control-AllowMethods" => true,
-              "method.response.header.Access-Control-AllowCredentials" => true
-            },
-            ResponseModels: {}
-          }
-        ],
-        RequestParameters: {},
-        Integration: {
-          Type: "MOCK",
-          RequestTemplates: {
-            "application/json" => "{statusCode:200}"
-          },
-          IntegrationResponses: [
-            {
-              StatusCode: "200",
-              ResponseParameters: {
-                "method.response.header.Access-Control-AllowOrigin" => "'*'",
-                "method.response.header.Access-Control-AllowHeaders" => "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'",
-                "method.response.header.Access-Control-AllowMethods" => "'OPTIONS,GET'",
-                "method.response.header.Access-Control-AllowCredentials" => "'false'"
-              },
-              ResponseTemplates: {"application/json" => ""}
-            }
-          ]
-        },
-        ResourceId: "!Ref #{map.gateway_resource_logical_id}",
-        RestApiId: "!Ref RestApi",
-      )
-    end
-
-    def add_permission(map)
-      add_resource(map.permission_logical_id, "AWS::Lambda::Permission",
-        FunctionName: "!GetAtt #{map.lambda_function_logical_id}.Arn",
-        Action: "lambda:InvokeFunction",
-        Principal: "apigateway.amazonaws.com",
-        SourceArn: "!Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/*"
-      )
-    end
-
     # routes scoped to this controller template.
     def scoped_routes
       @routes ||= Jets::Router.routes.select do |route|

data/lib/jets/cfn/template_builders/interface.rb

@@ -4,6 +4,8 @@
 #   * template_path
 class Jets::Cfn::TemplateBuilders
   module Interface
+    extend Memoist
+
     def build
       # Do not bother building
       # or writing the template unless there are functions defined
@@ -37,6 +39,9 @@ class Jets::Cfn::TemplateBuilders
         if line.include?(': "!') # IE: IamRole: "!Ref IamRole",
            # IamRole: "!Ref IamRole" => IamRole: !Ref IamRole
           line.sub(/: "(.*)"/, ': \1')
+        elsif line.include?('- "!') # IE: - "!GetAtt Foo.Arn"
+           # IamRole: - "!GetAtt Foo.Arn" => - !GetAtt Foo.Arn
+          line.sub(/- "(.*)"/, '- \1')
         else
           line
         end

data/lib/jets/cfn/template_builders/job_builder.rb

@@ -3,61 +3,7 @@ class Jets::Cfn::TemplateBuilders
     def compose
       add_common_parameters
       add_functions
-      add_scheduled_tasks
-    end
-
-    def add_scheduled_tasks
-      # @app_klass is PostsController, HardJob, Hello, or HelloFunction
-      @app_klass.tasks.each do |task|
-        map = Jets::Cfn::TemplateMappers::EventsRuleMapper.new(task)
-
-        # If there's no scheduled expression dont add a scheduled Events::Rule
-        if task.schedule_expression
-          add_event_rule(task, map)
-          add_permission(map)
-        end
-      end
-    end
-
-    def add_event_rule(task, map)
-      add_resource(map.logical_id, "AWS::Events::Rule",
-        ScheduleExpression: task.schedule_expression,
-        State: task.state,
-        Targets: [
-          {
-            Arn: "!GetAtt #{map.lambda_function_logical_id}.Arn",
-            Id: map.rule_target_id
-          }
-        ]
-      )
-      # Example:
-      # add_resource("HardJobDigScheduledEvent", "AWS::Events::Rule",
-      #   ScheduleExpression: "rate(1 minute)",
-      #   State: "ENABLED",
-      #   Targets: [
-      #     {
-      #       Arn: "!GetAtt HardJobDigLambdaFunction.Arn",
-      #       Id: "RuleTargetHardJobDig"
-      #     }
-      #   ]
-      # )
-    end
-
-    def add_permission(map)
-      add_resource(map.permission_logical_id, "AWS::Lambda::Permission",
-        FunctionName: "!GetAtt #{map.lambda_function_logical_id}.Arn",
-        Action: "lambda:InvokeFunction",
-        Principal: "events.amazonaws.com",
-        SourceArn: "!GetAtt #{map.logical_id}.Arn"
-      )
-      # Example:
-      # add_resource("HardJobDigEventsRulePermission", "AWS::Lambda::Permission",
-      #   FunctionName: "!GetAtt HardJobDigLambdaFunction.Arn",
-      #   Action: "lambda:InvokeFunction",
-      #   Principal: "events.amazonaws.com",
-      #   SourceArn: "!GetAtt HardJobDigScheduledEvent.Arn"
-      # )
+      add_associated_resources
     end
   end
 end
-

data/lib/jets/cfn/template_builders/rule_builder.rb

@@ -3,69 +3,18 @@ class Jets::Cfn::TemplateBuilders
     def compose
       add_common_parameters
       add_functions
-      add_config_rules
+      add_associated_resources
+      add_managed_rules
     end
 
-    def add_config_rules
-      # Handle config_rules associated with lambda functions.
-      # @app_klass is PostsController, HardRule, Hello, or HelloFunction, or GameRule
-      @app_klass.tasks.each do |task|
-        map = Jets::Cfn::TemplateMappers::ConfigRuleMapper.new(task)
-
-        add_config_rule(task, map)
-        add_permission(map)
-      end
-
-      # Handle config_rules associated with aws managed rules.
-      # List of AWS Config Managed Rules: https://amzn.to/2BOt9KN
+    # Handle config_rules associated with aws managed rules.
+    # List of AWS Config Managed Rules: https://amzn.to/2BOt9KN
+    def add_managed_rules
       @app_klass.managed_rules.each do |rule|
-        map = Jets::Cfn::TemplateMappers::ConfigRuleMapper.new(rule)
-        add_aws_managed_rule(rule, map)
+        creator = Jets::Resource::Creator.new(rule[:definition], rule[:task])
+        add_associated_resource(creator.resource)
       end
     end
-
-    def add_aws_managed_rule(rule, map)
-      # Usually we build the properties with the mappers but in the case for
-      # a config_rule it makes more sense to grab properties from the task
-      # using config_rule_properties
-      add_resource(map.logical_id, "AWS::Config::ConfigRule",
-        Properties: rule.config_rule_properties
-      )
-    end
-
-    def add_config_rule(task, map)
-      # Usually we build the properties with the mappers but in the case for
-      # a config_rule it makes more sense to grab properties from the task
-      # using config_rule_properties
-      add_resource(map.logical_id, "AWS::Config::ConfigRule",
-        Properties: task.config_rule_properties,
-        DependsOn: map.permission_logical_id
-      )
-      # Example:
-      # add_resource("GameRuleProtectConfigRule", "AWS::Config::ConfigRule",
-      #   "ConfigRuleName" : String,
-      #   "Description" : String,
-      #   "InputParameters" : { ParameterName : Value },
-      #   "MaximumExecutionFrequency" : String,
-      #   "Scope" : Scope,
-      #   "Source" : Source
-      # )
-    end
-
-    def add_permission(map)
-      add_resource(map.permission_logical_id, "AWS::Lambda::Permission",
-        FunctionName: "!GetAtt #{map.lambda_function_logical_id}.Arn",
-        Action: "lambda:InvokeFunction",
-        Principal: "config.amazonaws.com"
-      )
-      # Example:
-      # add_resource("GameRuleProtectConfigRulePermission", "AWS::Lambda::Permission",
-      #   FunctionName: "!GetAtt GameRuleProtectLambdaFunction.Arn",
-      #   Action: "lambda:InvokeFunction",
-      #   Principal: "config.amazonaws.com",
-      #   SourceArn: "!GetAtt ScheduledEventHardRuleDig.Arn"
-      # )
-    end
   end
 end
 

data/lib/jets/cfn/template_mappers.rb

@@ -6,8 +6,8 @@ class Jets::Cfn
     # used in the parent_template.rb
     autoload :ChildMapper, "jets/cfn/template_mappers/child_mapper"
     autoload :ControllerMapper, "jets/cfn/template_mappers/controller_mapper"
-    autoload :JobMapper, "jets/cfn/template_mappers/job_mapper"
     autoload :FunctionMapper, "jets/cfn/template_mappers/function_mapper"
+    autoload :JobMapper, "jets/cfn/template_mappers/job_mapper"
     autoload :RuleMapper, "jets/cfn/template_mappers/rule_mapper"
 
     autoload :ApiGatewayMapper, "jets/cfn/template_mappers/api_gateway_mapper"
@@ -17,9 +17,6 @@ class Jets::Cfn
     autoload :GatewayResourceMapper, "jets/cfn/template_mappers/gateway_resource_mapper"
     autoload :LambdaFunctionMapper, "jets/cfn/template_mappers/lambda_function_mapper"
 
-    autoload :EventsRuleMapper, "jets/cfn/template_mappers/events_rule_mapper"
-    autoload :ConfigRuleMapper, "jets/cfn/template_mappers/config_rule_mapper"
-
     autoload :IamPolicy, "jets/cfn/template_mappers/iam_policy"
   end
 end

data/lib/jets/cfn/template_mappers/child_mapper.rb

@@ -9,7 +9,7 @@ class Jets::Cfn::TemplateMappers
 
     # common parameters to all child stacks
     def parameters
-      parameters = {
+      {
         # YAML.dump converts it to a string
         # !GetAtt Base.Outputs.IamRole => "!GetAtt Base.Outputs.IamRole"
         # But post processing of the template fixes this

data/lib/jets/cfn/template_mappers/gateway_resource_mapper.rb

@@ -4,18 +4,18 @@ class Jets::Cfn::TemplateMappers
       @path = path # Examples: "posts/:id/edit" or "posts"
     end
 
-    # Returns: "ApiGatewayResourcePostsController"
+    # Returns: "ApiResourcePostsController"
     def logical_id
       homepage = @path == ''
       if homepage
         "RootResourceId"
       else
-        "#{path_logical_id(@path)}ApiGatewayResource"
+        "#{path_logical_id(@path)}ApiResource"
       end
     end
 
     def cors_logical_id
-      "#{path_logical_id(@path)}CorsApiGatewayResource"
+      "#{path_logical_id(@path)}CorsApiResource"
     end
 
     # Modify the path to conform to API Gateway capture expressions
@@ -43,7 +43,7 @@ class Jets::Cfn::TemplateMappers
       if @path.include?('/') # posts/:id or posts/:id/edit
         parent_path = @path.split('/')[0..-2].join('/')
         parent_logical_id = path_logical_id(parent_path)
-        "!Ref #{parent_logical_id}ApiGatewayResource"
+        "!Ref #{parent_logical_id}ApiResource"
       else
         "!GetAtt RestApi.RootResourceId"
       end
@@ -55,6 +55,7 @@ class Jets::Cfn::TemplateMappers
     end
 
   private
+    # Similar path_logical_id method in resource/route.rb
     def path_logical_id(path)
       path.gsub('/','_').gsub(':','').gsub('*','').camelize
     end

data/lib/jets/commands/build.rb

@@ -147,10 +147,10 @@ module Jets::Commands
       controllers = File.expand_path("../../internal/app/controllers/jets", __FILE__)
 
       welcome = Jets::Router.has_controller?("Jets::WelcomeController")
-      paths << "#{controllers}/public_controller.rb" if welcome
+      paths << "#{controllers}/welcome_controller.rb" if welcome
 
       public_catchall = Jets::Router.has_controller?("Jets::PublicController")
-      paths << "#{controllers}/welcome_controller.rb" if public_catchall
+      paths << "#{controllers}/public_controller.rb" if public_catchall
 
       jobs = File.expand_path("../../internal/app/jobs/jets", __FILE__)
       paths << "#{jobs}/preheat_job.rb"

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -6,10 +6,13 @@ Jets.application.configure do
   # config.env_extra = 2 # can also set this with JETS_ENV_EXTRA
   # config.extra_autoload_paths = []
 
+  config.cors = true # for '*''
+  # config.cors = '*.mydomain.com' # for specific domain
+
   config.function.timeout = 10
   # config.function.role = "arn:aws:iam::#{Jets.aws.account}:role/service-role/pre-created"
   # config.function.memory_size= 1536
-  # config.function.cors = true
+
   config.function.environment = {
     global_app_key1: "global_app_value1",
     global_app_key2: "global_app_value2",

data/lib/jets/internal/app/jobs/jets/preheat_job.rb

@@ -23,7 +23,7 @@ class Jets::PreheatJob < ApplicationJob
   )
 
   unless Jets::Commands::Build.poly_only?
-    torching ? rate(PREWARM_RATE) : disable(true)
+    rate(PREWARM_RATE) if torching
     def torch
       threads = []
       CONCURRENCY.times do
@@ -42,7 +42,7 @@ class Jets::PreheatJob < ApplicationJob
       "Finished prewarming your application with a concurrency of #{CONCURRENCY}."
     end
 
-    warming ? rate(PREWARM_RATE) : disable(true)
+    rate(PREWARM_RATE) if warming
     def warm
       options = call_options(event[:quiet])
       Jets::Preheat.warm_all(options)