stack_master 2.17.0 → 2.18.0

data/lib/stack_master/commands/drift.rb

@@ -6,16 +6,17 @@ module StackMaster
       include Command
       include Commander::UI
 
-      DETECTION_COMPLETE_STATES = [
-        'DETECTION_COMPLETE',
-        'DETECTION_FAILED'
+      DETECTION_COMPLETE_STATES = %w[
+        DETECTION_COMPLETE
+        DETECTION_FAILED
       ]
 
       def perform
         detect_stack_drift_result = cf.detect_stack_drift(stack_name: stack_name)
         drift_results = wait_for_drift_results(detect_stack_drift_result.stack_drift_detection_id)
 
-        puts colorize("Drift Status: #{drift_results.stack_drift_status}", stack_drift_status_color(drift_results.stack_drift_status))
+        puts colorize("Drift Status: #{drift_results.stack_drift_status}",
+                      stack_drift_status_color(drift_results.stack_drift_status))
         return if drift_results.stack_drift_status == 'IN_SYNC'
 
         failed
@@ -40,9 +41,7 @@ module StackMaster
                        drift.physical_resource_id].join(' '), color)
         return unless drift.stack_resource_drift_status == 'MODIFIED'
 
-        unless drift.property_differences.empty?
-          puts colorize('  Property differences:', color)
-        end
+        puts colorize('  Property differences:', color) unless drift.property_differences.empty?
         drift.property_differences.each do |property_difference|
           puts colorize("  - #{property_difference.difference_type} #{property_difference.property_path}", color)
         end
@@ -51,8 +50,10 @@ module StackMaster
       end
 
       def display_resource_drift(drift)
-        diff = ::StackMaster::Diff.new(before: prettify_json(drift.expected_properties),
-                        after: prettify_json(drift.actual_properties))
+        diff = ::StackMaster::Diff.new(
+          before: prettify_json(drift.expected_properties),
+          after: prettify_json(drift.actual_properties)
+        )
         diff.display_colorized_diff
       end
 
@@ -95,9 +96,7 @@ module StackMaster
           break if DETECTION_COMPLETE_STATES.include?(resp.detection_status)
 
           elapsed_time = Time.now - start_time
-          if elapsed_time > @options.timeout
-            raise "Timeout waiting for stack drift detection"
-          end
+          raise 'Timeout waiting for stack drift detection' if elapsed_time > @options.timeout
 
           sleep SLEEP_SECONDS
         end

data/lib/stack_master/commands/events.rb

@@ -9,9 +9,9 @@ module StackMaster
         filter_events(events).each do |event|
           StackEvents::Presenter.print_event(StackMaster.stdout, event)
         end
-        if @options.tail
-          StackEvents::Streamer.stream(@stack_definition.stack_name, @stack_definition.region, io: StackMaster.stdout)
-        end
+        return unless @options.tail
+
+        StackEvents::Streamer.stream(@stack_definition.stack_name, @stack_definition.region, io: StackMaster.stdout)
       end
 
       private
@@ -22,9 +22,7 @@ module StackMaster
         else
           n = @options.number || 25
           from = events.count - n
-          if from < 0
-            from = 0
-          end
+          from = 0 if from < 0
           events[from..-1]
         end
       end

data/lib/stack_master/commands/init.rb

@@ -1,4 +1,4 @@
-require "erb"
+require 'erb'
 
 module StackMaster
   module Commands
@@ -12,27 +12,28 @@ module StackMaster
       end
 
       def perform
-        if check_files
-          create_stack_master_yml
-          create_stack_json_yml
-          create_parameters_yml
-        end
+        return unless check_files
+
+        create_stack_master_yml
+        create_stack_json_yml
+        create_parameters_yml
       end
 
       private
 
       def check_files
-        @stack_master_filename = "stack_master.yml"
+        @stack_master_filename = 'stack_master.yml'
         @stack_json_filename = "templates/#{@stack_name}.json"
