sfn 3.0.30 → 3.0.32

data/lib/sfn/command.rb

@@ -1,53 +1,54 @@
-require 'sfn'
-require 'bogo-cli'
+require "sfn"
+require "bogo-cli"
 
 module Sfn
   class Command < Bogo::Cli::Command
     include CommandModule::Callbacks
 
-    autoload :Conf, 'sfn/command/conf'
-    autoload :Create, 'sfn/command/create'
-    autoload :Describe, 'sfn/command/describe'
-    autoload :Destroy, 'sfn/command/destroy'
-    autoload :Diff, 'sfn/command/diff'
-    autoload :Events, 'sfn/command/events'
-    autoload :Export, 'sfn/command/export'
-    autoload :Graph, 'sfn/command/graph'
-    autoload :Import, 'sfn/command/import'
-    autoload :Init, 'sfn/command/init'
-    autoload :Inspect, 'sfn/command/inspect'
-    autoload :Lint, 'sfn/command/lint'
-    autoload :List, 'sfn/command/list'
-    autoload :Print, 'sfn/command/print'
-    autoload :Promote, 'sfn/command/promote'
-    autoload :Update, 'sfn/command/update'
-    autoload :Validate, 'sfn/command/validate'
+    autoload :Conf, "sfn/command/conf"
+    autoload :Create, "sfn/command/create"
+    autoload :Describe, "sfn/command/describe"
+    autoload :Destroy, "sfn/command/destroy"
+    autoload :Diff, "sfn/command/diff"
+    autoload :Events, "sfn/command/events"
+    autoload :Export, "sfn/command/export"
+    autoload :Graph, "sfn/command/graph"
+    autoload :Import, "sfn/command/import"
+    autoload :Init, "sfn/command/init"
+    autoload :Inspect, "sfn/command/inspect"
+    autoload :Lint, "sfn/command/lint"
+    autoload :List, "sfn/command/list"
+    autoload :Plan, "sfn/command/plan"
+    autoload :Print, "sfn/command/print"
+    autoload :Promote, "sfn/command/promote"
+    autoload :Update, "sfn/command/update"
+    autoload :Validate, "sfn/command/validate"
 
     # Base name of configuration file
-    CONFIG_BASE_NAME = '.sfn'
+    CONFIG_BASE_NAME = ".sfn"
 
     # Supported configuration file extensions
     VALID_CONFIG_EXTENSIONS = [
-      '',
-      '.rb',
-      '.json',
-      '.yaml',
-      '.yml',
-      '.xml',
+      "",
+      ".rb",
+      ".json",
+      ".yaml",
+      ".yml",
+      ".xml",
     ]
 
     # Override to provide config file searching
     def initialize(cli_opts, args)
-      unless cli_opts['config']
+      unless cli_opts["config"]
         discover_config(cli_opts)
       end
-      unless ENV['DEBUG']
-        ENV['DEBUG'] = 'true' if cli_opts[:debug]
+      unless ENV["DEBUG"]
+        ENV["DEBUG"] = "true" if cli_opts[:debug]
       end
       super(cli_opts, args)
       load_api_provider_extensions!
       run_callbacks_for(:after_config)
-      run_callbacks_for("after_config_#{Bogo::Utility.snake(self.class.name.split('::').last)}")
+      run_callbacks_for("after_config_#{Bogo::Utility.snake(self.class.name.split("::").last)}")
     end
 
     # @return [Smash]
@@ -65,7 +66,7 @@ module Sfn
     def load_api_provider_extensions!
       if config.get(:credentials, :provider)
         base_ext = Bogo::Utility.camel(config.get(:credentials, :provider)).to_sym
-        targ_ext = self.class.name.split('::').last
+        targ_ext = self.class.name.split("::").last
         if ApiProvider.constants.include?(base_ext)
           base_module = ApiProvider.const_get(base_ext)
           ui.debug "Loading core provider extensions via `#{base_module}`"
