lono 8.0.0.pre.rc3 → 8.0.0.pre.rc4

data/lib/lono/bundler/util/git.rb

@@ -1,22 +1,7 @@
 module Lono::Bundler::Util
   module Git
     include Logging
-
-    def sh(command)
-      command = "#{command} 2>&1" # always need output for the sha
-      logger.debug "=> #{command}"
-      out = `#{command}`
-      unless $?.success?
-        if command.include?("git")
-          raise LB::GitError.new("#{command}\n#{out}")
-        else
-          logger.error "ERROR: running #{command}".color(:red)
-          logger.error out
-          exit $?.exitstatus
-        end
-      end
-      out
-    end
+    include Lono::Utils::Sh
 
     def git(command)
       sh("git #{command}")
@@ -33,5 +18,22 @@ module Lono::Bundler::Util
       end
       exit 1
     end
+
+    # Different from Lono::Utils::Sh
+    def sh(command)
+      command = "#{command} 2>&1" # always need output for the sha
+      logger.debug "=> #{command}"
+      out = `#{command}`
+      unless $?.success?
+        if command.include?("git")
+          raise LB::GitError.new("#{command}\n#{out}")
+        else
+          logger.error "ERROR: running #{command}".color(:red)
+          logger.error out
+          exit $?.exitstatus
+        end
+      end
+      out
+    end
   end
 end

data/lib/lono/cfn/base.rb

@@ -1,12 +1,12 @@
 module Lono::Cfn
   class Base < Lono::CLI::Base
     extend Memoist
-
     include Lono::AwsServices
-    include Lono::Utils::Sure
+    include Lono::Hooks::Concern
     include Lono::Utils::Logging
     include Lono::Utils::Pretty
     include Lono::Utils::Quit
+    include Lono::Utils::Sure
 
     include Concerns
 

data/lib/lono/cfn/concerns/build.rb

@@ -3,7 +3,7 @@ module Lono::Cfn::Concerns
     extend Memoist
 
     def build
-      Lono::CLI::Build.new(@options)
+      Lono::Builder.new(@options)
     end
     memoize :build
   end

data/lib/lono/cfn/delete.rb

@@ -1,9 +1,12 @@
 module Lono::Cfn
   class Delete < Base
     def run
+      logger.info "Will delete stack #{@stack.color(:green)}"
       plan.for_delete
-      sure?("Are you sure you want to delete the #{@stack} stack?")
-      cfn.delete_stack(stack_name: @stack)
+      sure?("Are you sure you want to delete the stack?")
+      run_hooks("down") do
+        cfn.delete_stack(stack_name: @stack)
+      end
       if @options[:wait]
         status.wait
       else

data/lib/lono/cfn/deploy/rollback.rb

@@ -11,10 +11,8 @@ class Lono::Cfn::Deploy
 
     def continue_update
       continue_update?
-      options = {stack_name: @stack}
-      show_options(options, "continue_update_rollback")
       begin
-        cfn.continue_update_rollback(options)
+        cfn.continue_update_rollback(stack_name: @stack)
       rescue Aws::CloudFormation::Errors::ValidationError => e
         logger.info "ERROR: Continue update: #{e.message}".color(:red)
         quit 1

data/lib/lono/cfn/deploy.rb

@@ -2,7 +2,9 @@ module Lono::Cfn
   class Deploy < Base
     def run
       start_message
-      perform # create or update
+      run_hooks("up") do
+        perform # create or update
+      end
       success = status.wait
       if success
         finish_message
@@ -29,7 +31,7 @@ module Lono::Cfn
         # e.message: Template format error: YAML not well-formed. (line 207, column 9)
         print_code(e)
       else
-        logger.info "ERROR: #{e.message}".color(:red)
+        logger.info "ERROR: Deploy#perform #{e.class} #{e.message}".color(:red)
         logger.info "Check: #{pretty_path(@blueprint.output_path)}"
         quit 1
       end
@@ -50,7 +52,6 @@ module Lono::Cfn
     def create
       plan.for_create
       @sure || sure?("Going to create stack #{@stack} with blueprint #{@blueprint.name}.")
