jets 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c88605b05a1cab1ca62e2c64ccb6a626cf292d2c7a033dba435754c8448f695
-  data.tar.gz: 6294de6054d3a1cd06cc865439eba6c83467f464ceeb116f6c5af83423d3868a
+  metadata.gz: b18d400a2d0e0f2133d5c6989b979bde0b1ad9e62f3d58256153d0f303b248a8
+  data.tar.gz: 24bb4977a7a3ae19a0c10db1e47597d8d5718fb613cb9e9b417ddf15a5aeafea
 SHA512:
-  metadata.gz: 27c9b31e58672f9d82eeaca489b2e1fce6c0f2e2cc24fa973d5deb6c06908d137148c41bc38b06bc43c02819548de96151a61638ac4fa1ae4464889207ec9d15
-  data.tar.gz: cd7d124386d22ee30de783c64ee361a86b44b0a683bc2b5eefd70bb727d194a1bf6e17cc8ec55dadd44e5f47a6c763b719c2808feade605266d18c25b346aaab
+  metadata.gz: f6adb65c04917a41ddfbb39d37baac2e5aa49052858a69b45abc6a751d516b7304dd42d5159c7108a0d168fe8776f859182d82070a869ad3100ff9d343fccc96
+  data.tar.gz: 370233f6def4284f6d0c26f6e4c48bbe217c40316733628ee71fedcf80b3b1e3e8a33291ad993450cf340244a246796d2bd9e7c69e4b79314c54d76f25aa6072

data/.codebuild/docs/bin/git_setup.sh

@@ -7,6 +7,9 @@
 # cb start:
 #   CODEBUILD_SOURCE_VERSION=codebuild
 
+git config --global user.email "tongueroo@gmail.com"
+git config --global user.name "Tung Nguyen"
+
 set +u # cb start will not have CODEBUILD_WEBHOOK_TRIGGER set
 if [ -n "$CODEBUILD_WEBHOOK_TRIGGER" ]; then # git push
   BRANCH=$(echo $CODEBUILD_WEBHOOK_TRIGGER | sed "s/.*\///")
@@ -16,4 +19,3 @@ else
   BRANCH=UNKNOWN-BRANCH
 fi
 git checkout $BRANCH
-set -u

data/.codebuild/docs/buildspec.yml

@@ -3,6 +3,8 @@ version: 0.2
 phases:
   build:
     commands:
-      - git config --global user.email "tongueroo@gmail.com"
-      - git config --global user.name "Tung Nguyen"
       - .codebuild/docs/bin/build.sh
+cache:
+  paths:
+    - /usr/local/bundle
+    - /usr/local/lib/ruby/gems/2.5.0

data/.codebuild/docs/project.rb

@@ -4,7 +4,7 @@ triggers(
   webhook: true,
   filter_groups: [[{type: "HEAD_REF", pattern: "master"}, {type: "EVENT", pattern: "PUSH"}]]
 )
-
 environment_variables(
   SSH_KEY_S3_PATH: "ssm:/codebuild/jets/ssh_key_s3_path"
 )
+local_cache(true)

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/).
 
+## [2.1.6]
+- #364 Add stagger deploy option: https://rubyonjets.com/docs/extras/deploy-stagger/
+- codebuild: add caching to speed up build
+
 ## [2.1.5]
 - perform_later calls perform_now in local mode when not on lambda
 - fix: clear view cache in development mode

data/README.md

@@ -4,7 +4,7 @@
 
 Ruby and Lambda splat out a baby and that child's name is [Jets](http://rubyonjets.com/).
 
