jets 0.8.0 → 0.8.1

data/lib/jets/resource/replacer.rb

@@ -1,25 +1,58 @@
-module Jets::Resource
-  module Replacer
-    autoload :Base, 'jets/resource/replacer/base'
-    autoload :ConfigRule, 'jets/resource/replacer/config_rule'
-    # TODO: handle autoloading for plugins
+class Jets::Resource
+  class Replacer
+    extend Memoist
 
-    class << self
-      def lookup(type)
-        klass = replacer_map[type] || "Jets::Resource::Replacer::Base"
-        klass.constantize
+    def initialize(replacements={})
+      @replacements = replacements
+    end
+
+    # Replace placeholder hash values with replacements.  This does a deep replacement
+    # to the hash values.  The replacement "key" is the string value within the value.
+    #
+    # Example:
+    #
+    #   attributes = {whatever: "foo REPLACE_KEY bar" }
+    #   replace_placeholders(attributes, REPLACE_KEY: "blah:arn")
+    #   => {whatever: "foo blah:arn bar" }
+    #
+    # Also, we always replace the special {namespace} value in the hash values. Example:
+    #
+    #   attributes = {whatever: "{namespace}LambdaFunction" }
+    #   replace_placeholders(attributes, {})
+    #   => {whatever: "foo PostsControllerIndexLambdaFunction bar" }
+    #
+    def replace_placeholders(attributes)
+      update_values(attributes)
+    end
+
+    def update_values(original)
+      case original
+      when Array
+        original.map { |v| update_values(v) }
+      when Hash
+        initializer = original.map do |k, v|
+          [k, update_values(v)]
+        end
+        Hash[initializer]
+      else
+        replace_value(original)
       end
+    end
 
-      # Maps
-      # TODO: get rid of this map, and use a convention
-      # * connect a plugin to figure out interface.
-      # * add ability to explicitly override principal and source_arn.
-      def replacer_map
-        {
-          "AWS::Config::ConfigRule" => "Jets::Resource::Replacer::ConfigRule"
-        }
+    def replace_value(value)
+      # Dont perform replacement on Integers
+      return value if value.is_a?(Integer)
+      # return value unless value.is_a?(String) or value.is_a?(Symbol)
+
+      value = value.to_s # normalize to String
+      @replacements.each do |k,v|
+        # IE: Replaces {namespace} => SecurityJobCheck
+        value = value.gsub("{#{k}}", v)
       end
+      value
+    end
 
+    class << self
       # Examples:
       #   "AWS::Events::Rule" => "events.amazonaws.com",
       #   "AWS::Config::ConfigRule" => "config.amazonaws.com",

data/lib/jets/resource/s3.rb

@@ -0,0 +1,17 @@
+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

data/lib/jets/route.rb

@@ -4,6 +4,8 @@
 #   to: "posts#index",
 # )
 class Jets::Route
+  CAPTURE_REGEX = "([a-zA\\-Z0-9_.]*)" # as string
+
   def initialize(options)
     @options = options
   end
@@ -104,7 +106,7 @@ class Jets::Route
     # changes path to a string used for a regexp
     # posts/:id/edit => posts\/(.*)\/edit
     regexp_string = path.split('/').map do |s|
-                      s.include?(':') ? "([a-zA-Z0-9_]*)" : s
+                      s.include?(':') ? CAPTURE_REGEX : s
                     end.join('\/')
     # make sure beginning and end of the string matches
     regexp_string = "^#{regexp_string}$"

data/lib/jets/rule/dsl.rb

@@ -109,7 +109,13 @@ module Jets::Rule::Dsl
       def register_managed_rule(name, definition)
         # A task object is needed to build {namespace} for later replacing.
         task = Jets::Lambda::Task.new(self.name, name, resources: @resources)
-        all_managed_rules[name] = { definition: definition, task: task }
+
+        # TODO: figure out better way for specific replacements for different classes
+        name_without_rule = self.name.underscore.gsub(/_rule$/,'')
+        config_rule_name = "#{name_without_rule}_#{name}".dasherize
+        replacements = task.replacements.merge(config_rule_name: config_rule_name)
+
+        all_managed_rules[name] = { definition: definition, replacements: replacements }
         clear_properties
       end
 

data/lib/jets/server/route_matcher.rb

