sfn 3.0.28 → 3.0.30

data/lib/sfn/callback.rb

@@ -3,7 +3,6 @@ require 'sfn'
 module Sfn
   # Interface for injecting custom functionality
   class Callback
-
     autoload :AwsAssumeRole, 'sfn/callback/aws_assume_role'
     autoload :AwsMfa, 'sfn/callback/aws_mfa'
     autoload :StackPolicy, 'sfn/callback/stack_policy'
@@ -49,6 +48,5 @@ module Sfn
         raise
       end
     end
-
   end
 end

data/lib/sfn/callback/aws_assume_role.rb

@@ -10,7 +10,7 @@ module Sfn
         :aws_sts_token,
         :aws_sts_access_key_id,
         :aws_sts_secret_access_key,
-        :aws_sts_token_expires
+        :aws_sts_token_expires,
       ]
 
       # Prevent callback output to user
@@ -21,7 +21,7 @@ module Sfn
       # Inject STS related configuration into
       # API provider credentials
       def after_config(*_)
-        if(enabled? && config.fetch(:credentials, :aws_sts_role_arn))
+        if enabled? && config.fetch(:credentials, :aws_sts_role_arn)
           load_stored_session
         end
       end
@@ -29,8 +29,8 @@ module Sfn
       # Store session token if available for
       # later use
       def after(*_)
-        if(enabled?)
-          if(api.connection.aws_sts_role_arn && api.connection.aws_sts_token)
+        if enabled?
+          if api.connection.aws_sts_role_arn && api.connection.aws_sts_token
             path = config.fetch(:aws_assume_role, :cache_file, '.sfn-aws')
             FileUtils.touch(path)
             File.chmod(0600, path)
@@ -55,12 +55,12 @@ module Sfn
       # @return [TrueClass, FalseClass]
       def load_stored_session
         path = config.fetch(:aws_assume_role, :cache_file, '.sfn-aws')
-        if(File.exists?(path))
+        if File.exists?(path)
           values = load_stored_values(path)
           STS_STORE_ITEMS.each do |key|
             api.connection.data[key] = values[key]
           end
-          if(values[:aws_sts_token_expires])
+          if values[:aws_sts_token_expires]
             begin
               api.connection.data[:aws_sts_token_expires] = Time.parse(values[:aws_sts_token_expires])
             rescue
@@ -78,7 +78,7 @@ module Sfn
       # @return [Hash]
       def load_stored_values(path)
         begin
-          if(File.exists?(path))
+          if File.exists?(path)
             MultiJson.load(File.read(path)).to_smash
           else
             Smash.new
@@ -87,7 +87,6 @@ module Sfn
           Smash.new
         end
       end
-
     end
   end
 end

data/lib/sfn/callback/aws_mfa.rb

@@ -10,7 +10,7 @@ module Sfn
         :aws_sts_session_token,
         :aws_sts_session_access_key_id,
         :aws_sts_session_secret_access_key,
-        :aws_sts_session_token_expires
+        :aws_sts_session_token_expires,
       ]
 
       # Prevent callback output to user
@@ -21,7 +21,7 @@ module Sfn
       # Inject MFA related configuration into
       # API provider credentials
       def after_config(*_)
-        if(enabled?)
+        if enabled?
           load_stored_session
           api.connection.aws_sts_session_token_code = method(:prompt_for_code)
         end
@@ -30,8 +30,8 @@ module Sfn
       # Store session token if available for
       # later use
       def after(*_)
-        if(enabled?)
-          if(api.connection.aws_sts_session_token)
+        if enabled?
+          if api.connection.aws_sts_session_token
             path = config.fetch(:aws_mfa, :cache_file, '.sfn-aws')
             FileUtils.touch(path)
             File.chmod(0600, path)
@@ -56,12 +56,12 @@ module Sfn
       # @return [TrueClass, FalseClass]
       def load_stored_session
         path = config.fetch(:aws_mfa, :cache_file, '.sfn-aws')
-        if(File.exists?(path))
+        if File.exists?(path)
           values = load_stored_values(path)
           SESSION_STORE_ITEMS.each do |key|
             api.connection.data[key] = values[key]
           end
