sfn 3.0.28 → 3.0.30

data/lib/sfn/command/graph/aws.rb

@@ -13,14 +13,14 @@ module Sfn
 
             attr_accessor :name
 
-            def initialize(template, args={})
+            def initialize(template, args = {})
               super
               @name = args[:name]
             end
 
-            def apply_function(hash, funcs=[])
+            def apply_function(hash, funcs = [])
               k, v = hash.first
-              if(hash.size == 1)
+              if hash.size == 1
                 case k
                 when 'Ref'
                   parameters.key?(v) ? parameters[v] : hash
@@ -37,27 +37,27 @@ module Sfn
             end
           end
 
-          def output_discovery(template, outputs, resource_name, parent_template, name='')
-            if(template['Resources'])
+          def output_discovery(template, outputs, resource_name, parent_template, name = '')
+            if template['Resources']
               template['Resources'].keys.each do |r_name|
                 r_info = template['Resources'][r_name]
-                if(r_info['Type'] == 'AWS::CloudFormation::Stack')
+                if r_info['Type'] == 'AWS::CloudFormation::Stack'
                   output_discovery(r_info['Properties']['Stack'], outputs, r_name, template, r_name)
                 end
               end
             end
-            if(parent_template)
+            if parent_template
               ui.debug "Pre-processing stack resource `#{resource_name}`"
               substack_parameters = Smash[
                 parent_template.fetch('Resources', resource_name, 'Properties', 'Parameters', {}).map do |key, value|
                   result = [key, value]
-                  if(value.is_a?(Hash))
+                  if value.is_a?(Hash)
                     v_key = value.keys.first
                     v_value = value.values.first
-                    if(v_key == 'Fn::GetAtt' && parent_template.fetch('Resources', {}).keys.include?(v_value.first) && v_value.last.start_with?('Outputs.'))
+                    if v_key == 'Fn::GetAtt' && parent_template.fetch('Resources', {}).keys.include?(v_value.first) && v_value.last.start_with?('Outputs.')
                       output_key = v_value.first + '__' + v_value.last.split('.', 2).last
                       ui.debug "Output key for check: #{output_key}"
-                      if(outputs.key?(output_key))
+                      if outputs.key?(output_key)
                         new_value = outputs[output_key]
                         result = [key, new_value]
                         ui.debug "Parameter for output swap `#{key}`: #{value} -> #{new_value}"
@@ -71,8 +71,7 @@ module Sfn
               ui.debug "Generated internal parameters for `#{resource_name}`: #{substack_parameters}"
 
               processor = AwsGraphProcessor.new({},
-                :parameters => substack_parameters
-              )
+                                                :parameters => substack_parameters)
               template['Resources'] = processor.dereference_processor(
                 template['Resources'], ['Ref']
               )
@@ -80,12 +79,11 @@ module Sfn
                 template['Outputs'], ['Ref']
               )
               rename_processor = AwsGraphProcessor.new({},
-                :parameters => Smash[
-                  template.fetch('Resources', {}).keys.map do |r_key|
-                    [r_key, {'Ref' => [name, r_key].join}]
-                  end
-                ]
-              )
+                                                       :parameters => Smash[
+                                                         template.fetch('Resources', {}).keys.map do |r_key|
+                                                           [r_key, {'Ref' => [name, r_key].join}]
+                                                         end
+                                                       ])
               derefed_outs = rename_processor.dereference_processor(
                 template.fetch('Outputs', {})
               ) || {}
@@ -96,12 +94,12 @@ module Sfn
               end
             end
             outputs.dup.each do |key, value|
-              if(value.is_a?(Hash))
+              if value.is_a?(Hash)
                 v_key = value.keys.first
                 v_value = value.values.first
-                if(v_key == 'Fn::GetAtt' && v_value.last.start_with?('Outputs.'))
+                if v_key == 'Fn::GetAtt' && v_value.last.start_with?('Outputs.')
                   output_key = v_value.first << '__' << v_value.last.split('.', 2).last
-                  if(outputs.key?(output_key))
+                  if outputs.key?(output_key)
                     outputs[key] = outputs[output_key]
                   end
                 end
@@ -114,12 +112,12 @@ module Sfn
             node_prefix = name
             resources.each do |resource_name, resource_data|
               node_name = [node_prefix, resource_name].join
