jets 1.7.2 → 1.8.0

data/lib/jets/internal/app/views/jets/mailers/index.html.erb

@@ -0,0 +1,8 @@
+<% @previews.each do |preview| %>
+<h3><%= link_to(preview.preview_name.titleize, "/jets/mailers/#{preview.preview_name}") %></h3>
+<ul>
+<% preview.emails.each do |email| %>
+<li><%= link_to(email, "/jets/mailers/#{preview.preview_name}/#{email}") %></li>
+<% end %>
+</ul>
+<% end %>

data/lib/jets/internal/app/views/jets/mailers/mailer.html.erb

@@ -0,0 +1,6 @@
+<h3><%= @preview.preview_name.titleize %></h3>
+<ul>
+<% @preview.emails.each do |email| %>
+<li><%= link_to(email, "/jets/mailers/#{@preview.preview_name}/#{email}") %></li>
+<% end %>
+</ul>

data/lib/jets/job/base.rb

@@ -6,9 +6,19 @@ require 'json'
 # Both Jets::Job::Base and Jets::Lambda::Functions have Dsl modules included.
 # So the Jets::Job::Dsl overrides some of the Jets::Lambda::Functions behavior.
 class Jets::Job
+  autoload :S3EventHelper, "jets/job/s3_event_helper"
+
   class Base < Jets::Lambda::Functions
     include Dsl
 
+    # non-DSL methods
+    include S3EventHelper
+
+    # Tracks bucket each time an s3_event is declared
+    # Map of bucket_name => stack_name (nested part)
+    cattr_accessor :s3_events # dont want this to be inheritable intentionally
+    self.s3_events = {}
+
     class << self
       def process(event, context, meth)
         job = new(event, context, meth)

data/lib/jets/job/dsl.rb

@@ -9,12 +9,14 @@
 module Jets::Job::Dsl
   extend ActiveSupport::Concern
   autoload :EventSourceMapping, "jets/job/dsl/event_source_mapping" # base for sqs_event, etc
+  autoload :S3Event, "jets/job/dsl/s3_event"
   autoload :SnsEvent, "jets/job/dsl/sns_event"
   autoload :SqsEvent, "jets/job/dsl/sqs_event"
 
   included do
     class << self
       include EventSourceMapping
+      include S3Event
       include SnsEvent
       include SqsEvent
 

data/lib/jets/job/dsl/s3_event.rb

@@ -0,0 +1,36 @@
+module Jets::Job::Dsl
+  module S3Event
+    def s3_event(bucket_name, props={})
+      stack_name = declare_s3_bucket_resources(bucket_name) # only set up once per bucket
+      declare_sns_subscription(topic_arn: "!Ref #{stack_name}SnsTopic") # set up subscription every time
+    end
+
+    # Returns stack_name
+    def declare_s3_bucket_resources(bucket_name)
+      # If shared s3 bucket resources have already been declared.
+      # We will not generate them again. However, we still need to always
+      # add the depends_on declaration to ensure that the shared stack parameters
+      # are properly passed to the nested child stack.
+      stack_name = s3_events[bucket_name] # already registered
+      if stack_name
+        depends_on stack_name.underscore.to_sym, class_prefix: true # always add this
+        return stack_name
+      end
+
+      # Create shared resources - one time
+      stack_name = declare_shared_s3_event_resources(bucket_name)
+      depends_on stack_name.underscore.to_sym, class_prefix: true # always add this
+      self.s3_events[bucket_name] = stack_name # tracks buckets already set up
+    end
+
+    def declare_shared_s3_event_resources(bucket_name)
+      s3_stack = Jets::Stack::S3Event.new(bucket_name)
+      s3_stack.build_stack
+      s3_stack.stack_name
+    end
+
+    def s3_events
+      Jets::Job::Base.s3_events
+    end
+  end
+end

data/lib/jets/job/dsl/sns_event.rb

@@ -25,6 +25,14 @@ module Jets::Job::Dsl
       end
     end
 
