stack_master 2.2.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365c8c1252350564177ff9a0827024d27a7600f31c7a76503cac20accfca5e12
-  data.tar.gz: '088c89fe1880f1879279b66b8eb26d59e6ec723ec842c81641f7e20f457aefb7'
+  metadata.gz: 4f146a3b9b4ca20e6c3fdf98d3620886663ec113cb81f7d763918aad28d5d42c
+  data.tar.gz: c7ebfef287797cff8cbb1ee74bafcbe583da1eb14079ea4b94d2102fbc48ea18
 SHA512:
-  metadata.gz: 6488da7b3d7ad2562e276246f76f2ec304c9b83c43d24469a76ccde609da290c648ac417232e42864b163dbb1b3111a06052322a8ba9037626eef7f0feb956ab
-  data.tar.gz: 0f7006a2c2f37f25e771727be69a5823407163ed9ac6a7970ea95a3a8ce07c25fc4f150c9a6fce46c0e5dae9219516699afd095962fdb08f745770a36eccea78
+  metadata.gz: 45ca7571feb3989ba167eec7b7dc27ba3ed003aec6890e6c172c4ced6dc432fb29bcc618481880604783f02138ca644b17d9f329f73dcab81d73585104a768c9
+  data.tar.gz: dead78c859b1d6cda3148a045c99d31c116a2849ccb2112d231561ae708e619236e4951754d7cdeecf53e08dd68ce99f2f8e242f255c6a168257c6b7cdaec021

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
@@ -157,18 +157,16 @@ template_compilers:
 
 Parameters are loaded from multiple YAML files, merged from the following lookup paths from bottom to top:
 
-- parameters/[underscored_stack_name].yaml
-- parameters/[underscored_stack_name].yml
-- parameters/[region]/[underscored_stack_name].yaml
-- parameters/[region]/[underscored_stack_name].yml
-- parameters/[region_alias]/[underscored_stack_name].yaml
-- parameters/[region_alias]/[underscored_stack_name].yml
-
-**Note:** The file names must be underscored, not hyphenated, even if the stack names are hyphenated.
+- parameters/[stack_name].yaml
+- parameters/[stack_name].yml
+- parameters/[region]/[stack_name].yaml
+- parameters/[region]/[stack_name].yml
+- parameters/[region_alias]/[stack_name].yaml
+- parameters/[region_alias]/[stack_name].yml
 
 A simple parameter file could look like this:
 
-```
+```yaml
 key_name: myapp-us-east-1
 ```
 
@@ -179,7 +177,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:
@@ -288,8 +286,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
@@ -479,7 +477,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
@@ -490,7 +488,7 @@ module StackMaster
 end
 ```
 In that example, using the array resolver would look like:
-```
+```yaml
 my_parameter:
   my_custom_array_resolver:
     - value1
@@ -500,13 +498,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'
 ```
 
@@ -522,7 +520,7 @@ ROLE=<%= role %>
 
 And used like this in SparkleFormation templates:
 
-```
+```ruby
 # templates/app.rb
   user_data user_data_file!('app.erb', role: :worker)
 ```
@@ -535,7 +533,7 @@ my_variable=<%= ref!(:foo) %>
 my_other_variable=<%= account_id! %>
 ```
 
-```
+```ruby
 # templates/ecs_task.rb
 container_definitions array!(
   -> {
@@ -567,7 +565,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:
@@ -627,7 +625,7 @@ stacks:
 
 ## Allowed accounts
 
-The AWS account the command is executing in can be restricted to a specific list of allowed accounts. This is useful in reducing the possibility of applying non-production changes in a production account. Each stack definition can specify the `allowed_accounts` property with an array of AWS account IDs the stack is allowed to work with.
+The AWS account the command is executing in can be restricted to a specific list of allowed accounts. This is useful in reducing the possibility of applying non-production changes in a production account. Each stack definition can specify the `allowed_accounts` property with an array of AWS account IDs or aliases the stack is allowed to work with.
 
 This is an opt-in feature which is enabled by specifying at least one account to allow.
 
@@ -646,7 +644,7 @@ stacks:
       template: myapp_db.rb
       allowed_accounts: # only allow these accounts (overrides the stack defaults)
         - '1234567890'
-        - '9876543210'
+        - my-account-alias
       tags:
         purpose: back-end
     myapp-web:
@@ -661,7 +659,7 @@ stacks:
         purpose: back-end
 ```
 
