jets 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937ef0db795a76aec8ead57f2da929bf26b1b1b4077e30927213e60282b87ad9
-  data.tar.gz: 616b22c4a69bd07e5c161fb9071b189c3ab9d29a695f6a47adf5390b2ad03c92
+  metadata.gz: de55bb3691c185a3d173c346d0e9ad2ccfbcd069a5758bfe39b3c52b0fe913ea
+  data.tar.gz: 07077cbd6b524a2f21206a31ab44872a56af82768224db56ece2692626a5608a
 SHA512:
-  metadata.gz: a1b0a33547640580431e982140202b4787029f2044728931977f9129830b831c551abd6ec91e0886f598ff70ff9ad66715c7bd3fb396e7d6935cc5f717eb166e
-  data.tar.gz: 3d07589ced4137f697e2c79b9d10255a46bf13d9ce192a031e5dd38558a7fbfd896f439da48ef2239940b80d0f71e0c58369df92f841005369480884d47660e5
+  metadata.gz: 7cf3f6787af8fd219275bfb05cf190a6dc2bfb84787317c3ecbd761582593af015731899d4325bc2df22d30d2d24abccf1a7e653c508c3acfda5d75d9be58488
+  data.tar.gz: 17ed838650b0dd77e9a74a67ba90652991d40fb785fc888bff7877bcc329f5ed1821945d2723c8893fd89436d2bc17711aed485ed0885b11897a8d2a161aa483

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [1.8.3]
+- #196 CloudWatch Log Event support
+- #197 IoT Event Support
+
 ## [1.8.2]
 - fix Jets.on_exception reporting
 

data/lib/jets/job/base.rb

@@ -6,12 +6,14 @@ 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 :LogEventHelper, "jets/job/log_event_helper"
   autoload :S3EventHelper, "jets/job/s3_event_helper"
 
   class Base < Jets::Lambda::Functions
     include Dsl
 
     # non-DSL methods
+    include LogEventHelper
     include S3EventHelper
 
     # Tracks bucket each time an s3_event is declared

data/lib/jets/job/dsl.rb

@@ -8,91 +8,25 @@
 #
 module Jets::Job::Dsl
   extend ActiveSupport::Concern
+  autoload :CloudwatchEvent, "jets/job/dsl/cloudwatch_event"
   autoload :EventSourceMapping, "jets/job/dsl/event_source_mapping" # base for sqs_event, etc
+  autoload :IotEvent, "jets/job/dsl/iot_event"
+  autoload :LogEvent, "jets/job/dsl/log_event"
   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 CloudwatchEvent
       include EventSourceMapping
+      include IotEvent
+      include LogEvent
       include S3Event
       include SnsEvent
       include SqsEvent
 
