lono 7.4.8 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d747ecd65bb8239ac79bebab231572190de2a39d46d4db692cb449e64abc6f77
-  data.tar.gz: 609e5aa49b41c5b981b5e62075d41195683a75976cf3db99df6f3e664d00e3d0
+  metadata.gz: a9747560fd12e2616a4e4087d00767cdf35ab3af81e5749a405f656277236435
+  data.tar.gz: 58ff9d94ad6c554e74f6c1f10cee69ad47084ab0d3353e7ad4f8fd7f0a79ea73
 SHA512:
-  metadata.gz: bb81fa313393a78647e218e5d61d53ea0b36c1c6aee29c39fed24036bdefeba2265f5449ca7d894fae173868437d1c64d24626fbe51282de69208cf57f427ba6
-  data.tar.gz: 29bf3543f1b61a416c2bbe148c5c60227a8cf5cea3e15455b30fcdc4fe8c2f18dc4b3b88a9ee9b0b4f929ee6b6e251518319470fa0af57ec92843c73cc6de728
+  metadata.gz: 0eb34584e3bd9836e31e45e2328c41d77b3a06ad09cf5454001bb6f22610c97772d5588839297b6115a492d09bb2394cc0fe904e3bc24ff4b4cdcf4467cd9003
+  data.tar.gz: ee471c17de149878638b407316154a773941ee7642a96118cf03c7c9daf3d56e18fdf9a0cf8af3207be7da05864d803813076917ff0c0654d31701391b144ff0

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 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.
 
+## [7.5.1] - 2021-05-03
+- remove registration check
+- fix brew install graphviz message
+
+## [7.5.0]
+- #71 `set_instances deploy` command in favor of `set_instances sync`
+
+## [7.4.11]
+- fix lookup_output
+
+## [7.4.10]
+- #70 fix out-of-sync Gemfile.lock
+
+## [7.4.9]
+- #69 `stack_output` and `stack_resource` helpers
+
 ## [7.4.8]
 - #68 squeezer: auto clean empty array values
 - add version numbers to extension gemspec template to remove deprecations