-      upload_files
       options = {
         stack_name: @stack,
         parameters: build.parameters,
@@ -58,6 +59,7 @@ module Lono::Cfn
       opts = Opts.new(@blueprint, "create_stack", iam, options)
       opts.show
       options = opts.values
+      upload_all
       cfn.create_stack(options)
     end
 
@@ -68,12 +70,22 @@ module Lono::Cfn
       end
 
       operable.check!
+      upload_all # important to call before plan.for_update.
+      # plan.for_update creates the changeset and requires the template to already be uploaded to s3
       changeset = plan.for_update
       !changeset.changed? || @sure || sure?("Are you sure you want to update the #{@stack} stack?")
-      upload_files
       changeset.execute_change_set
     end
 
+    def upload_all
+      upload_templates
+      upload_files
+    end
+
+    def upload_templates
+      Lono::Builder::Template::Upload.new(@options).run
+    end
+
     # Upload files right before create_stack or execute_change_set
     # Its better to upload here as part of a deploy vs a build
     # IE: lono build should try not to do a remote write to s3 if possible

data/lib/lono/cfn/plan/changeset.rb

@@ -36,7 +36,7 @@ class Lono::Cfn::Plan
         change_set = describe_change_set
         sleep 1
         unless newline_needed
-          logger.print "Determining Change Set"
+          logger.print "Calculating Change Set"
         end
         newline_needed = true
         logger.print '.'

data/lib/lono/cli/base.rb

@@ -1,6 +1,7 @@
 class Lono::CLI
   class Base < Abstract
     include Lono::Concerns::Names
+    include Lono::Utils::Sh
 
     def initialize(options={})
       super

data/lib/lono/cli/help/new/helper.md

@@ -0,0 +1,27 @@
+## Blueprint Helpers
+
+When the `--blueprint` option is used a blueprint helper is generated.
+
+The default name is custom
+
+    $ lono new helper --blueprint demo
+          create  app/blueprints/demo/helpers/custom_helper.rb
+
+Here's an example with a helper named vars.
+
+    $ lono new helper vars --blueprint demo
+          create  app/blueprints/demo/helpers/vars_helper.rb
+
+## Project Helpers
+
+When no `--blueprint` option is used a project helper is generated.
+
+The default name is custom.
+
+    $ lono new helper
+          create  app/helpers/custom/custom_helper.rb
+
+Here's an example with a helper named common.
+
+    $ lono new helper common
+          create  app/helpers/common/common_helper.rb

data/lib/lono/cli/help/new/hook.md

@@ -0,0 +1,14 @@
+## Blueprint Hooks
+
+When the `--blueprint` option is used a blueprint hook is generated.
+
+    $ lono new helper --blueprint demo
+          create  app/blueprints/demo/config/hooks.rb
+
+## Project Helpers
+
+When no `--blueprint` option is used a project hook is generated.
+
+    $ lono new helper
+          create  app/config/hooks.rb
+

data/lib/lono/cli/help/new/project.md

@@ -1,22 +1,15 @@
 ## Example
 
     $ lono new project infra
+    Other infra
     => Creating new project called infra.
           create  infra
           create  infra/.gitignore
           create  infra/Gemfile
           create  infra/README.md
           create  infra/config/app.rb
-    => Initialize git repo
-             run  git init from "."
-    Initialized empty Git repository in /home/ec2-user/environment/infra/.git/
     => Installing dependencies with: bundle install
-    Resolving dependencies...Fetching gem metadata from https://rubygems.org/.......
-    ............................
-    Using concurrent-ruby 1.1.9
-    ...
-    Bundle complete! 1 Gemfile dependency, 40 gems now installed.
-    Use `bundle info [gemname]` to see where a bundled gem is installed.
+    Bundle complete! 2 Gemfile dependencies, 47 gems now installed.
     ================================================================
     Congrats 🎉 You have successfully created a lono project.
 
@@ -31,4 +24,4 @@
         lono up demo
 
     More info: https://lono.cloud/
-    $
+    $

data/lib/lono/cli/iam.rb

@@ -0,0 +1,27 @@
+class Lono::CLI
+  class Iam < Base
+    include Lono::Cfn::Concerns::Build
+    include Lono::Cfn::Concerns::TemplateOutput
+
+    def run
+      build.template_builder.run
+      resources = template_output.data['Resources']
+      types = resources.map { |logical_id, attrs| attrs['Type'] }
+      actions = types.map do |t|
+        service = t.split('::')[1]
+        "#{service.downcase}:*"
+      end.uniq
+      text =<<~EOL
+        Version: 2012-10-17
+        Statement:
+        - Sid: #{@blueprint.name}
+          Effect: Allow
+          Resource: "*"
+      EOL
+      policy = YAML.load(text)
+      policy['Statement'][0]['Action'] = actions
+      puts "IAM Policy Example for blueprint #{@blueprint.name}".color(:green)
+      puts JSON.pretty_generate(policy)
+    end
+  end
+end

data/lib/lono/cli/new/blueprint.rb

@@ -5,7 +5,6 @@ class Lono::CLI::New
       [
         [:examples, type: :boolean, desc: "Whether not to generate examples"],
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-        [:project, desc: "Project name"],
       ]
     end
     cli_options.each do |args|
@@ -21,9 +20,8 @@ class Lono::CLI::New
     end
 
     def create_blueprint
-      logger.info "=> Creating new blueprint called #{name}."
-      dest = [@options[:project], "app/blueprints"].compact.join('/')
-      directory ".", "#{dest}/#{name}"
+      logger.info "=> Creating new blueprint: #{name}"
+      directory ".", "app/blueprints/#{name}"
     end
   end
 end

data/lib/lono/cli/new/helper.rb

@@ -1,13 +1,40 @@
 class Lono::CLI::New
-  class Helper < Lono::Command
-    Help = Lono::CLI::Help
+  class Helper < Lono::CLI::New::Sequence
+    def self.cli_options
+      # required for name => underscore_name => app/blueprints/demo/helpers/%underscore_name%_helper.rb.tt
+      argument :name, default: "custom", desc: "Helper name"
 
-    long_desc Help.text("new/helper/blueprint")
-    Blueprint.cli_options.each { |args| option(*args) }
-    register(Blueprint, "blueprint", "blueprint HELPER_NAME --blueprint", "Generates new blueprint helper")
+      [
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:blueprint, aliases: :b, desc: "Blueprint name. Only use you want a blueprint helper. Otherwise a project helper is generated"],
+      ]
+    end
+    cli_options.each do |args|
+      class_option(*args)
+    end
 