-      # Public: Creates CloudWatch Event Rule
-      #
-      # expression - The rate expression.
-      #
-      # Examples
-      #
-      #   rate("10 minutes")
-      #   rate("10 minutes", description: "Hard job")
-      #
-      def rate(expression, props={})
-        schedule_job("rate(#{expression})", props)
-      end
-
-      # Public: Creates CloudWatch Event Rule
-      #
-      # expression - The cron expression.
-      #
-      # Examples
-      #
-      #   cron("0 */12 * * ? *")
-      #   cron("0 */12 * * ? *", description: "Hard job")
-      #
-      def cron(expression, props={})
-        schedule_job("cron(#{expression})", props)
-      end
-
-      def schedule_job(expression, props={})
-        with_fresh_properties(multiple_resources: false) do
-          props = props.merge(schedule_expression: expression)
-          associated_properties(props)
-          resource(events_rule_definition) # add associated resource immediately
-        end
-      end
-
-      def event_pattern(details={}, props={})
-        with_fresh_properties(multiple_resources: false) do
-          props = props.merge(event_pattern: details)
-          associated_properties(props)
-          resource(events_rule_definition) # add associated resource immediately
-        end
-        add_descriptions # useful: generic description in the Event Rule console
-      end
-
-      def events_rule(props={})
-        with_fresh_properties(multiple_resources: false) do
-          associated_properties(props)
-          resource(events_rule_definition) # add associated resource immediately
-        end
-      end
-
-      # Works with eager definitions
-      def add_descriptions
-        numbered_resources = []
-        n = 1
-        @associated_resources.map do |associated|
-          # definition = associated.definition
-          # puts "associated #{associated.inspect}"
-          # puts "definition #{definition.inspect}"
-
-          # logical_id = definition.keys.first
-          # attributes = definition.values.first
-
-          logical_id = associated.logical_id
-          attributes = associated.attributes
-
-          attributes[:properties][:description] ||= "#{self.name} Event Rule #{n}"
-          new_definition = { "#{logical_id}" => attributes }
-          numbered_resources << Jets::Resource::Associated.new(new_definition)
-          n += 1
-        end
-        @associated_resources = numbered_resources
-      end
-
+      # Need to be in here
       ASSOCIATED_PROPERTIES = %W[
         description
         state
@@ -105,10 +39,6 @@ module Jets::Job::Dsl
         events_rule_definition
       end
 
-      def events_rule_definition
-        resource = Jets::Resource::Events::Rule.new(associated_properties)
-        resource.definition # returns a definition to be added by associated_resources
-      end
     end
   end
 end

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

@@ -0,0 +1,81 @@
+module Jets::Job::Dsl
+  module CloudwatchEvent
+    # Public: Creates CloudWatch Event Rule
+    #
+    # expression - The rate expression.
+    #
+    # Examples
+    #
+    #   rate("10 minutes")
+    #   rate("10 minutes", description: "Hard job")
+    #
+    def rate(expression, props={})
+      schedule_job("rate(#{expression})", props)
+    end
+
+    # Public: Creates CloudWatch Event Rule
+    #
+    # expression - The cron expression.
+    #
+    # Examples
+    #
+    #   cron("0 */12 * * ? *")
+    #   cron("0 */12 * * ? *", description: "Hard job")
+    #
+    def cron(expression, props={})
+      schedule_job("cron(#{expression})", props)
+    end
+
+    def schedule_job(expression, props={})
+      with_fresh_properties(multiple_resources: false) do
+        props = props.merge(schedule_expression: expression)
+        associated_properties(props)
+        resource(events_rule_definition) # add associated resource immediately
+      end
+    end
+
+    def event_pattern(details={}, props={})
+      with_fresh_properties(multiple_resources: false) do
+        props = props.merge(event_pattern: details)
+        associated_properties(props)
+        resource(events_rule_definition) # add associated resource immediately
+      end
+      add_descriptions # useful: generic description in the Event Rule console
+    end
+
+    def events_rule(props={})
+      with_fresh_properties(multiple_resources: false) do
+        associated_properties(props)
+        resource(events_rule_definition) # add associated resource immediately
+      end
+    end
+
+    # Works with eager definitions
+    def add_descriptions
+      numbered_resources = []
+      n = 1
+      @associated_resources.map do |associated|
+        # definition = associated.definition
+        # puts "associated #{associated.inspect}"
+        # puts "definition #{definition.inspect}"
+
+        # logical_id = definition.keys.first
+        # attributes = definition.values.first
+
+        logical_id = associated.logical_id
+        attributes = associated.attributes
+
+        attributes[:properties][:description] ||= "#{self.name} Event Rule #{n}"
+        new_definition = { "#{logical_id}" => attributes }
+        numbered_resources << Jets::Resource::Associated.new(new_definition)
+        n += 1
+      end
+      @associated_resources = numbered_resources
+    end
+
+    def events_rule_definition
+      resource = Jets::Resource::Events::Rule.new(associated_properties)
+      resource.definition # returns a definition to be added by associated_resources
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Jets::Job::Dsl
+  module IotEvent
+    # The user must at least pass in an SQL statement
+    def iot_event(props={})
+      if props.is_a?(String) # SQL Statement
+        props = {sql: props}
+        topic_props = {topic_rule_payload: props}
+      elsif props.key?(:topic_rule_payload) # full properties structure
+        topic_props = props
+      else # just the topic_rule_payload
+        topic_props = {topic_rule_payload: props}
+      end
+
+      declare_iot_topic(topic_props)
+    end
+
+    def declare_iot_topic(props={})
+      r = Jets::Resource::Iot::TopicRule.new(props)
+      with_fresh_properties do
+        resource(r.definition) # add associated resource immediately
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Jets::Job::Dsl
+  module LogEvent
+    def log_event(log_group_name, props={})
+      props.merge!(log_group_name: log_group_name)
+      declare_log_subscription_filter(props)
+    end
+
+    def declare_log_subscription_filter(props={})
+      r = Jets::Resource::Logs::SubscriptionFilter.new(props)
+      with_fresh_properties do
+        resource(r.definition) # add associated resource immediately
+      end
+    end
+  end
+end

data/lib/jets/job/log_event_helper.rb

@@ -0,0 +1,17 @@
+require 'base64'
+require 'json'
+require 'stringio'
+require 'zlib'
+
+class Jets::Job
+  module LogEventHelper
+    def log_event
+      encoded = event["awslogs"]["data"]
+      compressed_string = Base64.decode64(encoded)
+      gz = Zlib::GzipReader.new(StringIO.new(compressed_string))
+      uncompressed_string = gz.read
+      data = JSON.load(uncompressed_string)
+      ActiveSupport::HashWithIndifferentAccess.new(data)
+    end
+  end
+end

data/lib/jets/resource.rb

@@ -8,7 +8,9 @@ class Jets::Resource
   autoload :Config, 'jets/resource/config'
   autoload :Events, 'jets/resource/events'
   autoload :Iam, 'jets/resource/iam'
+  autoload :Iot, 'jets/resource/iot'
   autoload :Lambda, 'jets/resource/lambda'
+  autoload :Logs, 'jets/resource/logs'
   autoload :Permission, 'jets/resource/permission'
   autoload :Replacer, 'jets/resource/replacer'
   autoload :Route53, 'jets/resource/route53'

data/lib/jets/resource/iot.rb

@@ -0,0 +1,3 @@
+module Jets::Resource::Iot
+  autoload :TopicRule, 'jets/resource/iot/topic_rule'
+end

data/lib/jets/resource/iot/topic_rule.rb

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

data/lib/jets/resource/logs.rb

@@ -0,0 +1,3 @@
+module Jets::Resource::Logs
+  autoload :SubscriptionFilter, 'jets/resource/logs/subscription_filter'
+end

data/lib/jets/resource/logs/subscription_filter.rb

@@ -0,0 +1,31 @@
+# CloudFormation Log Subscription docs: https://amzn.to/2SNiSpr
+module Jets::Resource::Logs
+  class SubscriptionFilter < Jets::Resource::Base
+    def initialize(props={})
+      @props = props # associated_properties from dsl.rb
+    end
+
+    def definition
+      {
+        log_logical_id => {
+          type: "AWS::Logs::SubscriptionFilter",
+          properties: merged_properties,
+        }
+      }
+    end
+
+    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    def merged_properties
+      {
+        destination_arn: "!GetAtt {namespace}LambdaFunction.Arn",
+        filter_pattern: "", # matches everything https://amzn.to/2N3b39I
+        # log_group_name: string # will be set by log_event
+        # role_arn: string # only required for kinensis, we dont use this for Lambda
+      }.deep_merge(@props)
+    end
+
+    def log_logical_id
+      "{namespace}_subscription_filter"
+    end
+  end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.8.2"
+  VERSION = "1.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Tung Nguyen
@@ -687,10 +687,14 @@ files:
 - lib/jets/job.rb
 - lib/jets/job/base.rb
 - lib/jets/job/dsl.rb
+- lib/jets/job/dsl/cloudwatch_event.rb
 - lib/jets/job/dsl/event_source_mapping.rb
+- lib/jets/job/dsl/iot_event.rb
+- lib/jets/job/dsl/log_event.rb
 - lib/jets/job/dsl/s3_event.rb
 - lib/jets/job/dsl/sns_event.rb
 - lib/jets/job/dsl/sqs_event.rb
+- lib/jets/job/log_event_helper.rb
 - lib/jets/job/s3_event_helper.rb
 - lib/jets/klass.rb
 - lib/jets/lambda.rb
@@ -772,12 +776,16 @@ files:
 - lib/jets/resource/iam/function_role.rb
 - lib/jets/resource/iam/managed_policy.rb
 - lib/jets/resource/iam/policy_document.rb
+- lib/jets/resource/iot.rb
+- lib/jets/resource/iot/topic_rule.rb
 - lib/jets/resource/lambda.rb
 - lib/jets/resource/lambda/event_source_mapping.rb
 - lib/jets/resource/lambda/function.rb
 - lib/jets/resource/lambda/function/environment.rb
 - lib/jets/resource/lambda/gem_layer.rb
 - lib/jets/resource/lambda/layer_version.rb
+- lib/jets/resource/logs.rb
+- lib/jets/resource/logs/subscription_filter.rb
 - lib/jets/resource/permission.rb
 - lib/jets/resource/replacer.rb
 - lib/jets/resource/route53.rb