@@ -94,7 +110,7 @@ This project *tries* to adhere to [Semantic Versioning](http://semver.org/), eve
 - #36 lono v7
 - Breaking: project `blueprints` moved to `app/blueprints`. Use `lono upgrade` to update.
 - Introduce configsets concept.
-- Introduce lono sets concept: `lono sets`, `lono sets deploy`, `lono sets instances sync`
+- Introduce lono sets concept: `lono sets`, `lono sets deploy`, `lono set_instances sync`
 - Merge lono-pro into lono. Deprecate lono-pro gem.
 - Add lono registration.
 - Major refactoring:

data/README.md

@@ -10,6 +10,8 @@
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
+Please **watch/star** this repo to help grow and support the project.
+
 Lono is a CloudFormation framework. It builds, manages, and deploys CloudFormation templates.
 
 ## Lono Features

data/lib/lono/app_file/build/lambda_layer/ruby_packager.rb

@@ -90,10 +90,8 @@ class Lono::AppFile::Build::LambdaLayer
       end
 
       remove_bundled_with("#{cache_area}/Gemfile.lock")
-
-      # Copy the Gemfile.lock back to the project in case it was updated.
-      # For example we add the jets-rails to the Gemfile.
-      copy_back_gemfile_lock
+      # Fixes really tricky bug where Gemfile and Gemfile.lock is out-of-sync. Details: https://gist.github.com/tongueroo/b5b0d0c924a4a1633eee514795e4b04b
+      FileUtils.cp("#{cache_area}/Gemfile.lock", "#{Lono.config.output_path}/#{@blueprint}/files/#{@registry_name}/Gemfile.lock")
 
       puts 'Bundle install success.'
     end
@@ -120,12 +118,6 @@ class Lono::AppFile::Build::LambdaLayer
       IO.write(gemfile_lock, content)
     end
 
-    def copy_back_gemfile_lock
-      src = "#{cache_area}/Gemfile.lock"
-      dest = "#{@app_root}/Gemfile.lock"
-      FileUtils.cp(src, dest)
-    end
-
     def setup_bundle_config(dir)
       text =<<-EOL
 ---

data/lib/lono/cfn/base.rb

@@ -39,7 +39,6 @@ class Lono::Cfn
 
       # exit code for cfn.rb cli, so there's less duplication
       exit 1 unless success
-      Lono::Registration.check
       success
     end
 

data/lib/lono/cli.rb

@@ -13,7 +13,6 @@ module Lono
     long_desc Help.text(:blueprints)
     def blueprints
       Finder::Blueprint.list
-      Lono::Registration.check
     end
 
     desc "configsets [BLUEPRINT]", "Lists configsets"
@@ -162,6 +161,10 @@ module Lono
     long_desc Help.text(:sets)
     subcommand "sets", Sets
 
+    desc "set_instances SUBCOMMAND", "set_instances subcommands"
+    long_desc Help.text(:set_instances)
+    subcommand "set_instances", SetInstances
+
     desc "template SUBCOMMAND", "template subcommands"
     long_desc Help.text(:template)
     subcommand "template", Template

data/lib/lono/help/{sets/instances → set_instances}/delete.md

@@ -1,6 +1,6 @@
 ## Example
 
-    $ lono sets instances delete my-set --accounts 112233445566 --regions us-west-1 us-west-2
+    $ lono set_instances delete my-set --accounts 112233445566 --regions us-west-1 us-west-2
     Are you sure you want to delete the my-set instances?
     These stack instances will be deleted:
 

data/lib/lono/help/set_instances/deploy.md

@@ -0,0 +1,31 @@
+The deploy command delegates to the `lono set_instances create` or `lono set_instances update` commands. This spares you from having to manually figuring out which stack instances need to be created and updated.
+
+## Example
+
+    $ lono set_instances deploy enable-aws-config --accounts 111111111111 222222222222 --regions us-west-2 us-east-2Running lono set_instances create on account: 111111111111 regions: us-west-2,us-east-2
+    Deploying enable-aws-config stack set
+    Stack Set Operation Status: RUNNING
+    Stack Instance statuses... (takes a while)
+    You can also check with StackSets console at the Operations Tab.
+    Here is also the cli command to check:
+
+        aws cloudformation describe-stack-set-operation --stack-set-name enable-aws-config --operation-id 44a50065-1b10-49f0-b6b9-853092a0cb09
+
+    2020-04-25 10:58:32PM Stack Instance: account 222222222222 region us-east-2 status CURRENT
+    2020-04-25 10:58:32PM Stack Instance: account 111111111111 region us-west-2 status OUTDATED reason User initiated operation
+    2020-04-25 10:58:32PM Stack Instance: account 222222222222 region us-west-2 status CURRENT
+    2020-04-25 10:58:32PM Stack Instance: account 111111111111 region us-east-2 status OUTDATED reason User initiated operation
+    Stack Set Operation Status: SUCCEEDED
+    Time took to complete stack set operation: 1m 23s
+    Stack Set Operation Summary:
+    account 111111111111 region us-west-2 status SUCCEEDED
+    account 111111111111 region us-east-2 status SUCCEEDED
+    Running lono set_instances update on account: 222222222222 regions: us-west-2,us-east-2
+    Deploying enable-aws-config stack set
+    Stack Set Operation Status: RUNNING
+    Stack Set Operation Status: SUCCEEDED
+    Time took to complete stack set operation: 23s
+    Stack Set Operation Summary:
+    account 222222222222 region us-west-2 status SUCCEEDED
+    account 222222222222 region us-east-2 status SUCCEEDED
+    $

data/lib/lono/help/{sets/instances → set_instances}/list.md

@@ -1,6 +1,6 @@
 ## Example
 
-    $ lono sets instances list my-set
+    $ lono set_instances list my-set
     Stack Instance: account 112233445566 region ap-northeast-1 status CURRENT
     Stack Instance: account 223344556677 region us-west-1 status CURRENT
     Stack Instance: account 223344556677 region ap-northeast-1 status CURRENT

data/lib/lono/help/{sets/instances → set_instances}/status.md

@@ -1,6 +1,6 @@
 ## Example
 
-    $ lono sets instances status my-set
+    $ lono set_instances status my-set
     Stack Instance statuses... (takes a while)
     Stack Instance: account 112233445566 region ap-northeast-1 status CURRENT
     Stack Instance: account 112233445566 region us-west-1 status CURRENT

data/lib/lono/help/{sets/instances → set_instances}/sync.md

@@ -1,3 +1,5 @@
+IMPORTANT: The `lono set_instances sync` command is deprecated in favor of `lono set_instances deploy`. With stack sets, found more success with explicitness.
+
 Lono uses the `config/accounts` and `config/regions` to calculate whether `create-stack-set` or `delete-stack-set` need to be called and calls them accordingly.  You use this instead of `lono sets deploy` when only configs have been adjust and you want to keep the existing template.
 
 Provided:
@@ -23,9 +25,9 @@ configs/demo/regions/development/my-set.txt
     ap-northeast-1
     ap-northeast-2
 
-Running `lono sets instances sync` will delete and add the stack instances accordingly.
+Running `lono set_instances sync` will delete and add the stack instances accordingly.
 
-    $ lono sets instances sync my-set --blueprint demo
+    $ lono set_instances sync my-set --blueprint demo
     Using regions for development: configs/demo/regions/development/my-set.sh
     Using accounts for development: configs/demo/accounts/development/my-set.sh
     Are you sure you want to sync stack instances?

data/lib/lono/inspector/graph.rb

@@ -102,7 +102,7 @@ module Lono::Inspector
         puts "It appears that the Graphviz is not installed.  Please install it to generate the graph."
         if RUBY_PLATFORM =~ /darwin/
           puts "You can install Graphviz with homebrew:"
-          puts "  brew install brew install graphviz"
+          puts "    brew install graphviz"
         end
         exit 1
       end

data/lib/lono/registration/temp.rb

@@ -21,13 +21,6 @@ class Lono::Registration
     def prompt
       return if ENV['LONO_TEST']
 
-      # We get the api first before the prompt to check if api is up
-      resp = get_temp_key
-      # resp nil means non-200 http response. Failsafe behavior is to continue.
-      if resp.nil?
-        return true
-      end
-
       puts <<~EOL
 
         Looks like lono is not registered. Lono registration is optional and free.
@@ -35,12 +28,17 @@ class Lono::Registration
 
             https://register.lono.cloud
 
-        Registration removes this message. Registered users can also optionally receive
-        updates and special offers, including discounts to BoltOps Pro:
+        This prompt appears every 24 hours when lono is not registered. Registration removes
+        this message. Registered users can also optionally receive updates and special offers,
+        including discounts to BoltOps Pro:
 
             https://lono.cloud/docs/boltops-pro/
 
       EOL
+
+      # resp nil means non-200 http response
+      resp = get_temp_key
+      save_temp_key(resp) unless resp.nil? # save temp key so prompt only happens periodically
     end
 
     def save_temp_key(info)

data/lib/lono/set_instances.rb

@@ -0,0 +1,54 @@
+module Lono
+  class SetInstances < Lono::Command
+    opts = Opts.new(self)
+
+    desc "create STACK_SET", "Create CloudFormation stack set instances."
+    long_desc Lono::Help.text("set_instances/create")
+    opts.create
+    def create(stack)
+      Create.new(options.merge(stack: stack)).run
+    end
+
+    desc "update STACK_SET", "Update CloudFormation stack set instances."
+    long_desc Lono::Help.text("set_instances/update")
+    opts.update
+    def update(stack)
+      Update.new(options.merge(stack: stack)).run
+    end
+
+    desc "deploy STACK_SET", "Deploy CloudFormation stack set instances"
+    long_desc Lono::Help.text("set_instances/deploy")
+    opts.deploy
+    def deploy(stack)
+      Deploy.new(options.merge(stack: stack)).run
+    end
+
+    desc "delete STACK_SET", "Delete CloudFormation stack set instances."
+    long_desc Lono::Help.text("set_instances/delete")
+    opts.delete
+    def delete(stack)
+      Delete.new(options.merge(stack: stack)).run
+    end
+
+    desc "sync STACK_SET", "Sync CloudFormation stack set instances."
+    long_desc Lono::Help.text("set_instances/sync")
+    opts.sync
+    def sync(stack)
+      Sync.new(options.merge(stack: stack)).run
+    end
+
+    desc "list STACK_SET", "List CloudFormation stack set instances."
+    long_desc Lono::Help.text("set_instances/list")
+    def list(stack)
+      List.new(options.merge(stack: stack)).run
+    end
+
+    desc "status STACK_SET", "Show current status of stack instances."
+    long_desc Lono::Help.text("set_instances/status")
+    def status(stack)
+      instances_status = Status.new(options.merge(stack: stack))
+      success = instances_status.run
+      exit 3 unless success
+    end
+  end
+end

data/lib/lono/{sets/instances → set_instances}/base.rb

@@ -1,4 +1,4 @@
-class Lono::Sets::Instances
+class Lono::SetInstances
   class Base < Lono::Sets::Base
     # Simple structure to help with subtracting logic
     # [["112233445566", "us-west-1"], ["112233445566", "us-west-1"]]

data/lib/lono/set_instances/changeable.rb

@@ -0,0 +1,53 @@
+class Lono::SetInstances
+  class Changeable < Base
+    include Lono::AwsServices
+    include Lono::Utils::Sure
+
+    def initialize(options={})
+      super # need conventions so config lookup will work
+      @regions, @accounts = [], []
+    end
+
+    def run
+      validate!
+
+      unless stack_set_exists?(@stack)
+        puts "ERROR: Cannot update a stack set because #{@stack} does not exists.".color(:red)
+        return
+      end
+      exit_unless_updatable!
+
+      options = {
+        stack_set_name: @stack,
+        accounts: accounts,
+        regions: regions,
+      }
+      begin
+        resp = perform(options)
+      rescue Aws::CloudFormation::Errors::ValidationError => e
+        # IE: Aws::CloudFormation::Errors::ValidationError: Region eu-north-1 is not supported
+        puts "#{e.class}: #{e.message}".color(:red)
+        exit 1
+      end
+
+      return true if @options[:noop]
+      Lono::Sets::Waiter.new(@options).run(resp[:operation_id])
+    end
+
+    def validate!
+      invalid = (regions.blank? || accounts.blank?) && !@options[:all]
+      if invalid
+        puts "ERROR: You must provide --accounts and --regions or --all.".color(:red)
+        exit 1
+      end
+    end
+
+    def accounts
+      @options[:all] ? stack_instances.map(&:account).uniq : @options[:accounts]
+    end
+
+    def regions
+      @options[:all] ? stack_instances.map(&:region).uniq : @options[:regions]
+    end
+  end
+end

data/lib/lono/set_instances/create.rb

@@ -0,0 +1,7 @@
+class Lono::SetInstances
+  class Create < Changeable
+    def perform(options)
+      cfn.create_stack_instances(options)
+    end
+  end
+end

data/lib/lono/{sets/instances → set_instances}/delete.rb

@@ -1,28 +1,24 @@
-class Lono::Sets::Instances
-  class Delete < Base
-    include Lono::AwsServices
-    include Lono::Utils::Sure
-
+class Lono::SetInstances
+  class Delete < Changeable
     def initialize(options={})
-      @options = options
+      super
       @stack = options[:stack]
     end
 
     def run
       validate!
 
-      sure?("Are you sure you want to delete the #{@stack} instances?", long_desc)
+      sure?("Are you sure you want to delete the #{@stack} stack instances?", long_desc)
 
       # delete_stack_instances resp has operation_id
       # Could also use that to poll for status with the list_stack_set_operation_results
       # api. Currently, Instance::Status class not using this info. If we need will add the logic.
+      retain_stacks = @options[:retain_stacks] ? @options[:retain_stacks] : false
       resp = cfn.delete_stack_instances(
-        options = {
-          stack_set_name: @stack,
-          accounts: accounts,
-          regions: regions,
-          retain_stacks: false,
-        }
+        stack_set_name: @stack,
+        accounts: accounts,
+        regions: regions,
+        retain_stacks: retain_stacks,
       )
       operation_id = resp.operation_id
 
@@ -32,8 +28,6 @@ class Lono::Sets::Instances
         start_on_outdated: false,
         operation_id: operation_id,
       )
