stack_master 2.4.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676259d50dc1b2634f669f98625e3203f57d39eb77d6e6bf55f0e3b13318174b
-  data.tar.gz: f759222c480eed85f359c9b6f713f865664f156078a065bd4ad16fcd2db47417
+  metadata.gz: 7d401f198bf80974977c8b031f27422ea84aa171f18747fa6064cf6d9d2af784
+  data.tar.gz: dd930994d8034f57d60ba1a77d8bfee0f524301501306a3d8cee64502c27029e
 SHA512:
-  metadata.gz: 482ccf3ecd0511921404744dd8f081f6f1c17c954918bc8fef5e5d6b2bf4ddebafd74d942c22b858062abb9e38fa238031d0fb310c8a5dbd02482833b6119641
-  data.tar.gz: f9fdaf391a317ccaa1cad9e527b8bd4b529c7446b6bc13335a31fc8fde7504878f6f9183959742710e9a5b637ad3a783b302f2955f7ed6c2b67ba2876ef6fb62
+  metadata.gz: de26f0ce262ef2b4b11cced8789a8093896d9bd7db6950008ad7e0e469ea43a9752fbbcb0e4b57271656442aa7bb13dc159697690d0a0754fcbc9ecce39d07b0
+  data.tar.gz: 0ef954037a433821d09b90acbbd39da5a881044f305353267cba379a07e77bd2ffe7645700b8ce927d15d7f518c823aa17a42f0c9971ce3c37b29f5164a8b219

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Steve Hodgkiss
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -53,7 +53,7 @@ Stacks are defined inside a `stack_master.yml` YAML file. When running
 directory, or that the file is passed in with `--config
 /path/to/stack_master.yml`.  Here's an example configuration file:
 
-```
+```yaml
 region_aliases:
   production: us-east-1
   staging: ap-southeast-2
@@ -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
@@ -166,10 +169,34 @@ Parameters are loaded from multiple YAML files, merged from the following lookup
 
 A simple parameter file could look like this:
 
-```
+```yaml
 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