-In the cases where you want to bypass the account check, there is StackMaster flag `--skip-account-check` that can be used.
+In the cases where you want to bypass the account check, there is the StackMaster flag `--skip-account-check` that can be used.
 
 ## Commands
 

data/bin/stack_master

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'stack_master'
 
 if ENV['STUB_AWS'] == 'true'

data/lib/stack_master.rb

@@ -7,8 +7,11 @@ require 'aws-sdk-ecr'
 require 'aws-sdk-s3'
 require 'aws-sdk-sns'
 require 'aws-sdk-ssm'
-require 'colorize'
-require 'active_support/core_ext/string'
+require 'aws-sdk-iam'
+require 'rainbow'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
 require 'multi_json'
 
 MultiJson.use :json_gem
@@ -43,6 +46,7 @@ module StackMaster
 
   autoload :StackDiffer, 'stack_master/stack_differ'
   autoload :Validator, 'stack_master/validator'
+  autoload :ParameterValidator, 'stack_master/parameter_validator'
 
   require 'stack_master/template_compilers/sparkle_formation'
   require 'stack_master/template_compilers/json'
@@ -126,7 +130,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!

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,11 +67,11 @@ 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
-            StackMaster::Commands::Init.perform(options.overwrite, *args)
+            StackMaster::Commands::Init.perform(options, *args)
           end
         end
       end
@@ -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,10 +116,10 @@ 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)
+          StackMaster::Commands::ListStacks.perform(config, nil, options)
         end
       end
 
@@ -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,10 +163,10 @@ 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)
+          StackMaster::Commands::Status.perform(config, nil, options)
         end
       end
 
@@ -175,10 +176,10 @@ 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)
+          StackMaster::Commands::Tidy.perform(config, nil, options)
         end
       end
 
@@ -208,7 +209,7 @@ module StackMaster
 
           success = execute_if_allowed_account(allowed_accounts) do
             StackMaster.cloud_formation_driver.set_region(region)
-            StackMaster::Commands::Delete.perform(region, stack_name).success?
+            StackMaster::Commands::Delete.perform(region, stack_name, options).success?
           end
           @kernel.exit false unless success
         end
@@ -262,13 +263,15 @@ module StackMaster
       if running_in_allowed_account?(allowed_accounts)
         block.call
       else
-        StackMaster.stdout.puts "Account '#{identity.account}' is not an allowed account. Allowed accounts are #{allowed_accounts}."
+        account_text = "'#{identity.account}'"
+        account_text << " (#{identity.account_aliases.join(', ')})" if identity.account_aliases.any?
+        StackMaster.stdout.puts "Account #{account_text} is not an allowed account. Allowed accounts are #{allowed_accounts}."
         false
       end
     end
 
     def running_in_allowed_account?(allowed_accounts)
-      StackMaster.skip_account_check? || identity.running_in_allowed_account?(allowed_accounts)
+      StackMaster.skip_account_check? || identity.running_in_account?(allowed_accounts)
     end
 
     def identity

data/lib/stack_master/command.rb

@@ -27,6 +27,12 @@ module StackMaster
       end
     end
 
+    def initialize(config, stack_definition = nil, options = Commander::Command::Options.new)
+      @config = config
+      @stack_definition = stack_definition
+      @options = options
+    end
+
     def success?
       @failed != true
     end
@@ -36,9 +42,24 @@ module StackMaster
     def error_message(e)
       msg = "#{e.class} #{e.message}"
       msg << "\n Caused by: #{e.cause.class} #{e.cause.message}" if e.cause
+      if options.trace
+        msg << "\n#{backtrace(e)}"
+      else
+        msg << "\n Use --trace to view backtrace"
+      end
       msg
     end
 
+    def backtrace(error)
+      if error.respond_to?(:full_message)
+        error.full_message
+      else
+        # full_message was introduced in Ruby 2.5
+        # remove this conditional when StackMaster no longer supports Ruby 2.4
+        error.backtrace.join("\n")
+      end
+    end
+
     def failed(message = nil)
       StackMaster.stderr.puts(message) if message
       @failed = true