-        @parameters_filename = File.join("parameters", "#{@stack_name}.yml")
-        @region_parameters_filename = File.join("parameters", @region, "#{@stack_name}.yml")
-
-        if !@options.overwrite
-          [@stack_master_filename, @stack_json_filename, @parameters_filename, @region_parameters_filename].each do |filename|
-            if File.exist?(filename)
-              StackMaster.stderr.puts("Aborting: #{filename} already exists. Use --overwrite to force overwriting file.")
-              return false
-            end
+        @parameters_filename = File.join('parameters', "#{@stack_name}.yml")
+        @region_parameters_filename = File.join('parameters', @region, "#{@stack_name}.yml")
+
+        unless @options.overwrite
+          [@stack_master_filename, @stack_json_filename, @parameters_filename,
+           @region_parameters_filename].each do |filename|
+            next unless File.exist?(filename)
+
+            StackMaster.stderr.puts("Aborting: #{filename} already exists. Use --overwrite to force overwriting file.")
+            return false
           end
         end
         true
@@ -49,7 +50,7 @@ module StackMaster
       end
 
       def stack_json_template
-        File.join(StackMaster.base_dir, "stacktemplates", "stack.json.erb")
+        File.join(StackMaster.base_dir, 'stacktemplates', 'stack.json.erb')
       end
 
       def create_stack_master_yml
@@ -62,7 +63,7 @@ module StackMaster
       end
 
       def stack_master_template
-        File.join(StackMaster.base_dir, "stacktemplates", "stack_master.yml.erb")
+        File.join(StackMaster.base_dir, 'stacktemplates', 'stack_master.yml.erb')
       end
 
       def create_parameters_yml
@@ -82,11 +83,11 @@ module StackMaster
       end
 
       def parameter_stack_name_template
-        File.join(StackMaster.base_dir, "stacktemplates", "parameter_stack_name.yml")
+        File.join(StackMaster.base_dir, 'stacktemplates', 'parameter_stack_name.yml')
       end
 
       def parameter_region_template
-        File.join(StackMaster.base_dir, "stacktemplates", "parameter_region.yml")
+        File.join(StackMaster.base_dir, 'stacktemplates', 'parameter_region.yml')
       end
 
       def render(renderer)

data/lib/stack_master/commands/lint.rb

@@ -19,7 +19,7 @@ module StackMaster
           f.write(proposed_stack.template_body)
           f.flush
           system('cfn-lint', f.path)
-          puts "cfn-lint run complete"
+          puts 'cfn-lint run complete'
         end
       end
 

data/lib/stack_master/commands/list_stacks.rb

@@ -8,7 +8,7 @@ module StackMaster
       include StackMaster::Commands::TerminalHelper
 
       def perform
-        tp.set :max_width, self.window_size
+        tp.set :max_width, window_size
         tp @config.stacks, :region, :stack_name
       end
     end

data/lib/stack_master/commands/nag.rb

@@ -24,7 +24,6 @@ module StackMaster
       def proposed_stack
         @proposed_stack ||= Stack.generate(stack_definition, @config)
       end
-
     end
   end
 end

data/lib/stack_master/commands/outputs.rb

@@ -9,7 +9,7 @@ module StackMaster
 
       def perform
         if stack
-          tp.set :max_width, self.window_size
+          tp.set :max_width, window_size
           tp stack.outputs, :output_key, :output_value, :description
         else
           failed("Stack doesn't exist")

data/lib/stack_master/commands/resources.rb

@@ -8,7 +8,15 @@ module StackMaster
 
       def perform
         if stack_resources
-          tp stack_resources, :logical_resource_id, :resource_type, :timestamp, :resource_status, :resource_status_reason, :description
+          tp(
+            stack_resources,
+            :logical_resource_id,
+            :resource_type,
+            :timestamp,
+            :resource_status,
+            :resource_status_reason,
+            :description
+          )
         else
           failed("Stack doesn't exist")
         end

data/lib/stack_master/commands/status.rb

@@ -21,11 +21,11 @@ module StackMaster
           {
             region: stack_definition.region,
             stack_name: stack_definition.stack_name,
-            stack_status: running_in_allowed_account?(allowed_accounts) ? stack_status.status : "Disallowed account",
-            different: running_in_allowed_account?(allowed_accounts) ? stack_status.changed_message : "N/A",
+            stack_status: running_in_allowed_account?(allowed_accounts) ? stack_status.status : 'Disallowed account',
+            different: running_in_allowed_account?(allowed_accounts) ? stack_status.changed_message : 'N/A'
           }
         end