-      Lono::Sets::Status::Instance::Base.show_time_progress = true
-      Lono::Sets::Status::Instance::Base.delay_factor = accounts.size * regions.size
       instances_status = Status.new(o)
       instances_status.run(to: "deleted") unless @options[:noop] # returns success: true or false
     end
@@ -49,21 +43,5 @@ class Lono::Sets::Instances
       Number of stack instances to be deleted: #{total}
       EOL
     end
-
-    def validate!
-      invalid = (regions.blank? || accounts.blank?) && !@options[:all]
-      if invalid
-        puts "ERROR: You must provide --accounts and --regions or --all.".color(:red)
-        exit 1
-      end
-    end
-
-    def accounts
-      @options[:all] ? stack_instances.map(&:account).uniq : @options[:accounts]
-    end
-
-    def regions
-      @options[:all] ? stack_instances.map(&:region).uniq : @options[:regions]
-    end
   end
 end

data/lib/lono/set_instances/deploy.rb

@@ -0,0 +1,52 @@
+class Lono::SetInstances
+  class Deploy < Changeable
+    def run
+      # computes whether create or update should be ran for stack instances within each account
+      updates, creates = Hash.new([]), Hash.new([])
+      accounts.each do |account|
+        regions.each do |region|
+          if stack_instance_exists?(account, region)
+            updates[account] += [region] # += [item] works, << item doesnt seem to work
+          else
+            creates[account] += [region] # += [item] works, << item doesnt seem to work
+          end
+        end
+      end
+
+      deploy(:create, creates)
+      deploy(:update, updates)
+    end
+
+    def deploy(type, changes)
+      changes.each do |account, regions|
+        run_action(type, account, regions)
+      end
+    end
+
+    def run_action(type, account, regions)
+      klass = "Lono::SetInstances::#{type.to_s.camelize}"
+      klass = klass.constantize
+      command = lono_command(klass)
+      puts "Running #{command.color(:green)} on account: #{account} regions: #{regions.join(',')}"
+
+      options = @options.dup
+      options[:accounts] = [account]
+      options[:regions] = regions
+      klass.new(options).run
+    end
+
+    def lono_command(klass)
+      klass = klass.to_s
+      klass.split('::').map(&:underscore).join(' ')
+    end
+
+    def stack_instance_exists?(account, region)
+      existing = stack_instances.map do |summary|
+        [summary.account, summary.region]
+      end
+      intersect = existing & [[account, region]]
+      !intersect.empty?
+    end
+
+  end
+end