@@ -78,8 +78,9 @@ class Jets::Server
     def capture_detection(route_path, actual_path)
       # changes path to a string used for a regexp
       # posts/:id/edit => posts\/(.*)\/edit
+
       regexp_string = route_path.split('/').map do |s|
-                        s.include?(':') ? "([a-zA-Z0-9_]*)" : s
+                        s.include?(':') ? Jets::Route::CAPTURE_REGEX : s
                       end.join('\/')
       # make sure beginning and end of the string matches
       regexp_string = "^#{regexp_string}$"

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -290,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -426,49 +440,18 @@ files:
 - lib/jets/builders/node-hello.js
 - lib/jets/builders/node-shim.js
 - lib/jets/cfn.rb
+- lib/jets/cfn/builders.rb
+- lib/jets/cfn/builders/api_deployment_builder.rb
+- lib/jets/cfn/builders/api_gateway_builder.rb
+- lib/jets/cfn/builders/base_child_builder.rb
+- lib/jets/cfn/builders/controller_builder.rb
+- lib/jets/cfn/builders/function_builder.rb
+- lib/jets/cfn/builders/interface.rb
+- lib/jets/cfn/builders/job_builder.rb
+- lib/jets/cfn/builders/parent_builder.rb
+- lib/jets/cfn/builders/rule_builder.rb
 - lib/jets/cfn/ship.rb
 - lib/jets/cfn/status.rb
-- lib/jets/cfn/template_builders.rb
-- lib/jets/cfn/template_builders/api_gateway_builder.rb
-- lib/jets/cfn/template_builders/api_gateway_deployment_builder.rb
-- lib/jets/cfn/template_builders/base_child_builder.rb
-- lib/jets/cfn/template_builders/controller_builder.rb
-- lib/jets/cfn/template_builders/function_builder.rb
-- lib/jets/cfn/template_builders/function_properties.rb
-- lib/jets/cfn/template_builders/function_properties/base_builder.rb
-- lib/jets/cfn/template_builders/function_properties/node_builder.rb
-- lib/jets/cfn/template_builders/function_properties/python_builder.rb
-- lib/jets/cfn/template_builders/function_properties/ruby_builder.rb
-- lib/jets/cfn/template_builders/iam_policy.rb
-- lib/jets/cfn/template_builders/iam_policy/application_policy.rb
-- lib/jets/cfn/template_builders/iam_policy/base_policy.rb
-- lib/jets/cfn/template_builders/iam_policy/class_policy.rb
-- lib/jets/cfn/template_builders/iam_policy/function_policy.rb
-- lib/jets/cfn/template_builders/interface.rb
-- lib/jets/cfn/template_builders/job_builder.rb
-- lib/jets/cfn/template_builders/managed_iam_policy.rb
-- lib/jets/cfn/template_builders/managed_iam_policy/application_policy.rb
-- lib/jets/cfn/template_builders/managed_iam_policy/base_policy.rb
-- lib/jets/cfn/template_builders/managed_iam_policy/class_policy.rb
-- lib/jets/cfn/template_builders/managed_iam_policy/function_policy.rb
-- lib/jets/cfn/template_builders/parent_builder.rb
-- lib/jets/cfn/template_builders/rule_builder.rb
-- lib/jets/cfn/template_builders/templates/minimal-stack.yml
-- lib/jets/cfn/template_mappers.rb
-- lib/jets/cfn/template_mappers/api_gateway_deployment_mapper.rb
-- lib/jets/cfn/template_mappers/api_gateway_mapper.rb
-- lib/jets/cfn/template_mappers/child_mapper.rb
-- lib/jets/cfn/template_mappers/controller_mapper.rb
-- lib/jets/cfn/template_mappers/function_mapper.rb
-- lib/jets/cfn/template_mappers/gateway_resource_mapper.rb
-- lib/jets/cfn/template_mappers/iam_policy.rb
-- lib/jets/cfn/template_mappers/iam_policy/application_policy_mapper.rb
-- lib/jets/cfn/template_mappers/iam_policy/base_policy_mapper.rb
-- lib/jets/cfn/template_mappers/iam_policy/class_policy_mapper.rb
-- lib/jets/cfn/template_mappers/iam_policy/function_policy_mapper.rb
-- lib/jets/cfn/template_mappers/job_mapper.rb
-- lib/jets/cfn/template_mappers/lambda_function_mapper.rb
-- lib/jets/cfn/template_mappers/rule_mapper.rb
 - lib/jets/cli.rb
 - lib/jets/commands.rb
 - lib/jets/commands/base.rb