-          if(values[:aws_sts_session_token_expires])
+          if values[:aws_sts_session_token_expires]
             begin
               api.connection.data[:aws_sts_session_token_expires] = Time.parse(values[:aws_sts_session_token_expires])
             rescue
@@ -79,7 +79,7 @@ module Sfn
       # @return [Hash]
       def load_stored_values(path)
         begin
-          if(File.exists?(path))
+          if File.exists?(path)
             MultiJson.load(File.read(path)).to_smash
           else
             Smash.new
@@ -96,7 +96,6 @@ module Sfn
         result = ui.ask 'AWS MFA code', :valid => /^\d{6}$/
         result.strip
       end
-
     end
   end
 end

data/lib/sfn/callback/stack_policy.rb

@@ -7,11 +7,11 @@ module Sfn
       # Policy to apply prior to stack deletion
       DEFENSELESS_POLICY = {
         'Statement' => [{
-            'Effect' => 'Allow',
-            'Action' => 'Update:*',
-            'Resource' => '*',
-            'Principal' => '*'
-          }]
+          'Effect' => 'Allow',
+          'Action' => 'Update:*',
+          'Resource' => '*',
+          'Principal' => '*',
+        }],
       }
 
       # @return [Smash] cached policies
@@ -38,6 +38,7 @@ module Sfn
         end
         ui.info 'Stack policy documents successfully submitted!'
       end
+
       alias_method :after_create, :submit_policy
       alias_method :after_update, :submit_policy
 
@@ -45,7 +46,7 @@ module Sfn
       #
       # @param args [Hash]
       def before_update(args)
-        if(config.get(:stack_policy, :update).to_s == 'defenseless')
+        if config.get(:stack_policy, :update).to_s == 'defenseless'
           ui.warn 'Disabling all stack policies for update.'
           stack = args[:api_stack]
           ([stack] + stack.nested_stacks).compact.each do |p_stack|
@@ -62,10 +63,9 @@ module Sfn
       #
       # @param info [Hash]
       def template(info)
-        if(info[:sparkle_stack])
+        if info[:sparkle_stack]
           @policies.set(info.fetch(:stack_name, 'unknown'),
-            info[:sparkle_stack].generate_policy
-          )
+                        info[:sparkle_stack].generate_policy)
         end
       end
 
@@ -76,15 +76,14 @@ module Sfn
       def save_stack_policy(p_stack)
         valid_logical_ids = p_stack.resources.reload.all.map(&:logical_id)
         stack_policy = @policies.fetch(p_stack.id,
-          @policies.fetch(p_stack.data[:logical_id]),
-          @policies[p_stack.name]
-        ).to_smash
-        if(stack_policy)
+                                       @policies.fetch(p_stack.data[:logical_id]),
+                                       @policies[p_stack.name]).to_smash
+        if stack_policy
           stack_policy[:Statement].delete_if do |policy_item|
             policy_match = policy_item[:Resource].to_s.match(
               %r{LogicalResourceId/(?<logical_id>.+)$}
             )
-            if(policy_match)
+            if policy_match
               !valid_logical_ids.include?(policy_match["logical_id"])
             end
           end
@@ -95,11 +94,10 @@ module Sfn
           :form => Smash.new(
             'Action' => 'SetStackPolicy',
             'StackName' => p_stack.id,
-            'StackPolicyBody' => MultiJson.dump(stack_policy)
-          )
+            'StackPolicyBody' => MultiJson.dump(stack_policy),
+          ),
         )
       end
-
     end
   end
 end

data/lib/sfn/command.rb

@@ -3,7 +3,6 @@ require 'bogo-cli'
 
 module Sfn
   class Command < Bogo::Cli::Command
-
     include CommandModule::Callbacks
 
     autoload :Conf, 'sfn/command/conf'
@@ -34,15 +33,15 @@ module Sfn
       '.json',
       '.yaml',
       '.yml',
-      '.xml'
+      '.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'])
+      unless ENV['DEBUG']
         ENV['DEBUG'] = 'true' if cli_opts[:debug]
       end
       super(cli_opts, args)
@@ -64,14 +63,14 @@ module Sfn
     #
     # @return [TrueClass, FalseClass]
     def load_api_provider_extensions!