-![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUE12K3ljQTFQUjVpRW0reGhGVHVQdkplTHlOdUtENnBya2JhVWVXaFIvTU92MlBtV3hIUE9pb25jWGw0MS9jN2RXMERKRHh5Nzhvd01Za0NyeUs5SCtzPSIsIml2UGFyYW1ldGVyU3BlYyI6IkMybEJFaXdzejJEaHNWVmEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
+![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiRXY0bzFlZS93TUF0cXhDaGdEY2FIbTVtdW43YjB0andmbnRTL3VvbWJOcTBOM3IxWDZPSFh2OHpvczBmdU5QcHpjUThvd084RERORFlvZVI4QWVKcis0PSIsIml2UGFyYW1ldGVyU3BlYyI6IllBZk0xTmVWZ3c2K3VWdTYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 [![CircleCI](https://circleci.com/gh/tongueroo/jets.svg?style=svg)](https://circleci.com/gh/tongueroo/jets)
 [![Gem Version](https://badge.fury.io/rb/jets.svg)](https://badge.fury.io/rb/jets)
 [![Support](https://img.shields.io/badge/Support-Help-blue.svg)](http://rubyonjets.com/support/)

data/lib/jets/application/defaults.rb

@@ -147,6 +147,11 @@ class Jets::Application
       config.controllers = ActiveSupport::OrderedOptions.new
       config.controllers.default_protect_from_forgery = nil
 
+      config.deploy = ActiveSupport::OrderedOptions.new
+      config.deploy.stagger = ActiveSupport::OrderedOptions.new
+      config.deploy.stagger.enabled = false
+      config.deploy.stagger.batch_size = 10
+
       config
     end
 

data/lib/jets/aws_info.rb

@@ -55,7 +55,7 @@ module Jets
       ENV['AWS_REGION'] ||= region
       begin
         sts.get_caller_identity.account
-      rescue Aws::Errors::MissingCredentialsError
+      rescue Aws::Errors::MissingCredentialsError, Aws::Errors::NoSuchEndpointError
         puts "INFO: You're missing AWS credentials. Only local services are currently available"
       end
     end

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

@@ -35,7 +35,6 @@ module Jets::Cfn::Builders
 
     def depends_on_params
       return {} unless @app_class.depends_on
-
       depends = Jets::Stack::Depends.new(@app_class.depends_on)
       depends.params
     end

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

@@ -4,6 +4,7 @@ module Jets::Cfn::Builders
   class ParentBuilder
     include Interface
     include Jets::AwsServices
+    include Stagger
 
     def initialize(options={})
       @options = options
@@ -68,6 +69,7 @@ module Jets::Cfn::Builders
 
     def add_app_class_stack(path)
       resource = Jets::Resource::ChildStack::AppClass.new(@options[:s3_bucket], path: path)
+      add_stagger(resource)
       add_child_resources(resource)
     end
 

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

@@ -0,0 +1,34 @@
+class Jets::Cfn::Builders::ParentBuilder
+  module Stagger
+    def add_stagger(resource)
+      batch_size = stagger_batch_size # shorter convenience variable
+      return if !stagger_enabled || batch_size.nil? || batch_size == 0
+
+      # initialize all here to keep logic together
+      @previous_stacks ||= []
+      @added_count ||= 0
+
+      if @previous_stacks.size >= batch_size
+        at_boundary = @added_count % batch_size == 0
+        if at_boundary
+          @left = @added_count - batch_size
+          @right = @left + batch_size - 1
+        end
+        previous_stack_batch = @previous_stacks[@left..@right]
+        resource.add_stagger_depends_on(previous_stack_batch)
+      end
+
+      @added_count += 1
+      @previous_stacks << resource
+    end
+
+    def stagger_batch_size
+      Jets.config.deploy.stagger.batch_size
+    end
+
+    # for spec-ing
+    def stagger_enabled
+      Jets.config.deploy.stagger.enabled
+    end
+  end
+end

data/lib/jets/lambda/functions.rb

@@ -29,6 +29,11 @@ module Jets::Lambda
         super
         self.subclasses << base if base.name
       end
+
+      # Needed for depends_on. Got added due to stagger logic.
+      def output_keys
+        []
+      end
     end
   end
 end

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

@@ -21,29 +21,40 @@ module Jets::Resource::ChildStack
           }
         }
       }
-      defintion[logical_id][:depends_on] = depends_on if depends_on
+      defintion[logical_id][:depends_on] = depends.stack_list if depends
       defintion
     end
 
-    def depends_on
-      klass = current_app_class.constantize
-      return unless klass.depends_on
+    def depends
+      return if all_depends_on.empty?
+      Jets::Stack::Depends.new(all_depends_on)
+    end
+    memoize :depends
 
-      depends = Jets::Stack::Depends.new(klass.depends_on)
-      depends.stack_list
+    # Always returns an Array, could be empty
+    def all_depends_on
+      depends_on = current_app_class.depends_on || [] # contains Depends::Items
+      stagger_depends_on = @stagger_depends_on  || [] # contains Depends::Items
+      depends_on + stagger_depends_on
     end
 
-    def depends_on_params
-      klass = current_app_class.constantize
-      return unless klass.depends_on
-      depends = Jets::Stack::Depends.new(klass.depends_on)
-      depends.params
+    # For staggering. We're abusing depends_on to slow down the update rate.
+    #
+    # For this type of depends_on, there are no template parameters or outputs. To use the normal depends at we would
+    # have to make app classes adhere to what Jets::Stack::Depends requires.  This is mainly dependency_outputs and
+    # output_keys for each class right now.  It would not be that difficult but is not needed. So we create the
+    # Jets::Stack::Depends::Item objects directly.
+    def add_stagger_depends_on(stacks)
+      stack_names = stacks.map { |s| s.current_app_class.to_s.underscore }
+      items = stack_names.map { |name| Jets::Stack::Depends::Item.new(name) }
+      @stagger_depends_on ||= []
+      @stagger_depends_on += items.flatten
     end
 
     def parameters
       common = self.class.common_parameters
       common.merge!(controller_params) if controller?
-      common.merge!(depends_on_params) if depends_on
+      common.merge!(depends.params) if depends
       common
     end
 
@@ -86,7 +97,7 @@ module Jets::Resource::ChildStack
 
     def scoped_routes
       @routes ||= Jets::Router.routes.select do |route|
-        route.controller_name == current_app_class
+        route.controller_name == current_app_class.to_s
       end
     end
 
@@ -96,6 +107,7 @@ module Jets::Resource::ChildStack
         .sub(/\.yml$/,'')
         .gsub('-','/')
         .camelize
+        .constantize
     end
 
     # map the path to a camelized logical_id. Example:

data/lib/jets/stack/depends.rb

@@ -1,15 +1,15 @@
 class Jets::Stack
   class Depends
     def initialize(items)
-      @items = items
+      @items = items # Jets::Stack::Depends::Item - has stack and options properties
     end
 
     def params
       result = {}
       @items.each do |item|
-        logical_id = item.stack.to_s.camelize # logical_id
-        dependency_outputs(logical_id).each do |output|
-          dependency_class = logical_id.to_s.camelize
+        class_name = item.class_name
+        dependency_outputs(class_name).each do |output|
+          dependency_class = class_name.to_s.camelize
           output_key = item.options[:class_prefix] ?
             "#{dependency_class}#{output}" : # already camelized
             output
@@ -21,14 +21,14 @@ class Jets::Stack
       result
     end
 
+    # Returns CloudFormation template logical ids
     def stack_list
-      @items.map do |item|
-        item.stack.to_s.camelize # logical_id # logical_id
-      end
+      @items.map(&:logical_id)
     end
 
-    def dependency_outputs(logical_id)
-      logical_id.to_s.camelize.constantize.output_keys
+  private
+    def dependency_outputs(class_name)
+      class_name.to_s.camelize.constantize.output_keys
     end
   end
-end
+end

data/lib/jets/stack/depends/item.rb

@@ -1,9 +1,26 @@
+# Usage examples:
+#
+#   Jets::Stack::Depends::Item.new(:custom)
+#   Jets::Stack::Depends::Item.new(:custom, :alert)
+#   Jets::Stack::Depends::Item.new(:custom, class_prefix: true)
+#   Jets::Stack::Depends::Item.new(:custom, :alert, class_prefix: true)
+#
+# The Jets::Stack::Depends#params uses the options to determine if the class prefix should be added.
+#
 class Jets::Stack::Depends
   class Item
     attr_reader :stack, :options
     def initialize(stack, options={})
-      @stack = stack
+      @stack = stack # should be underscore format. IE: admin/posts_controller
       @options = options
     end
+
+    def logical_id
+      @stack.to_s.gsub('::','').gsub('/','_').camelize
+    end
+
+    def class_name
+      @stack.to_s.camelize
+    end
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -614,6 +614,7 @@ files:
 - lib/jets/cfn/builders/interface.rb
 - lib/jets/cfn/builders/job_builder.rb
 - lib/jets/cfn/builders/parent_builder.rb
+- lib/jets/cfn/builders/parent_builder/stagger.rb
 - lib/jets/cfn/builders/rule_builder.rb
 - lib/jets/cfn/builders/shared_builder.rb
 - lib/jets/cfn/built_template.rb