@@ -626,15 +609,28 @@ files:
 - lib/jets/rails_overrides/rendering_helper.rb
 - lib/jets/rails_overrides/url_helper.rb
 - lib/jets/resource.rb
-- lib/jets/resource/attributes.rb
-- lib/jets/resource/creator.rb
+- lib/jets/resource/api_gateway.rb
+- lib/jets/resource/api_gateway/cors.rb
+- lib/jets/resource/api_gateway/deployment.rb
+- lib/jets/resource/api_gateway/method.rb
+- lib/jets/resource/api_gateway/resource.rb
+- lib/jets/resource/api_gateway/rest_api.rb
+- lib/jets/resource/base.rb
+- lib/jets/resource/child_stack.rb
+- lib/jets/resource/child_stack/api_deployment.rb
+- lib/jets/resource/child_stack/api_gateway.rb
+- lib/jets/resource/child_stack/app_class.rb
+- lib/jets/resource/function.rb
+- lib/jets/resource/iam.rb
+- lib/jets/resource/iam/application_role.rb
+- lib/jets/resource/iam/base_role_definition.rb
+- lib/jets/resource/iam/class_role.rb
+- lib/jets/resource/iam/function_role.rb
+- lib/jets/resource/iam/managed_policy.rb
+- lib/jets/resource/iam/policy_document.rb
 - lib/jets/resource/permission.rb
 - lib/jets/resource/replacer.rb
-- lib/jets/resource/replacer/base.rb
-- lib/jets/resource/replacer/config_rule.rb
-- lib/jets/resource/route.rb
-- lib/jets/resource/route/attributes.rb
-- lib/jets/resource/route/cors.rb
+- lib/jets/resource/s3.rb
 - lib/jets/route.rb
 - lib/jets/router.rb
 - lib/jets/ruby_server.rb
@@ -679,7 +675,6 @@ files:
 - vendor/dynomite/lib/dynomite/migration/templates/create_table.rb
 - vendor/dynomite/lib/dynomite/migration/templates/update_table.rb
 - vendor/dynomite/lib/dynomite/version.rb
-- vendor/dynomite/pkg/dynomite-1.0.7.gem
 - vendor/dynomite/spec/fixtures/app_root/config/dynamodb.yml
 - vendor/dynomite/spec/lib/dynomite/item_spec.rb
 - vendor/dynomite/spec/lib/dynomite/migration/dsl/global_secondary_index_spec.rb
@@ -721,7 +716,6 @@ files:
 - vendor/lambdagem/lib/lambdagem/upload.rb
 - vendor/lambdagem/lib/lambdagem/util.rb
 - vendor/lambdagem/lib/lambdagem/version.rb
-- vendor/lambdagem/pkg/lambdagem-0.5.1.gem
 - vendor/lambdagem/spec/lib/build_spec.rb
 - vendor/lambdagem/spec/lib/cli_spec.rb
 - vendor/lambdagem/spec/lib/upload_spec.rb

data/lib/jets/cfn/template_builders.rb

@@ -1,25 +0,0 @@
-require 'active_support/core_ext/hash'
-require 'yaml'
-
-class Jets::Cfn
-  # TODO: Refactor builder classes. They all work slightly differently.
-  class TemplateBuilders
-    autoload :Interface, "jets/cfn/template_builders/interface"
-    autoload :ParentBuilder, "jets/cfn/template_builders/parent_builder"
-
-    # These build the app/controllers, app/jobs, and app/functions
-    autoload :BaseChildBuilder, "jets/cfn/template_builders/base_child_builder"
-    autoload :ControllerBuilder, "jets/cfn/template_builders/controller_builder"
-    autoload :JobBuilder, "jets/cfn/template_builders/job_builder"
-    autoload :FunctionBuilder, "jets/cfn/template_builders/function_builder"
-    autoload :RuleBuilder, "jets/cfn/template_builders/rule_builder"
-
-    autoload :ApiGatewayBuilder, "jets/cfn/template_builders/api_gateway_builder"
-    autoload :ApiGatewayDeploymentBuilder, "jets/cfn/template_builders/api_gateway_deployment_builder"
-
-    # separate beasts:
-    autoload :FunctionProperties, "jets/cfn/template_builders/function_properties" # sort of a builder
-    autoload :IamPolicy, "jets/cfn/template_builders/iam_policy" # resource only
-    autoload :ManagedIamPolicy, "jets/cfn/template_builders/managed_iam_policy" # resource only
-  end
-end

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