+    def declare_sns_topic_policy(props={})
+      props ||= {} # options.delete(:topic_policy_properties) can be nil
+      r = Jets::Resource::Sns::TopicPolicy.new(props)
+      with_fresh_properties do
+        resource(r.definition) # add associated resource immediately
+      end
+    end
+
     def declare_sns_subscription(props={})
       r = Jets::Resource::Sns::Subscription.new(props)
       with_fresh_properties do

data/lib/jets/job/s3_event_helper.rb

@@ -0,0 +1,13 @@
+class Jets::Job
+  module S3EventHelper
+    def s3_event_message
+      message = event["Records"][0]["Sns"]["Message"]
+      h = JSON.load(message)
+      ActiveSupport::HashWithIndifferentAccess.new(h)
+    end
+
+    def s3_object
+      s3_event_message["Records"][0]["s3"]["object"]
+    end
+  end
+end

data/lib/jets/lambda/dsl.rb

@@ -213,12 +213,22 @@ module Jets::Lambda::Dsl
         @associated_resources = numbered_resources
       end
 
+      # Examples:
+      #
+      #   depends_on :custom
+      #   depends_on :custom, :alert
+      #   depends_on :custom, class_prefix: true
+      #   depends_on :custom, :alert, class_prefix: true
+      #
       def depends_on(*stacks)
         if stacks == []
           @depends_on
         else
           @depends_on ||= []
-          @depends_on += stacks
+          options = stacks.last.is_a?(Hash) ? stacks.pop : {}
+          stacks.each do |stack|
+            @depends_on << Jets::Stack::Depends::Item.new(stack, options)
+          end
         end
       end
 

data/lib/jets/mailer.rb

@@ -0,0 +1,51 @@
+module Jets
+  # Reference: https://github.com/rails/rails/blob/master/actionmailer/lib/action_mailer/railtie.rb
+  class Mailer < ::Jets::Turbine
+    config.action_mailer = ActiveSupport::OrderedOptions.new
+
+    initializer "action_mailer.logger" do
+      ActiveSupport.on_load(:action_mailer) { self.logger ||= Jets.logger }
+    end
+
+    initializer "action_mailer.set_configs" do |app|
+      options = app.config.action_mailer
+      options.default_url_options ||= {}
+      options.default_url_options[:protocol] ||= "https"
+      options.show_previews = false if options.show_previews.nil?
+      options.preview_path ||= "#{Jets.root}/app/previews" if options.show_previews
+      options.view_paths ||= "#{Jets.root}/app/views"
+
+      # TODO: Dont think Jets sets asset_host the same way
+      # make sure readers methods get compiled
+      # options.asset_host          ||= app.config.asset_host
+      # options.relative_url_root   ||= app.config.relative_url_root
+
+      ActiveSupport.on_load(:action_mailer) do
+        include AbstractController::UrlFor
+        # TODO: figure out rest of the helpers
+        # extend ::AbstractController::Railties::RoutesHelpers.with(app.routes, false)
+        # include app.routes.mounted_helpers
+
+        register_interceptors(options.delete(:interceptors))
+        register_preview_interceptors(options.delete(:preview_interceptors))
+        register_observers(options.delete(:observers))
+
+        options.each { |k, v| send("#{k}=", v) }
+      end
+    end
+
+    after_initializer "action_mailer.routes" do |app|
+      if app.config.action_mailer.show_previews
+        app.routes.draw do
+          get "jets/mailers", to: "jets/mailers#index"
+          get "jets/mailers/*path", to: "jets/mailers#preview"
+        end
+
+        ActiveSupport.on_load :action_controller do
+          internal_views = File.expand_path("internal/app/views", File.dirname(__FILE__))
+          ActionController::Base.append_view_path(internal_views)
+        end
+      end
+    end
+  end
+end

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

@@ -29,24 +29,15 @@ module Jets::Resource::ChildStack
       klass = current_app_class.constantize
       return unless klass.depends_on
 
-      klass.depends_on.map do |shared_stack|
-        shared_stack.to_s.camelize # logical_id
-      end
+      depends = Jets::Stack::Depends.new(klass.depends_on)
+      depends.stack_list
     end
 
     def depends_on_params
