jets 0.8.18 → 0.9.0

data/lib/jets/builders/handler_generator.rb

@@ -15,7 +15,35 @@ class Jets::Builders
 
     def generate
       poly_shims
-      ruby_node_shim
+      app_ruby_shim
+      shared_shims
+    end
+
+    def shared_shims
+      Jets::Stack.subclasses.each do |subclass|
+        subclass.functions.each do |fun|
+          if fun.lang.to_s == "ruby"
+            shared_ruby_shim(fun)
+          else
+            copy_source_as_handler(fun)
+          end
+        end
+      end
+    end
+
+    # app/shared/functions/kevin.py => /tmp/jets/demo/app_root/handlers/shared/functions/kevin.py
+    def copy_source_as_handler(fun)
+      source_path = fun.source_file
+      unless source_path
+        attributes = fun.template.values.first
+        function_name = attributes['Properties']['FunctionName']
+        puts "WARN: missing source file for: '#{function_name}' function".colorize(:yellow)
+        return
+      end
+
+      dest_path = "#{tmp_app_root}/#{fun.handler_dest}"
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      FileUtils.cp(source_path, dest_path)
     end
 
     def poly_shims
@@ -55,10 +83,18 @@ class Jets::Builders
       FileUtils.cp(source_path, dest_path)
     end
 
+    def shared_ruby_shim(fun)
+      deducer = Jets::Builders::SharedDeducer.new(fun)
+      generate_shim(deducer)
+    end
+
     # Generates one big node shim for a entire controller.
-    def ruby_node_shim
+    def app_ruby_shim
       deducer = Jets::Builders::Deducer.new(@path)
+      generate_shim(deducer)
+    end
 
+    def generate_shim(deducer)
       js_path = "#{tmp_app_root}/#{deducer.js_path}"
       FileUtils.mkdir_p(File.dirname(js_path))
 

data/lib/jets/builders/shared_deducer.rb

@@ -0,0 +1,32 @@
+# Deducer.new(path)
+#
+#   @deducer.functions.each do |function_name|
+#     @deducer.handler_for(function_name)
+#   end
+#
+# Implements:
+#
+#   functions
+#   handler_for(function_name)
+#   js_path
+#
+class Jets::Builders
+  class SharedDeducer < Deducer
+    def initialize(fun)
+      @fun = fun
+    end
+
+    def functions
+      [@fun.meth] # function_names
+    end
+
+    # dont need function_name arg but keeping the same interface as parent class
+    def handler_for(function_name)
+      @fun.handler_dest
+    end
+
+    def js_path
+      @fun.handler_dest
+    end
+  end
+end

data/lib/jets/cfn/builders.rb

@@ -9,11 +9,13 @@ class Jets::Cfn
     # These build the app/controllers, app/jobs, and app/functions
     autoload :BaseChildBuilder, "jets/cfn/builders/base_child_builder"
     autoload :ControllerBuilder, "jets/cfn/builders/controller_builder"
-    autoload :JobBuilder, "jets/cfn/builders/job_builder"
     autoload :FunctionBuilder, "jets/cfn/builders/function_builder"
+    autoload :JobBuilder, "jets/cfn/builders/job_builder"
     autoload :RuleBuilder, "jets/cfn/builders/rule_builder"
 
     autoload :ApiGatewayBuilder, "jets/cfn/builders/api_gateway_builder"
     autoload :ApiDeploymentBuilder, "jets/cfn/builders/api_deployment_builder"
+
+    autoload :SharedBuilder, "jets/cfn/builders/shared_builder"
   end
 end

data/lib/jets/cfn/builders/api_deployment_builder.rb

@@ -10,7 +10,7 @@ class Jets::Cfn::Builders
 
     # compose is an interface method
     def compose
-      return if @options[:stack_type] == :minimal
+      return unless @options[:full] || @options[:stack_type] != :minimal
 
       deployment = Jets::Resource::ApiGateway::Deployment.new
       add_resource(deployment)

data/lib/jets/cfn/builders/api_gateway_builder.rb

@@ -10,7 +10,7 @@ class Jets::Cfn::Builders
 
     # compose is an interface method
     def compose
-      return if @options[:stack_type] == :minimal
+      return unless @options[:full] || @options[:stack_type] != :minimal
 
       add_gateway_rest_api
       add_gateway_routes

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

