awx 0.5.1 → 0.6.0

data/lib/routes/{aws_cloudformation_create.rb → cloudformation_create.rb}

@@ -3,13 +3,13 @@ require 'digest'
 
 module AppCommand
 
-    class AWSCloudFormationCreate < ::Convoy::ActionCommand::Base
+    class CloudFormationCreate < ::Convoy::ActionCommand::Base
 
         DEFAULT                 = 'Default'
         PARAMETERS              = 'Parameters'
         SPECIAL_METHODS         = [:before_create, :after_create, :before_teardown, :after_teardown]
         AWS_TAGS                = %w(Environment Project Region Category Template)
-        RESERVED_WORDS          = %w(stackname description environment project region timeout resource cache_uuid category template terminationprotection projectid)
+        RESERVED_WORDS          = %w(cache_uuid category description environment owner project projectid region resource stack stackname template terminationprotection timeout)
         OPTION_PROJECT_ID       = 'ProjectId'
         OPTION_DEPLOYMENT_STACK = 'DeploymentStack'
         OPTION_STACK_NAME       = 'StackName'
@@ -21,6 +21,7 @@ module AppCommand
         OPTION_CATEGORY         = 'Category'
         OPTION_TEMPLATE         = 'Template'
         OPTION_TERM_PROTECT     = 'TerminationProtection'
+        OPTION_OWNER            = 'Owner'
         MATCHERS                = %w(CATEGORY TEMPLATE PROJECT ENVIRONMENT REGION UUID)
         OPTIONS                 = 'Options'
         SPECIAL                 = 'AWS-specific'
@@ -29,8 +30,9 @@ module AppCommand
         SPACER                  = '<<--Spacer-->>'
         CAPABILITIES            = 'Capabilities'
         RETURN_VALUE            = 'PjNkHK33EopWxCpzOQfuku3la'
-        SSH_USERS               = 'SSHUsers'
         SYSTEM                  = 'System'
+        NESTED                  = 'nested'
+        STACK                   = 'Stack'
 
         def execute
 
@@ -55,11 +57,14 @@ module AppCommand
                 @cache           = {}
                 @cache_valid     = false
                 @projects        = {}
+                @nested_stacks   = {}
 
                 @terminal_width                             = Blufin::Terminal::get_terminal_width
                 @columns, @data, @export_map, @table_widths = App::AWSReports::parse_metadata(@regions)
 
-                Blufin::Projects::init(App::AWSProfile::get_profile, App::CONFIG_FILE)
+                @owner = Blufin::Config::get['DeveloperName']
+
+                Blufin::Projects::init(App::AWSProfile::get_profile['Projects'])
 
                 opts_validate
                 opts_routing
@@ -88,14 +93,15 @@ module AppCommand
             terminal_required_width = 227
             Blufin::Terminal::error("Output for this command \x1B[38;5;240m(#{Blufin::Terminal::format_action(terminal_required_width)}\x1B[38;5;240m-width)\x1B[0m does not fit in Terminal \x1B[38;5;240m(#{Blufin::Terminal::format_action(terminal_width_actual)}\x1B[38;5;240m-width)\x1B[0m", 'Please make your terminal wider and try again.', true) if terminal_width_actual < terminal_required_width
 
-            @warnings = []
-            @lookups  = App::AWSReports::get_lookups(@data)
+            @warnings                            = []
+            @lookups                             = App::AWSReports::get_lookups(@data)
 
             # Add SSH Users to Lookups (if they've been configured).
-            users               = App::AWSProfile::get_ssh_users
-            @lookups[SSH_USERS] = users if users.any?
+            users                                = App::AWSProfile::get_ssh_users
+            @lookups[App::Replacer::SSH_USERS]   = users if users.any?
 