@@ -53,5 +74,9 @@ module StackMaster
       StackMaster.stdout.puts(message) if message
       throw :halt
     end
+
+    def options
+      @options ||= Commander::Command::Options.new
+    end
   end
 end

data/lib/stack_master/commands/apply.rb

@@ -6,14 +6,10 @@ module StackMaster
       include StackMaster::Prompter
       TEMPLATE_TOO_LARGE_ERROR_MESSAGE = 'The (space compressed) stack is larger than the limit set by AWS. See http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html'.freeze
 
-      def initialize(config, stack_definition, options = Commander::Command::Options.new)
-        @config = config
-        @s3_config = stack_definition.s3
-        @stack_definition = stack_definition
+      def initialize(*_args)
+        super
+        @s3_config = @stack_definition.s3
         @from_time = Time.now
-        @options = options
-        @options.on_failure ||= nil
-        @options.yes_param ||= nil
       end
 
       def perform
@@ -207,13 +203,8 @@ module StackMaster
       end
 
       def ensure_valid_parameters!
-        if @proposed_stack.missing_parameters?
-          StackMaster.stderr.puts "Empty/blank parameters detected, ensure values exist for those parameters. Parameters will be read from the following locations:"
-          @stack_definition.parameter_files.each do |parameter_file|
-            StackMaster.stderr.puts " - #{parameter_file}"
-          end
-          halt!
-        end
+        pv = ParameterValidator.new(stack: @proposed_stack, stack_definition: @stack_definition)
+        failed!(pv.error_message) if pv.missing_parameters?
       end
 
       def ensure_valid_template_body_size!

data/lib/stack_master/commands/compile.rb

@@ -4,11 +4,6 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
         puts(proposed_stack.template_body)
       end

data/lib/stack_master/commands/delete.rb

@@ -4,7 +4,8 @@ module StackMaster
       include Command
       include StackMaster::Prompter
 
-      def initialize(region, stack_name)
+      def initialize(region, stack_name, options)
+        super(nil, nil, options)
         @region = region
         @stack_name = stack_name
         @from_time = Time.now

data/lib/stack_master/commands/diff.rb

@@ -4,11 +4,6 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
         StackMaster::StackDiffer.new(proposed_stack, stack).output_diff
       end

data/lib/stack_master/commands/events.rb

@@ -4,12 +4,6 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-        @options = options
-      end
-
       def perform
         events = StackEvents::Fetcher.fetch(@stack_definition.stack_name, @stack_definition.region)
         filter_events(events).each do |event|

data/lib/stack_master/commands/init.rb

@@ -5,8 +5,8 @@ module StackMaster
     class Init
       include Command
 
-      def initialize(overwrite, region, stack_name)
-        @overwrite = overwrite
+      def initialize(options, region, stack_name)
+        super(nil, nil, options)
         @region = region
         @stack_name = stack_name
       end
@@ -24,10 +24,10 @@ module StackMaster
       def check_files
         @stack_master_filename = "stack_master.yml"
         @stack_json_filename = "templates/#{@stack_name}.json"
-        @parameters_filename = File.join("parameters", "#{underscored_stack_name}.yml")
-        @region_parameters_filename = File.join("parameters", @region, "#{underscored_stack_name}.yml")
+        @parameters_filename = File.join("parameters", "#{@stack_name}.yml")
+        @region_parameters_filename = File.join("parameters", @region, "#{@stack_name}.yml")
 
-        if !@overwrite
+        if !@options.overwrite
           [@stack_master_filename, @stack_json_filename, @parameters_filename, @region_parameters_filename].each do |filename|
             if File.exists?(filename)
               StackMaster.stderr.puts("Aborting: #{filename} already exists. Use --overwrite to force overwriting file.")
@@ -89,10 +89,6 @@ module StackMaster
         File.join(StackMaster.base_dir, "stacktemplates", "parameter_region.yml")
       end
 
-      def underscored_stack_name
-        @stack_name.gsub('-', '_')
-      end
-
       def render(renderer)
         binding = InitBinding.new(region: @region, stack_name: @stack_name).get_binding
         renderer.result(binding)