@@ -1,27 +1,57 @@
+# Implements:
+#
+#   * template_path
+#
+# FYI
+#
+#   * compose implemented by the classes that include this
 class Jets::Cfn::Builders
   class BaseChildBuilder
     include Interface
 
-    # The app_klass is can be a controller, job or anonymous function class.
+    # The app_class is can be a controller, job or anonymous function class.
     # IE: PostsController, HardJob
-    def initialize(app_klass)
-      @app_klass = app_klass
+    def initialize(app_class)
+      @app_class = app_class
       @template = ActiveSupport::HashWithIndifferentAccess.new(Resources: {})
     end
 
     # template_path is an interface method for Interface module
     def template_path
-      Jets::Naming.template_path(@app_klass)
+      Jets::Naming.app_template_path(@app_class)
     end
 
     def add_common_parameters
       add_parameter("IamRole", Description: "Iam Role that Lambda function uses.")
       add_parameter("S3Bucket", Description: "S3 Bucket for source code.")
+      depends_on_params.each do |logical_id, desc|
+        add_parameter(logical_id, Description: desc)
+      end
+    end
+
+    def depends_on_params
+      return {} unless @app_class.depends_on
+
+      params = {}
+      @app_class.depends_on.each do |shared_stack|
+        dependency = shared_stack.to_s.camelize # logical_id
+        dependency_outputs(dependency).each do |output|
+          dependency_class = dependency.to_s.classify
+          desc = "From #{dependency_class}.Outputs.#{output}"
+          # key: logical_id , value: description
+          params[output] = desc
+        end
+      end
+      params
+    end
+
+    def dependency_outputs(dependency)
+      dependency.to_s.classify.constantize.output_keys
     end
 
     def add_functions
       add_class_iam_policy
-      @app_klass.tasks.each do |task|
+      @app_class.tasks.each do |task|
         add_function(task)
         add_function_iam_policy(task)
       end
@@ -33,9 +63,9 @@ class Jets::Cfn::Builders
     end
 
     def add_class_iam_policy
-      return unless @app_klass.build_class_iam?
+      return unless @app_class.build_class_iam?
 
-      resource = Jets::Resource::Iam::ClassRole.new(@app_klass)
+      resource = Jets::Resource::Iam::ClassRole.new(@app_class)
       add_resource(resource)
     end
 

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

@@ -1,3 +1,8 @@
+# Implements:
+#
+#   compose
+#   template_path
+#
 class Jets::Cfn::Builders
   class ControllerBuilder < BaseChildBuilder
     # compose is an interface method for Interface module
@@ -30,7 +35,7 @@ class Jets::Cfn::Builders
     # routes scoped to this controller template.
     def scoped_routes
       @routes ||= Jets::Router.routes.select do |route|
-        route.controller_name == @app_klass.to_s
+        route.controller_name == @app_class.to_s
       end
     end
   end

data/lib/jets/cfn/builders/function_builder.rb

@@ -1,3 +1,8 @@
+# Implements:
+#
+#   compose
+#   template_path
+#
 class Jets::Cfn::Builders
   class FunctionBuilder < BaseChildBuilder
     # compose is an interface method for Interface module

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

@@ -7,9 +7,8 @@ class Jets::Cfn::Builders
     extend Memoist
 
     def build
-      # Do not bother building
-      # or writing the template unless there are functions defined
-      return if @app_klass && !@app_klass.build?
+      # Do not bother building or writing the template unless there are functions defined
+      return if @app_class && !@app_class.build?
 
       compose # must be implemented by subclass
       write
@@ -74,9 +73,9 @@ class Jets::Cfn::Builders
     end
 
     def add_resources
-      @app_klass.tasks.each do |task|
-        task.resources.each do |definition|
-          resource = Jets::Resource.new(definition, task.replacements)
+      @app_class.tasks.each do |task|
+        task.associated_resources.each do |associated|
+          resource = Jets::Resource.new(associated.definition, task.replacements)
           add_resource(resource)
           add_resource(resource.permission)
         end

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

@@ -1,3 +1,8 @@
+# Implements:
+#
+#   compose
+#   template_path
+#
 class Jets::Cfn::Builders
   class JobBuilder < BaseChildBuilder
     def compose

data/lib/jets/cfn/builders/parent_builder.rb

@@ -15,7 +15,7 @@ class Jets::Cfn::Builders
       puts "Building parent CloudFormation template."
 
       build_minimal_resources