-    long_desc Help.text("new/helper/project")
-    Project.cli_options.each { |args| option(*args) }
-    register(Project, "project", "project HELPER_NAME", "Generates new project helper")
+    def set_source
+      set_template_source "helper"
+    end
+
+    def create_helper
+      if @options[:blueprint]
+        create_blueprint_helper
+      else
+        create_project_helper
+      end
+    end
+
+  private
+    def create_blueprint_helper
+      @blueprint = @options[:blueprint] # allows %underscore_name%_helper.rb.tt to access @blueprint
+      logger.info "=> Generating #{underscore_name}_helper.rb"
+      directory ".", "app/blueprints/#{@blueprint}/helpers"
+    end
+
+    def create_project_helper
+      logger.info "=> Generating #{underscore_name}_helper.rb"
+      directory ".", "app/helpers/#{underscore_name}"
+    end
   end
 end

data/lib/lono/cli/new/hook.rb

@@ -0,0 +1,32 @@
+class Lono::CLI::New
+  class Hook < Lono::CLI::New::Sequence
+    def self.cli_options
+      [
+        [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
+        [:blueprint, aliases: :b, desc: "Blueprint name. Only use you want a blueprint helper. Otherwise a project helper is generated"],
+      ]
+    end
+    cli_options.each do |args|
+      class_option(*args)
+    end
+
+    def set_source
+      set_template_source "hook"
+    end
+
+    def create_hook
+      logger.info "=> Generating hook"
+      if blueprint
+        directory ".", "app/blueprints/#{blueprint}"
+      else
+        directory ".", "."
+      end
+    end
+
+  private
+    # So templates/hooks/config/hooks.rb.tt has access to blueprint
+    def blueprint
+      @options[:blueprint]
+    end
+  end
+end

data/lib/lono/cli/new.rb

@@ -8,6 +8,14 @@ class Lono::CLI
     Configset.cli_options.each { |args| option(*args) }
     register(Configset, "configset", "configset NAME", "Generate new configset")
 
+    long_desc Help.text("new/helper")
+    Helper.cli_options.each { |args| option(*args) }
+    register(Helper, "helper", "helper NAME", "Generate new helper")
+
+    long_desc Help.text("new/hook")
+    Hook.cli_options.each { |args| option(*args) }
+    register(Hook, "hook", "hook NAME", "Generate new hook")
+
     long_desc Help.text("new/project")
     Project.cli_options.each { |args| option(*args) }
     register(Project, "project", "project NAME", "Generate new project")
@@ -16,10 +24,6 @@ class Lono::CLI
     Shim.cli_options.each { |args| option(*args) }
     register(Shim, "shim", "shim NAME", "Generate new shim")
 
-    desc "helper SUBCOMMAND", "helper subcommands"
-    long_desc Help.text(:helper)
-    subcommand "helper", Helper
-
     desc "test SUBCOMMAND", "test subcommands"
     long_desc Help.text(:test)
     subcommand "test", Test

data/lib/lono/cli/script/build.rb

@@ -63,10 +63,5 @@ class Lono::CLI::Script
       @md5sum ||= Digest::MD5.file("#{@blueprint.root}/scripts.tgz").to_s[0..7]
     end
 
-    def sh(command)
-      puts "=> #{command}"
-      system command
-    end
-
   end
 end

data/lib/lono/{inspector → cli}/summary.rb

@@ -1,29 +1,27 @@
-module Lono::Inspector
+class Lono::CLI
   class Summary < Base
+    include Lono::Cfn::Concerns::Build
     include Lono::Cfn::Concerns::TemplateOutput
 
-    def perform(template)
-      # little dirty but @template is used in data method so we dont have to pass it to the data method
-      @template = template
-      logger.info "=> CloudFormation Template Summary for template #{@template.color(:sienna)}:"
+    def run
+      build.all
       print_parameters_summary
-      logger.info "# Resources:"
       print_resource_types
     end
 
     def print_parameters_summary
       parameters = template_output.parameters
+      logger.info "Parameters (#{parameters.size})".color(:green)
       parameter_groups = template_output.parameter_groups
 
       if parameters.empty?
-        logger.info "There are no parameters in this template."
+        logger.info "No parameters"
         return
       end
 
       shown = []
-      logger.info "# Parameters Total (#{parameters.size})"
-      parameter_groups.each do |label, parameters|
-        logger.info "# Parameter Group (#{parameters.size}): #{label}".color(:sienna)
+      parameter_groups.each do |parameter_group_label, parameters|
+        logger.info parameter_group_label
         parameters.each do |name|
           logger.info parameter_line(name)
           shown << name
@@ -37,13 +35,11 @@ module Lono::Inspector
 
     def parameter_line(name)
       data = template_output.parameters[name]
-      example = description_example(data["Description"])
       if data["Default"].nil?
-        line = "#{name}=#{example} # (required)"
+        line = "    #{name} (required)"
       else
         default = data["Default"]
-        line = "# #{name}=#{default}"
-        line = "#{line} # #{example}" if example
+        line = default.blank? ? "    #{name}" : "    #{name}=#{default}"
       end
       line
     end
@@ -56,18 +52,9 @@ module Lono::Inspector
       md[2]
     end
 
-    def resource_types
-      resources = template_output.data["Resources"]
-      return unless resources
-
-      types = Hash.new(0)
-      resources.each do |logical_id, resource|
-        types[resource["Type"]] += 1
-      end
-      types
-    end
-
     def print_resource_types
+      total = template_output.data["Resources"].size
+      logger.info "Resources (#{total})".color(:green)
       unless resource_types
         logger.info "No resources found."
         return
@@ -76,15 +63,21 @@ module Lono::Inspector
       types = resource_types.sort_by {|r| r[1] * -1} # Hash -> 2D Array
       types.each do |a|
         type, count = a
-        printf "%3s %s\n", count, type
+        printf "%5s %s\n", count, type
       end
       total = types.inject(0) { |sum,(type,count)| sum += count }
-      printf "%3s %s\n", total, "Total"
+      printf "%5s %s\n", total, "Total"
     end
 
-    def template_output
-      Lono::Builder::Template::Output.new(@blueprint)
+    def resource_types
+      resources = template_output.data["Resources"]
+      return unless resources
+
+      types = Hash.new(0)
+      resources.each do |logical_id, resource|
+        types[resource["Type"]] += 1
+      end
+      types
     end
-    memoize :template_output
   end
 end

data/lib/lono/cli.rb

@@ -10,7 +10,7 @@ module Lono
     option :quiet, type: :boolean, desc: "silence the output"
     opts.clean
     def build(blueprint)
-      Build.new(options.merge(blueprint: blueprint, build_only: true)).all
+      Lono::Builder.new(options.merge(blueprint: blueprint, build_only: true)).all
     end
 
     desc "bundle", "Bundle with Lonofile."
@@ -32,6 +32,12 @@ module Lono
       Lono::Cfn::Delete.new(options.merge(blueprint: blueprint)).run
     end
 
+    desc "iam BLUEPRINT", "Generate IAM policy"
+    long_desc Help.text(:down)
+    def iam(blueprint)
+      Iam.new(options.merge(blueprint: blueprint)).run
+    end
+
     desc "list", "List blueprints"
     long_desc Help.text(:list)
     option :type, aliases: :t, desc: "Type: IE: blueprint, configset, extension. Defaults to all"
@@ -41,7 +47,7 @@ module Lono
 
     desc "output BLUEPRINT", "output or preview of the deploy"
     long_desc Help.text(:output)
-    option :format, desc: "Output formats: #{CliFormat.formats.join(', ')}"
+    option :format, aliases: :f, desc: "Output formats: #{CliFormat.formats.join(', ')}"
     def output(blueprint)
       Lono::Cfn::Output.new(options.merge(blueprint: blueprint)).run
     end
@@ -77,7 +83,7 @@ module Lono
     desc "summary BLUEPRINT", "Prints summary of CloudFormation template"
     long_desc Help.text("summary")
     def summary(blueprint)
-      Lono::Inspector::Summary.new(options.merge(blueprint: blueprint)).run
+      Summary.new(options.merge(blueprint: blueprint)).run
     end
 
     desc "test", "Run test."
@@ -122,10 +128,6 @@ module Lono
     long_desc Help.text(:cfn)
     subcommand "cfn", Cfn
 
-    desc "code SUBCOMMAND", "code subcommands"
-    long_desc Help.text(:code)
-    subcommand "code", Code
-
     desc "new SUBCOMMAND", "new subcommands"
     long_desc Help.text(:new)
     subcommand "new", New

data/lib/lono/command.rb

@@ -37,6 +37,7 @@ module Lono
         # Lono.argv provides consistency when lono is being called by rspec-lono test harness
         Lono.argv = args.clone # important to clone since Thor removes the first argv
 
+        check_version_structure!
         check_project!(args.first)
 
         # Allow calling for help via:
@@ -68,13 +69,39 @@ module Lono
         return if subcommand?
         return if command_name.nil?
         return if help_flags.include?(Lono.argv.last) # IE: -h help
-        return if %w[-h -v --version completion completion_script help new test version].include?(command_name)
+        return if non_project_command?
         return if File.exist?("#{Lono.root}/config/app.rb")
         return unless Lono.check_project
         logger.error "ERROR: It doesnt look like this is a lono project. Are you sure you are in a lono project?".color(:red)
         ENV['LONO_TEST'] ? raise : exit(1)
       end
 
+      # Also, using ARGV instead of args because args is called by thor in multiple passes
+      # For `lono new project`:
+      # * 1st pass: "new"
+      # * 2nd pass: "project"
+      def non_project_command?
+        commands = %w[-h -v --version completion completion_script help new test version]
+        commands.include?(ARGV[0])
+      end
+
+      def check_version_structure!
+        return if non_project_command?
+        return unless File.exist?('configs')
+        puts "ERROR: Old lono project structure detected".color(:red)
+        puts <<~EOL
+          It looks like this Lono project with an old structure.
+          The old structure does not work with this version of Lono.
+
+          Current Installed Lono Version: #{Lono::VERSION}
+
+          Please upgrade the lono project structure.
+
+          See: https://lono.com/docs/upgrading/version8/
+        EOL
+        exit 1
+      end
+
       def help_flags
         Thor::HELP_MAPPINGS + ["help"]
       end

data/lib/lono/core.rb

@@ -19,11 +19,21 @@ module Lono
     end
     memoize :app
 
+    def role
+      ENV['LONO_ROLE']
+    end
+    memoize :role
+
     def env
       ENV['LONO_ENV'] || 'dev'
     end
     memoize :env
 
+    def extra
+      ENV['LONO_EXTRA']
+    end
+    memoize :extra
+
     def tmp_root
       ENV['LONO_TMP_ROOT'] || "/tmp/lono"
     end

data/lib/lono/{utils → files/builder/lambda_layer}/rsync.rb

@@ -1,13 +1,11 @@
 require 'shellwords'
 
-module Lono::Utils
+class Lono::Files::Builder::LambdaLayer
   module Rsync
-    include Lono::Utils::Logging
-
     def sh(command)
-      logger.info "=> #{command}"
+      logger.debug "=> #{command}"
       out = `#{command}`
-      logger.info out if ENV['LONO_DEBUG_SH']
+      logger.debug out
       success = $?.success?
       raise("ERROR: running command #{command}").color(:red) unless success
       success