data/lib/stack_master/commands/lint.rb

@@ -6,11 +6,6 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
         unless cfn_lint_available
           failed! 'Failed to run cfn-lint. You may need to install it using'\

data/lib/stack_master/commands/list_stacks.rb

@@ -7,10 +7,6 @@ module StackMaster
       include Commander::UI
       include StackMaster::Commands::TerminalHelper
 
-      def initialize(config)
-        @config = config
-      end
-
       def perform
         tp.set :max_width, self.window_size
         tp @config.stacks, :region, :stack_name

data/lib/stack_master/commands/outputs.rb

@@ -7,11 +7,6 @@ module StackMaster
       include Commander::UI
       include StackMaster::Commands::TerminalHelper
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
         if stack
           tp.set :max_width, self.window_size

data/lib/stack_master/commands/resources.rb

@@ -6,11 +6,6 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
         if stack_resources
           tp stack_resources, :logical_resource_id, :resource_type, :timestamp, :resource_status, :resource_status_reason, :description

data/lib/stack_master/commands/status.rb

@@ -7,8 +7,8 @@ module StackMaster
       include Command
       include StackMaster::Commands::TerminalHelper
 
-      def initialize(config, show_progress = true)
-        @config = config
+      def initialize(config, options, show_progress = true)
+        super(config, nil, options)
         @show_progress = show_progress
       end
 
@@ -44,7 +44,7 @@ module StackMaster
       end
 
       def running_in_allowed_account?(allowed_accounts)
-        StackMaster.skip_account_check? || identity.running_in_allowed_account?(allowed_accounts)
+        StackMaster.skip_account_check? || identity.running_in_account?(allowed_accounts)
       end
 
       def identity

data/lib/stack_master/commands/tidy.rb

@@ -4,10 +4,6 @@ module StackMaster
       include Command
       include StackMaster::Commands::TerminalHelper
 
-      def initialize(config)
-        @config = config
-      end
-
       def perform
         used_templates = []
         used_parameter_files = []

data/lib/stack_master/commands/validate.rb

@@ -4,13 +4,8 @@ module StackMaster
       include Command
       include Commander::UI
 
-      def initialize(config, stack_definition, options = {})
-        @config = config
-        @stack_definition = stack_definition
-      end
-
       def perform
-        failed unless Validator.valid?(@stack_definition, @config)
+        failed unless Validator.valid?(@stack_definition, @config, @options)
       end
     end
   end

data/lib/stack_master/identity.rb

@@ -1,16 +1,25 @@
 module StackMaster
   class Identity
-    def running_in_allowed_account?(allowed_accounts)
-      allowed_accounts.nil? || allowed_accounts.empty? || allowed_accounts.include?(account)
+    MissingIamPermissionsError = Class.new(StandardError)
+
+    def running_in_account?(accounts)
+      accounts.nil? ||
+        accounts.empty? ||
+        contains_account_id?(accounts) ||
+        contains_account_alias?(accounts)
     end
 
     def account
       @account ||= sts.get_caller_identity.account
     end
 
-    private
+    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'
+    end
 
-    attr_reader :sts
+    private
 
     def region
       @region ||= ENV['AWS_REGION'] || Aws.config[:region] || Aws.shared_config.region || 'us-east-1'
@@ -19,5 +28,17 @@ module StackMaster
     def sts
       @sts ||= Aws::STS::Client.new(region: region)
     end
+
+    def iam
+      @iam ||= Aws::IAM::Client.new(region: region)
+    end
+
+    def contains_account_id?(ids)
+      ids.include?(account)
+    end
+
+    def contains_account_alias?(aliases)
+      account_aliases.any? { |account_alias| aliases.include?(account_alias) }
+    end
   end
 end

data/lib/stack_master/parameter_resolvers/latest_ami.rb

@@ -12,7 +12,7 @@ module StackMaster
         owners = Array(value.fetch('owners', 'self').to_s)
         ami_finder = AmiFinder.new(@stack_definition.region)
         filters = ami_finder.build_filters_from_hash(value.fetch('filters'))