-              if(resource_data['Type'] == 'AWS::CloudFormation::Stack')
+              if resource_data['Type'] == 'AWS::CloudFormation::Stack'
                 graph.subgraph << generate_graph(
                   resource_data['Properties'].delete('Stack'),
                   :name => resource_name,
                   :type => resource_data['Type'],
-                  :resource_names => resource_names
+                  :resource_names => resource_names,
                 )
                 next
               else
@@ -129,30 +127,30 @@ module Sfn
               graph.filled << graph.node(node_name)
               graph.node(node_name).label "#{resource_name}\n<#{resource_data['Type']}>\n#{name}"
               resource_dependencies(resource_data, resource_names + resources.keys).each do |dep_name|
-                if(resources.keys.include?(dep_name))
+                if resources.keys.include?(dep_name)
                   dep_name = [node_prefix, dep_name].join
                 end
-                if(config[:graph_style] == 'creation')
+                if config[:graph_style] == 'creation'
                   @root_graph.edge(dep_name, node_name)
                 else
                   @root_graph.edge(node_name, dep_name)
                 end
               end
             end
-            resource_names.concat resources.keys.map{|r_name| [node_prefix, r_name].join}
+            resource_names.concat resources.keys.map { |r_name| [node_prefix, r_name].join }
           end
 
           def resource_dependencies(data, names)
             case data
             when Hash
               data.map do |key, value|
-                if(key == 'Ref' && names.include?(value))
+                if key == 'Ref' && names.include?(value)
                   value
-                elsif(key == 'DependsOn')
+                elsif key == 'DependsOn'
                   [value].flatten.compact.find_all do |dependson_name|
                     names.include?(dependson_name)
                   end
-                elsif(key == 'Fn::GetAtt' && names.include?(res = [value].flatten.compact.first))
+                elsif key == 'Fn::GetAtt' && names.include?(res = [value].flatten.compact.first)
                   res
                 else
                   resource_dependencies(key, names) +

data/lib/sfn/command/graph/terraform.rb

@@ -13,15 +13,15 @@ module Sfn
 
             attr_accessor :name
 
-            def initialize(template, args={})
+            def initialize(template, args = {})
               super
               @name = args[:name]
             end
 
-            def dereference_processor(obj, funcs=[])
+            def dereference_processor(obj, funcs = [])
               case obj
               when Array
-                obj = obj.map{|v| dereference_processor(v, funcs)}
+                obj = obj.map { |v| dereference_processor(v, funcs) }
               when Hash
                 new_hash = {}
                 obj.each do |k, v|
@@ -50,10 +50,10 @@ module Sfn
               @original.fetch('outputs', {})
             end
 
-            def apply_function(string, funcs=[])
+            def apply_function(string, funcs = [])
               # first check for vars and replace with params
               string.scan(/(\$\{var\.(.+?)\})/).each do |match|
-                if(parameters[match.last])
+                if parameters[match.last]
                   string.sub!(match.first, parameters[match.last])
                 end
               end
@@ -61,24 +61,24 @@ module Sfn
             end
           end
 
-          def output_discovery(template, outputs, resource_name, parent_template, name='')
-            if(template['resources'])
+          def output_discovery(template, outputs, resource_name, parent_template, name = '')
+            if template['resources']
               template['resources'].keys.each do |r_name|
                 r_info = template['resources'][r_name]
-                if(r_info['type'] == 'module')
+                if r_info['type'] == 'module'
                   output_discovery(r_info['properties']['stack'], outputs, r_name, template, r_name)
                 end
               end
             end
-            if(parent_template)
+            if parent_template
               ui.debug "Pre-processing stack resource `#{resource_name}`"
               substack_parameters = Smash[
                 parent_template.fetch('resources', resource_name, 'properties', 'parameters', {}).map do |key, value|
                   result = [key, value]
-                  if(value.to_s.start_with?('${module.'))
+                  if value.to_s.start_with?('${module.')
                     output_key = value.sub('${module.', '').sub('}', '').sub('.', '__')
                     ui.debug "Output key for check: #{output_key}"
-                    if(outputs.key?(output_key))
+                    if outputs.key?(output_key)
                       new_value = outputs[output_key]
                       result = [key, new_value]
                       ui.debug "Parameter for output swap `#{key}`: #{value} -> #{new_value}"
@@ -91,8 +91,7 @@ module Sfn
               ui.debug "Generated internal parameters for `#{resource_name}`: #{substack_parameters}"
 
               processor = TerraformGraphProcessor.new({},
-                :parameters => substack_parameters
-              )
+                                                      :parameters => substack_parameters)
               template['resources'] = processor.dereference_processor(
                 template['resources'], []
               )