@@ -1,38 +0,0 @@
-class Jets::Cfn::TemplateBuilders
-  class ApiGatewayDeploymentBuilder
-    include Interface
-    include Jets::AwsServices
-
-    def initialize(options={})
-      @options = options
-      @template = ActiveSupport::HashWithIndifferentAccess.new(Resources: {})
-    end
-
-    # compose is an interface method
-    def compose
-      return if @options[:stack_type] == :minimal
-
-      puts "Building API Gateway Deployment template."
-      add_parameter("RestApi", Description: "RestApi")
-
-      map = Jets::Cfn::TemplateMappers::ApiGatewayDeploymentMapper.new(path=nil,s3_bucket=nil)
-      add_resource(map.logical_id, "AWS::ApiGateway::Deployment",
-        Description: "Version #{map.timestamp} deployed by jets",
-        RestApiId: "!Ref RestApi",
-        StageName: map.stage_name,
-      )
-
-      add_output("RestApiUrl", Value: "!Sub 'https://${RestApi}.execute-api.${AWS::Region}.amazonaws.com/#{map.stage_name}/'")
-    end
-
-    # template_path is an interface method
-    def template_path
-      Jets::Naming.api_gateway_deployment_template_path
-    end
-
-    # do not bother writing a template if routes are empty
-    def write
-      super unless Jets::Router.routes.empty?
-    end
-  end
-end

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

@@ -1,72 +0,0 @@
-class Jets::Cfn::TemplateBuilders
-  class BaseChildBuilder
-    include Interface
-
-    # The app_klass is can be a controller, job or anonymous function class.
-    # IE: PostsController, HardJob
-    def initialize(app_klass)
-      @app_klass = app_klass
-      @template = ActiveSupport::HashWithIndifferentAccess.new(Resources: {})
-    end
-
-    # template_path is an interface method for Interface module
-    def template_path
-      Jets::Naming.template_path(@app_klass)
-    end
-
-    def add_common_parameters
-      add_parameter("IamRole", Description: "Iam Role that Lambda function uses.")
-      add_parameter("S3Bucket", Description: "S3 Bucket for source code.")
-    end
-
-    def add_functions
-      add_class_iam_policy
-      @app_klass.tasks.each do |task|
-        add_function(task)
-        add_function_iam_policy(task)
-      end
-    end
-
-    def add_function(task)
-      # Examples:
-      #   FunctionProperties::RubyBuilder
-      #   FunctionProperties::PythonBuilder
-      builder_class = "Jets::Cfn::TemplateBuilders::FunctionProperties::#{task.lang.to_s.classify}Builder".constantize
-      builder = builder_class.new(task)
-      logical_id = builder.map.logical_id
-      add_resource(logical_id, "AWS::Lambda::Function", builder.properties)
-    end
-
-    def add_class_iam_policy
-      return unless @app_klass.build_class_iam?
-
-      map = Jets::Cfn::TemplateMappers::IamPolicy::ClassPolicyMapper.new(@app_klass)
-      logical_id = map.logical_id
-      properties = map.properties
-      add_resource(logical_id, "AWS::IAM::Role", properties)
-    end
-
-    def add_function_iam_policy(task)
-      return unless task.build_function_iam?
-
-      map = Jets::Cfn::TemplateMappers::IamPolicy::FunctionPolicyMapper.new(task)
-      logical_id = map.logical_id
-      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/function_properties.rb

@@ -1,6 +0,0 @@
-module Jets::Cfn::TemplateBuilders::FunctionProperties
-  autoload :BaseBuilder, 'jets/cfn/template_builders/function_properties/base_builder'
-  autoload :RubyBuilder, 'jets/cfn/template_builders/function_properties/ruby_builder'
-  autoload :PythonBuilder, 'jets/cfn/template_builders/function_properties/python_builder'
-  autoload :NodeBuilder, 'jets/cfn/template_builders/function_properties/node_builder'
-end