-        ami_finder.find_latest_ami(filters, owners).try(:image_id)
+        ami_finder.find_latest_ami(filters, owners)&.image_id
       end
     end
   end

data/lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb

@@ -11,7 +11,7 @@ module StackMaster
 
       def resolve(value)
         filters = @ami_finder.build_filters_from_string(value, prefix = "tag")
-        @ami_finder.find_latest_ami(filters).try(:image_id)
+        @ami_finder.find_latest_ami(filters)&.image_id
       end
     end
   end

data/lib/stack_master/parameter_validator.rb

@@ -0,0 +1,36 @@
+require 'pathname'
+
+module StackMaster
+  class ParameterValidator
+    def initialize(stack:, stack_definition:)
+      @stack = stack
+      @stack_definition = stack_definition
+    end
+
+    def error_message
+      return nil unless missing_parameters?
+      message = "Empty/blank parameters detected. Please provide values for these parameters:"
+      missing_parameters.each do |parameter_name|
+        message << "\n - #{parameter_name}"
+      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}"
+      end
+      message
+    end
+
+    def missing_parameters?
+      missing_parameters.any?
+    end
+
+    private
+
+    def missing_parameters
+      @missing_parameters ||=
+        @stack.parameters_with_defaults.select { |_key, value| value.nil? }.keys
+    end
+  end
+end

data/lib/stack_master/role_assumer.rb

@@ -45,6 +45,7 @@ module StackMaster
       credentials_key = "#{account}:#{role}"
       @credentials.fetch(credentials_key) do
         @credentials[credentials_key] = Aws::AssumeRoleCredentials.new(
+          region: StackMaster.cloud_formation_driver.region,
           role_arn: "arn:aws:iam::#{account}:role/#{role}",
           role_session_name: "stack-master-role-assumer"
         )

data/lib/stack_master/sparkle_formation/template_file.rb

@@ -71,7 +71,7 @@ module StackMaster
             newlines = lines.split("\n").map do |line|
               "#{line}#{newlines.pop}"
             end
-            if lines.starts_with?("\n")
+            if lines.start_with?("\n")
               newlines.insert(0, "\n")
             end
             newlines

data/lib/stack_master/stack.rb

@@ -27,12 +27,6 @@ module StackMaster
       template_default_parameters.merge(parameters)
     end
 
-    def missing_parameters?
-      parameters_with_defaults.any? do |key, value|
-        value == nil
-      end
-    end
-
     def self.find(region, stack_name)
       cf = StackMaster.cloud_formation_driver
       cf_stack = cf.describe_stacks(stack_name: stack_name).stacks.first
@@ -81,6 +75,25 @@ module StackMaster
           stack_policy_body: stack_policy_body)
     end
 
+    def self.generate_without_parameters(stack_definition, config)
+      parameter_hash = ParameterLoader.load(stack_definition.parameter_files)
+      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

@@ -23,7 +23,6 @@ module StackMaster
     include Utils::Initializable
 
     def initialize(attributes = {})
-      @additional_parameter_lookup_dirs = []
       @compiler_options = {}
       @notification_arns = []
       @s3 = {}
@@ -32,6 +31,7 @@ module StackMaster
       @ejson_file_kms = true
       @compiler = nil
       super
+      @additional_parameter_lookup_dirs ||= []
       @template_dir ||= File.join(@base_dir, 'templates')
       @allowed_accounts = Array(@allowed_accounts)
     end
@@ -86,7 +86,11 @@ module StackMaster
     end
 
     def parameter_files
-      [ default_parameter_file_path, region_parameter_file_path, additional_parameter_lookup_file_paths ].flatten.compact
+      parameter_file_globs.map(&Dir.method(:glob)).flatten
+    end
+
+    def parameter_file_globs
+      [ default_parameter_glob, region_parameter_glob ] + additional_parameter_lookup_globs
     end
 
     def stack_policy_file_path
@@ -99,23 +103,22 @@ module StackMaster
 
     private
 
-    def additional_parameter_lookup_file_paths
-      return unless additional_parameter_lookup_dirs
+    def additional_parameter_lookup_globs
       additional_parameter_lookup_dirs.map do |a|
