stack_master 2.5.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb7f5a24127477671e8e06a522daedc090735825f9911168123d0a7173bf2350
-  data.tar.gz: 2301be2eaf943e22f980c07b75686d5303a77e3475c34f9de0eee1e6654a9bf6
+  metadata.gz: 2ba7ee171f7c218998ce73593d18bb62165c40a201f088b51192a7cfc1d8fb10
+  data.tar.gz: 368a14a56b4cbd7678d71860902c1e1d360756c6272bd1fc6a7b1b6f5ac8f7c3
 SHA512:
-  metadata.gz: 59a9b3bc3d11e90bd4a01c57b76085bc2b702c3c10feee855d66cf3199225068a9298ff7e750dea12fdd55746e91e5b61f673065ebc48b59f22e1d2344c1c6f9
-  data.tar.gz: bdef690c7b5ea589d060f92c8c09a9fb4f491216ed2997a2c37f3c67bea41a598d70039686a17d44efa26d03e8cc17786ce5a424efd9d41f659af370ee98f8ed
+  metadata.gz: 6eb37d06cd15fbf0852f7c798a18b35747b001d8ffe1edfcdf55c25c629e46d731c47dc5466e8af7275512f6f2dac54b492c714069dfded2c78ab6920bea04af
+  data.tar.gz: 03c242ee5d588b817a53d1bf74e6808c762d37047805fcd79b18c73d5f2e84ce87ed8114efe7ea583f05d71449b4d64b50f4cce7395b72784d9c44837cb9579d

data/README.md

@@ -123,6 +123,7 @@ stack_defaults:
 ```
 
 Additional files can be configured to be uploaded to S3 alongside the templates:
+
 ```yaml
 stacks:
   production:
@@ -131,6 +132,7 @@ stacks:
       files:
         - userdata.sh
 ```
+
 ## Directories
 
 - `templates` - CloudFormation, SparkleFormation or CfnDsl templates.
@@ -155,7 +157,8 @@ template_compilers:
 
 ## Parameters
 
-Parameters are loaded from multiple YAML files, merged from the following lookup paths from bottom to top:
+By default, parameters are loaded from multiple YAML files, merged from the
+following lookup paths from bottom to top:
 
 - parameters/[stack_name].yaml
 - parameters/[stack_name].yml
@@ -170,6 +173,30 @@ A simple parameter file could look like this:
 key_name: myapp-us-east-1
 ```
 