@@ -87,26 +88,26 @@ module Sfn
     # @return [Slop]
     def discover_config(opts)
       cwd = Dir.pwd.split(File::SEPARATOR)
-      detected_path = ''
+      detected_path = ""
       until cwd.empty? || File.exists?(detected_path.to_s)
         detected_path = Dir.glob(
-          (cwd + ["#{CONFIG_BASE_NAME}{#{VALID_CONFIG_EXTENSIONS.join(',')}}"]).join(
+          (cwd + ["#{CONFIG_BASE_NAME}{#{VALID_CONFIG_EXTENSIONS.join(",")}}"]).join(
             File::SEPARATOR
           )
         ).first
         cwd.pop
       end
       if opts.respond_to?(:fetch_option)
-        opts.fetch_option('config').value = detected_path if detected_path
+        opts.fetch_option("config").value = detected_path if detected_path
       else
-        opts['config'] = detected_path if detected_path
+        opts["config"] = detected_path if detected_path
       end
       opts
     end
 
     # @return [Class] attempt to return customized configuration class
     def config_class
-      klass_name = self.class.name.split('::').last
+      klass_name = self.class.name.split("::").last
       if Sfn::Config.const_defined?(klass_name)
         Sfn::Config.const_get(klass_name)
       else

data/lib/sfn/command/conf.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   class Command
@@ -12,42 +12,42 @@ module Sfn
         Config::Conf.attributes.sort_by(&:first).each do |k, val|
           if config.has_key?(k)
             ui.print "  #{ui.color(k, :bold, :green)}: "
-            format_value(config[k], '  ')
+            format_value(config[k], "  ")
           end
         end
         if config[:generate]
           ui.puts
-          ui.info 'Generating .sfn configuration file..'
+          ui.info "Generating .sfn configuration file.."
           generate_config!
-          ui.info "Generation of .sfn configuration file #{ui.color('complete!', :green, :bold)}"
+          ui.info "Generation of .sfn configuration file #{ui.color("complete!", :green, :bold)}"
         end
       end
 
       def generate_config!
-        if File.exists?('.sfn')
-          ui.warn 'Existing .sfn configuration file detected!'
-          ui.confirm 'Overwrite current .sfn configuration file?'
+        if File.exists?(".sfn")
+          ui.warn "Existing .sfn configuration file detected!"
+          ui.confirm "Overwrite current .sfn configuration file?"
         end
-        run_action 'Writing .sfn file' do
-          File.open('.sfn', 'w') do |file|
+        run_action "Writing .sfn file" do
+          File.open(".sfn", "w") do |file|
             file.write SFN_CONFIG_CONTENTS
           end
           nil
         end
       end
 
-      def format_value(value, indent = '')
+      def format_value(value, indent = "")
         if value.is_a?(Hash)
           ui.puts
           value.sort_by(&:first).each do |k, v|
             ui.print "#{indent}  #{ui.color(k, :bold)}: "
-            format_value(v, indent + '  ')
+            format_value(v, indent + "  ")
           end
         elsif value.is_a?(Array)
           ui.puts
           value.map(&:to_s).sort.each do |v|
             ui.print "#{indent}  "
-            format_value(v, indent + '  ')
+            format_value(v, indent + "  ")
           end
         else
           ui.puts value.to_s

data/lib/sfn/command/create.rb

@@ -1,5 +1,5 @@
-require 'sparkle_formation'
-require 'sfn'
+require "sparkle_formation"
+require "sfn"
 
 module Sfn
   class Command
@@ -24,12 +24,12 @@ module Sfn
         end
 
         unless config[:print_only]
-          ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('create', :green)}"
+          ui.info "#{ui.color("SparkleFormation:", :bold)} #{ui.color("create", :green)}"
         end
 
-        stack_info = "#{ui.color('Name:', :bold)} #{name}"
+        stack_info = "#{ui.color("Name:", :bold)} #{name}"
         if config[:path]