-            @options_default[OPTION_ENVIRONMENT] = Blufin::Projects::get_environments
+            # TODO - Environments cannot be hard-coded here. Possibly get from deployments (once we have it parsing)?
+            @options_default[OPTION_ENVIRONMENT] = %w(dev test staging prod)
             @options_default[OPTION_REGION]      = App::AWSProfile::get_profile[App::AWSProfile::CLOUDFORMATION]['Defaults']['Regions']
             @options_default[OPTION_STACK_NAME]  = App::AWSProfile::get_profile[App::AWSProfile::CLOUDFORMATION]['Defaults']['StackName']
             @options_default[OPTION_TIMEOUT]     = App::AWSProfile::get_profile[App::AWSProfile::CLOUDFORMATION]['Defaults']['Timeout']
@@ -267,7 +273,7 @@ module AppCommand
                             if stack_name.nil? || stack_name.strip == ''
                                 stack_name = @options_default[OPTION_STACK_NAME]
                             end
-                            results = Blufin::Replacer::scan_string(stack_name)
+                            results = App::Replacer::scan_string(stack_name)
                             validate_matchers(file_cloudformation, results, template_name, parameters)
                             # Make sure deployment stack is not a reserved word.
                             if deployment_stack.is_a?(String) && %w(lambda).include?(deployment_stack.downcase)
@@ -330,41 +336,45 @@ module AppCommand
                     end
                     # Validate template matchers.
                     unless file_cloudformation.nil?
-                        results = Blufin::Replacer::scan_file(file_cloudformation)
+                        results = App::Replacer::scan_file(file_cloudformation)
                         # Handle errors first.
                         validate_matchers(file_cloudformation, results, template_name, parameters)
                     end
                     @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 The #{Blufin::Terminal::format_highlight('template.yml')}\x1B[38;5;240m is missing, empty or invalid." if file_cloudformation.nil?
-                    @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 The #{Blufin::Terminal::format_highlight('template.rb')}\x1B[38;5;240m is missing, empty or invalid." if file_ruby.nil?
-                    @templates[category] = {} unless @templates.has_key?(category)
-                    if @warnings.length > warnings_count
-                        @templates[category][template] = {
-                            :name   => template,
-                            :broken => 'Broken'
-                        }
+                    if category == NESTED
+                        @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 #{Blufin::Terminal::format_highlight('template.rb')}\x1B[38;5;240m for nested stacks will be ignored, please remove." unless file_ruby.nil?
                     else
-                        @templates[category][template]                    = {
-                            :name                   => template,
-                            :path                   => template_path,
-                            :broken                 => false,
-                            :file_cloudformation    => file_cloudformation,
-                            :file_ruby              => file_ruby,
-                            :method_before_create   => method_before_create,
-                            :method_after_create    => method_after_create,
-                            :method_before_teardown => method_before_teardown,
-                            :method_after_teardown  => method_after_teardown,
-                            :parameters             => parameters,
-                            :parameters_no_sort     => parameters_no_sort,
-                            :intro                  => intro,
-                            :description            => description,
-                            :stack_name             => stack_name,
-                            :projects               => projects,
-                            :environments           => environments,
-                            :regions                => regions,
-                            :timeout                => timeout,
-                            :single_serve           => single_serve
-                        }
-                        @templates[category][template][:deployment_stack] = deployment_stack unless deployment_stack.nil?
+                        @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 The #{Blufin::Terminal::format_highlight('template.rb')}\x1B[38;5;240m is missing, empty or invalid." if file_ruby.nil?
+                        @templates[category] = {} unless @templates.has_key?(category)
+                        if @warnings.length > warnings_count
+                            @templates[category][template] = {
+                                :name   => template,
+                                :broken => 'Broken'
+                            }
+                        else
+                            @templates[category][template]                    = {
+                                :name                   => template,
+                                :path                   => template_path,
+                                :broken                 => false,
+                                :file_cloudformation    => file_cloudformation,
+                                :file_ruby              => file_ruby,
+                                :method_before_create   => method_before_create,
+                                :method_after_create    => method_after_create,
+                                :method_before_teardown => method_before_teardown,
+                                :method_after_teardown  => method_after_teardown,
+                                :parameters             => parameters,
+                                :parameters_no_sort     => parameters_no_sort,
+                                :intro                  => intro,
+                                :description            => description,
+                                :stack_name             => stack_name,
+                                :projects               => projects,
+                                :environments           => environments,
+                                :regions                => regions,
+                                :timeout                => timeout,
+                                :single_serve           => single_serve
+                            }
+                            @templates[category][template][:deployment_stack] = deployment_stack unless deployment_stack.nil?
+                        end
                     end
                 end
             end
