lono 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14ca2afc46780d2abc5bb0ecabaf53a685befb89abe63263fa02d847201582f4
-  data.tar.gz: b3ccb40f3ecc4902b769651c67ef1a76dfb330c0d547c3da686e2913857b048a
+  metadata.gz: 2a5ca91b3f1e36849794c7dd3450bdad734b95105ac76d8b24bbf51886b22890
+  data.tar.gz: 05f32b9ee239b75b9fbc99fefee557352acffa35a39e812367f39247892e9e27
 SHA512:
-  metadata.gz: 63bcc9ff8a025fba3666fb8bcd73fb1a7ffa5e9382dcdf2d407f4c7ea678fb63302887a3bddc8f527c13846100af26d91361f6a7f9bfc2583d4345635ab698de
-  data.tar.gz: ac98507f3f1a706602662f47af7055b6b983c6c373d8c78f13706dab323fbf8a33d35b16d87234de9674ca7e2c5464d2dcfe1cbd475f6d1ba19b6539ba81a7a1
+  metadata.gz: e71a1fe6b43df90adc2d0fc91d9a506b2e6610ff8d72c9640366baf306720cb969da972af6711ee66b9c362103666dd0f44863918ee74a454694f23062344190
+  data.tar.gz: c2109dd8da019dbcba4ec958b49d90951a0aaa83e2b9d1259fcba89f8c4bda9cbb7bb6ad911473cc80c4c266f8a4214fbf81ddc3c816426530c9ff7286723df1

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.2.0]
+- lono current
+- lono cfn status
+- app/files support with file_s3_key helper
+- Display status of stack deployment and wait for completion
+- fix iam retry logic for cfn update
+
 ## [4.1.0]
 - Merge pull request #36 from tongueroo/cli_markdown
 - fix current_region helper in variables, add s3_region setting

data/README.md