-          stack_info << " #{ui.color('Path:', :bold)} #{config[:file]}"
+          stack_info << " #{ui.color("Path:", :bold)} #{config[:file]}"
         end
 
         if config[:print_only]
@@ -66,14 +66,14 @@ module Sfn
             stack = provider.stack(name)
 
             if stack.reload.state == :create_complete
-              ui.info "Stack create complete: #{ui.color('SUCCESS', :green)}"
+              ui.info "Stack create complete: #{ui.color("SUCCESS", :green)}"
               namespace.const_get(:Describe).new({:outputs => true}, [name]).execute!
             else
-              ui.fatal "Create of new stack #{ui.color(name, :bold)}: #{ui.color('FAILED', :red, :bold)}"
-              raise 'Stack did not reach a successful completion state.'
+              ui.fatal "Create of new stack #{ui.color(name, :bold)}: #{ui.color("FAILED", :red, :bold)}"
+              raise "Stack did not reach a successful completion state."
             end
           else
-            ui.warn 'Stack state polling has been disabled.'
+            ui.warn "Stack state polling has been disabled."
             ui.info "Stack creation initialized for #{ui.color(name, :green)}"
           end
         end

data/lib/sfn/command/describe.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   class Command
@@ -75,11 +75,11 @@ module Sfn
         unless stack.outputs.nil? || stack.outputs.empty?
           stack.outputs.each do |output|
             key, value = output.key, output.value
-            key = snake(key).to_s.split('_').map(&:capitalize).join(' ')
-            ui.info ['  ', ui.color("#{key}:", :bold), value].join(' ')
+            key = snake(key).to_s.split("_").map(&:capitalize).join(" ")
+            ui.info ["  ", ui.color("#{key}:", :bold), value].join(" ")
           end
         else
-          ui.info "  #{ui.color('No outputs found')}"
+          ui.info "  #{ui.color("No outputs found")}"
         end
       end
 
@@ -90,10 +90,10 @@ module Sfn
         ui.info "Tags for stack: #{ui.color(stack.name, :bold)}"
         if stack.tags && !stack.tags.empty?
           stack.tags.each do |key, value|
-            ui.info ['  ', ui.color("#{key}:", :bold), value].join(' ')
+            ui.info ["  ", ui.color("#{key}:", :bold), value].join(" ")
           end
         else
-          ui.info "  #{ui.color('No tags found')}"
+          ui.info "  #{ui.color("No tags found")}"
         end
       end
 

data/lib/sfn/command/destroy.rb

@@ -1,4 +1,4 @@
-require 'sfn'
+require "sfn"
 
 module Sfn
   class Command
@@ -9,7 +9,7 @@ module Sfn
       def execute!
         name_required!
         stacks = name_args.sort
-        plural = 's' if stacks.size > 1
+        plural = "s" if stacks.size > 1
         globs = stacks.find_all do |s|
           s !~ /^[a-zA-Z0-9-]+$/
         end
@@ -23,7 +23,7 @@ module Sfn
           stacks -= globs
           stacks.sort!
         end
-        ui.warn "Destroying Stack#{plural}: #{ui.color(stacks.join(', '), :bold)}"
+        ui.warn "Destroying Stack#{plural}: #{ui.color(stacks.join(", "), :bold)}"
         ui.confirm "Destroy listed stack#{plural}?"
         stacks.each do |stack_name|
           stack = provider.connection.stacks.get(stack_name)
@@ -56,7 +56,7 @@ module Sfn
             ui.error "Stack polling is not available when multiple stack deletion is requested!"
           end
         end
-        ui.info "  -> Destroyed SparkleFormation#{plural}: #{ui.color(stacks.join(', '), :bold, :red)}"
+        ui.info "  -> Destroyed SparkleFormation#{plural}: #{ui.color(stacks.join(", "), :bold, :red)}"
       end
 
       # Cleanup persisted templates if nested stack resources are included