-        Dir.glob(File.join(base_dir, 'parameters', a, "#{underscored_stack_name}.y*ml"))
+        File.join(base_dir, 'parameters', a, "#{stack_name_glob}.y*ml")
       end
     end
 
-    def region_parameter_file_path
-      Dir.glob(File.join(base_dir, 'parameters', "#{region}", "#{underscored_stack_name}.y*ml"))
+    def region_parameter_glob
+      File.join(base_dir, 'parameters', "#{region}", "#{stack_name_glob}.y*ml")
     end
 
-    def default_parameter_file_path
-      Dir.glob(File.join(base_dir, 'parameters', "#{underscored_stack_name}.y*ml"))
+    def default_parameter_glob
+      File.join(base_dir, 'parameters', "#{stack_name_glob}.y*ml")
     end
 
-    def underscored_stack_name
-      stack_name.gsub('-', '_')
+    def stack_name_glob
+      stack_name.gsub('-', '[-_]')
     end
   end
 end

data/lib/stack_master/stack_differ.rb

@@ -107,7 +107,7 @@ module StackMaster
 
     def colorize(text, color)
       if colorize?
-        text.colorize(color)
+        Rainbow(text).color(color)
       else
         text
       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_compiler.rb

@@ -11,7 +11,7 @@ module StackMaster
       compiler.require_dependencies
       compiler.compile(template_dir, template, compile_time_parameters, compiler_options)
     rescue StandardError => e
-      raise TemplateCompilationFailed.new("Failed to compile #{template} with error #{e}.\n#{e.backtrace}")
+      raise TemplateCompilationFailed, "Failed to compile #{template}"
     end
 
     def self.register(name, klass)

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,21 +1,22 @@
 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
-      parameter_hash = ParameterLoader.load(@stack_definition.parameter_files)
-      compile_time_parameters = ParameterResolver.resolve(@config, @stack_definition, parameter_hash[:compile_time_parameters])
-
       StackMaster.stdout.print "#{@stack_definition.stack_name}: "
-      template_body = TemplateCompiler.compile(@config, @stack_definition.compiler, @stack_definition.template_dir, @stack_definition.template, compile_time_parameters, @stack_definition.compiler_options)
-      cf.validate_template(template_body: TemplateUtils.maybe_compressed_template_body(template_body))
+      if validate_template_parameters? && parameter_validator.missing_parameters?
+        StackMaster.stdout.puts "invalid\n#{parameter_validator.error_message}"
+        return false
+      end
+      cf.validate_template(template_body: TemplateUtils.maybe_compressed_template_body(stack.template_body))
       StackMaster.stdout.puts "valid"
       true
     rescue Aws::CloudFormation::Errors::ValidationError => e
@@ -25,8 +26,24 @@ module StackMaster
 
     private
 
+    def validate_template_parameters?
+      @options.validate_template_parameters
+    end
+
     def cf
       @cf ||= StackMaster.cloud_formation_driver
     end
+
+    def stack
+      @stack ||= if validate_template_parameters?
+        Stack.generate(@stack_definition, @config)
+      else
+        Stack.generate_without_parameters(@stack_definition, @config)
+      end
+    end
+
+    def parameter_validator
+      @parameter_validator ||= ParameterValidator.new(stack: stack, stack_definition: @stack_definition)
+    end
   end
 end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "2.2.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -255,6 +255,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-iam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +298,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -432,6 +446,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - README.md
 - bin/stack_master
 - lib/stack_master.rb
@@ -472,6 +487,7 @@ files:
 - lib/stack_master/parameter_resolvers/security_group.rb
 - lib/stack_master/parameter_resolvers/sns_topic_name.rb
 - lib/stack_master/parameter_resolvers/stack_output.rb
+- lib/stack_master/parameter_validator.rb
 - lib/stack_master/prompter.rb
 - lib/stack_master/resolver_array.rb
 - lib/stack_master/role_assumer.rb
@@ -523,8 +539,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.2.0
-  source_code_uri: https://github.com/envato/stack_master/tree/v2.2.0
+  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.6.1
+  source_code_uri: https://github.com/envato/stack_master/tree/v2.6.1
 post_install_message: 
 rdoc_options: []
 require_paths: