jets 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb8be5eb8194cd0e2d6ac3f718e4ecdb2a4a14ef785b513e32bb097a9402e417
-  data.tar.gz: e70d4f88f3e0b8701a16c2115cdc5ad8a463447ba45ffc6adcf32e494a431690
+  metadata.gz: 557604f70083b13e25eb88496bbc2709d715688386e6cea83fc6d84d9c830799
+  data.tar.gz: 618b800e673d812303e28411d8cc16304777141a195c2ddd3029f416ed755591
 SHA512:
-  metadata.gz: eef24ef7e8533bab5e98b3ca06205f219ec46ad7e0a8ba84cdf9a687ee9122253b17942e661990b2fb82be4aa28501076eae9626b8aea4958b2347241ca7a75f
-  data.tar.gz: 98f1272457a69bc6ae50f093f32c2f130c3ca32dbf0235fbf82bd449612f2001edc3faab2f0957c7df7dd7c823548806d4329a62f1e11d9fa1346ca48d66c267
+  metadata.gz: 25c15f2f3f7ecf2d5b40ade99d990d2548be2c03f4a4312616aecff04482ca6a193a100e0c4851572ee3692b91534811f431c51640aff718645e7447fa4950b9
+  data.tar.gz: 9e16e4ad95fd469021853e328e982c22eed8dff9e85feb7f77c1a216c407e7239715399255afa0770f813858129b45707e1563673a2dfe25046c009ac8bf8463

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.6.9]
+- add aws managed rule support, pull request #18
+
 ## [0.6.8]
 - add jets clean:log and clean:build commands pull request #17
 - allow integration.sh test script to run locally

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.6.8)
+    jets (0.6.9)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -64,7 +64,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.100.0)
+    aws-partitions (1.102.0)
     aws-sdk-cloudformation (1.6.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)

data/bin/release

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Wrapper release script so we don't forget to add submodules.
+# Should still update the CHANGELOG.md and version.rb before running this script.
+
+git submodule init
+git submodule update
+bundle update
+rake release

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

@@ -5,8 +5,9 @@
 class Jets::Cfn::TemplateBuilders
   module Interface
     def build
-      return if @app_klass && @app_klass.tasks.empty? # do not bother building
-        #or writing the template unless there are functions defined
+      # Do not bother building
+      # or writing the template unless there are functions defined
+      return if @app_klass && !@app_klass.build?
 
       compose # must be implemented by subclass
       write

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

@@ -7,6 +7,7 @@ class Jets::Cfn::TemplateBuilders
     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)
@@ -14,8 +15,23 @@ class Jets::Cfn::TemplateBuilders
         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
+      @app_klass.managed_rules.each do |rule|
+        map = Jets::Cfn::TemplateMappers::ConfigRuleMapper.new(rule)
+        add_aws_managed_rule(rule, map)
+      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

data/lib/jets/commands/base.rb

@@ -64,7 +64,7 @@ class Jets::Commands::Base < Thor
         class_name.sub!(/Task$/, "Tasks") # special rule here for Tasks class
         # NOTE: Weird thing where Jets::Commands::Db::Task => Thor::Command
         # because Task is a class available to Thor I believe.
-        puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['DEBUG']
+        puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
         class_name.constantize # dont have to worry about order.
       end
     end

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

@@ -7,7 +7,7 @@ Jets.application.configure do
   # config.extra_autoload_paths = []
 
   config.function.timeout = 10
-  # config.function.role = "arn:aws:iam::#{ENV['AWS_ACCOUNT_ID']}:role/service-role/pre-created"
+  # 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 = {

data/lib/jets/commands/templates/skeleton/config/database.yml.tt

@@ -16,11 +16,6 @@ test:
   <<: *default
   database: <%= project_name %>_test
 
-staging:
-  <<: *default
-  database: <%= project_name %>_stag
-  url: <%%= ENV['DATABASE_URL'] %>
-
 production:
   <<: *default
   database: <%= project_name %>_prod

data/lib/jets/commands/templates/skeleton/config/dynamodb.yml

@@ -18,8 +18,5 @@ test:
   endpoint: http://localhost:8000
   table_namespace: <%= Jets.config.table_namespace %>
 
-staging:
-  table_namespace: <%= Jets.config.table_namespace %>
-
 production:
   table_namespace: <%= Jets.config.table_namespace %>