@@ -381,12 +391,15 @@ module AppCommand
 
         def opts_routing
 
-            used_cache   = true
-            showing_tags = false
+            used_cache                    = true
+            showing_tags                  = false
 
             # Show prompt to select template.
             category, template, @template = select_template_prompt
 
+            # Will be something like: "ec2/build-server"
+            template_name =  "#{category}/#{template}"
+
             if @params.any?
                 # Here we replace the UUID for the stack-name at the last-second to enable parallel, identical runs (if exists).
                 @params[OPTION_STACK_NAME] = replace_stack_suffix(@params[OPTION_STACK_NAME]) if @params.has_key?(OPTION_STACK_NAME)
@@ -399,25 +412,28 @@ module AppCommand
                             puts "\x1B[38;5;#{App::AWSOutputter::DIVIDER_COLOR}m--- \x1B[38;5;136m[Tags]\x1B[0m\x1B[38;5;#{App::AWSOutputter::DIVIDER_COLOR}m #{'-' * (@terminal_width - 17)}\x1B[0m"
                             puts
                         end
+
+                        # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
                         # Deployment ID needs to be handled here because we need to know what the project/region/environment is before we can display the options.
-                        if param_name == OPTION_PROJECT_ID
-                            # Figure out which deployments are eligible for this stack.
-                            if @template.has_key?(:deployment_stack)
-                                @projects = Blufin::Projects::get_deployments(
-                                    @params[OPTION_PROJECT],
-                                    @template[:deployment_stack],
-                                    @params[OPTION_REGION],
-                                    @params[OPTION_ENVIRONMENT]
-                                )
-                                if @projects.any?
-                                    project_options = []
-                                    @projects.each { |project| project_options << project[1][Blufin::Projects::DEPLOYMENT_ID] }
-                                    @params[param_name] = Blufin::Terminal::prompt_select('Select Project ID:', project_options, help: param_data[OPTION_DESCRIPTION])
-                                    puts
-                                end
-                            end
-                            next
-                        end
+                        # if param_name == OPTION_PROJECT_ID
+                        #     # Figure out which deployments are eligible for this stack.
+                        #     if @template.has_key?(:deployment_stack)
+                        #         @projects = Blufin::Projects::get_deployments(
+                        #             @params[OPTION_PROJECT],
+                        #             @template[:deployment_stack],
+                        #             @params[OPTION_REGION],
+                        #             @params[OPTION_ENVIRONMENT]
+                        #         )
+                        #         if @projects.any?
+                        #             project_options = []
+                        #             @projects.each { |project| project_options << project[1][Blufin::Projects::PROJECT_ID] }
+                        #             @params[param_name] = Blufin::Terminal::prompt_select('Select Project ID:', project_options, help: param_data[OPTION_DESCRIPTION])
+                        #             puts
+                        #         end
+                        #     end
+                        #     next
+                        # end
+
                         @params[param_name] = get_parameter_value(param_data, param_name, category, template)
                         # Puts space unless it's a hidden parameter. Keeps spacing consistent.
                         puts unless [OPTION_TIMEOUT].include?(param_name)
@@ -445,19 +461,52 @@ module AppCommand
             capabilities_arr = []
             capabilities_str = nil
 
+            # # TODO - REMOVE OR EMBED? This shows all the params eligible for replacing...
+            # puts get_replacer_params(category, template).to_yaml
+            # exit
+
             # Replace matchers in CloudFormation Template before uploading to S3.