+Alternatively, a `parameter_files` array can be defined to explicitly list
+parameter files that will be loaded. If `parameter_files` are defined, the
+automatic search locations will not be used.
+
+```yaml
+parameters_dir: parameters # the default
+stacks:
+  us-east-1:
+    my-app:
+      parameter_files:
+        - my-app.yml # parameters/my-app.yml
+```
+
+Parameters can also be defined inline with stack definitions:
+
+```yaml
+stacks:
+  us-east-1:
+    my-app:
+      parameters:
+        VpcId:
+          stack_output: my-vpc/VpcId
+```
+
 ### Compile Time Parameters
 
 Compile time parameters can be used for [SparkleFormation](http://www.sparkleformation.io) templates. It conforms and
@@ -661,6 +688,7 @@ stacks:
 
 In the cases where you want to bypass the account check, there is the StackMaster flag `--skip-account-check` that can be used.
 
+
 ## Commands
 
 ```bash
@@ -674,6 +702,7 @@ stack_master apply # Create or update all stacks
 stack_master --changed apply # Create or update all stacks that have changed
 stack_master --yes apply [region-or-alias] [stack-name] # Create or update a stack non-interactively (forcing yes)
 stack_master diff [region-or-alias] [stack-name] # Display a stack template and parameter diff
+stack_master drift [region-or-alias] [stack-name] # Detects and displays stack drift using the CloudFormation Drift API
 stack_master delete [region-or-alias] [stack-name] # Delete a stack
 stack_master events [region-or-alias] [stack-name] # Display events for a stack
 stack_master outputs [region-or-alias] [stack-name] # Display outputs for a stack
@@ -682,7 +711,7 @@ stack_master status # Displays the status of each stack
 stack_master tidy # Find missing or extra templates or parameter files
 ```
 
-## Applying updates
+## Applying updates - `stack_master apply`
 
 The apply command does the following:
 
@@ -699,6 +728,18 @@ Demo:
 
 ![Apply Demo](/apply_demo.gif?raw=true)
 
+## Drift Detection - `stack_master drift`
+
+`stack_master drift us-east-1 mystack` uses the CloudFormation APIs to trigger drift detection and display resources
+that have changed outside of the CloudFormation stack. This can happen if a resource has been updated via the console or
+CLI directly rather than via a stack update.
+
+## Diff - `stack_master diff`
+
+`stack_master diff us-east-1 mystack` displays whether the computed parameters or template differ to what was last
+applied in CloudFormation. This can happen if the template or computed parameters have changed in code and the change
+hasn't been applied to this stack.
+
 ## Maintainers
 
 - [Steve Hodgkiss](https://github.com/stevehodgkiss)

data/lib/stack_master.rb

@@ -8,7 +8,7 @@ require 'aws-sdk-s3'
 require 'aws-sdk-sns'
 require 'aws-sdk-ssm'
 require 'aws-sdk-iam'
-require 'colorize'
+require 'rainbow'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
@@ -24,6 +24,7 @@ module StackMaster
   autoload :CLI, 'stack_master/cli'
   autoload :CtrlC, 'stack_master/ctrl_c'
   autoload :Command, 'stack_master/command'
+  autoload :Diff, 'stack_master/diff'
   autoload :VERSION, 'stack_master/version'
   autoload :Stack, 'stack_master/stack'
   autoload :Prompter, 'stack_master/prompter'
@@ -56,6 +57,7 @@ module StackMaster
   module Commands
     autoload :TerminalHelper, 'stack_master/commands/terminal_helper'
     autoload :Apply, 'stack_master/commands/apply'
+    autoload :Drift, 'stack_master/commands/drift'
     autoload :Events, 'stack_master/commands/events'
     autoload :Outputs, 'stack_master/commands/outputs'
     autoload :Init, 'stack_master/commands/init'
@@ -130,7 +132,7 @@ module StackMaster
 
   def debug(message)
     return unless debug?
-    stderr.puts "[DEBUG] #{message}".colorize(:green)
+    stderr.puts Rainbow("[DEBUG] #{message}").color(:green)
   end
 
   def quiet!
@@ -198,4 +200,16 @@ module StackMaster
   def stderr=(io)
     @stderr = io
   end
+
+  def colorize(text, color)
+    if colorize?
+      Rainbow(text).color(color)
+    else
+      text
+    end
+  end
+
+  def colorize?
+    ENV.fetch('COLORIZE') { 'true' } == 'true'
+  end
 end

data/lib/stack_master/aws_driver/cloud_formation.rb

@@ -28,7 +28,10 @@ module StackMaster
                           :update_stack,
                           :create_stack,
                           :validate_template,
-                          :describe_stacks
+                          :describe_stacks,
+                          :detect_stack_drift,
+                          :describe_stack_drift_detection_status,
+                          :describe_stack_resource_drifts
 
       private
 

data/lib/stack_master/change_set.rb

@@ -75,7 +75,7 @@ io.puts "========================================"
                     end
       message = "#{action_name} #{resource_change.resource_type} #{resource_change.logical_resource_id}"
       color = action_color(action_name)
-      io.puts message.colorize(color)
+      io.puts Rainbow(message).color(color)
       resource_change.details.each do |detail|
         display_resource_change_detail(io, action_name, color, detail)
       end
@@ -92,7 +92,7 @@ io.puts "========================================"
         triggered_by << "(#{detail.evaluation})"
       end
       detail_messages << "Triggered by: #{triggered_by}"
-      io.puts "- #{detail_messages.join('. ')}. ".colorize(color)
+      io.puts Rainbow("- #{detail_messages.join('. ')}. ").color(color)
     end
 
     def action_color(action_name)

data/lib/stack_master/cli.rb

@@ -215,6 +215,18 @@ module StackMaster
         end
       end
 
+      command :drift do |c|
+        c.syntax = 'stack_master drift [region_or_alias] [stack_name]'
+        c.summary = 'Detects and displays stack drift using the CloudFormation Drift API'
+        c.description = 'Detects and displays stack drift'
+        c.option '--timeout SECONDS', Integer, "The number of seconds to wait for drift detection to complete"
+        c.example 'view stack drift for a stack named myapp-vpc in us-east-1', 'stack_master drift us-east-1 myapp-vpc'
+        c.action do |args, options|
+          options.default config: default_config_file, timeout: 120
+          execute_stacks_command(StackMaster::Commands::Drift, args, options)
+        end
+      end
+
       run!
     end
 

data/lib/stack_master/commands/drift.rb

@@ -0,0 +1,118 @@
+require 'diffy'
+
+module StackMaster
+  module Commands
+    class Drift
+      include Command
+      include Commander::UI
+
+      DETECTION_COMPLETE_STATES = [
+        '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))
+        return if drift_results.stack_drift_status == 'IN_SYNC'
+
+        failed
+
+        resp = cf.describe_stack_resource_drifts(stack_name: stack_name)
+        resp.stack_resource_drifts.each do |drift|
+          display_drift(drift)
+        end
+      end
+
+      private
+
+      def cf
+        @cf ||= StackMaster.cloud_formation_driver
+      end
+
+      def display_drift(drift)
+        color = drift_color(drift)
+        puts colorize([drift.stack_resource_drift_status,
+                       drift.resource_type,
+                       drift.logical_resource_id,
+                       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
+        drift.property_differences.each do |property_difference|
+          puts colorize("  - #{property_difference.difference_type} #{property_difference.property_path}", color)
+        end
+        puts colorize('  Resource diff:', color)
+        display_resource_drift(drift)
+      end
+
+      def display_resource_drift(drift)
+        diff = ::StackMaster::Diff.new(before: prettify_json(drift.expected_properties),
+                        after: prettify_json(drift.actual_properties))
+        diff.display_colorized_diff
+      end
+
+      def prettify_json(string)
+        JSON.pretty_generate(JSON.parse(string)) + "\n"
+      rescue StandardError => e
+        puts "Failed to prettify drifted resource: #{e.message}"
+        string
+      end
+
+      def stack_drift_status_color(stack_drift_status)
+        case stack_drift_status
+        when 'IN_SYNC'
+          :green
+        when 'DRIFTED'
+          :yellow
+        else
+          :blue
+        end
+      end
+
+      def drift_color(drift)
+        case drift.stack_resource_drift_status
+        when 'IN_SYNC'
+          :green
+        when 'MODIFIED'
+          :yellow
+        when 'DELETED'
+          :red
+        else
+          :blue
+        end
+      end
+
+      def wait_for_drift_results(detection_id)
+        resp = nil
+        start_time = Time.now
+        loop do
+          resp = cf.describe_stack_drift_detection_status(stack_drift_detection_id: detection_id)
+          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
+
+          sleep SLEEP_SECONDS
+        end
+        resp
+      end
+
+      def puts(string)
+        StackMaster.stdout.puts(string)
+      end
+
+      extend Forwardable
+      def_delegators :@stack_definition, :stack_name, :region
+      def_delegators :StackMaster, :colorize
+
+      SLEEP_SECONDS = 1
+    end
+  end
+end

data/lib/stack_master/commands/tidy.rb

@@ -12,7 +12,7 @@ module StackMaster
         parameter_files = Set.new(find_parameter_files())
 
         status = @config.stacks.each do |stack_definition|
-          parameter_files.subtract(stack_definition.parameter_files)
+          parameter_files.subtract(stack_definition.parameter_files_from_globs)
           template = File.absolute_path(stack_definition.template_file_path)
 
           if template

data/lib/stack_master/config.rb

@@ -17,6 +17,7 @@ module StackMaster
     attr_accessor :stacks,
                   :base_dir,
                   :template_dir,
+                  :parameters_dir,
                   :stack_defaults,
                   :region_defaults,
                   :region_aliases,
@@ -39,6 +40,7 @@ module StackMaster
       @config = config
       @base_dir = base_dir
       @template_dir = config.fetch('template_dir', nil)
+      @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)|
@@ -115,6 +117,7 @@ module StackMaster
             'stack_name' => stack_name,
             'base_dir' => @base_dir,
             'template_dir' => @template_dir,
+            'parameters_dir' => @parameters_dir,
             'additional_parameter_lookup_dirs' => @region_to_aliases[region])
           stack_attributes['allowed_accounts'] = attributes['allowed_accounts'] if attributes['allowed_accounts']
           @stacks << StackDefinition.new(stack_attributes)

data/lib/stack_master/diff.rb

@@ -0,0 +1,45 @@
+module StackMaster
+  class Diff
+    def initialize(name: nil, before:, after:, context: 10_000)
+      @name = name
+      @before = before
+      @after = after
+      @context = context
+    end
+
+    def display
+      stdout.print "#{@name} diff: "
+      if diff == ''
+        stdout.puts "No changes"
+      else
+        stdout.puts
+        display_colorized_diff
+      end
+    end
+
+    def display_colorized_diff
+      diff.each_line do |line|
+        if line.start_with?('+')
+          stdout.print colorize(line, :green)
+        elsif line.start_with?('-')
+          stdout.print colorize(line, :red)
+        else
+          stdout.print line
+        end
+      end
+    end
+
+    def different?
+      diff != ''
+    end
+
+    private
+
+    def diff
+      @diff ||= Diffy::Diff.new(@before, @after, context: @context).to_s
+    end
+
+    extend Forwardable
+    def_delegators :StackMaster, :colorize, :stdout
+  end
+end

data/lib/stack_master/parameter_loader.rb

@@ -5,10 +5,10 @@ module StackMaster
 
     COMPILE_TIME_PARAMETERS_KEY = 'compile_time_parameters'
 
-    def self.load(parameter_files)
+    def self.load(parameter_files: [], parameters: {})
       StackMaster.debug 'Searching for parameter files...'
-      parameter_files.reduce({template_parameters: {}, compile_time_parameters: {}}) do |hash, file_name|
-        parameters = load_parameters(file_name)
+      all_parameters = parameter_files.map { |file_name| load_parameters(file_name) } + [parameters]
+      all_parameters.reduce({template_parameters: {}, compile_time_parameters: {}}) do |hash, parameters|
         template_parameters = create_template_parameters(parameters)
         compile_time_parameters = create_compile_time_parameters(parameters)
 
@@ -16,7 +16,6 @@ module StackMaster
         merge_and_camelize(hash[:compile_time_parameters], compile_time_parameters)
         hash
       end
-
     end
 
     private

data/lib/stack_master/parameter_validator.rb

@@ -9,15 +9,14 @@ module StackMaster
 
     def error_message
       return nil unless missing_parameters?
-      message = "Empty/blank parameters detected. Please provide values for these parameters:"
+      message = "Empty/blank parameters detected. Please provide values for these parameters:\n"
       missing_parameters.each do |parameter_name|
-        message << "\n - #{parameter_name}"
+        message << " - #{parameter_name}\n"
       end
-      message << "\nParameters will be read from files matching the following globs:"
-      base_dir = Pathname.new(@stack_definition.base_dir)
-      @stack_definition.parameter_file_globs.each do |glob|
-        parameter_file = Pathname.new(glob).relative_path_from(base_dir)
-        message << "\n - #{parameter_file}"
+      if @stack_definition.parameter_files.empty?
+        message << message_for_parameter_globs
+      else
+        message << message_for_parameter_files
       end
       message
     end
@@ -28,6 +27,24 @@ module StackMaster
 
     private
 
+    def message_for_parameter_files
+      "Parameters are configured to be read from the following files:\n".tap do |message|
+        @stack_definition.parameter_files.each do |parameter_file|
+          message << " - #{parameter_file}\n"
+        end
+      end
+    end
+
+    def message_for_parameter_globs
+      "Parameters will be read from files matching the following globs:\n".tap do |message|
+        base_dir = Pathname.new(@stack_definition.base_dir)
+        @stack_definition.parameter_file_globs.each do |glob|
+          parameter_file = Pathname.new(glob).relative_path_from(base_dir)
+          message << " - #{parameter_file}\n"
+        end
+      end
+    end
+
     def missing_parameters
       @missing_parameters ||=
         @stack.parameters_with_defaults.select { |_key, value| value.nil? }.keys

data/lib/stack_master/stack.rb

@@ -56,7 +56,7 @@ module StackMaster
     end
 
     def self.generate(stack_definition, config)
-      parameter_hash = ParameterLoader.load(stack_definition.parameter_files)
+      parameter_hash = ParameterLoader.load(parameter_files: stack_definition.all_parameter_files, parameters: stack_definition.parameters)
       template_parameters = ParameterResolver.resolve(config, stack_definition, parameter_hash[:template_parameters])
       compile_time_parameters = ParameterResolver.resolve(config, stack_definition, parameter_hash[:compile_time_parameters])
       template_body = TemplateCompiler.compile(config, stack_definition.compiler, stack_definition.template_dir, stack_definition.template, compile_time_parameters, stack_definition.compiler_options)
@@ -76,7 +76,7 @@ module StackMaster
     end
 
     def self.generate_without_parameters(stack_definition, config)
-      parameter_hash = ParameterLoader.load(stack_definition.parameter_files)
+      parameter_hash = ParameterLoader.load(parameter_files: stack_definition.all_parameter_files, parameters: stack_definition.parameters)
       compile_time_parameters = ParameterResolver.resolve(config, stack_definition, parameter_hash[:compile_time_parameters])
       template_body = TemplateCompiler.compile(config, stack_definition.compiler, stack_definition.template_dir, stack_definition.template, compile_time_parameters, stack_definition.compiler_options)
       template_format = TemplateUtils.identify_template_format(template_body)

data/lib/stack_master/stack_definition.rb

@@ -16,7 +16,10 @@ module StackMaster
                   :additional_parameter_lookup_dirs,
                   :s3,
                   :files,
-                  :compiler_options
+                  :compiler_options,
+                  :parameters_dir,
+                  :parameters,
+                  :parameter_files
 
     attr_reader :compiler
 
@@ -32,8 +35,12 @@ module StackMaster
       @compiler = nil
       super
       @additional_parameter_lookup_dirs ||= []
+      @base_dir ||= ""
       @template_dir ||= File.join(@base_dir, 'templates')
+      @parameters_dir ||= File.join(@base_dir, 'parameters')
       @allowed_accounts = Array(@allowed_accounts)
+      @parameters ||= {}
+      @parameter_files ||= []
     end
 
     def ==(other)
@@ -56,13 +63,9 @@ module StackMaster
         @compiler_options == other.compiler_options
     end
 
-    def compiler=(compiler)
-      @compiler = compiler.&to_sym
-    end
-
     def template_file_path
       return unless template
-      File.expand_path(File.join(template_dir, template))
+      File.expand_path(template, template_dir)
     end
 
     def files_dir
@@ -85,7 +88,15 @@ module StackMaster
       Utils.change_extension(template, 'json')
     end
 
-    def parameter_files
+    def all_parameter_files
+      if parameter_files.empty?
+        parameter_files_from_globs
+      else
+        parameter_files
+      end
+    end
+
+    def parameter_files_from_globs
       parameter_file_globs.map(&Dir.method(:glob)).flatten
     end
 
@@ -101,20 +112,26 @@ module StackMaster
       !s3.nil?
     end
 
+    def parameter_files
+      Array(@parameter_files).map do |file|
+        File.expand_path(file, parameters_dir)
+      end
+    end
+
     private
 
     def additional_parameter_lookup_globs
       additional_parameter_lookup_dirs.map do |a|
-        File.join(base_dir, 'parameters', a, "#{stack_name_glob}.y*ml")
+        File.join(parameters_dir, a, "#{stack_name_glob}.y*ml")
       end
     end
 
     def region_parameter_glob
-      File.join(base_dir, 'parameters', "#{region}", "#{stack_name_glob}.y*ml")
+      File.join(parameters_dir, "#{region}", "#{stack_name_glob}.y*ml")
     end
 
     def default_parameter_glob
-      File.join(base_dir, 'parameters', "#{stack_name_glob}.y*ml")
+      File.join(parameters_dir, "#{stack_name_glob}.y*ml")
     end
 
     def stack_name_glob

data/lib/stack_master/stack_differ.rb

@@ -10,13 +10,13 @@ module StackMaster
 
     def proposed_template
       return @proposed_stack.template_body unless @proposed_stack.template_format == :json
-      JSON.pretty_generate(JSON.parse(@proposed_stack.template_body))
+      JSON.pretty_generate(JSON.parse(@proposed_stack.template_body)) + "\n"
     end
 
     def current_template
       return '' unless @current_stack
       return @current_stack.template_body unless @current_stack.template_format == :json
-      JSON.pretty_generate(TemplateUtils.template_hash(@current_stack.template_body))
+      JSON.pretty_generate(TemplateUtils.template_hash(@current_stack.template_body)) + "\n"
     end
 
     def current_parameters
@@ -39,24 +39,30 @@ module StackMaster
     end
 
     def body_different?
-      body_diff != ''
+      body_diff.different?
     end
 
     def body_diff
-      @body_diff ||= Diffy::Diff.new(current_template, proposed_template, context: 7, include_diff_info: true).to_s
+      @body_diff ||= Diff.new(name: 'Stack',
+                              before: current_template,
+                              after: proposed_template,
+                              context: 7)
     end
 
     def params_different?
-      params_diff != ''
+      parameters_diff.different?
     end
 
-    def params_diff
-      @param_diff ||= Diffy::Diff.new(current_parameters, proposed_parameters, {}).to_s
+    def parameters_diff
+      @param_diff ||= Diff.new(name: 'Parameters',
+                               before: current_parameters,
+                               after: proposed_parameters)
     end
 
     def output_diff
-      display_diff('Stack', body_diff)
-      display_diff('Parameters', params_diff)
+      body_diff.display
+      parameters_diff.display
+
       unless noecho_keys.empty?
         StackMaster.stdout.puts " * can not tell if NoEcho parameters are different."
       end
@@ -83,38 +89,8 @@ module StackMaster
 
     private
 
-    def display_diff(thing, diff)
-      StackMaster.stdout.print "#{thing} diff: "
-      if diff == ''
-        StackMaster.stdout.puts "No changes"
-      else
-        StackMaster.stdout.puts
-        diff.each_line do |line|
-          if line.start_with?('+')
-            StackMaster.stdout.print colorize(line, :green)
-          elsif line.start_with?('-')
-            StackMaster.stdout.print colorize(line, :red)
-          else
-            StackMaster.stdout.print line
-          end
-        end
-      end
-    end
-
     def sort_params(hash)
       hash.sort.to_h
     end
-
-    def colorize(text, color)
-      if colorize?
-        text.colorize(color)
-      else
-        text
-      end
-    end
-
-    def colorize?
-      ENV.fetch('COLORIZE') { 'true' } == 'true'
-    end
   end
 end

data/lib/stack_master/stack_events/presenter.rb

@@ -10,7 +10,7 @@ module StackMaster
       end
 
       def print_event(event)
-        @io.puts "#{event.timestamp.localtime} #{event.logical_resource_id} #{event.resource_type} #{event.resource_status} #{event.resource_status_reason}".colorize(event_colour(event))
+        @io.puts Rainbow("#{event.timestamp.localtime} #{event.logical_resource_id} #{event.resource_type} #{event.resource_status} #{event.resource_status_reason}").color(event_colour(event))
       end
 
       def event_colour(event)

data/lib/stack_master/template_utils.rb

@@ -2,12 +2,18 @@ module StackMaster
   module TemplateUtils
     MAX_TEMPLATE_SIZE = 51200
     MAX_S3_TEMPLATE_SIZE = 460800
+    # Matches if the first non-whitespace character is a '{', handling cases
+    # with leading whitespace and extra (whitespace-only) lines.
+    JSON_IDENTIFICATION_PATTERN = Regexp.new('\A\s*{', Regexp::MULTILINE)
 
     extend self
 
     def identify_template_format(template_body)
-      return :json if template_body =~ /^{/x # ignore leading whitespaces
-      :yaml
+      if template_body =~ JSON_IDENTIFICATION_PATTERN
+        :json
+      else
+        :yaml
+      end
     end
 
     def template_hash(template_body=nil)
@@ -28,4 +34,4 @@ module StackMaster
       JSON.dump(template_hash(template_body))
     end
   end
-end
+end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "2.5.0"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -459,6 +459,7 @@ files:
 - lib/stack_master/commands/compile.rb
 - lib/stack_master/commands/delete.rb
 - lib/stack_master/commands/diff.rb
+- lib/stack_master/commands/drift.rb
 - lib/stack_master/commands/events.rb
 - lib/stack_master/commands/init.rb
 - lib/stack_master/commands/lint.rb
@@ -471,6 +472,7 @@ files:
 - lib/stack_master/commands/validate.rb
 - lib/stack_master/config.rb
 - lib/stack_master/ctrl_c.rb
+- lib/stack_master/diff.rb
 - lib/stack_master/identity.rb
 - lib/stack_master/paged_response_accumulator.rb
 - lib/stack_master/parameter_loader.rb
@@ -539,8 +541,8 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/envato/stack_master/issues
   changelog_uri: https://github.com/envato/stack_master/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.5.0
-  source_code_uri: https://github.com/envato/stack_master/tree/v2.5.0
+  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.9.0
+  source_code_uri: https://github.com/envato/stack_master/tree/v2.9.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -556,7 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track