data/lib/lono/{sets/instances → set_instances}/list.rb

@@ -1,4 +1,4 @@
-class Lono::Sets::Instances
+class Lono::SetInstances
   class List
     include Lono::AwsServices
 

data/lib/lono/{sets/instances → set_instances}/opts.rb

@@ -1,5 +1,13 @@
-class Lono::Sets::Instances
+class Lono::SetInstances
   class Opts < Lono::Sets::Opts
+    def update
+      delete
+    end
+
+    def create
+      delete
+    end
+
     def delete
       operation_preferences_options
       accounts_options

data/lib/lono/{sets/instances → set_instances}/status.rb

@@ -1,4 +1,4 @@
-class Lono::Sets::Instances
+class Lono::SetInstances
   class Status
     def initialize(options={})
       @options = options

data/lib/lono/{sets/instances → set_instances}/sync.rb

@@ -1,4 +1,4 @@
-class Lono::Sets::Instances
+class Lono::SetInstances
   class Sync < Base
     include Lono::Sets::Summarize
     include Lono::Utils::Sure
@@ -9,6 +9,9 @@ class Lono::Sets::Instances
     end
 
     def run
+      puts "DEPRECATED: The sync command is deprecated, in favor of the deploy command.".color(:yellow)
+      puts "Found more success with an explicit approach. sync may be removed in future versions of lono."
+
       unless stack_set_exists?(@stack)
         puts "ERROR: Cannot update a stack set because #{@stack} does not exists.".color(:red)
         return