-      build_child_resources unless @options[:stack_type] == :minimal
+      build_child_resources if @options[:full] || @options[:stack_type] == :full
     end
 
     # template_path is an interface method
@@ -38,26 +38,37 @@ class Jets::Cfn::Builders
     def build_child_resources
       puts "Building child CloudFormation templates."
 
-      expression = "#{Jets::Naming.template_path_prefix}-*"
+      expression = "#{Jets::Naming.template_path_prefix}-app-*"
       # IE: path: #{Jets.build_root}/templates/demo-dev-2-comments_controller.yml
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
-        next if api_gateway_paths.include?(path) # specially treated
-
         add_app_class_stack(path)
       end
 
-      if @options[:stack_type] == :full and !Jets::Router.routes.empty?
+      expression = "#{Jets::Naming.template_path_prefix}-shared-*"
+      # IE: path: #{Jets.build_root}/templates/demo-dev-2-shared-resources.yml
+      Dir.glob(expression).each do |path|
+        next unless File.file?(path)
+
+        add_shared_resources(path)
+      end
+
+      if (@options[:full] || @options[:stack_type] == :full) and !Jets::Router.routes.empty?
         add_api_gateway
         add_api_deployment
       end
     end
 
     def add_app_class_stack(path)
-      resource = Jets::Resource::ChildStack::AppClass.new(path, @options[:s3_bucket])
+      resource = Jets::Resource::ChildStack::AppClass.new(@options[:s3_bucket], path: path)
       add_child_resources(resource)
     end
 
+    def add_shared_resources(path)
+      resource = Jets::Resource::ChildStack::Shared.new(@options[:s3_bucket], path: path)
+      add_child_resources(resource) if resource.resources?
+    end
+
     def add_api_gateway
       resource = Jets::Resource::ChildStack::ApiGateway.new(@options[:s3_bucket])
       add_child_resources(resource)
@@ -72,15 +83,5 @@ class Jets::Cfn::Builders
       add_resource(resource)
       add_outputs(resource.outputs)
     end
-
-    def api_gateway_paths
-      files = %w[
-        api-deployment.yml
-        api-gateway.yml
-      ]
-      files.map do |name|
-        "#{Jets::Naming.template_path_prefix}-#{name}"
-      end
-    end
   end
 end

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

@@ -1,3 +1,8 @@
+# Implements:
+#
+#   compose
+#   template_path
+#
 class Jets::Cfn::Builders
   class RuleBuilder < BaseChildBuilder
     def compose
@@ -10,7 +15,7 @@ class Jets::Cfn::Builders
     # 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|
+      @app_class.managed_rules.each do |rule|
         resource = Jets::Resource.new(rule[:definition], rule[:replacements])
         add_resource(resource)
       end

data/lib/jets/cfn/builders/shared_builder.rb

@@ -0,0 +1,14 @@
+class Jets::Cfn::Builders
+  class SharedBuilder < BaseChildBuilder
+    def compose
+      stack = @app_class.new # @app_class is subclass. IE: Alarm < Jets::Stack
+      builder = Jets::Stack::Builder.new(stack)
+      @template = builder.template # overwrite entire @template
+    end
+
+    # template_path is an interface method for Interface module
+    def template_path
+      Jets::Naming.shared_template_path(@app_class)
+    end
+  end
+end

data/lib/jets/commands.rb

@@ -1,23 +1,24 @@
 module Jets::Commands
-  autoload :Help, "jets/commands/help"
   autoload :Base, "jets/commands/base"
   autoload :Build, "jets/commands/build"
-  autoload :Deploy, "jets/commands/deploy"
-  autoload :Delete, "jets/commands/delete"
-  autoload :New, "jets/commands/new"
   autoload :Call, "jets/commands/call"
+  autoload :Clean, "jets/commands/clean"
   autoload :Console, "jets/commands/console"
   autoload :Db, "jets/commands/db"
+  autoload :Dbconsole, "jets/commands/dbconsole"
+  autoload :Delete, "jets/commands/delete"
+  autoload :Deploy, "jets/commands/deploy"
   autoload :Dynamodb, "jets/commands/dynamodb"
+  autoload :Help, "jets/commands/help"
   autoload :Main, "jets/commands/main"