@@ -64,12 +64,12 @@ module Sfn
         stack.nested_stacks.each do |n_stack|
           nested_stack_cleanup!(n_stack)
         end
-        nest_stacks = stack.template.fetch('Resources', {}).values.find_all do |resource|
-          provider.connection.data[:stack_types].include?(resource['Type'])
+        nest_stacks = stack.template.fetch("Resources", {}).values.find_all do |resource|
+          provider.connection.data[:stack_types].include?(resource["Type"])
         end.each do |resource|
-          url = resource['Properties']['TemplateURL']
+          url = resource["Properties"]["TemplateURL"]
           if url && url.is_a?(String)
-            _, bucket_name, path = URI.parse(url).path.split('/', 3)
+            _, bucket_name, path = URI.parse(url).path.split("/", 3)
             bucket = provider.connection.api_for(:storage).buckets.get(bucket_name)
             if bucket
               file = bucket.files.get(path)

data/lib/sfn/command/diff.rb

@@ -1,6 +1,6 @@
-require 'sparkle_formation'
-require 'sfn'
-require 'hashdiff'
+require "sparkle_formation"
+require "sfn"
+require "hashdiff"
 
 module Sfn
   class Command
@@ -26,7 +26,7 @@ module Sfn
           file = load_template_file
           file = parameter_scrub!(file.dump)
 
-          ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('diff', :blue)} - #{name}"
+          ui.info "#{ui.color("SparkleFormation:", :bold)} #{ui.color("diff", :blue)} - #{name}"
           ui.puts
 
           diff_stack(stack, MultiJson.load(MultiJson.dump(file)).to_smash)
@@ -40,8 +40,8 @@ module Sfn
       def diff_stack(stack, file, parent_names = [])
         stack_template = stack.template
         nested_stacks = Hash[
-          file.fetch('Resources', file.fetch('resources', {})).find_all do |name, value|
-            value.fetch('Properties', {})['Stack']
+          file.fetch("Resources", file.fetch("resources", {})).find_all do |name, value|
+            value.fetch("Properties", {})["Stack"]
           end
         ]
         nested_stacks.each do |name, value|
@@ -49,58 +49,58 @@ module Sfn
             ns.data[:logical_id] == name
           end
           if n_stack
-            diff_stack(n_stack, value['Properties']['Stack'], [*parent_names, stack.data.fetch(:logical_id, stack.name)].compact)
+            diff_stack(n_stack, value["Properties"]["Stack"], [*parent_names, stack.data.fetch(:logical_id, stack.name)].compact)
           end
-          file['Resources'][name]['Properties'].delete('Stack')
+          file["Resources"][name]["Properties"].delete("Stack")
         end
 
-        ui.info "#{ui.color('Stack diff:', :bold)} #{ui.color((parent_names + [stack.data.fetch(:logical_id, stack.name)]).compact.join(' > '), :blue)}"
+        ui.info "#{ui.color("Stack diff:", :bold)} #{ui.color((parent_names + [stack.data.fetch(:logical_id, stack.name)]).compact.join(" > "), :blue)}"
 
         stack_diff = HashDiff.diff(stack.template, file)
 
         if config[:raw_diff]
           ui.info "Dumping raw template diff:"
-          require 'pp'
+          require "pp"
           pp stack_diff
         else
           added_resources = stack_diff.find_all do |item|
-            item.first == '+' && item[1].match(/Resources\.[^.]+$/)
+            item.first == "+" && item[1].match(/Resources\.[^.]+$/)
           end
           removed_resources = stack_diff.find_all do |item|
-            item.first == '-' && item[1].match(/Resources\.[^.]+$/)
+            item.first == "-" && item[1].match(/Resources\.[^.]+$/)
           end
           modified_resources = stack_diff.find_all do |item|