-            source = File.expand_path("#{App::AWSCloudFormation::get_cloudformation_path}/#{category}/#{template}/template.yml")
-            raise RuntimeError, "File does not exist: #{source}" unless Blufin::Files::file_exists(source)
-            file_lines = Blufin::Replacer::replace_yml(source, get_replacer_params(category, template))
-            tmp_file   = "/tmp/converted-template-#{Blufin::Strings::random_string(4)}.txt"
-            Blufin::Files::write_file(tmp_file, file_lines)
+            replacer_params  = get_replacer_params(category, template)
+
+            if !@nested_stacks[template_name].nil? && @nested_stacks[template_name].any?
+                # First create a temporary filename map for all the stacks we need to upload.
+                tmp_filenames = {}
+                @nested_stacks[template_name].keys.each do |stack|
+                    tmp_filenames[stack] = "#{stack.gsub('/', '-')}-#{DateTime.now.strftime('%Y%m%d-%H%M%S')}.yml"
+                end
+
+                replacer_params[STACK] = {}
+                @nested_stacks[template_name].each do |stack|
+                    replacer_params[STACK][stack[0]] = {
+                        :s3_url => "#{App::AWSCloudFormation::get_s3_bucket_url}/#{tmp_filenames[stack[0]]}"
+                    }
+                end
+
+                # Upload Nested Stacks to S3.
+                @nested_stacks[template_name].each do |stack|
+                    nested_template_converted = "/tmp/#{tmp_filenames[stack[0]]}"
+                    nested_template_file      = File.expand_path("#{App::AWSCloudFormation::get_cloudformation_path}/#{stack[0]}/template.yml")
+                    file_lines                = App::Replacer::replace_yml(nested_template_file, replacer_params)
+                    Blufin::Files::write_file(nested_template_converted, file_lines)
+                    # Upload nested template to S3.
+                    App::AWSCloudFormation::upload_cloudformation_template(nested_template_converted, category, template, filename_override: tmp_filenames[stack[0]])
+                    system("rm #{nested_template_converted}")
+                end
+
+            end
+
+            base_template_file = File.expand_path("#{App::AWSCloudFormation::get_cloudformation_path}/#{category}/#{template}/template.yml")
+            raise RuntimeError, "File does not exist: #{base_template_file}" unless Blufin::Files::file_exists(base_template_file)
+            tmp_file            = "/tmp/converted-template-#{Blufin::Strings::random_string(4)}.txt"
+            base_template_lines = App::Replacer::replace_yml(base_template_file, replacer_params)
+            Blufin::Files::write_file(tmp_file, base_template_lines)
 
             # Upload the template to S3.
-            s3_url = App::AWSCloudFormation::upload_cloudformation_template(tmp_file, category, template)
+            base_template = App::AWSCloudFormation::upload_cloudformation_template(tmp_file, category, template)
             system("rm #{tmp_file}")
 
-            # Validates the template.
-            validation = App::AWSCli::cloudformation_stack_validate(@params[OPTION_REGION], s3_url)
+            # Validates the base template.
+            validation = App::AWSCli::cloudformation_stack_validate(@params[OPTION_REGION], base_template)
 
             # Check if validation output is JSON (and output appropriate format).
             begin
@@ -475,14 +524,17 @@ module AppCommand
                 Blufin::Terminal::error("AWS says your template is: \x1B[38;5;196mINVALID", App::AWSCli::format_cli_error(validation), true)
             end
 