+  autoload :Markdown, "jets/commands/markdown"
+  autoload :New, "jets/commands/new"
   autoload :Process, "jets/commands/process"
   autoload :RakeCommand, "jets/commands/rake_command"
   autoload :RakeTasks, 'jets/commands/rake_tasks'
-  autoload :WebpackerTemplate, 'jets/commands/webpacker_template'
+  autoload :Runner, 'jets/commands/runner'
   autoload :Sequence, "jets/commands/sequence"
   autoload :StackInfo, "jets/commands/stack_info"
-  autoload :Dbconsole, "jets/commands/dbconsole"
   autoload :Url, "jets/commands/url"
-  autoload :Markdown, "jets/commands/markdown"
-  autoload :Clean, "jets/commands/clean"
+  autoload :WebpackerTemplate, 'jets/commands/webpacker_template'
 end

data/lib/jets/commands/build.rb

@@ -31,10 +31,10 @@ module Jets::Commands
     time :build_code
 
     def build_templates
-      if @options[:stack_type] == :minimal
-        build_minimal_template
-      else
+      if @options[:full] || @options[:stack_type] == :full
         build_all_templates
+      else
+        build_minimal_template
       end
     end
     time :build_templates
@@ -45,8 +45,10 @@ module Jets::Commands
       # 1. Shared templates - child templates needs them
       build_api_gateway_templates
       # 2. Child templates - parent template needs them
-      build_child_templates
-      # 3. Finally parent template
+      build_app_child_templates
+      # 2. Child templates - parent template needs them
+      build_shared_resources_templates
+      # 4. Finally parent template
       build_parent_template # must be called at the end
     end
 
@@ -59,19 +61,21 @@ module Jets::Commands
       Jets::Cfn::Builders::ApiDeploymentBuilder.new(@options).build
     end
 
-    def build_child_templates
+    def build_app_child_templates
       app_files.each do |path|
         build_child_template(path)
       end
     end
 
+    def build_shared_resources_templates
+      Jets::Stack.subclasses.each do |subclass|
+        Jets::Cfn::Builders::SharedBuilder.new(subclass).build
+      end
+    end
+
     # path: app/controllers/comments_controller.rb
     # path: app/jobs/easy_job.rb
     def build_child_template(path)
-      class_path = path.sub(%r{.*app/\w+/},'').sub(/\.rb$/,'')
-      class_name = class_path.classify
-      class_name.constantize # load app/**/* class definition
-
       md = path.match(%r{app/(.*?)/}) # extract: controller, job or function
       process_class = md[1].classify
       builder_class = "Jets::Cfn::Builders::#{process_class}Builder".constantize
@@ -82,8 +86,8 @@ module Jets::Commands
       #   Jets::Cfn::Builders::RuleBuilder.new(CheckRule)
       #   Jets::Cfn::Builders::FunctionBuilder.new(Hello)
       #   Jets::Cfn::Builders::FunctionBuilder.new(HelloFunction)
-      app_klass = Jets::Klass.from_path(path)
-      builder = builder_class.new(app_klass)
+      app_class = Jets::Klass.from_path(path)
+      builder = builder_class.new(app_class)
       builder.build
     end
 
@@ -119,6 +123,24 @@ module Jets::Commands
       paths
     end
 
+    def shared_files
+      self.class.shared_files
+    end
+
+    def self.shared_files
+      paths = []
+      expression = "#{Jets.root}app/**/**/*.rb"
+      Dir.glob(expression).each do |path|
+        return false unless File.file?(path)
+        next unless path.include?("app/shared/resources")
+
+        relative_path = path.sub(Jets.root.to_s, '')
+        # Rids of the Jets.root at beginning
+        paths << relative_path
+      end
+      paths
+    end
+
     def self.poly_only?
       # Scans all the app code and look for any methods that are ruby.
       # If any method is written in ruby then we know the app is not a
@@ -129,8 +151,8 @@ module Jets::Commands
         app_file = path.sub(%r{app/\w+/},'').sub(/\.rb$/,'')
         # Internal jets controllers like Welcome and Public need a different regexp
         app_file = app_file.sub(%r{.*lib/jets/internal/},'')
-        app_klass = app_file.classify.constantize # IE: PostsController, Jets::PublicController
-        langs = app_klass.tasks.map(&:lang)
+        app_class = app_file.classify.constantize # IE: PostsController, Jets::PublicController
+        langs = app_class.tasks.map(&:lang)
         langs.include?(:ruby)
       end
       !has_ruby