data/lib/jets/cfn/template_builders/function_properties/base_builder.rb

@@ -1,128 +0,0 @@
-# Jets::Cfn::TemplateBuilders does not stick to the TemplateBuilders::Interface.
-# It builds the properties of a function. Usage:
-#
-#   builder = FunctionProperties::PythonBuilder.new(task)
-#   buider.properties
-#   buider.map.logical_id # to access Function's logical id
-#
-module Jets::Cfn::TemplateBuilders::FunctionProperties
-  class BaseBuilder
-    def initialize(task)
-      @task = task
-    end
-
-    def map
-      @map ||= Jets::Cfn::TemplateMappers::LambdaFunctionMapper.new(@task)
-    end
-
-    def properties
-      props = env_file_properties
-        .deep_merge(global_properties)
-        .deep_merge(class_properties)
-        .deep_merge(function_properties)
-      finalize_properties!(props)
-    end
-
-    # Add properties managed by Jets.
-    def finalize_properties!(props)
-      handler = full_handler(props)
-      runtime = get_runtime(props)
-      props.merge!(
-        "FunctionName" => map.function_name,
-        "Handler" => handler,
-        "Runtime" => runtime,
-      )
-    end
-
-    def get_runtime(props)
-      props["Runtime"] || default_runtime
-    end
-
-    # Ensure that the handler path is normalized.
-    def full_handler(props)
-      if props["Handler"]
-        map.handler_value(props["Handler"])
-      else
-        default_handler
-      end
-    end
-
-    # Global properties example:
-    # jets defaults are in jets/default/application.rb.
-    # Your application's default config/application.rb then get used. Example:
-    #
-    #   Jets.application.configure do
-    #     config.function = ActiveSupport::OrderedOptions.new
-    #     config.function.timeout = 10
-    #     config.function.runtime = "nodejs8.10"
-    #     config.function.memory_size = 1536
-    #   end
-    def global_properties
-      baseline = {
-        Code: {
-          S3Bucket: {Ref: "S3Bucket"}, # from child stack
-          S3Key: map.code_s3_key
-        },
-        Role: { Ref: "IamRole" },
-        Environment: { Variables: map.environment },
-      }.deep_stringify_keys
-
-      app_config_props = Jets.application.config.function.to_h
-      app_config_props = Jets::Pascalize.pascalize(app_config_props.deep_stringify_keys)
-
-      baseline.deep_merge(app_config_props)
-    end
-
-    # Class properties example:
-    #
-    #   class PostsController < ApplicationController
-    #     class_timeout 22
-    #     ...
-    #   end
-    #
-    # Also handles iam policy override at the class level. Example:
-    #
-    #   class_iam_policy("logs:*")
-    #
-    def class_properties
-      # klass is PostsController, HardJob, GameRule, Hello or HelloFunction
-      klass = Jets::Klass.from_task(@task)
-      class_properties = klass.class_properties
-      if klass.build_class_iam?
-        map = Jets::Cfn::TemplateMappers::IamPolicy::ClassPolicyMapper.new(klass)
-        class_properties[:Role] = "!GetAtt #{map.logical_id}.Arn"
-      end
-      Jets::Pascalize.pascalize(class_properties.deep_stringify_keys)
-    end
-
-    # Function properties example:
-    #
-    # class PostsController < ApplicationController
-    #   timeout 18
-    #   def index
-    #     ...
-    #   end
-    #
-    # Also handles iam policy override at the function level. Example:
-    #
-    #   iam_policy("ec2:*")
-    #   def new
-    #     render json: params.merge(action: "new")
-    #   end
-    #
-    def function_properties
-      properties = @task.properties
-      if @task.build_function_iam?
-        map = Jets::Cfn::TemplateMappers::IamPolicy::FunctionPolicyMapper.new(@task)
-        properties[:Role] = "!GetAtt #{map.logical_id}.Arn"
-      end
-      Jets::Pascalize.pascalize(properties.deep_stringify_keys)
-    end
-
-    def env_file_properties
-      env_vars = Jets::Dotenv.load!(true)
-      Jets::Pascalize.pascalize(environment: { variables: env_vars })
-    end
-  end
-end
-