data/lib/jets/core.rb

@@ -135,7 +135,7 @@ module Jets::Core
                     .sub(/^\.\//,'') # remove ./
                     .sub(/app\/\w+\//,'') # remove app/controllers or app/jobs etc
                     .classify
-      puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['DEBUG']
+      puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['JETS_DEBUG']
       class_name.constantize # use constantize instead of require so dont have to worry about order.
     end
   end

data/lib/jets/erb.rb

@@ -15,7 +15,7 @@ class Jets::Erb
         ERB.new(template, nil, "-").result(binding)
       rescue Exception => e
         puts e
-        puts e.backtrace if ENV['DEBUG']
+        puts e.backtrace if ENV['JETS_DEBUG']
 
         # how to know where ERB stopped? - https://www.ruby-forum.com/topic/182051
         # syntax errors have the (erb):xxx info in e.message

data/lib/jets/lambda/dsl.rb

@@ -42,6 +42,10 @@ module Jets::Lambda::Dsl
         class_properties(handler: name)
       end
 
+      def class_runtime(value)
+        class_properties(runtime: value)
+      end
+
       # convenience method that set properties
       def timeout(value)
         properties(timeout: value)
@@ -146,6 +150,12 @@ module Jets::Lambda::Dsl
         all_tasks.values
       end
 
+      # Used in Jets::Cfn::TemplateBuilders::Interface#build
+      # Overridden in rule/dsl.rb
+      def build?
+        !tasks.empty?
+      end
+
       # The public methods defined in the project app class ulimately become
       # lambda functions.
       #

data/lib/jets/rule.rb

@@ -1,5 +1,6 @@
 class Jets::Rule
-  autoload :Dsl, "jets/rule/dsl"
+  autoload :AwsManagedRule, "jets/rule/aws_managed_rule"
   autoload :Base, "jets/rule/base"
+  autoload :Dsl, "jets/rule/dsl"
   autoload :Task, "jets/rule/task"
 end

data/lib/jets/rule/aws_managed_rule.rb

@@ -0,0 +1,12 @@
+class Jets::Rule::AwsManagedRule < Jets::Rule::Task
+  def config_rule_defaults
+    source_identifier = meth.to_s.upcase
+    {
+      "ConfigRuleName" => config_rule_name,
+      "Source" => {
+        "Owner" => "AWS",
+        "SourceIdentifier" => source_identifier
+      }
+    }
+  end
+end

data/lib/jets/rule/dsl.rb

@@ -41,7 +41,6 @@ module Jets::Rule::Dsl
         config_rule(maximum_execution_frequency: value)
       end
 
-      # not really meant to be used but provided for completeness
       def source(value)
         config_rule(source: value)
       end
@@ -57,8 +56,36 @@ module Jets::Rule::Dsl
       def register_task(meth, lang=:ruby)
         all_tasks[meth] = Jets::Rule::Task.new(self.name, meth,
           properties: @properties, config_rule: @config_rule, lang: lang)
+        clear_properties
         true
       end
+
+      def clear_properties
+        super
+        @config_rule = nil
+      end
+
+      ## aws managed rules work different enough to merit their own storage
+
+      def all_managed_rules
+        @all_managed_rules ||= ActiveSupport::OrderedHash.new
+      end
+
+      def managed_rules
+        all_managed_rules.values
+      end
+
+      def managed_rule(meth)
+        all_managed_rules[meth] = Jets::Rule::AwsManagedRule.new(self.name, meth,
+          properties: @properties, config_rule: @config_rule)
+        clear_properties
+        true
+      end
+
+      # Override Lambda::Dsl.build? to account of possible managed_rules
+      def build?
+        !tasks.empty? || !managed_rules.empty?
+      end
     end
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -408,6 +408,7 @@ files:
 - Procfile
 - README.md
 - Rakefile
+- bin/release
 - buildspec.yml
 - exe/jets
 - jets.gemspec
@@ -627,6 +628,7 @@ files:
 - lib/jets/router.rb
 - lib/jets/ruby_server.rb
 - lib/jets/rule.rb
+- lib/jets/rule/aws_managed_rule.rb
 - lib/jets/rule/base.rb
 - lib/jets/rule/dsl.rb
 - lib/jets/rule/task.rb