@@ -103,7 +102,7 @@ module Sfn
               derefed_outs.each do |o_name, o_data|
                 o_key = [name, o_name].join('__')
                 val = o_data['value']
-                if(val.start_with?('${') && val.scan('.').count == 2)
+                if val.start_with?('${') && val.scan('.').count == 2
                   val = val.split('.')
                   val[1] = "#{name}__#{val[1]}"
                   val = val.join('.')
@@ -112,9 +111,9 @@ module Sfn
               end
             end
             outputs.dup.each do |key, value|
-              if(value.to_s.start_with?('${module.'))
+              if value.to_s.start_with?('${module.')
                 output_key = value.to_s.sub('${module.', '').sub('}', '').sub('.', '__')
-                if(outputs.key?(output_key))
+                if outputs.key?(output_key)
                   outputs[key] = outputs[output_key]
                 end
               end
@@ -126,12 +125,12 @@ module Sfn
             node_prefix = name
             resources.each do |resource_name, resource_data|
               node_name = [node_prefix, resource_name].join('__')
-              if(resource_data['type'] == 'module')
+              if resource_data['type'] == 'module'
                 graph.subgraph << generate_graph(
                   resource_data['properties'].delete('stack'),
                   :name => resource_name,
                   :type => resource_data['type'],
-                  :resource_names => resource_names
+                  :resource_names => resource_names,
                 )
                 next
               else
@@ -141,24 +140,24 @@ module Sfn
               graph.filled << graph.node(node_name)
               graph.node(node_name).label "#{resource_name}\n<#{resource_data['type']}>\n#{name}"
               resource_dependencies(resource_data, resource_names + resources.keys).each do |dep_name|
-                if(resources.keys.include?(dep_name))
+                if resources.keys.include?(dep_name)
                   dep_name = [node_prefix, dep_name].join('__')
                 end
-                if(config[:graph_style] == 'creation')
+                if config[:graph_style] == 'creation'
                   @root_graph.edge(dep_name, node_name)
                 else
                   @root_graph.edge(node_name, dep_name)
                 end
               end
             end
-            resource_names.concat resources.keys.map{|r_name| [node_prefix, r_name].join('__')}
+            resource_names.concat resources.keys.map { |r_name| [node_prefix, r_name].join('__') }
           end
 
           def resource_dependencies(data, names)
             case data
             when String
               result = []
-              if(data.start_with?('${') && data.scan('.').count >= 1)
+              if data.start_with?('${') && data.scan('.').count >= 1
                 data = data.tr('${}', '')
                 check_name = data.split('.')[1]
                 if names.include?(check_name)
@@ -168,7 +167,7 @@ module Sfn
               result
             when Hash
               data.map do |key, value|
-                if(key == 'depends_on')
+                if key == 'depends_on'
                   [value].flatten.compact.map do |dependson_name|
                     dep_name = dependson_name.split('.').last
                     dep_name if names.include?(dep_name)

data/lib/sfn/command/import.rb

@@ -5,7 +5,6 @@ module Sfn
   class Command
     # Import command
     class Import < Command
-
       include Sfn::CommandModule::Base
       include Sfn::Utils::JSON
       include Sfn::Utils::ObjectStorage
@@ -16,19 +15,19 @@ module Sfn
         raise NotImplementedError.new 'Implementation updates required'
         stack_name, json_file = name_args
         ui.info "#{ui.color('Stack Import:', :bold)} #{stack_name}"
-        unless(json_file)
+        unless json_file
           entries = [].tap do |_entries|
             _entries.push('s3') if config[:bucket]
             _entries.push('fs') if config[:path]
           end
-          if(entries.size > 1)
+          if entries.size > 1
             valid = false
-            until(valid)
+            until valid
               answer = ui.ask_question('Import via file system (fs) or remote bucket (remote)?', :default => 'remote')
               valid = true if %w(remote fs).include?(answer)
               entries = [answer]
             end
-          elsif(entries.size < 1)
+          elsif entries.size < 1
             ui.fatal 'No path or bucket set. Unable to perform dynamic lookup!'
             exit 1
           end
@@ -39,14 +38,14 @@ module Sfn
             json_file = local_discovery
           end
         end