@@ -25,7 +25,9 @@ See [lono.cloud](http://lono.cloud) for full lono documentation.
 
 ## Important
 
-If you are on version 3, you can run `lono upgrade4` within your project to upgrade it to version 4.  Refer to the [CHANGELOG](CHANGELOG.md).
+If you are on version 3, you can run `lono upgrade v3to4` within your project to upgrade it to version 4.  Refer to the [CHANGELOG](CHANGELOG.md).
+
+If you are on version 4.0 or 4.1 and need to uppgrade to 4.2.  You can run `lono upgrade v4to4_2` within your project to upgrade it to version 4.2.  Refer to the [CHANGELOG](CHANGELOG.md).
 
 ## Blog Posts
 

data/exe/lono

@@ -3,7 +3,7 @@
 # Trap ^C
 Signal.trap("INT") {
   puts "\nCtrl-C detected. Exiting..."
-  sleep 1
+  sleep 0.1
   exit
 }
 

data/lib/lono.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'pp'
 require 'render_me_pretty'
 require 'yaml'
+require 'memoist'
 
 # vendor because need https://github.com/futurechimp/plissken/pull/6 to be merged
 $:.unshift(File.expand_path("../../vendor/plissken/lib", __FILE__))
@@ -12,27 +13,28 @@ require "plissken"
 
 $:.unshift(File.expand_path('../', __FILE__))
 module Lono
-  autoload :VERSION, 'lono/version'
-  autoload :Env, 'lono/env'
-  autoload :Help, 'lono/help'
-  autoload :ProjectChecker, 'lono/project_checker'
-  autoload :Command, 'lono/command'
-  autoload :CLI, 'lono/cli'
-  autoload :New, 'lono/new'
-  autoload :Sequence, 'lono/sequence'
-  autoload :Template, 'lono/template'
   autoload :Cfn, 'lono/cfn'
-  autoload :Param, 'lono/param'
   autoload :Clean, 'lono/clean'
-  autoload :Setting, 'lono/setting'
-  autoload :Importer, 'lono/importer'
-  autoload :Inspector, 'lono/inspector'
-  autoload :Completion, 'lono/completion'
+  autoload :CLI, 'lono/cli'
+  autoload :Command, 'lono/command'
   autoload :Completer, 'lono/completer'
+  autoload :Completion, 'lono/completion'
   autoload :Core, 'lono/core'
-  autoload :Upgrade4, 'lono/upgrade4'
+  autoload :Env, 'lono/env'
+  autoload :FileUploader, 'lono/file_uploader'
+  autoload :Help, 'lono/help'
+  autoload :Importer, 'lono/importer'
+  autoload :Inspector, 'lono/inspector'
+  autoload :New, 'lono/new'
+  autoload :Param, 'lono/param'
+  autoload :ProjectChecker, 'lono/project_checker'
   autoload :Script, 'lono/script'
+  autoload :Sequence, 'lono/sequence'
+  autoload :Setting, 'lono/setting'
+  autoload :Template, 'lono/template'
+  autoload :Upgrade, 'lono/upgrade'
   autoload :UserData, 'lono/user_data'
+  autoload :VERSION, 'lono/version'
 
   extend Core
 end

data/lib/lono/cfn.rb

@@ -2,32 +2,40 @@ require "thor"
 
 class Lono::Cfn < Lono::Command
   autoload :AwsService, 'lono/cfn/aws_service'
-  autoload :Util, 'lono/cfn/util'
-  autoload :CLI, 'lono/cfn/cli'
   autoload :Base, 'lono/cfn/base'
+  autoload :CLI, 'lono/cfn/cli'
   autoload :Create, 'lono/cfn/create'
-  autoload :Update, 'lono/cfn/update'
+  autoload :Current, 'lono/cfn/current'
   autoload :Delete, 'lono/cfn/delete'
-  autoload :Preview, 'lono/cfn/preview'
   autoload :Diff, 'lono/cfn/diff'
   autoload :Download, 'lono/cfn/download'
+  autoload :Preview, 'lono/cfn/preview'
+  autoload :Status, 'lono/cfn/status'
+  autoload :Update, 'lono/cfn/update'
+  autoload :Util, 'lono/cfn/util'
 
   class_option :verbose, type: :boolean
   class_option :noop, type: :boolean
 
-  # common to create and update
-  class_option :template, desc: "override convention and specify the template file to use"
-  class_option :param, desc: "override convention and specify the param file to use"
-  class_option :lono, type: :boolean, desc: "invoke lono to generate CloudFormation templates", default: true
-  class_option :capabilities, type: :array, desc: "iam capabilities. Ex: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
-  class_option :iam, type: :boolean, desc: "Shortcut for common IAM capabilities: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
-  class_option :rollback, type: :boolean, desc: "rollback", default: true
+  base_options = Proc.new do
+    # common to create and update
+    option :template, desc: "override convention and specify the template file to use"
+    option :param, desc: "override convention and specify the param file to use"
+    option :lono, type: :boolean, desc: "invoke lono to generate CloudFormation templates", default: true
+    option :capabilities, type: :array, desc: "iam capabilities. Ex: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
+    option :iam, type: :boolean, desc: "Shortcut for common IAM capabilities: CAPABILITY_IAM, CAPABILITY_NAMED_IAM"
+    option :rollback, type: :boolean, desc: "rollback", default: true
+  end
+  wait_option = Proc.new do
+    option :wait, type: :boolean, desc: "Wait for stack operation to complete.", default: true
+  end
 
   desc "create STACK", "Create a CloudFormation stack using the generated template."
-  option :randomize_stack_name, type: :boolean, desc: "tack on random string at the end of the stack name", default: nil
+  base_options.call
+  wait_option.call
   long_desc Lono::Help.text("cfn/create")
-  def create(name)
-    Create.new(name, options).run
+  def create(stack_name)
+    Create.new(stack_name, options).run
   end
 
   desc "update STACK", "Update a CloudFormation stack using the generated template."
@@ -36,36 +44,58 @@ class Lono::Cfn < Lono::Command
   option :diff, type: :boolean, default: true, desc: "Show diff of the source code template changes before continuing."
   option :preview, type: :boolean, default: true, desc: "Show preview of the stack changes before continuing."
   option :sure, type: :boolean, desc: "Skips are you sure prompt"
-  def update(name)
-    Update.new(name, options).run
+  base_options.call
+  wait_option.call
+  def update(stack_name=:current)
+    Update.new(stack_name, options).run
   end
 
   desc "delete STACK", "Delete a CloudFormation stack."
   long_desc Lono::Help.text("cfn/delete")
   option :sure, type: :boolean, desc: "Skips are you sure prompt"
-  def delete(name)
-    Delete.new(name, options).run
+  base_options.call
+  wait_option.call
+  def delete(stack_name=:current)
+    Delete.new(stack_name, options).run
   end
 
   desc "preview STACK", "Preview a CloudFormation stack update.  This is similar to terraform's plan or puppet's dry-run mode."
   long_desc Lono::Help.text("cfn/preview")
   option :keep, type: :boolean, desc: "keep the changeset instead of deleting it afterwards"
   option :diff, type: :boolean, default: true, desc: "Show diff of the source code template changes also."
-  def preview(name)
-    Diff.new(name, options).run if options[:diff]
-    Preview.new(name, options).run
+  base_options.call
+  def preview(stack_name=:current)
+    Diff.new(stack_name, options).run if options[:diff]
+    Preview.new(stack_name, options).run
   end
 
   desc "diff STACK", "Diff newly generated template vs existing template."
   long_desc Lono::Help.text("cfn/diff")
-  def diff(name)
-    Diff.new(name, options).run
+  base_options.call
+  def diff(stack_name=:current)
+    Diff.new(stack_name, options).run
   end
 
   desc "download STACK", "Download CloudFormation template from existing stack."
   long_desc Lono::Help.text("cfn/download")
   option :name, desc: "Name you want to save the template as. Default: existing stack name."
-  def download(stack_name)
+  base_options.call
+  def download(stack_name=:current)
     Download.new(stack_name, options).run
   end
+
+  desc "current", "Current stack that you're working with."
+  long_desc Lono::Help.text("cfn/current")
+  option :rm, type: :boolean, desc: "Remove all current settings. Removes `.lono/current`"
+  option :name, desc: "Current stack name."
+  option :suffix, desc: "Current suffix for stack name."
+  def current
+    Current.new(options).run
+  end
+
+  desc "status", "Shows the current status for the stack."
+  long_desc Lono::Help.text("cfn/status")
+  def status(stack_name=:current)
+    Status.new(stack_name, options).run
+  end
 end

data/lib/lono/cfn/base.rb

@@ -4,14 +4,13 @@ class Lono::Cfn::Base
   include Lono::Cfn::AwsService
   include Lono::Cfn::Util
 
-  attr_reader :randomize_stack_name
   def initialize(stack_name, options={})
-    @randomize_stack_name = options[:randomize_stack_name]
-    @stack_name = randomize(stack_name)
-    @options = options
+    @options = options # options must be set first because @option used in append_suffix
+    stack_name = switch_current(stack_name)
+    @stack_name = append_suffix(stack_name)
     Lono::ProjectChecker.check unless options[:lono] # already ran checker in lono generate
 
-    @template_name = options[:template] || derandomize(@stack_name)
+    @template_name = options[:template] || remove_suffix(@stack_name)
     @param_name = options[:param] || @template_name
     @template_path = get_source_path(@template_name, :template)
     @param_path = get_source_path(@param_name, :param)
@@ -19,7 +18,18 @@ class Lono::Cfn::Base
     puts "Using parameters: #{@param_path}" unless @options[:mute_using]
   end
 
+  def switch_current(stack_name)
+    Lono::Cfn::Current.name!(stack_name)
+  end
+
+  def starting_message
+    action = self.class.to_s.split('::').last
+    action = action[0..-2] + 'ing' # create => creating
+    puts "#{action} #{@stack_name.colorize(:green)} stack..."
+  end
+
   def run
+    starting_message
     params = generate_all
     begin
       save_stack(params) # defined in the sub class
@@ -35,6 +45,13 @@ class Lono::Cfn::Base
         exit 1
       end
     end
+
+    return unless @options[:wait]
+    status.wait
+  end
+
+  def status
+    @status ||= Lono::Cfn::Status.new(@stack_name)
   end
 
   def prompt_for_iam(capabilities)
@@ -55,6 +72,7 @@ class Lono::Cfn::Base
       generate_templates
       unless @options[:noop]
         upload_scripts
+        upload_files
         upload_templates
       end
     end
@@ -82,6 +100,11 @@ class Lono::Cfn::Base
     Lono::Script::Upload.new.run
   end
 
+  def upload_files
+    return unless s3_folder
+    Lono::FileUploader.new.upload_all
+  end
+
   def generate_params(options={})
     generator_options = {
       path: @param_path,
@@ -172,28 +195,61 @@ class Lono::Cfn::Base
     exit signal
   end
 
-  # Do nothing unless in Create class
-  def randomize(stack_name)
-    stack_name
+  # Appends a short suffix at the end of a stack name.
+  # Lono internally strips this same suffix for the template name.
+  # Makes it convenient for the development flow.
+  #
+  #   lono cfn current --suffix 1
+  #   lono cfn create demo => demo-1
+  #   lono cfn update demo-1
+  #
+  # Instead of typing:
+  #
+  #   lono cfn create demo-1 --template demo
+  #   lono cfn update demo-1 --template demo
+  #
+  # The suffix can be specified at the CLI but can also be saved as a
+  # preference.
+  #
+  # A random suffix can be specified with random. Example:
+  #
+  #   lono cfn current --suffix random
+  #   lono cfn create demo => demo-[RANDOM], example: demo-abc
+  #   lono cfn update demo-abc
+  #
+  # It is not a default setting because it might confuse new lono users.
+  def append_suffix(stack_name)
+    suffix = Lono.suffix == 'random' ? random_suffix : Lono.suffix
+    [stack_name, suffix].compact.join('-')
   end
 
-  # Strip the random string at end of the template name
-  def derandomize(template_name)
-    if randomize_stack_name?
-      template_name.sub(/-(\w{3})$/,'') # strip the random part at the end
+  def remove_suffix(stack_name)
+    return stack_name unless Lono.suffix
+
+    if stack_name_suffix == 'random'
+      stack_name.sub(/-(\w{3})$/,'') # strip the random suffix at the end
+    elsif stack_name_suffix
+      pattern = Regexp.new("-#{stack_name_suffix}$",'')
+      stack_name.sub(pattern, '') # strip suffix
     else
-      template_name
+      stack_name
     end
   end
 
-  def randomize_stack_name?
-    if !randomize_stack_name.nil?
-      return randomize_stack_name # CLI option takes highest precedence
+  # only generate random suffix for Lono::Cfn::Create class
+  def random_suffix
+    return nil unless self.class.name.to_s =~ /Create/
+    (0...3).map { (65 + rand(26)).chr }.join.downcase # Ex: jhx
+  end
+
+  def stack_name_suffix
+    if @options[:suffix] && !@options[:suffix].nil?
+      return @options[:suffix] # CLI option takes highest precedence
     end
 
     # otherwise use the settings preference
     settings = Lono::Setting.new
-    settings.data['randomize_stack_name']
+    settings.data['stack_name_suffix']
   end
 
   def capabilities
@@ -215,4 +271,26 @@ class Lono::Cfn::Base
     setting = Lono::Setting.new
     setting.s3_folder
   end
+
+  # Either set the templmate_body or template_url attribute based on
+  # if template was uploaded to s3.
+  # Nice to reference s3 url because the max size of the template body is
+  # greater if the template body is on s3. Limits:
+  #
+  #   template_body: 51,200 bytes
+  #   template_url: 460,800 bytes
+  #
+  # Reference: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html
+  def set_template_body!(params)
+    # if s3_folder is set this means s3 upload is enabled
+    if s3_folder # s3_folder defined in cfn/base.rb
+      upload = Lono::Template::Upload.new
+      url = upload.s3_presigned_url(@template_path)
+      params[:template_url] = url
+    else
+      params[:template_body] = IO.read(@template_path)
+    end
+
+    params
+  end
 end

data/lib/lono/cfn/create.rb

@@ -8,56 +8,32 @@ class Lono::Cfn::Create < Lono::Cfn::Base
 
   # aws cloudformation create-stack --stack-name prod-hi-123456789 --parameters file://output/params/prod-hi-123456789.json --template-body file://output/prod-hi.json
   def create_stack(params)
-    message = "Creating #{@stack_name} stack."
+    message = "Creating #{@stack_name.colorize(:green)} stack."
     if @options[:noop]
       puts "NOOP #{message}"
       return
     end
 
     if stack_exists?(@stack_name)
-      puts "Cannot create '#{@stack_name}' stack because it already exists.".colorize(:red)
+      puts "Cannot create #{@stack_name.colorize(:green)} stack because it already exists.".colorize(:red)
       return
     end
 
     unless File.exist?(@template_path)
-      puts "Cannot create '#{@stack_name}' template not found: #{@template_path}."
+      puts "Cannot create #{@stack_name.colorize(:green)} template not found: #{@template_path}."
       return
     end
 
-    template_body = IO.read(@template_path)
     params = {
       stack_name: @stack_name,
-      template_body: template_body,
       parameters: params,
       capabilities: capabilities, # ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
       disable_rollback: !@options[:rollback],
     }
+    set_template_body!(params)
+
     show_parameters(params, "cfn.create_stack")
     cfn.create_stack(params)
     puts message unless @options[:mute]
   end
-
-  # Appends a short random string at the end of a stack name.
-  # Later we will strip this same random string from the template name.
-  # Very makes it convenient.  We can just type:
-  #
-  #   lono cfn create main --randomize-stack-name
-  #
-  # instead of:
-  #
-  #   lono cfn create main-[RANDOM] --template main
-  #
-  # The randomize_stack_name can be specified at the CLI but can also be saved as a
-  # preference.
-  #
-  # It is not a default setting because it might confuse new lono users.
-  def randomize(stack_name)
-    if randomize_stack_name?
-      random = (0...3).map { (65 + rand(26)).chr }.join.downcase # Ex: jhx
-      [stack_name, random].join('-')
-    else
-      stack_name
-    end
-  end
-
 end