@@ -114,8 +117,6 @@ class Lono::Sets::Instances
         operation_id: operation_id,
         start_on_outdated: meth != :delete_stack_instances,
       )
-      Lono::Sets::Status::Instance::Base.show_time_progress = true
-      Lono::Sets::Status::Instance::Base.delay_factor = accounts.size * regions.size
       instances_status = Status.new(o)
       final_status = meth == :delete_stack_instances ? "deleted" : "completed"
       instances_status.run(to: final_status) unless @options[:noop] # returns success: true or false

data/lib/lono/set_instances/update.rb

@@ -0,0 +1,15 @@
+class Lono::SetInstances
+  class Update < Changeable
+    def perform(options)
+      cfn.update_stack_instances(options)
+    rescue Aws::CloudFormation::Errors::StackInstanceNotFoundException => e
+      puts "#{e.class}: #{e.message}".color(:red)
+      puts <<~EOL
+        One of the provided stack instance was not found. Unable to update the stack instances unless all stack instances
+        already exist. It may be helpful to check the StackSet console Instances Tab. You can also use the
+        `lono set_instances deploy` command instead.
+      EOL
+      exit 1
+    end
+  end
+end

data/lib/lono/sets.rb

@@ -30,9 +30,5 @@ module Lono
     def list
       List.new(options).run
     end
-
-    desc "instances SUBCOMMAND", "instances subcommands"
-    long_desc Help.text("sets/instances")
-    subcommand "instances", Instances
   end
 end

data/lib/lono/sets/create.rb

@@ -19,9 +19,6 @@ class Lono::Sets
 
       options = build_options
       show_options(options, "cfn.create_stack_set")
-
-      sure?("Are you sure you want to create the #{@stack} stack set?")
-
       cfn.create_stack_set(options) # resp.stack_set_id => String. There is no resp.operation_id
       puts message unless @options[:mute]
       true # There is no resp.operation_id

data/lib/lono/sets/delete.rb

@@ -6,7 +6,7 @@ class Lono::Sets
 
     def initialize(options={})
       @options = options
-      @stack = options.delete(:stack)
+      @stack = options[:stack]
     end
 
     def run
@@ -16,35 +16,26 @@ class Lono::Sets
       else
         desc =<<~EOL
           Be sure that the emptied StackSet instances is emptied first.
-          You can empty it with a separate command: lono sets instances delete #{@stack} --all
-          This command will only delete the StackSet itself after it's been emptied.
+          You can empty it with a separate command: lono set_instances delete #{@stack} --all
+          This command will only delete the StackSet itself after its been emptied.
         EOL
         sure?("Are you sure you want to delete the #{@stack} stack set?", desc)
 
         if stack_set_exists?(@stack)
-          cfn.delete_stack_set(stack_set_name: @stack) # resp is an Empty structure, so much get operation_id from status
+          cfn.delete_stack_set(stack_set_name: @stack) # resp is an Empty structure, so must get operation_id from status
           puts message
         else
           puts "#{@stack.inspect} stack set does not exist".color(:red)
           return
         end
       end