-      if(config.get(:credentials, :provider))
+      if config.get(:credentials, :provider)
         base_ext = Bogo::Utility.camel(config.get(:credentials, :provider)).to_sym
         targ_ext = self.class.name.split('::').last
-        if(ApiProvider.constants.include?(base_ext))
+        if ApiProvider.constants.include?(base_ext)
           base_module = ApiProvider.const_get(base_ext)
           ui.debug "Loading core provider extensions via `#{base_module}`"
           extend base_module
-          if(base_module.constants.include?(targ_ext))
+          if base_module.constants.include?(targ_ext)
             targ_module = base_module.const_get(targ_ext)
             ui.debug "Loading targeted provider extensions via `#{targ_module}`"
             extend targ_module
@@ -89,7 +88,7 @@ module Sfn
     def discover_config(opts)
       cwd = Dir.pwd.split(File::SEPARATOR)
       detected_path = ''
-      until(cwd.empty? || File.exists?(detected_path.to_s))
+      until cwd.empty? || File.exists?(detected_path.to_s)
         detected_path = Dir.glob(
           (cwd + ["#{CONFIG_BASE_NAME}{#{VALID_CONFIG_EXTENSIONS.join(',')}}"]).join(
             File::SEPARATOR
@@ -97,7 +96,7 @@ module Sfn
         ).first
         cwd.pop
       end
-      if(opts.respond_to?(:fetch_option))
+      if opts.respond_to?(:fetch_option)
         opts.fetch_option('config').value = detected_path if detected_path
       else
         opts['config'] = detected_path if detected_path
@@ -108,12 +107,11 @@ module Sfn
     # @return [Class] attempt to return customized configuration class
     def config_class
       klass_name = self.class.name.split('::').last
-      if(Sfn::Config.const_defined?(klass_name))
+      if Sfn::Config.const_defined?(klass_name)
         Sfn::Config.const_get(klass_name)
       else
         super
       end
     end
-
   end
 end

data/lib/sfn/command/conf.rb

@@ -4,19 +4,18 @@ module Sfn
   class Command
     # Config command
     class Conf < Command
-
       include Sfn::CommandModule::Base
 
       # Run the list command
       def execute!
         ui.info ui.color("Current configuration state:")
         Config::Conf.attributes.sort_by(&:first).each do |k, val|
-          if(config.has_key?(k))
+          if config.has_key?(k)
             ui.print "  #{ui.color(k, :bold, :green)}: "
             format_value(config[k], '  ')
           end
         end
-        if(config[:generate])
+        if config[:generate]
           ui.puts
           ui.info 'Generating .sfn configuration file..'
           generate_config!
@@ -25,7 +24,7 @@ module Sfn
       end
 
       def generate_config!
-        if(File.exists?('.sfn'))
+        if File.exists?('.sfn')
           ui.warn 'Existing .sfn configuration file detected!'
           ui.confirm 'Overwrite current .sfn configuration file?'
         end
@@ -37,14 +36,14 @@ module Sfn
         end
       end
 
-      def format_value(value, indent='')
-        if(value.is_a?(Hash))
+      def format_value(value, indent = '')
+        if value.is_a?(Hash)
           ui.puts
-          value.sort_by(&:first).each do |k,v|
+          value.sort_by(&:first).each do |k, v|
             ui.print "#{indent}  #{ui.color(k, :bold)}: "
             format_value(v, indent + '  ')
           end
-        elsif(value.is_a?(Array))
+        elsif value.is_a?(Array)
           ui.puts
           value.map(&:to_s).sort.each do |v|
             ui.print "#{indent}  "
@@ -134,8 +133,6 @@ Configuration.new do
   end
 end
 EOF
-
-
     end
   end
 end

data/lib/sfn/command/create.rb

@@ -5,7 +5,6 @@ module Sfn
   class Command
     # Create command
     class Create < Command
-
       include Sfn::CommandModule::Base
       include Sfn::CommandModule::Template
       include Sfn::CommandModule::Stack
@@ -18,22 +17,22 @@ module Sfn
         # NOTE: Always disable plans on create
         config[:plan] = false
 
-        if(config[:template])
+        if config[:template]
           file = config[:template]
         else
           file = load_template_file
         end
 
-        unless(config[:print_only])
+        unless config[:print_only]
           ui.info "#{ui.color('SparkleFormation:', :bold)} #{ui.color('create', :green)}"
         end
 
         stack_info = "#{ui.color('Name:', :bold)} #{name}"
-        if(config[:path])
+        if config[:path]
           stack_info << " #{ui.color('Path:', :bold)} #{config[:file]}"
         end
 
-        if(config[:print_only])
+        if config[:print_only]
           ui.puts format_json(parameter_scrub!(template_content(file)))
           return
         else
@@ -44,7 +43,7 @@ module Sfn
           config.fetch(:options, Smash.new).dup.merge(
             :name => name,
             :template => template_content(file),
-            :parameters => Smash.new
+            :parameters => Smash.new,
           )
         )
 