-        tp.set :max_width, self.window_size
+        tp.set :max_width, window_size
         tp.set :io, StackMaster.stdout
         tp status
         StackMaster.stdout.puts " * No echo parameters can't be diffed"
@@ -34,7 +34,7 @@ module StackMaster
       private
 
       def progress
-        @progress ||= ProgressBar.create(title: "Fetching stack information",
+        @progress ||= ProgressBar.create(title: 'Fetching stack information',
                                          total: @config.stacks.size,
                                          output: StackMaster.stdout)
       end

data/lib/stack_master/commands/terminal_helper.rb

@@ -4,9 +4,9 @@ module StackMaster
   module Commands
     module TerminalHelper
       def window_size
-        size = ENV.fetch("COLUMNS") { OS.windows? ? windows_window_size : unix_window_size }
+        size = ENV.fetch('COLUMNS') { OS.windows? ? windows_window_size : unix_window_size }
 
-        if size.nil? || size == ""
+        if size.nil? || size == ''
           80
         else
           size.to_i
@@ -18,7 +18,7 @@ module StackMaster
       end
 
       def windows_window_size
-        columns_regex = %r{^\s+Columns:\s+([0-9]+)$}
+        columns_regex = /^\s+Columns:\s+([0-9]+)$/
         output = `mode con`
         columns_line = output.split("\n").select { |line| line.match(columns_regex) }.last
         columns_line.match(columns_regex)[1]

data/lib/stack_master/commands/tidy.rb

@@ -8,20 +8,23 @@ module StackMaster
         used_templates = []
         used_parameter_files = []
 
-        templates = Set.new(find_templates())
-        parameter_files = Set.new(find_parameter_files())
+        templates = Set.new(find_templates)
+        parameter_files = Set.new(find_parameter_files)
 
         status = @config.stacks.each do |stack_definition|
           parameter_files.subtract(stack_definition.parameter_files_from_globs)
           template = File.absolute_path(stack_definition.template_file_path)
 
-          if template
-            templates.delete(template)
+          next unless template
 
-            if !File.exist?(template)
-              StackMaster.stdout.puts "Stack \"#{stack_definition.stack_name}\" in \"#{stack_definition.region}\" missing template \"#{rel_path(template)}\""
-            end
-          end
+          templates.delete(template)
+
+          next if File.exist?(template)
+
+          StackMaster.stdout.puts(
+            "Stack \"#{stack_definition.stack_name}\" in \"#{stack_definition.region}\" " \
+            "missing template \"#{rel_path(template)}\""
+          )
         end
 
         templates.each do |path|
@@ -43,21 +46,19 @@ module StackMaster
         # template directories) this won't find the right directory.
         template_dir = @config.template_dir || File.join(@config.base_dir, 'templates')
 
-        templates = Dir.glob(File.absolute_path(File.join(template_dir, '**', "*.{rb,yaml,yml,json}")))
+        templates = Dir.glob(File.absolute_path(File.join(template_dir, '**', '*.{rb,yaml,yml,json}')))
         dynamics_dir = File.join(template_dir, 'dynamics')
 
         # Exclude sparkleformation dynamics
         # TODO: Should this filter out anything with 'dynamics', not just the first
         # subdirectory?
-        templates = templates.select do |path|
+        templates.select do |path|
           !path.start_with?(dynamics_dir)
         end
-
-        templates
       end
 
       def find_parameter_files
-        Dir.glob(File.absolute_path(File.join(@config.base_dir, "parameters", "*.{yml,yaml}")))
+        Dir.glob(File.absolute_path(File.join(@config.base_dir, 'parameters', '*.{yml,yaml}')))
       end
     end
   end

data/lib/stack_master/config.rb

@@ -14,23 +14,25 @@ module StackMaster
       raise ConfigParseError, "Unable to parse #{resolved_config_file}: #{error}"
     end
 
-    attr_accessor :stacks,
-                  :base_dir,
-                  :template_dir,
-                  :parameters_dir,
-                  :stack_defaults,
-                  :region_defaults,
-                  :region_aliases,
-                  :template_compilers,
+    attr_accessor(
+      :stacks,
+      :base_dir,
+      :template_dir,
+      :parameters_dir,
+      :stack_defaults,
+      :region_defaults,
+      :region_aliases,
+      :template_compilers
+    )
 
     def self.search_up_and_chdir(config_file)
-      return config_file unless File.dirname(config_file) == "."
+      return config_file unless File.dirname(config_file) == '.'
 
       dir = Dir.pwd
-      parent_dir = File.expand_path("..", Dir.pwd)
+      parent_dir = File.expand_path('..', Dir.pwd)
       while parent_dir != dir && !File.exist?(File.join(dir, config_file))
         dir = parent_dir
-        parent_dir = File.expand_path("..", dir)
+        parent_dir = File.expand_path('..', dir)
       end
 
       File.join(dir, config_file)
@@ -43,15 +45,15 @@ module StackMaster
       @parameters_dir = config.fetch('parameters_dir', nil)
       @stack_defaults = config.fetch('stack_defaults', {})
       @region_aliases = Utils.underscore_keys_to_hyphen(config.fetch('region_aliases', {}))
-      @region_to_aliases = @region_aliases.inject({}) do |hash, (key, value)|
+      @region_to_aliases = @region_aliases.each_with_object({}) do |(key, value), hash|
         hash[value] ||= []
         hash[value] << key
-        hash
       end
       @region_defaults = normalise_region_defaults(config.fetch('region_defaults', {}))
       @stacks = []
 
       raise ConfigParseError.new("Stack defaults can't be undefined") if @stack_defaults.nil?
+
       load_template_compilers(config)
       load_config
     end
@@ -72,6 +74,7 @@ module StackMaster
     end
 
     private
+
     def load_template_compilers(config)
       @template_compilers = {}
       populate_template_compilers(config.fetch('template_compilers', {}))
@@ -82,7 +85,7 @@ module StackMaster
       @template_compilers = default_template_compilers.merge(@template_compilers)
     end
 
-    def populate_template_compilers user_defined_compilers
+    def populate_template_compilers(user_defined_compilers)
       user_defined_compilers.each do |key, val|
         @template_compilers[key.to_sym] = val.to_sym
       end
@@ -92,9 +95,9 @@ module StackMaster
       {
         rb: :sparkle_formation,
         json: :json,
-        yml:  :yaml,
+        yml: :yaml,
         yaml: :yaml,
-        erb:  :yaml_erb,
+        erb: :yaml_erb
       }
     end
 
@@ -104,9 +107,8 @@ module StackMaster
     end
 
     def resolve_region_aliases(stacks)
-      stacks.inject({}) do |hash, (region, attributes)|
+      stacks.each_with_object({}) do |(region, attributes), hash|
         hash[unalias_region(region)] = attributes
-        hash
       end
     end
 
@@ -123,7 +125,8 @@ module StackMaster
             'base_dir' => @base_dir,
             'template_dir' => @template_dir,
             'parameters_dir' => @parameters_dir,
-            'additional_parameter_lookup_dirs' => @region_to_aliases[region])
+            'additional_parameter_lookup_dirs' => @region_to_aliases[region]
+          )
           stack_attributes['allowed_accounts'] = attributes['allowed_accounts'] if attributes['allowed_accounts']
           @stacks << StackDefinition.new(stack_attributes)
         end