-        if(File.exists?(json_file) || json_file.is_a?(IO))
+        if File.exists?(json_file) || json_file.is_a?(IO)
           content = json_file.is_a?(IO) ? json_file.read : File.read(json_file)
           export = Mash.new(_from_json(content))
           begin
             creator = namespace.const_val(:Create).new(
               Smash.new(
                 :template => _from_json(export[:stack][:template]),
-                :options => _from_json(export[:stack][:options])
+                :options => _from_json(export[:stack][:options]),
               ),
               [stack_name]
             )
@@ -68,8 +67,8 @@ module Sfn
       #
       # @return [String, NilClass]
       def bucket_prefix
-        if(prefix = config[:bucket_prefix])
-          if(prefix.respond_to?(:call))
+        if prefix = config[:bucket_prefix]
+          if prefix.respond_to?(:call)
             prefix.call
           else
             prefix.to_s
@@ -87,9 +86,9 @@ module Sfn
           directory,
           :directories_name => 'Collections',
           :files_names => 'Exports',
-          :filter_prefix => bucket_prefix
+          :filter_prefix => bucket_prefix,
         )
-        if(file)
+        if file
           remote_file = storage.files.get(file)
           StringIO.new(remote_file.body)
         end
@@ -101,17 +100,15 @@ module Sfn
       def local_discovery
         _, bucket = config[:path].split('/', 2)
         storage = provider.service_for(:storage,
-          :provider => :local,
-          :local_root => '/'
-        )
+                                       :provider => :local,
+                                       :local_root => '/')
         directory = storage.directories.get(bucket)
         prompt_for_file(
           directory,
           :directories_name => 'Collections',
-          :files_names => 'Exports'
+          :files_names => 'Exports',
         )
       end
-
     end
   end
 end

data/lib/sfn/command/init.rb

@@ -5,26 +5,25 @@ module Sfn
   class Command
     # Init command
     class Init < Command
-
       include Sfn::CommandModule::Base
 
       INIT_DIRECTORIES = [
         'sparkleformation/dynamics',
         'sparkleformation/components',
-        'sparkleformation/registry'
+        'sparkleformation/registry',
       ]
 
       # Run the init command to initialize new project
       def execute!
-        unless(name_args.size == 1)
+        unless name_args.size == 1
           raise ArgumentError.new 'Please provide path argument only for project initialization'
         else
           path = name_args.first
         end
-        if(File.file?(path))
+        if File.file?(path)
           raise "Cannot create project directory. Given path is a file. (`#{path}`)"
         end
-        if(File.directory?(path))
+        if File.directory?(path)
           ui.warn "Project directory already exists at given path. (`#{path}`)"
           ui.confirm 'Overwrite existing files?'
         end
@@ -46,7 +45,7 @@ module Sfn
         end
         ui.info 'Installing project bundle'
         Dir.chdir(path) do
-          if(defined?(Bundler))
+          if defined?(Bundler)
             Bundler.clean_system('bundle install')
           else
             system('bundle install')
@@ -55,7 +54,6 @@ module Sfn
         ui.info 'Project initialization complete!'
         ui.puts "  Project path -> #{File.expand_path(path)}"
       end
-
     end
   end
 end

data/lib/sfn/command/inspect.rb

@@ -4,7 +4,6 @@ module Sfn
   class Command
     # Inspect command
     class Inspect < Command
-
       include Sfn::CommandModule::Base
       include Sfn::Utils::Ssher
 
@@ -16,19 +15,19 @@ module Sfn
         ui.info "Stack inspection #{ui.color(stack_name, :bold)}:"
         outputs = api_action!(:api_stack => stack) do
           [:attribute, :nodes, :load_balancers, :instance_failure].map do |key|
-            if(config.has_key?(key))
+            if config.has_key?(key)
               send("display_#{key}", stack)
               key
             end
           end.compact
         end
-        if(outputs.empty?)
+        if outputs.empty?
           ui.info '  Stack dump:'
           ui.puts MultiJson.dump(
             MultiJson.load(
               stack.reload.to_json
             ),
-            :pretty => true
+            :pretty => true,
           )
         end
       end
@@ -38,32 +37,32 @@ module Sfn
           resource.state.to_s.end_with?('failed')
         end.map do |resource|
           # If compute instance, simply expand