-            output                     = {}
-            output[OPTION_STACK_NAME]  = @params[OPTION_STACK_NAME]
-            output[OPTION_DESCRIPTION] = @params[OPTION_DESCRIPTION]
-            output[SPACER]             = true
-            if @template.has_key?(:deployment_stack) && !@params[OPTION_PROJECT_ID].nil? && @params[OPTION_PROJECT_ID].length > 0
-                output[OPTION_DEPLOYMENT_STACK] = @template[:deployment_stack]
-                output[OPTION_PROJECT_ID]       = @params[OPTION_PROJECT_ID]
-            end
+            output                      = {}
+            output[OPTION_STACK_NAME]   = @params[OPTION_STACK_NAME]
+            output[OPTION_DESCRIPTION]  = @params[OPTION_DESCRIPTION]
+            output[SPACER]              = true
+
+            # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
+            # if @template.has_key?(:deployment_stack) && !@params[OPTION_PROJECT_ID].nil? && @params[OPTION_PROJECT_ID].length > 0
+            #     output[OPTION_DEPLOYMENT_STACK] = @template[:deployment_stack]
+            #     output[OPTION_PROJECT_ID]       = @params[OPTION_PROJECT_ID]
+            # end
+
             output[OPTION_TIMEOUT]      = @params[OPTION_TIMEOUT]
             output[OPTION_TERM_PROTECT] = @params[OPTION_TERM_PROTECT] unless @template[:single_serve]
             output[CAPABILITIES]        = capabilities_arr.join(', ') unless capabilities_str.nil?
@@ -521,15 +573,24 @@ module AppCommand
                 # If no 'after' actions necessary, give option to terminate script.
                 term_script = false
                 if @template[:method_after_create].nil? && !@template[:single_serve]
-                    term_script = Blufin::Terminal::prompt_yes?('     End script after CloudFormation starts running?')
+                    options     = [{:text => "Yes \xe2\x80\x94 Script will wait until stack is fully built.", :value => false}, {:text => 'No', :value => true}]
+                    help_text   = "Select 'No' to end the script immediately. Status can still be viewed in the AWS console."
+                    term_script = Blufin::Terminal::prompt_select('Wait for stack to build?', options, help: help_text)
                     puts
                 end
 
                 # Call :before_create() -- if exists.
                 @template[:method_before_create].call(@params) unless @template[:method_before_create].nil?
 
+                # TODO - Uncomment to see template (or remove).
+                # # Output the base template to terminal (for reference). Nested stacks are currently not outputted.
+                # base_template_lines.each do |line|
+                #     puts "  \x1B[38;5;240m#{line}\x1B[0m"
+                # end
+                # puts
+
                 # Create the Stack (if term_scrip == TRUE, script terminates inside).