-
-      return true if @options[:noop] || !@options[:wait]
-
-      status = Status.new(@options)
-      success = status.wait
-      operation_id = status.operation_id # getting operation_id from status because cfn.delete_stack_set resp is an Empty structure
-      summarize(operation_id)
-      exit 1 unless success
-
     rescue Aws::CloudFormation::Errors::StackSetNotEmptyException => e
       puts "ERROR: #{e.class}: #{e.message}".color(:red)
       puts <<~EOL
         The stack set must be empty before deleting. Cannot delete stack set until all stack instances are first
         deleted. If you want to delete all stack instances you can use:
 
-            lono sets instances delete #{@stack} --all
+            lono set_instances delete #{@stack} --all
 
       EOL
     end

data/lib/lono/sets/status.rb

@@ -14,6 +14,9 @@ class Lono::Sets
     end
 
     def wait
+      Lono::Sets::Status::Instance::Base.show_time_progress = true
+      Lono::Sets::Status::Instance::Base.delay_factor = stack_instances.size
+
       status = nil
       until completed?(status)
         resp = display_one
@@ -42,9 +45,14 @@ class Lono::Sets
     end
 
     def show
+      if summaries.empty?
+        puts "No stack operations have been done with this stack set. So there is no status to report."
+        return
+      end
+
       display_one
       o = @options.merge(show_time_spent: false)
-      instances_status = Lono::Sets::Instances::Status.new(o)
+      instances_status = Lono::SetInstances::Status.new(o)
       instances_status.run
       summarize(operation_id)
     end
@@ -60,7 +68,7 @@ class Lono::Sets
       Thread.new do
         # show_time_spent because we already show it in this status class. Dont want it to show twice.
         o = @options.merge(start_on_outdated: true, show_time_spent: false)
-        instances_status = Lono::Sets::Instances::Status.new(o)
+        instances_status = Lono::SetInstances::Status.new(o)
         instances_status.run
       end
       @@instances_status_waiter_started = true
@@ -101,11 +109,15 @@ class Lono::Sets
     end
 
     def latest_operation_id
+      summaries.first.operation_id
+    end
+
+    def summaries
       resp = cfn.list_stack_set_operations(
         stack_set_name: @stack,
         max_results: 1,
       )
-      resp.summaries.first.operation_id
+      resp.summaries
     end
 
     def stack_instances

data/lib/lono/sets/status/instances.rb

@@ -11,7 +11,7 @@ class Lono::Sets::Status
 
     def wait(to="completed")
       puts "Stack Instance statuses... (takes a while)"
-      puts "You can check on the StackSetsole Operations Tab for the operation status."
+      puts "You can also check with StackSets console at the Operations Tab."
       wait_until_outdated if @options[:start_on_outdated]
 
       threads = start_wait_for_instances_threads
@@ -23,8 +23,11 @@ class Lono::Sets::Status
       if stack_instances.empty?
         # Note: no access to @blueprint here
         puts <<~EOL
-          There are 0 stack instances associated with the #{@stack} stack set.  Add files
-          Add accounts and regions configs use `lono sets instances sync` to add stack instances.
+          There are 0 stack instances associated with the #{@stack} stack set.
+          Use `lono set_instances deploy` to add stack instances. Example:
+
+              lono set_instances deploy #{@stack} --accounts 111 --regions us-west-2 us-east-2
+
         EOL
         return
       end
@@ -64,7 +67,7 @@ class Lono::Sets::Status
           sleep 5
         end
       end
-      if @show_time_spent # or else it double shows from `lono sets deploy`. Do want it to show for `lono sets instances sync` though
+      if @show_time_spent # or else it double shows from `lono sets deploy`. Do want it to show for `lono set_instances sync` though
         show_time_spent(stack_set_operation)
         puts "Stack set operation completed."
       end
@@ -108,7 +111,7 @@ class Lono::Sets::Status
       resp = cfn.list_stack_instances(stack_set_name: @stack)
       summaries = resp.summaries
       # filter is really only used internally. So it's fine to keep it as complex data structure since that's what we
-      # build it up as in Lono::Sets::Instances::Deploy
+      # build it up as in Lono::SetInstances::Deploy
       filter = @options[:filter] # [["112233445566", "us-west-1"],["112233445566", "us-west-2"]]
       return summaries unless filter
 

data/lib/lono/sets/summarize.rb

@@ -1,5 +1,7 @@
 class Lono::Sets
   module Summarize
+    include Lono::AwsServices
+
     def summarize(operation_id)
       puts "Stack Set Operation Summary:"
       resp = cfn.list_stack_set_operation_results(stack_set_name: @stack, operation_id: operation_id)

data/lib/lono/sets/update.rb

@@ -26,26 +26,19 @@ class Lono::Sets
         puts <<~EOL
           NOTE: There are 0 stack instances associated with the #{@stack} stack set.
           Will update the stack set template but there no instances to be updated.