-      params = {}
-      depends_on.each do |dependency|
-        dependency_outputs(dependency).each do |output|
-          dependency_class = dependency.to_s.classify
-          params[output] = "!GetAtt #{dependency_class}.Outputs.#{output}"
-        end
-      end
-      params
-    end
-
-    def dependency_outputs(dependency)
-      dependency.to_s.classify.constantize.output_keys
+      klass = current_app_class.constantize
+      return unless klass.depends_on
+      depends = Jets::Stack::Depends.new(klass.depends_on)
+      depends.params
     end
 
     def parameters

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

@@ -40,10 +40,12 @@ module Jets::Resource::ChildStack
     end
 
     def common_parameters
-      {
+      parameters = {
         IamRole: "!GetAtt IamRole.Arn",
         S3Bucket: "!Ref S3Bucket",
       }
+      parameters[:GemLayer] = "!Ref GemLayer" unless Jets.poly_only?
+      parameters
     end
 
     # Returns output keys associated with the stack.  They are the resource logical ids.

data/lib/jets/resource/events/rule.rb

@@ -1,6 +1,6 @@
 module Jets::Resource::Events
   class Rule < Jets::Resource::Base
-    def initialize(props)
+    def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
 

data/lib/jets/resource/lambda/event_source_mapping.rb

@@ -1,7 +1,7 @@
 # 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
-    def initialize(props)
+    def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
 

data/lib/jets/resource/permission.rb

@@ -28,7 +28,7 @@ class Jets::Resource
 
     def permission_logical_id
       logical_id = "{namespace}_permission"
-      md = @associated_resource.logical_id.match(/(\d+)/)
+      md = @associated_resource.logical_id.match(/(\d+)$/)
       counter = md[1] if md
       [logical_id, counter].compact.join('').underscore
     end

data/lib/jets/resource/replacer.rb

@@ -59,9 +59,17 @@ class Jets::Resource
       #   "AWS::ApiGateway::Method" => "apigateway.amazonaws.com"
       def principal_map(type)
         service = type.split('::')[1].downcase
+        service = special_principal_map(service)
         "#{service}.amazonaws.com"
       end
 
+      def special_principal_map(service)
+        # special map
+        # s3_event actually uses sns topic events to trigger a Lambda function
+        map = { "s3" => "sns" }
+        map[service] || service
+      end
+
       # From AWS docs: https://amzn.to/2N0QXQL
       # source_arn is "not supported by all event sources"
       #

data/lib/jets/resource/s3.rb

@@ -1,17 +1,3 @@
-class Jets::Resource
-  class S3 < Jets::Resource::Base
-    def definition
-      {
-        s3_bucket: {
-          type: "AWS::S3::Bucket"
-        }
-      }
-    end
-
-    def outputs
-      {
-        "S3Bucket" => "!Ref S3Bucket",
-      }
-    end
-  end
-end
+module Jets::Resource::S3
+  autoload :Bucket, 'jets/resource/s3/bucket'
+end

data/lib/jets/resource/s3/bucket.rb

@@ -0,0 +1,24 @@
+module Jets::Resource::S3
+  class Bucket < Jets::Resource::Base
+    attr_reader :bucket_logical_id
+    def initialize(props={})
+      @props = props # associated_properties from dsl.rb
+      @bucket_logical_id = props.delete(:logical_id) || "{namespace}_s3_bucket"
+    end
+
+    def definition
+      {
+        bucket_logical_id => {
+          type: "AWS::S3::Bucket",
+          properties: @props,
+        }
+      }
+    end
+
+    def outputs
+      {
+        bucket_logical_id => "!Ref #{bucket_logical_id.to_s.camelize}",
+      }
+    end
+  end
+end

data/lib/jets/resource/sns.rb

@@ -1,4 +1,5 @@
 module Jets::Resource::Sns
   autoload :Topic, 'jets/resource/sns/topic'
+  autoload :TopicPolicy, 'jets/resource/sns/topic_policy'
   autoload :Subscription, 'jets/resource/sns/subscription'
 end

data/lib/jets/resource/sns/subscription.rb

@@ -1,7 +1,7 @@
 # CloudFormation SNS Subscription docs: https://amzn.to/2SJtN3C
 module Jets::Resource::Sns
   class Subscription < Jets::Resource::Base
-    def initialize(props)
+    def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
 

data/lib/jets/resource/sns/topic.rb

@@ -1,7 +1,7 @@
 # CloudFormation SNS Topic docs: https://amzn.to/2MYbUZc
 module Jets::Resource::Sns
   class Topic < Jets::Resource::Base
-    def initialize(props)
+    def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
 

data/lib/jets/resource/sns/topic_policy.rb

@@ -0,0 +1,40 @@
+# CloudFormation SNS TopicPolicy docs: https://amzn.to/2SBMq9v
+module Jets::Resource::Sns
+  class TopicPolicy < Jets::Resource::Base
+    def initialize(props={})
+      @props = props # associated_properties from dsl.rb
+    end
+
+    def definition
+      {
+        policy_logical_id => {
+          type: "AWS::SNS::TopicPolicy",
+          properties: merged_properties,
+        }
+      }
+    end
+
+    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    def merged_properties
+      {
+        policy_document: {
+          version: "2012-10-17",
+          statement: {
+            effect: "Allow",
+            principal: { service: "s3.amazonaws.com"},
+            action: "sns:Publish",
+            resource: "*", # TODO: figure out good syntax to limit easily
+            # Condition:
+            #   ArnLike:
+            #     aws:SourceArn: arn:aws:s3:::aa-test-95872017
+          }
+        },
+        topics: ["!Ref {namespace}SnsTopic"],
+      }.deep_merge(@props)
+    end
+
+    def policy_logical_id
+      "{namespace}_sns_topic_policy"
+    end
+  end
+end

data/lib/jets/resource/sqs/queue.rb

@@ -1,7 +1,7 @@
 # CloudFormation SQS Queue docs: https://amzn.to/2MVWk0j
 module Jets::Resource::Sqs
   class Queue < Jets::Resource::Base
-    def initialize(props)
+    def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
 

data/lib/jets/stack.rb

@@ -1,12 +1,14 @@
 module Jets
   class Stack
+    autoload :Builder, 'jets/stack/builder'
     autoload :Definition, 'jets/stack/definition' # Registration and definitions
+    autoload :Depends, 'jets/stack/depends'
+    autoload :Function, 'jets/stack/function'
     autoload :Main, 'jets/stack/main'
-    autoload :Parameter, 'jets/stack/parameter'
     autoload :Output, 'jets/stack/output'
+    autoload :Parameter, 'jets/stack/parameter'
     autoload :Resource, 'jets/stack/resource'
-    autoload :Builder, 'jets/stack/builder'
-    autoload :Function, 'jets/stack/function'
+    autoload :S3Event, 'jets/stack/s3_event'
 
     include Main::Dsl
     include Parameter::Dsl
@@ -26,6 +28,20 @@ module Jets
         self.subclasses << base if base.name
       end
 
+      # klass = Jets::Stack.new_class("Bucket3")
+      def new_class(class_name, &block)
+        # https://stackoverflow.com/questions/4113479/dynamic-class-definition-with-a-class-name
+        # Defining the constant this way gets around: SyntaxError: dynamic constant assignment error
+        klass = Class.new(Jets::Stack) # First klass is an anonymous class. IE: class.name is nil
+        klass = Object.const_set(class_name, klass) # now klass is a named class
+        Jets::Stack.subclasses << klass # mimic inherited hook because
+
+        # Must run class_eval after adding to subclasses in order for the resource declarations in the
+        # so that the resources get registered to the right subclass.
+        klass.class_eval(&block)
+        klass # return klass
+      end
+
       # Build it to figure out if we need to build the stack for the SharedBuilder
       def build?
         empty = template == {"Parameters"=>{"IamRole"=>{"Type"=>"String"}, "S3Bucket"=>{"Type"=>"String"}}}