@@ -136,10 +139,9 @@ module StackMaster
     end
 
     def normalise_region_defaults(region_defaults)
-      region_defaults.inject({}) do |normalised_aliases, (region_or_alias, value)|
+      region_defaults.each_with_object({}) do |(region_or_alias, value), normalised_aliases|
         region = unalias_region(region_or_alias)
         normalised_aliases[Utils.underscore_to_hyphen(region)] = value
-        normalised_aliases
       end
     end
   end

data/lib/stack_master/diff.rb

@@ -1,6 +1,6 @@
 module StackMaster
   class Diff
-    def initialize(name: nil, before:, after:, context: 10_000)
+    def initialize(before:, after:, name: nil, context: 10_000)
       @name = name
       @before = before
       @after = after
@@ -10,7 +10,7 @@ module StackMaster
     def display
       stdout.print "#{@name} diff: "
       if diff == ''
-        stdout.puts "No changes"
+        stdout.puts 'No changes'
       else
         stdout.puts
         display_colorized_diff

data/lib/stack_master/identity.rb

@@ -21,7 +21,8 @@ module StackMaster
     def account_aliases
       @aliases ||= iam.list_account_aliases.account_aliases
     rescue Aws::IAM::Errors::AccessDenied
-      raise MissingIamPermissionsError, 'Failed to retrieve account aliases. Missing required IAM permission: iam:ListAccountAliases'
+      raise MissingIamPermissionsError,
+            'Failed to retrieve account aliases. Missing required IAM permission: iam:ListAccountAliases'
     end
 
     private