-          if(resource.within?(:compute, :servers))
+          if resource.within?(:compute, :servers)
             resource.instance
-          # If a waitcondition, check for instance ID
-          elsif(resource.type.to_s.downcase.end_with?('waitcondition'))
-            if(resource.status_reason.to_s.include?('uniqueId'))
+            # If a waitcondition, check for instance ID
+          elsif resource.type.to_s.downcase.end_with?('waitcondition')
+            if resource.status_reason.to_s.include?('uniqueId')
               srv_id = resource.status_reason.split(' ').last.strip
               provider.connection.api_for(:compute).servers.get(srv_id)
             end
           end
         end.compact
-        if(instances.empty?)
+        if instances.empty?
           ui.error 'Failed to locate any failed instances'
         else
           log_path = config[:failure_log_path]
-          if(log_path.to_s.empty?)
+          if log_path.to_s.empty?
             log_path = '/var/log/chef/client.log'
           end
           opts = ssh_key ? {:keys => [ssh_key]} : {}
           instances.each do |instance|
             ui.info "  -> Log inspect for #{instance.id}:"
             address = instance.addresses_public.map do |address|
-              if(address.version == 4)
+              if address.version == 4
                 address.address
               end
             end
-            if(address)
+            if address
               ssh_attempt_users.each do |user|
                 begin
                   ui.info remote_file_contents(address.first, user, log_path, opts)
@@ -96,12 +95,12 @@ module Sfn
         [config[:attribute]].flatten.compact.each do |stack_attribute|
           attr = stack_attribute.split('.').inject(stack) do |memo, key|
             args = key.scan(/\(([^\)]*)\)/).flatten.first.to_s
-            if(args)
-              args = args.split(',').map{|a| a.to_i.to_s == a ? a.to_i : a}
+            if args
+              args = args.split(',').map { |a| a.to_i.to_s == a ? a.to_i : a }
               key = key.split('(').first
             end
-            if(memo.public_methods.include?(key.to_sym))
-              if(args.size == 1 && args.first.to_s.start_with?('&'))
+            if memo.public_methods.include?(key.to_sym)
+              if args.size == 1 && args.first.to_s.start_with?('&')
                 memo.send(key, &args.first.slice(2, args.first.size).to_sym)
               else
                 memo.send(*[key, args].flatten.compact)
@@ -115,7 +114,7 @@ module Sfn
             MultiJson.load(
               MultiJson.dump(attr)
             ),
-            :pretty => true
+            :pretty => true,
           )
         end
       end
@@ -129,13 +128,13 @@ module Sfn
             [
               asg.name,
               Smash[
-                asg.servers.map(&:expand).compact.map{|s|
+                asg.servers.map(&:expand).compact.map { |s|
                   [s.id, Smash.new(
-                      :name => s.name,
-                      :addresses => s.addresses.map(&:address)
+                    :name => s.name,
+                    :addresses => s.addresses.map(&:address),
                   )]
                 }
-              ]
+              ],
             ]
           end
         ]
@@ -144,19 +143,19 @@ module Sfn
             resource.within?(:compute, :servers)
           end.map do |srv|
             srv = srv.instance
-            if(srv)
+            if srv
               [srv.id, Smash.new(
                 :name => srv.name,
-                :addresses => srv.addresses.map(&:address)
+                :addresses => srv.addresses.map(&:address),
               )]
             end
           end.compact
         ]
-        unless(asg_nodes.empty?)
+        unless asg_nodes.empty?
           ui.info '  AutoScale Group Instances:'
           ui.puts MultiJson.dump(asg_nodes, :pretty => true)
         end
-        unless(compute_nodes.empty?)
+        unless compute_nodes.empty?
           ui.info '  Compute Instances:'
           ui.puts MultiJson.dump(compute_nodes, :pretty => true)
         end
@@ -175,9 +174,8 @@ module Sfn
               :state => exp_lb.state,
               :public_addresses => lb_pub_addrs,
               :private_addresses => lb_priv_addrs,
-              :server_states => exp_lb.server_states
-            ).delete_if {|k,v| v.nil?}
-            ]
+              :server_states => exp_lb.server_states,
+            ).delete_if { |k, v| v.nil? }]
           end
         ]
         unless load_balancers.empty?
@@ -185,7 +183,6 @@ module Sfn
           ui.puts MultiJson.dump(load_balancers, :pretty => true)
         end
       end
-
     end
   end
 end