@@ -177,7 +204,7 @@ allows you to use the [Compile Time Parameters](http://www.sparkleformation.io/d
 
 A simple example looks like this
 
-```
+```yaml
 vpc_cidr: 10.0.0.0/16
 compile_time_parameters:
   subnet_cidrs:
@@ -286,8 +313,8 @@ db_password:
 An alternative to the secrets store is accessing 1password secrets using the 1password cli (`op`).
 You declare a 1password lookup with the following parameters in your parameters file:
 
-```
-parameters/database.yml
+```yaml
+# parameters/database.yml
 database_password:
   one_password:
     title: production database
@@ -477,7 +504,7 @@ name of the original resolver.
 
 When creating a new resolver, one can automatically create the array resolver by adding a `array_resolver` statement
 in the class definition, with an optional class name if different from the default one.
-```
+```ruby
 module StackMaster
   module ParameterResolvers
     class MyResolver < Resolver
@@ -488,7 +515,7 @@ module StackMaster
 end
 ```
 In that example, using the array resolver would look like:
-```
+```yaml
 my_parameter:
   my_custom_array_resolver:
     - value1
@@ -498,13 +525,13 @@ my_parameter:
 Array parameter values can include nested parameter resolvers.
 
 For example, given the following parameter definition:
-```
+```yaml
 my_parameter:
   - stack_output: my-stack/output # value resolves to 'value1'
   - value2
 ```
 The parameter value will resolve to:
-```
+```yaml
 my_parameter: 'value1,value2'
 ```
 
@@ -520,7 +547,7 @@ ROLE=<%= role %>
 
 And used like this in SparkleFormation templates:
 
-```
+```ruby
 # templates/app.rb
   user_data user_data_file!('app.erb', role: :worker)
 ```
@@ -533,7 +560,7 @@ my_variable=<%= ref!(:foo) %>
 my_other_variable=<%= account_id! %>
 ```
 
-```
+```ruby
 # templates/ecs_task.rb
 container_definitions array!(
   -> {
@@ -565,7 +592,7 @@ project-root
 
 Your env-1/stack_master.yml files can reference common templates by setting:
 
-```
+```yaml
 template_dir: ../../sparkle/templates
 stack_defaults:
   compiler_options:
@@ -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

@@ -46,7 +46,7 @@ module StackMaster
         c.option '--on-failure ACTION', String, "Action to take on CREATE_FAILURE. Valid Values: [ DO_NOTHING | ROLLBACK | DELETE ]. Default: ROLLBACK\nNote: You cannot use this option with Serverless Application Model (SAM) templates."
         c.option '--yes-param PARAM_NAME', String, "Auto-approve stack updates when only parameter PARAM_NAME changes"
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Apply, args, options)
         end
       end
@@ -56,7 +56,7 @@ module StackMaster
         c.summary = 'Displays outputs for a stack'
         c.description = "Displays outputs for a stack"
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Outputs, args, options)
         end
       end
@@ -67,7 +67,7 @@ module StackMaster
         c.description = 'Initialises the expected directory structure and stack_master.yml file'
         c.option('--overwrite', 'Overwrite existing files')
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           unless args.size == 2
             say "Invalid arguments. stack_master init [region] [stack_name]"
           else
@@ -82,7 +82,7 @@ module StackMaster
         c.description = "Shows a diff of the proposed stack's template and parameters"
         c.example 'diff a stack named myapp-vpc in us-east-1', 'stack_master diff us-east-1 myapp-vpc'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Diff, args, options)
         end
       end
@@ -96,7 +96,7 @@ module StackMaster
         c.option '--all', 'Show all events'
         c.option '--tail', 'Tail events'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Events, args, options)
         end
       end
@@ -106,7 +106,7 @@ module StackMaster
         c.summary = "Shows stack resources"
         c.description = "Shows stack resources"
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Resources, args, options)
         end
       end
@@ -116,7 +116,7 @@ module StackMaster
         c.summary = 'List stack definitions'
         c.description = 'List stack definitions'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           say "Invalid arguments." if args.size > 0
           config = load_config(options.config)
           StackMaster::Commands::ListStacks.perform(config, nil, options)
@@ -128,8 +128,9 @@ module StackMaster
         c.summary = 'Validate a template'
         c.description = 'Validate a template'
         c.example 'validate a stack named myapp-vpc in us-east-1', 'stack_master validate us-east-1 myapp-vpc'
+        c.option '--[no-]validate-template-parameters', 'Validate template parameters. Default: validate'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file, validate_template_parameters: true
           execute_stacks_command(StackMaster::Commands::Validate, args, options)
         end
       end
@@ -140,7 +141,7 @@ module StackMaster
         c.description = "Runs cfn-lint on the template which would be sent to AWS on apply"
         c.example 'run cfn-lint on stack myapp-vpc with us-east-1 settings', 'stack_master lint us-east-1 myapp-vpc'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Lint, args, options)
         end
       end
@@ -151,7 +152,7 @@ module StackMaster
         c.description = "Processes the stack and prints out a compiled version - same we'd send to AWS"
         c.example 'print compiled stack myapp-vpc with us-east-1 settings', 'stack_master compile us-east-1 myapp-vpc'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           execute_stacks_command(StackMaster::Commands::Compile, args, options)
         end
       end
@@ -162,7 +163,7 @@ module StackMaster
         c.description = 'Checks the status of all stacks defined in the stack_master.yml file. Warning this operation can be somewhat slow.'
         c.example 'description', 'Check the status of all stack definitions'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           say "Invalid arguments. stack_master status" and return unless args.size == 0
           config = load_config(options.config)
           StackMaster::Commands::Status.perform(config, nil, options)
@@ -175,7 +176,7 @@ module StackMaster
         c.description = 'Cross references stack_master.yml with the template and parameter directories to identify extra or missing files.'
         c.example 'description', 'Check for missing or extra files'
         c.action do |args, options|
-          options.defaults config: default_config_file
+          options.default config: default_config_file
           say "Invalid arguments. stack_master tidy" and return unless args.size == 0
           config = load_config(options.config)
           StackMaster::Commands::Tidy.perform(config, nil, options)
@@ -214,6 +215,17 @@ 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.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
+          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)
+        try_count = 0
+        resp = nil
+        loop do
+          if try_count >= 10
+            raise 'Failed to wait for stack drift detection after 10 tries'
+          end
+
+          resp = cf.describe_stack_drift_detection_status(stack_drift_detection_id: detection_id)
+          break if DETECTION_COMPLETE_STATES.include?(resp.detection_status)
+
+          try_count += 1
+          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/commands/validate.rb

@@ -5,7 +5,7 @@ module StackMaster
       include Commander::UI
 
       def perform
-        failed unless Validator.valid?(@stack_definition, @config)
+        failed unless Validator.valid?(@stack_definition, @config, @options)
       end
     end
   end

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)
@@ -75,6 +75,25 @@ module StackMaster
           stack_policy_body: stack_policy_body)
     end
 
+    def self.generate_without_parameters(stack_definition, config)
+      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)
+      stack_policy_body = if stack_definition.stack_policy_file_path
+                            File.read(stack_definition.stack_policy_file_path)
+                          end
+      new(region: stack_definition.region,
+          stack_name: stack_definition.stack_name,
+          tags: stack_definition.tags,
+          parameters: {},
+          template_body: template_body,
+          template_format: template_format,
+          role_arn: stack_definition.role_arn,
+          notification_arns: stack_definition.notification_arns,
+          stack_policy_body: stack_policy_body)
+    end
+
     def max_template_size(use_s3)
       return TemplateUtils::MAX_S3_TEMPLATE_SIZE if use_s3
       TemplateUtils::MAX_TEMPLATE_SIZE

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/validator.rb

@@ -1,17 +1,18 @@
 module StackMaster
   class Validator
-    def self.valid?(stack_definition, config)
-      new(stack_definition, config).perform
+    def self.valid?(stack_definition, config, options)
+      new(stack_definition, config, options).perform
     end
 
-    def initialize(stack_definition, config)
+    def initialize(stack_definition, config, options)
       @stack_definition = stack_definition
       @config = config
+      @options = options
     end
 
     def perform
       StackMaster.stdout.print "#{@stack_definition.stack_name}: "
-      if parameter_validator.missing_parameters?
+      if validate_template_parameters? && parameter_validator.missing_parameters?
         StackMaster.stdout.puts "invalid\n#{parameter_validator.error_message}"
         return false
       end
@@ -25,12 +26,20 @@ module StackMaster
 
     private
 
+    def validate_template_parameters?
+      @options.validate_template_parameters
+    end
+
     def cf
       @cf ||= StackMaster.cloud_formation_driver
     end
 
     def stack
-      @stack ||= Stack.generate(@stack_definition, @config)
+      @stack ||= if validate_template_parameters?
+        Stack.generate(@stack_definition, @config)
+      else
+        Stack.generate_without_parameters(@stack_definition, @config)
+      end
     end
 
     def parameter_validator

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "2.4.0"
+  VERSION = "2.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 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:
     - - ">="
@@ -446,6 +446,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - README.md
 - bin/stack_master
 - lib/stack_master.rb
@@ -458,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
@@ -470,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
@@ -538,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.4.0
-  source_code_uri: https://github.com/envato/stack_master/tree/v2.4.0
+  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.8.0
+  source_code_uri: https://github.com/envato/stack_master/tree/v2.8.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -555,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