-            item[1].start_with?('Resources.') &&
-              !item[1].end_with?('TemplateURL') &&
-              !item[1].include?('Properties.Parameters')
+            item[1].start_with?("Resources.") &&
+              !item[1].end_with?("TemplateURL") &&
+              !item[1].include?("Properties.Parameters")
           end - added_resources - removed_resources
 
           if added_resources.empty? && removed_resources.empty? && modified_resources.empty?
-            ui.info 'No changes detected'
+            ui.info "No changes detected"
             ui.puts
           else
             unless added_resources.empty?
-              ui.info ui.color('Added Resources:', :green, :bold)
+              ui.info ui.color("Added Resources:", :green, :bold)
               added_resources.each do |item|
-                ui.print ui.color("  -> #{item[1].split('.').last}", :green)
-                ui.puts " [#{item[2]['Type']}]"
+                ui.print ui.color("  -> #{item[1].split(".").last}", :green)
+                ui.puts " [#{item[2]["Type"]}]"
               end
               ui.puts
             end
 
             unless modified_resources.empty?
-              ui.info ui.color('Modified Resources:', :yellow, :bold)
+              ui.info ui.color("Modified Resources:", :yellow, :bold)
               m_resources = Hash.new.tap do |hash|
                 modified_resources.each do |item|
-                  _, key, path = item[1].split('.', 3)
+                  _, key, path = item[1].split(".", 3)
                   hash[key] ||= {}
-                  prefix, a_key = path.split('.', 2)
+                  prefix, a_key = path.split(".", 2)
                   hash[key][prefix] ||= []
                   matched = hash[key][prefix].detect do |i|
                     i[:path] == a_key
                   end
                   if matched
-                    if item.first == '-'
+                    if item.first == "-"
                       matched[:original] = item[2]
                     else
                       matched[:new] = item[2]
@@ -109,10 +109,10 @@ module Sfn
                     hash[key][prefix] << Hash.new.tap do |info|
                       info[:path] = a_key
                       case item.first
-                      when '~'
+                      when "~"
                         info[:original] = item[2]
                         info[:new] = item[3]
-                      when '+'
+                      when "+"
                         info[:new] = item[2]
                       else
                         info[:original] = item[2]
@@ -121,12 +121,12 @@ module Sfn
                   end
                 end
               end.to_smash(:sorted).each do |key, value|
-                ui.puts ui.color("  - #{key}", :yellow) + " [#{stack.template['Resources'][key]['Type']}]"
+                ui.puts ui.color("  - #{key}", :yellow) + " [#{stack.template["Resources"][key]["Type"]}]"
                 value.each do |prefix, items|
                   ui.puts ui.color("    #{prefix}:", :bold)
                   items.each do |item|
-                    original = item[:original].nil? ? ui.color('(none)', :yellow) : ui.color(item[:original].inspect, :red)
-                    new_val = item[:new].nil? ? ui.color('(deleted)', :red) : ui.color(item[:new].inspect, :green)
+                    original = item[:original].nil? ? ui.color("(none)", :yellow) : ui.color(item[:original].inspect, :red)
+                    new_val = item[:new].nil? ? ui.color("(deleted)", :red) : ui.color(item[:new].inspect, :green)
                     ui.puts "      #{item[:path]}: #{original} -> #{new_val}"
                   end
                 end
@@ -135,10 +135,10 @@ module Sfn
             end
 
             unless removed_resources.empty?
-              ui.info ui.color('Removed Resources:', :red, :bold)
+              ui.info ui.color("Removed Resources:", :red, :bold)
               removed_resources.each do |item|
-                ui.print ui.color("  <- #{item[1].split('.').last}", :red)
-                ui.puts " [#{item[2]['Type']}]"
+                ui.print ui.color("  <- #{item[1].split(".").last}", :red)
+                ui.puts " [#{item[2]["Type"]}]"
               end
               ui.puts
             end