@@ -53,7 +52,7 @@ module Sfn
 
         stack.parameters = config_root_parameters
 
-        if(config[:upload_root_template])
+        if config[:upload_root_template]
           upload_result = store_template(name, file, Smash.new)
           stack.template_url = upload_result[:url]
         else
@@ -62,11 +61,11 @@ module Sfn
 
         api_action!(:api_stack => stack) do
           stack.save
-          if(config[:poll])
+          if config[:poll]
             poll_stack(stack.name)
             stack = provider.stack(name)
 
-            if(stack.reload.state == :create_complete)
+            if stack.reload.state == :create_complete
               ui.info "Stack create complete: #{ui.color('SUCCESS', :green)}"
               namespace.const_get(:Describe).new({:outputs => true}, [name]).execute!
             else
@@ -78,10 +77,7 @@ module Sfn
             ui.info "Stack creation initialized for #{ui.color(name, :green)}"
           end
         end
-
       end
-
     end
-
   end
 end

data/lib/sfn/command/describe.rb

@@ -4,11 +4,10 @@ module Sfn
   class Command
     # Cloudformation describe command
     class Describe < Command
-
       include Sfn::CommandModule::Base
 
       # information available
-      unless(defined?(AVAILABLE_DISPLAYS))
+      unless defined?(AVAILABLE_DISPLAYS)
         AVAILABLE_DISPLAYS = [:resources, :outputs, :tags]
       end
 
@@ -19,12 +18,12 @@ module Sfn
         root_stack = api_action! do
           provider.stack(stack_name)
         end
-        if(root_stack)
+        if root_stack
           ([root_stack] + root_stack.nested_stacks).compact.each do |stack|
             ui.info "Stack description of #{ui.color(stack.name, :bold)}:"
             display = [].tap do |to_display|
               AVAILABLE_DISPLAYS.each do |display_option|
-                if(config[display_option])
+                if config[display_option]
                   to_display << display_option
                 end
               end
@@ -54,7 +53,7 @@ module Sfn
           table(:border => false) do
             row(:header => true) do
               allowed_attributes.each do |attr|
-                column as_title(attr), :width => stack_resources.map{|r| r[attr].to_s.length}.push(as_title(attr).length).max + 2
+                column as_title(attr), :width => stack_resources.map { |r| r[attr].to_s.length }.push(as_title(attr).length).max + 2
               end
             end
             stack_resources.each do |resource|
@@ -73,7 +72,7 @@ module Sfn
       # @param stack [Miasma::Models::Orchestration::Stack]
       def outputs(stack)
         ui.info "Outputs for stack: #{ui.color(stack.name, :bold)}"
-        unless(stack.outputs.nil? || stack.outputs.empty?)
+        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(' ')
@@ -89,7 +88,7 @@ module Sfn
       # @param stack [Miasma::Models::Orchestration::Stack]
       def tags(stack)
         ui.info "Tags for stack: #{ui.color(stack.name, :bold)}"
-        if(stack.tags && !stack.tags.empty?)
+        if stack.tags && !stack.tags.empty?
           stack.tags.each do |key, value|
             ui.info ['  ', ui.color("#{key}:", :bold), value].join(' ')
           end
@@ -102,7 +101,6 @@ module Sfn
       def default_attributes
         %w(updated logical_id type status status_reason)
       end
-
     end
   end
 end