-          Add `configs/#{@blueprint}/accounts` and `configs/#{@blueprint}/regions` settings
-          and use `lono sets instances sync` to add stack instances.
+
+          Use `lono set_instances deploy` to add stack instances. Example:
+
+              lono set_instances deploy #{@stack} --accounts 111 --regions us-west-2 us-east-2
+
         EOL
       else
         sure?("Are you sure you want to update the #{@stack} stack set?", long_desc)
       end
 
       resp = cfn.update_stack_set(options)
-      operation_id = resp[:operation_id]
-      puts message unless @options[:mute]
-
-      return true if @options[:noop] || !@options[:wait]
 
-      Lono::Sets::Status::Instance::Base.show_time_progress = true
-      Lono::Sets::Status::Instance::Base.delay_factor = stack_instances.size
-      status = Status.new(@options.merge(operation_id: operation_id))
-      success = status.wait
-      summarize(operation_id)
-      exit 1 unless success
-      success
+      Lono::Sets::Waiter.new(@options).run(resp[:operation_id])
     end
 
     def stack_instances

data/lib/lono/sets/waiter.rb

@@ -0,0 +1,23 @@
+class Lono::Sets
+  class Waiter
+    include Lono::Sets::Summarize
+
+    def initialize(options)
+      @options = options
+      @stack = options[:stack]
+      @wait = @options[:wait].nil? ? true : @options[:wait]
+    end
+
+    def run(operation_id)
+      message = "Deploying #{@stack} stack set"
+      puts message unless @options[:mute]
+      return unless @wait
+
+      status = Status.new(@options.merge(operation_id: operation_id))
+      success = status.wait
+      summarize(operation_id)
+      exit 1 unless success
+      success
+    end
+  end
+end

data/lib/lono/template/strategy/dsl/builder/helpers.rb

@@ -2,12 +2,14 @@
 class Lono::Template::Strategy::Dsl::Builder
   module Helpers
     extend Memoist
-    include CoreHelper
-    include Ec2Helper
-    include FileHelper
-    include LookupHelper
-    include S3Helper
-    include TagsHelper
+
+    # Auto include all modules in helpers folder
+    helpers_dir = File.expand_path("helpers", __dir__)
+    Dir.glob("#{helpers_dir}/**/*").each do |path|
+      next unless File.file?(path)
+      klass = path.gsub(%r{.*/lib/},'').sub(".rb",'').camelize
+      include klass.constantize
+    end
 
     include Lono::Template::Strategy::Common::Helpers
   end

data/lib/lono/template/strategy/dsl/builder/helpers/stack_helper.rb

@@ -0,0 +1,51 @@
+module Lono::Template::Strategy::Dsl::Builder::Helpers
+  module StackHelper
+    extend Memoist
+    include Lono::AwsServices
+
+    def stack_output(name)
+      stack_name, key = name.split(".")
+      resp = describe_stacks(stack_name: stack_name)
+      stack = resp.stacks.first
+      if stack
+        o = stack.outputs.detect { |h| h.output_key == key }
+      end
+
+      if o
+        o.output_value
+      else
+        "NOT FOUND: output #{key} for stack #{stack_name}"
+      end
+    end
+
+    def stack_resource(name)
+      stack_name, logical_id = name.split(".")
+      resp = describe_stack_resources(stack_name: stack_name)
+      resources = resp.stack_resources
+      resource = resources.find { |r| r.logical_resource_id == logical_id }
+      if resource
+        resource.physical_resource_id
+      else
+        "NOT FOUND: logical_id #{logical_id} for stack #{stack_name}"
+      end
+    end
+
+    def lookup_output(name)
+      result = stack_output(name)
+      return unless ENV['LONO_DEPRECATION_SOFT']
+      puts "DEPRECATION WARNING: lookup_output is deprecated. Please use stack_output instead".color(:yellow)
+      result
+    end
+
+  private
+    def describe_stacks(options={})
+      cfn.describe_stacks(options)
+    end
+    memoize :describe_stacks
+
+    def describe_stack_resources(options={})
+      cfn.describe_stack_resources(options)
+    end
+    memoize :describe_stack_resources
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.4.8"
+  VERSION = "7.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.4.8
+  version: 7.5.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -577,12 +577,13 @@ files:
 - lib/lono/help/script/build.md
 - lib/lono/help/script/upload.md
 - lib/lono/help/seed.md
+- lib/lono/help/set_instances/delete.md
+- lib/lono/help/set_instances/deploy.md
+- lib/lono/help/set_instances/list.md
+- lib/lono/help/set_instances/status.md
+- lib/lono/help/set_instances/sync.md
 - lib/lono/help/sets/delete.md
 - lib/lono/help/sets/deploy.md