-                App::AWSCli::cloudformation_stack_create(@params[OPTION_REGION], @params[OPTION_STACK_NAME], s3_url,
+                App::AWSCli::cloudformation_stack_create(@params[OPTION_REGION], @params[OPTION_STACK_NAME], base_template,
                                                          params:       assemble_params(@params),
                                                          tags:         assemble_tags(@params),
                                                          capabilities: capabilities_arr,
@@ -548,7 +609,7 @@ module AppCommand
                         Blufin::Terminal::error('Something went wrong.')
                     end
                 else
-                    Blufin::Terminal::success('Stack creation was successful.') unless term_script
+                    Blufin::Terminal::success('Stack creation was successful.', nil, false) unless term_script
                 end
             end
         end
@@ -641,12 +702,15 @@ module AppCommand
                     OPTIONS            => options_current[key],
                 }
             end
-            unless @template[:deployment_stack].nil?
-                @template[:parameters][OPTION_PROJECT_ID] = {
-                    'Type'             => 'String',
-                    OPTION_DESCRIPTION => 'Project ID (used for associating this Stack with an existing Project).'
-                }
-            end
+
+            # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
+            # unless @template[:deployment_stack].nil?
+            #     @template[:parameters][OPTION_PROJECT_ID] = {
+            #         'Type'             => 'String',
+            #         OPTION_DESCRIPTION => 'Project ID (used for associating this Stack with an existing Project).'
+            #     }
+            # end
+
             @template[:parameters][OPTION_STACK_NAME]           = {
                 'Type'             => 'String',
                 OPTION_DESCRIPTION => @template[:stack_name].nil? ? default_options : @template[:stack_name],
@@ -664,6 +728,11 @@ module AppCommand
                 OPTION_DESCRIPTION => 'The amount of minutes that can pass before the stack aborts the mission.',
                 DEFAULT            => options_current[OPTION_TIMEOUT]
             }
+            @template[:parameters][OPTION_OWNER]                = {
+                'Type'             => 'String',
+                OPTION_DESCRIPTION => "Who is considered the 'Owner' of this Stack?",
+                DEFAULT            => @owner
+            }
             unless @template[:single_serve]
                 @template[:parameters][OPTION_TERM_PROTECT] = {
                     'Type'             => 'Boolean',
@@ -741,11 +810,11 @@ module AppCommand
             if empty_options.any?
                 Blufin::Terminal::error("Cannot currently use this template because empty #{Blufin::Terminal::format_highlight('required resource(s)')} were detected.", empty_options, true, false)
             else
-                choices = [{ value: 'y', text: 'Select this template' }]
-                choices << { value: 'Y', text: "Select this template \x1B[38;5;198m(and apply cached values)\x1B[0m" } if @cache_valid
+                choices = [{value: 'y', text: 'Select this template'}]
+                choices << {value: 'Y', text: "Select this template \x1B[38;5;198m(and apply cached values)\x1B[0m"} if @cache_valid
             end
             # The prompt at the end of the intro.
-            choices << { value: 'n', text: "\x1B[38;5;240m#{Blufin::Strings::RETURN_CHARACTER}\x1B[0m" }
+            choices << {value: 'n', text: "\x1B[38;5;240m#{Blufin::Strings::RETURN_CHARACTER}\x1B[0m"}
             choice = Blufin::Terminal::prompt_select('What would you like to do?', choices)
             case choice
                 when 'y'
@@ -773,7 +842,7 @@ module AppCommand
                 constraints << "\x1B[38;5;240mMinLength: \x1B[38;5;#{App::AWSOutputter::CONSTRAINT_COLOR}m#{param_data['MinLength']}" if param_data.has_key?('MinLength')
                 constraints << "\x1B[38;5;240mMaxLength: \x1B[38;5;#{App::AWSOutputter::CONSTRAINT_COLOR}m#{param_data['MaxLength']}" if param_data.has_key?('MaxLength')
                 default   = @template[:stack_name]
-                default   = Blufin::Replacer::replace_string(default, replace_hash)
+                default   = App::Replacer::replace_string(default, replace_hash)
                 default   = default.downcase
                 help_text = 'Stack Name (will be displayed in CloudFormation console).'
                 return Blufin::Terminal::prompt_ask("Enter #{param_name}#{render_constraints(constraints)}", default: default, help: help_text)
@@ -782,14 +851,16 @@ module AppCommand
                 constraints << "\x1B[38;5;240mMinLength: \x1B[38;5;#{App::AWSOutputter::CONSTRAINT_COLOR}m#{param_data['MinLength']}" if param_data.has_key?('MinLength')
                 constraints << "\x1B[38;5;240mMaxLength: \x1B[38;5;#{App::AWSOutputter::CONSTRAINT_COLOR}m#{param_data['MaxLength']}" if param_data.has_key?('MaxLength')
                 default   = param_data.has_key?(DEFAULT) ? param_data[DEFAULT] : nil
-                default   = Blufin::Replacer::replace_string(default, replace_hash)
+                default   = App::Replacer::replace_string(default, replace_hash)
                 help_text = 'Description (will be displayed in CloudFormation console).'
                 return Blufin::Terminal::prompt_ask("Enter #{param_name}#{render_constraints(constraints)}", default: default, help: help_text)
             elsif param_name == OPTION_TIMEOUT
                 return param_data[DEFAULT]
             elsif param_name == OPTION_TERM_PROTECT
                 # Basically, by default Termination Protection is off (because most of the time your just testing and want to press Enter).
-                return !Blufin::Terminal::prompt_yes?("Allow accidental Termination? (type 'n' to enable Termination Protection)")
+                options   = [{:text => "No \xe2\x80\x94 Don't protect this stack.", :value => false}, {:text => 'Yes', :value => true}]
+                help_text = "Select 'Yes' to require an extra step when deleting this Stack."
+                return Blufin::Terminal::prompt_select('Enable "Accidental Termination" protection?', options, help: help_text)
             elsif @lookups.has_key?(param_name)
                 # Sort alphabetically.
                 options, multi = fetch_autocomplete_options(param_name, silent: true)
@@ -844,7 +915,7 @@ module AppCommand
                 if default.nil?
                     default = @cache[param_name] if @cache.has_key?(param_name)
                 else
-                    default = Blufin::Replacer::replace_string(default, replace_hash)
+                    default = App::Replacer::replace_string(default, replace_hash)
                 end
                 loop do
                     value         = Blufin::Terminal::prompt_ask("Enter #{param_name}#{render_constraints(constraints)}", default: default, help: description)
@@ -880,33 +951,64 @@ module AppCommand
                 results[:matchers].each do |key, matchers|
                     raise RuntimeError, "Expected Array, but got #{matchers.class}" unless matchers.is_a?(Array)
                     matchers.each do |m|
-                        matcher_raw = "${{#{key}:#{m[:key]}#{m.has_key?(:modifier) ? ":#{m[:modifier]}" : ''}}}"
+                        val         = m[:key]
+                        matcher_raw = "${{#{key}:#{val}#{m.has_key?(:modifier) ? ":#{m[:modifier]}" : ''}}}"
                         begin
                             case key
                                 when PARAMETERS
                                     valid_keys = parameters.keys.push(*[
                                         OPTION_CATEGORY,
-                                        OPTION_TEMPLATE,
-                                        OPTION_PROJECT,
+                                        OPTION_DESCRIPTION,
                                         OPTION_ENVIRONMENT,
-                                        OPTION_REGION
+                                        OPTION_REGION,
+                                        OPTION_OWNER,
+                                        OPTION_PROJECT,
+                                        OPTION_REGION,
+                                        OPTION_TEMPLATE,
+                                        OPTION_TIMEOUT
                                     ])
-                                    raise RuntimeError unless valid_keys.include?(m[:key])
+                                    raise RuntimeError "${{Parameter:#{val}}} is not valid (or has not been added to the valid keys Array)." unless valid_keys.include?(val)
+                                when STACK
+                                    ks = val.split('/')
+                                    raise RuntimeError, "Expected value to have a single slash, instead got: #{val}" unless ks.length == 2
+                                    stack_found = false
+                                    Blufin::Files::get_dirs_in_dir(App::AWSCloudFormation::get_cloudformation_path).each do |cat|
+                                        cs = cat.split('/')
+                                        if cs[cs.length - 1] == ks[0]
+                                            Blufin::Files::get_dirs_in_dir(cat).each do |tmpl|
+                                                ts = tmpl.split('/')
+                                                if ts[ts.length - 1] == ks[1]
+                                                    stack_found = true
+                                                    break
+                                                end
+                                            end
+                                        end
+                                        break if stack_found
+                                    end
+                                    if stack_found
+                                        @nested_stacks[template_name]      = {} unless @nested_stacks.has_key?(template_name)
+                                        @nested_stacks[template_name][val] = [] unless @nested_stacks[template_name].has_key?(val)
+                                        @nested_stacks[template_name][val] << file_cloudformation
+                                    else
+                                        raise RuntimeError, "Stack not found: #{val}"
+                                    end
                                 when SYSTEM
-                                    raise RuntimeError unless %w(UUID-8 UUID-16 UUID-AWX).include?(m[:key])
+                                    raise RuntimeError unless %w(UUID-8 UUID-16 UUID-AWX).include?(val)
                                 when 'file'
-                                    file_path = "#{Blufin::Files::extract_path_name(file_cloudformation)}/#{m[:key]}"
+                                    file_path = "#{Blufin::Files::extract_path_name(file_cloudformation)}/#{val}"
                                     unless Blufin::Files::file_exists(file_path)
                                         @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 File from matcher not found: #{Blufin::Terminal::format_invalid(file_path)}"
                                         next
                                     end
-                                    results_inner = Blufin::Replacer::scan_file(file_path)
+                                    results_inner = App::Replacer::scan_file(file_path)
                                     validate_matchers(file_path, results_inner, template_name, parameters)
                                 else
-                                    raise RuntimeError
+                                    raise RuntimeError "Key: #{key} does not match any of the expected keys."
                             end
-                        rescue
-                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid matcher found in template: #{Blufin::Terminal::format_invalid(matcher_raw)}"
+                        rescue => e
+                            message = e.message.to_s.strip
+                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid matcher found in template: #{Blufin::Terminal::format_invalid(matcher_raw)}\x1B[0m" if message == ''
+                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid matcher found in template: #{Blufin::Terminal::format_invalid(matcher_raw)} \x1B[38;5;240m \xe2\x80\x94 #{message}\x1B[0m" unless message == ''
                         end
                     end
                 end
@@ -935,10 +1037,10 @@ module AppCommand
             raise RuntimeError, "Key not found in @lookups: #{resource_name}" unless @lookups.has_key?(resource_name)
             return @lookup_cache[resource_name] if @lookup_cache.has_key?(resource_name)
             multi = false
-            if resource_name == SSH_USERS
+            if resource_name == App::Replacer::SSH_USERS
                 multi   = true
                 options = []
-                @lookups[SSH_USERS].each do |user, pub_key|
+                @lookups[App::Replacer::SSH_USERS].each do |user, pub_key|
                     options << {
                         :value => pub_key,
                         :text  => user,
@@ -958,7 +1060,7 @@ module AppCommand
         # Returns short-hand syntax for tags.
         # @return string
         def assemble_tags(params)
-            output = []
+            output = [{'Key' => OPTION_OWNER, 'Value' => @owner}]
             params.each do |key, value|
                 next unless AWS_TAGS.include?(key)
                 output << {
@@ -966,16 +1068,19 @@ module AppCommand
                     'Value' => value
                 }
             end
-            if @template.has_key?(:deployment_stack) && params.has_key?(OPTION_PROJECT_ID)
-                output << {
-                    'Key'   => OPTION_DEPLOYMENT_STACK,
-                    'Value' => @template[:deployment_stack].to_s
-                }
-                output << {
-                    'Key'   => OPTION_PROJECT_ID,
-                    'Value' => params[OPTION_PROJECT_ID]
-                }
-            end
+
+            # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
+            # if @template.has_key?(:deployment_stack) && params.has_key?(OPTION_PROJECT_ID)
+            #     output << {
+            #         'Key'   => OPTION_DEPLOYMENT_STACK,
+            #         'Value' => @template[:deployment_stack].to_s
+            #     }
+            #     output << {
+            #         'Key'   => OPTION_PROJECT_ID,
+            #         'Value' => params[OPTION_PROJECT_ID]
+            #     }
+            # end
+
             output.to_json
         end
 

data/lib/routes/{aws_cloudformation_delete.rb → cloudformation_delete.rb}

@@ -1,6 +1,6 @@
 module AppCommand
 
-    class AWSCloudFormationDelete < ::Convoy::ActionCommand::Base
+    class CloudFormationDelete < ::Convoy::ActionCommand::Base
 
         def execute
 

data/lib/routes/{aws_cloudformation_detect_drift.rb → cloudformation_detect_drift.rb}

@@ -1,6 +1,6 @@
 module AppCommand
 
-    class AWSCloudFormationDetectDrift < ::Convoy::ActionCommand::Base
+    class CloudFormationDetectDrift < ::Convoy::ActionCommand::Base
 
         TMP_OUTPUT = '/tmp/execute-output'