data/lib/stack_master/parameter_loader.rb

@@ -2,19 +2,17 @@ require 'active_support/core_ext/object/deep_dup'
 
 module StackMaster
   class ParameterLoader
-
     COMPILE_TIME_PARAMETERS_KEY = 'compile_time_parameters'
 
     def self.load(parameter_files: [], parameters: {})
       StackMaster.debug 'Searching for parameter files...'
       all_parameters = parameter_files.map { |file_name| load_parameters(file_name) } + [parameters]
-      all_parameters.reduce({template_parameters: {}, compile_time_parameters: {}}) do |hash, parameters|
+      all_parameters.each_with_object({ template_parameters: {}, compile_time_parameters: {} }) do |parameters, hash|
         template_parameters = create_template_parameters(parameters)
         compile_time_parameters = create_compile_time_parameters(parameters)
 
         merge_and_camelize(hash[:template_parameters], template_parameters)
         merge_and_camelize(hash[:compile_time_parameters], compile_time_parameters)
-        hash
       end
     end
 
@@ -32,7 +30,8 @@ module StackMaster
 
     def self.create_template_parameters(parameters)
       parameters.deep_dup.tap do |parameters_clone|
-        parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) || parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
+        parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) ||
+          parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
       end
     end
 
@@ -43,6 +42,5 @@ module StackMaster
     def self.merge_and_camelize(hash, parameters)
       parameters.each { |key, value| hash[key.camelize] = value }
     end
-
   end
 end

data/lib/stack_master/parameter_resolver.rb

@@ -15,13 +15,12 @@ module StackMaster
     end
 
     def resolve
-      @parameters.reduce({}) do |parameters, (key, value)|
+      @parameters.each_with_object({}) do |(key, value), parameters|
         begin
           parameters[key] = resolve_parameter_value(key, value)
         rescue InvalidParameter
           raise InvalidParameter, "Unable to resolve parameter #{key.inspect} value causing error: #{$!.message}"
         end
-        parameters
       end
     end
 
@@ -30,11 +29,9 @@ module StackMaster
     def require_parameter_resolver(file_name)
       require "stack_master/parameter_resolvers/#{file_name}"
     rescue LoadError
-      if file_name == file_name.singularize
-        raise ResolverNotFound.new(file_name)
-      else
-        require_parameter_resolver(file_name.singularize)
-      end
+      raise ResolverNotFound.new(file_name) if file_name == file_name.singularize
+
+      require_parameter_resolver(file_name.singularize)
     end
 
     def load_parameter_resolver(class_name)
@@ -46,9 +43,12 @@ module StackMaster
     end
 
     def resolve_parameter_value(key, parameter_value)
-      return parameter_value.to_s if Numeric === parameter_value || parameter_value == true || parameter_value == false
-      return resolve_array_parameter_values(key, parameter_value).join(',') if Array === parameter_value
-      return parameter_value unless Hash === parameter_value
+      if parameter_value.is_a?(Numeric) || parameter_value == true || parameter_value == false
+        return parameter_value.to_s
+      end
+      return resolve_array_parameter_values(key, parameter_value).join(',') if parameter_value.is_a?(Array)
+      return parameter_value unless parameter_value.is_a?(Hash)
+
       resolve_parameter_resolver_hash(key, parameter_value)
     rescue Aws::CloudFormation::Errors::ValidationError
       raise InvalidParameter, $!.message
@@ -72,14 +72,13 @@ module StackMaster
       end
     end
 
-    def assume_role_if_present(account, role, key)
+    def assume_role_if_present(account, role, key, &block)
       return yield if account.nil? && role.nil?
       if account.nil? || role.nil?
         raise InvalidParameter, "Both 'account' and 'role' are required to assume role for parameter '#{key}'"
       end
-      role_assumer.assume_role(account, role) do
-        yield
-      end
+
+      role_assumer.assume_role(account, role, &block)
     end
 
     def resolve_array_parameter_values(key, parameter_values)
@@ -105,15 +104,16 @@ module StackMaster
         begin
           @resolvers[class_name] = resolver_class_const(class_name).new(@config, @stack_definition)
         rescue NameError
-          raise ResolverNotFound, "Could not find parameter resolver called #{class_name}, please double check your configuration"
+          raise ResolverNotFound,
+                "Could not find parameter resolver called #{class_name}, please double check your configuration"
         end
       end
     end
 
     def validate_parameter_value!(key, parameter_value)
-      if parameter_value.keys.size != 1
-        raise InvalidParameter, "#{key} hash contained more than one key: #{parameter_value.inspect}"
-      end
+      return if parameter_value.keys.size == 1
+
+      raise InvalidParameter, "#{key} hash contained more than one key: #{parameter_value.inspect}"
     end
 
     def role_assumer

data/lib/stack_master/parameter_resolvers/acm_certificate.rb

@@ -10,7 +10,10 @@ module StackMaster
 
       def resolve(domain_name)
         cert_arn = find_cert_arn_by_domain_name(domain_name)
-        raise CertificateNotFound, "Could not find certificate #{domain_name} in #{@stack_definition.region}" unless cert_arn
+        unless cert_arn
+          raise CertificateNotFound, "Could not find certificate #{domain_name} in #{@stack_definition.region}"
+        end
+
         cert_arn
       end
 

data/lib/stack_master/parameter_resolvers/ami_finder.rb

@@ -6,16 +6,15 @@ module StackMaster
       end
 
       def build_filters_from_string(value, prefix = nil)
-        filters = value.split(',').map do |name_with_value|
+        value.split(',').map do |name_with_value|
           name, value = name_with_value.strip.split('=')
           name = prefix ? "#{prefix}:#{name}" : name
           { name: name, values: [value] }
         end
-        filters
       end
 
       def build_filters_from_hash(hash)
-        hash.map { |key, value| {name: key, values: Array(value.to_s)}}
+        hash.map { |key, value| { name: key, values: Array(value.to_s) } }
       end
 
       def find_latest_ami(filters, owners = ['self'])

data/lib/stack_master/parameter_resolvers/ejson.rb

@@ -22,17 +22,20 @@ module StackMaster
       private
 
       def validate_ejson_file_specified
-        if @stack_definition.ejson_file.nil?
-          raise ArgumentError, "No ejson_file defined for stack definition #{@stack_definition.stack_name} in #{@stack_definition.region}"
-        end
+        return unless @stack_definition.ejson_file.nil?
+
+        raise ArgumentError, 'No ejson_file defined for stack definition ' \
+                             "#{@stack_definition.stack_name} in #{@stack_definition.region}"
       end
 
       def decrypt_ejson_file
         ejson_file_key = credentials_key
         @decrypted_ejson_files.fetch(ejson_file_key) do
-          @decrypted_ejson_files[ejson_file_key] = EJSONWrapper.decrypt(ejson_file_path,
-                                                                        use_kms: @stack_definition.ejson_file_kms,
-                                                                        region: ejson_file_region)
+          @decrypted_ejson_files[ejson_file_key] = EJSONWrapper.decrypt(
+            ejson_file_path,
+            use_kms: @stack_definition.ejson_file_kms,
+            region: ejson_file_region
+          )
         end
       end