-- lib/lono/help/sets/instances/delete.md
-- lib/lono/help/sets/instances/list.md
-- lib/lono/help/sets/instances/status.md
-- lib/lono/help/sets/instances/sync.md
 - lib/lono/help/sets/status.md
 - lib/lono/help/summary.md
 - lib/lono/help/template.md
@@ -639,18 +640,22 @@ files:
 - lib/lono/seed/base.rb
 - lib/lono/seed/service_role.rb
 - lib/lono/sequence.rb
+- lib/lono/set_instances.rb
+- lib/lono/set_instances/base.rb
+- lib/lono/set_instances/changeable.rb
+- lib/lono/set_instances/create.rb
+- lib/lono/set_instances/delete.rb
+- lib/lono/set_instances/deploy.rb
+- lib/lono/set_instances/list.rb
+- lib/lono/set_instances/opts.rb
+- lib/lono/set_instances/status.rb
+- lib/lono/set_instances/sync.rb
+- lib/lono/set_instances/update.rb
 - lib/lono/sets.rb
 - lib/lono/sets/base.rb
 - lib/lono/sets/create.rb
 - lib/lono/sets/delete.rb
 - lib/lono/sets/deploy.rb
-- lib/lono/sets/instances.rb
-- lib/lono/sets/instances/base.rb
-- lib/lono/sets/instances/delete.rb
-- lib/lono/sets/instances/list.rb
-- lib/lono/sets/instances/opts.rb
-- lib/lono/sets/instances/status.rb
-- lib/lono/sets/instances/sync.rb
 - lib/lono/sets/list.rb
 - lib/lono/sets/opts.rb
 - lib/lono/sets/preview/codediff.rb
@@ -665,6 +670,7 @@ files:
 - lib/lono/sets/summarize.rb
 - lib/lono/sets/time_spent.rb
 - lib/lono/sets/update.rb
+- lib/lono/sets/waiter.rb
 - lib/lono/setting.rb
 - lib/lono/template.rb
 - lib/lono/template/aws_service.rb
@@ -688,8 +694,8 @@ files:
 - lib/lono/template/strategy/dsl/builder/helpers/core_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/ec2_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/file_helper.rb
-- lib/lono/template/strategy/dsl/builder/helpers/lookup_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/s3_helper.rb
+- lib/lono/template/strategy/dsl/builder/helpers/stack_helper.rb
 - lib/lono/template/strategy/dsl/builder/helpers/tags_helper.rb
 - lib/lono/template/strategy/dsl/builder/section/base.rb
 - lib/lono/template/strategy/dsl/builder/section/condition.rb
@@ -804,7 +810,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: The CloudFormation Framework

data/lib/lono/sets/instances.rb

@@ -1,33 +0,0 @@
-class Lono::Sets
-  class Instances < Lono::Command
-    opts = Opts.new(self)
-
-    desc "delete STACK_SET", "Delete CloudFormation stack set instances."
-    long_desc Lono::Help.text("sets/instances/delete")
-    opts.delete
-    def delete(stack)
-      Delete.new(options.merge(stack: stack)).run
-    end
-
-    desc "sync STACK_SET", "Sync CloudFormation stack set instances."
-    long_desc Lono::Help.text("sets/instances/sync")
-    opts.sync
-    def sync(stack)
-      Sync.new(options.merge(stack: stack)).run
-    end
-
-    desc "list STACK_SET", "List CloudFormation stack set instances."
-    long_desc Lono::Help.text("sets/instances/list")
-    def list(stack)
-      List.new(options.merge(stack: stack)).run
-    end
-
-    desc "status STACK_SET", "Show current status of stack instances."
-    long_desc Lono::Help.text("sets/instances/status")
-    def status(stack)
-      instances_status = Status.new(options.merge(stack: stack))
-      success = instances_status.run
-      exit 3 unless success
-    end
-  end
-end

data/lib/lono/template/strategy/dsl/builder/helpers/lookup_helper.rb

@@ -1,27 +0,0 @@
-module Lono::Template::Strategy::Dsl::Builder::Helpers
-  module LookupHelper
-    extend Memoist
-    include Lono::AwsServices
-
-    def lookup_output(name)
-      stack_name, key = name.split(".")
-      resp = describe_stacks(stack_name: stack_name)
-      stack = resp.stacks.first
-      if stack
-        o = stack.outputs.detect { |h| h.output_key == key }
-      end
-
-      if o
-        o.output_value
-      else
-        "NOT FOUND: Did not lookup_output #{name} for stack #{stack}"
-      end
-    end
-
-  private
-    def describe_stacks(options={})
-      cfn.describe_stacks(options)
-    end
-    memoize :describe_stacks
-  end
-end