awx 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a94c9502e74dbf2341f840580ecef942de5f4b
-  data.tar.gz: 1282d29984bc74544f9690e8165be5cc1d5e8937
+  metadata.gz: 54e617e3d455c0aa8d4f5d3dce0573cbb8ed86c3
+  data.tar.gz: 2039dffe2e3f9cc5e391fca408d726313280fcc7
 SHA512:
-  metadata.gz: 80cb2a19a8ed00b096cfab3053ae90cfb32162f767f38cce76d86d985d364faaab670abf7629e7ae487aab3c7655cd557fc615f9179a330646a0eddb997b02c9
-  data.tar.gz: fc84a4875cf90448c977a14f1e9849fb5685e1f0ef32b31d3a9676c04b37a479dc032ec24b9e0feb6c108b1237f09a60a3f7553f4fc9fb3549492123d1f2d591
+  metadata.gz: d050dcd91c40b5fb9fc39f38bba5854fe6790cc9cf77f262ab656bb0d8e666d63d0bafcd567a84a75c7142501e0e730bb559dfb5e48d73687d3528ebb02af699
+  data.tar.gz: 0cb3de40b28af605e5bbf33124a8c348c38441a95faa9a8fa90b81eafb8619fdf91d2ff6d8b74c0adadc71ae55739e6c50f70ba9d6ea35710f47406cecb3c1dc

data/lib/aws/aws_cloudformation.rb

@@ -5,7 +5,8 @@ module App
         # Gets the path to the root of the cloudformation templates in blufin-secrets repo.
         # @return string
         def self.get_cloudformation_path
-            path = App::AWSProfile::get_profile['CloudFormation']['TemplatePath']
+            # TODO AWX PROFILE - Must support S3.
+            path = App::AWSProfile::get_profile['CloudFormation']['Templates']['Local']['Path']
             Blufin::Terminal::error("CloudFormation path not found: #{Blufin::Terminal::format_directory(path)}", 'This probably means directories got renamed or code got changed.', true) unless Blufin::Files::path_exists(path)
             path
         end
@@ -26,7 +27,7 @@ module App
             parsing_parameters = true
             Blufin::Files::read_file(tmp_file).each do |line|
                 line = line.gsub("\n", '')
-                if line.strip =~ /^description:/i
+                if line.strip =~ /^description:/i && !description_found
                     new_lines << line unless description_found
                     description_found = true
                 else
@@ -44,7 +45,7 @@ module App
             template_filename = "#{template_category}-#{template_name}-#{DateTime.now.strftime('%Y%m%d-%H%M%S')}.yml"
             bucket_path       = get_s3_bucket_path
             bucket_path       = bucket_path == '' ? '' : "#{bucket_path}/"
-            App::AWSCli::s3_upload(tmp_file, App::AWSProfile::get_profile['CloudFormation']['S3Bucket'], "#{bucket_path}#{template_filename}")
+            App::AWSCli::s3_upload(tmp_file, App::AWSProfile::get_profile['CloudFormation']['Uploads']['S3Bucket']['Name'], "#{bucket_path}#{template_filename}")
             # Return the S3 bucket URL.
             "#{get_s3_bucket_url}/#{template_filename}"
         end
@@ -54,13 +55,13 @@ module App
         def self.get_s3_bucket_url
             bucket_path = get_s3_bucket_path
             bucket_path = bucket_path == '' ? '' : "/#{bucket_path}"
-            "https://#{App::AWSProfile::get_profile['CloudFormation']['S3Bucket']}.s3-#{App::AWSProfile::get_profile['CloudFormation']['S3BucketRegion']}.amazonaws.com#{bucket_path}"
+            "https://#{App::AWSProfile::get_profile['CloudFormation']['Uploads']['S3Bucket']['Name']}.s3-#{App::AWSProfile::get_profile['CloudFormation']['Uploads']['S3Bucket']['Region']}.amazonaws.com#{bucket_path}"
         end
 
         # Returns the S3 bucket path based on config parameters.
         # @return string
         def self.get_s3_bucket_path
-            bucket_path = App::AWSProfile::get_profile['CloudFormation']['S3BucketPath']
+            bucket_path = App::AWSProfile::get_profile['CloudFormation']['Uploads']['S3Bucket']['Path']
             bucket_path.nil? || bucket_path.to_s.strip == '' ? '' : bucket_path
         end
 

data/lib/aws/aws_profile.rb

@@ -48,8 +48,9 @@ module App
 
             # Validate CloudFormation data (if exists)
             if @@profile.has_key?(CLOUDFORMATION)
-                cloudformation_template_path = @@profile[CLOUDFORMATION]['TemplatePath']
-                s3_region                    = @@profile[CLOUDFORMATION]['S3BucketRegion']
+                # TODO AWX PROFILE - Must support S3.
+                cloudformation_template_path = @@profile[CLOUDFORMATION]['Templates']['Local']['Path']
+                s3_region                    = @@profile[CLOUDFORMATION]['Uploads']['S3Bucket']['Region']
                 default_regions              = @@profile[CLOUDFORMATION]['Defaults']['Regions']
                 errors << "Path not found: #{Blufin::Terminal::format_invalid(cloudformation_template_path)}" unless Blufin::Files::path_exists(cloudformation_template_path)
                 errors << "Invalid region: #{Blufin::Terminal::format_invalid(s3_region)}" unless App::AWS::VALID_REGIONS.include?(s3_region)

data/lib/awx.rb

@@ -1,7 +1,7 @@
+require 'blufin-lib'
 require 'columnist'
 require 'convoy'
 require 'yaml'
-require 'blufin-lib'
 
 require_relative 'version'
 require 'core/opt'
@@ -52,7 +52,8 @@ TEMPLATE
                         awx_cloudformation.command :create, :aliases => [:c] do |awx_cloudformation_create|
                             awx_cloudformation_create.summary 'Create stack'
                             awx_cloudformation_create.options do |opts|
-                                if Blufin::Files::path_exists("#{File.expand_path(App::AWSProfile::get_profile['CloudFormation']['TemplatePath'])}/test")
+                                # TODO AWX PROFILE - Must support S3.
+                                if Blufin::Files::path_exists("#{File.expand_path(App::AWSProfile::get_profile['CloudFormation']['Templates']['Local']['Path'])}/test")
                                     opts.opt :test, 'Run through test-template.', :short => '-t', :long => '--test', :type => :boolean
                                 end
                                 opts.opt :test, "Re-run previous with cached values (if exists) \xe2\x80\x94 #{Blufin::Terminal::format_invalid('@NotImplemented')}", :short => '-R', :long => '--re-run', :type => :boolean

data/lib/routes/aws_cloudformation_create.rb

@@ -29,6 +29,8 @@ module AppCommand
         SPACER                  = '<<--Spacer-->>'
         CAPABILITIES            = 'Capabilities'
         RETURN_VALUE            = 'PjNkHK33EopWxCpzOQfuku3la'
+        EC2_USER_DATA           = 'EC2UserData'
+        EC2_USER_DATA_FILE      = 'cloud-config.yml'
 
         def execute
 
@@ -71,6 +73,9 @@ module AppCommand
 
         def opts_validate
 
+            # Windows is currently not supported, so bomb-out.
+            Blufin::Tools::os_not_supported([Blufin::Tools::OS_WINDOWS])
+
             # If Terminal window is smaller than 230, bomb-out.
             terminal_width_actual   = Blufin::Terminal::get_terminal_width
             terminal_required_width = 227
@@ -94,6 +99,7 @@ module AppCommand
                     ps                     = path_inner.split('/')
                     template               = ps[ps.length - 1]
                     template_name          = "#{category}/#{template}"
+                    template_path          = nil
                     file_cloudformation    = nil
                     file_ruby              = nil
                     method_before_create   = nil
@@ -110,10 +116,12 @@ module AppCommand
                     single_serve           = false
                     deployment_stack       = nil
                     parameters             = {}
+                    parameters_no_sort     = nil
                     warnings_count         = @warnings.length
                     raise RuntimeError, "Template name must consist of [service]/[service-description] with exactly one slash, instead got: #{template_name}" if template_name.strip.split('/').length != 2
                     Blufin::Files::get_files_in_dir(path_inner).each do |file|
-                        filename = Blufin::Files::extract_file_name(file)
+                        filename      = Blufin::Files::extract_file_name(file)
+                        template_path = Blufin::Files::extract_path_name(file)
                         if filename == 'template.yml'
                             begin
                                 yml_data = YAML.load_file(File.expand_path(file))
@@ -126,7 +134,7 @@ module AppCommand
                                 @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 AWSTemplateFormatVersion: '2010-09-09' is missing." unless yml_data.has_key?('AWSTemplateFormatVersion')
                                 @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 This template either has no resources, invalid resources, or something else wrong with the resources." if !yml_data.has_key?('Resources') || yml_data['Resources'].nil? || !yml_data['Resources'].is_a?(Hash) || yml_data['Resources'].length == 0
                                 if yml_data.has_key?(PARAMETERS) && yml_data[PARAMETERS].is_a?(Hash) && yml_data[PARAMETERS].length > 0
-                                    yml_data[PARAMETERS].each do |resource_name, data|
+                                    yml_data[PARAMETERS].each do |param_name, param_data|
                                         # Validate keys are in specific order.
                                         expected = {
                                             'Type'                  => true,
@@ -140,72 +148,77 @@ module AppCommand
                                             'MaxValue'              => false,
                                             'ConstraintDescription' => false,
                                         }
-                                        Blufin::Validate::assert_valid_keys(expected, data.keys, "#{file} \xe2\x86\x92 #{resource_name}")
-                                        @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Template has reserved parameter: #{Blufin::Terminal::format_invalid(resource_name)}" if [OPTION_STACK_NAME.downcase].concat(RESERVED_WORDS).include?(resource_name.downcase)
-                                        parameters[resource_name] = data
-                                        if @auto_fetch_resources.has_key?(resource_name)
-                                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Parameter: #{resource_name} cannot have default value: '#{data[DEFAULT]}' because it is a live look-up list (from AWS)." if data.keys.include?(DEFAULT)
+                                        Blufin::Validate::assert_valid_keys(expected, param_data.keys, "#{file} \xe2\x86\x92 #{param_name}")
+                                        @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Template has reserved parameter: #{Blufin::Terminal::format_invalid(param_name)}" if [OPTION_STACK_NAME.downcase].concat(RESERVED_WORDS).include?(param_name.downcase)
+                                        parameters[param_name] = param_data
+                                        if @auto_fetch_resources.has_key?(param_name)
+                                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Parameter: #{param_name} cannot have default value: '#{param_data[DEFAULT]}' because it is a live look-up list (from AWS)." if param_data.keys.include?(DEFAULT)
                                         end
                                         # Validate parameter type.
                                         valid_parameter_types   = %w(String Number List<Number> CommaDelimitedList)
                                         valid_parameter_regexes = [/^AWS::[A-Za-z0-9]+::[A-Za-z0-9]+::[A-Za-z0-9]+$/, /^List<AWS::[A-Za-z0-9]+::[A-Za-z0-9]+::[A-Za-z0-9]+>$/]
-                                        unless valid_parameter_types.include?(data['Type'])
+                                        unless valid_parameter_types.include?(param_data['Type'])
                                             matches_vpr = false
                                             valid_parameter_regexes.each do |vpr|
-                                                matches_vpr = true if data['Type'] =~ vpr
+                                                matches_vpr = true if param_data['Type'] =~ vpr
                                             end
                                             if matches_vpr
                                                 constraints = []
-                                                constraints << 'AllowedPattern' if data.has_key?('AllowedPattern')
-                                                constraints << 'MinLength' if data.has_key?('MinLength')
-                                                constraints << 'MaxLength' if data.has_key?('MaxLength')
-                                                constraints << 'MinValue' if data.has_key?('MinValue')
-                                                constraints << 'MaxValue' if data.has_key?('MaxValue')
+                                                constraints << 'AllowedPattern' if param_data.has_key?('AllowedPattern')
+                                                constraints << 'MinLength' if param_data.has_key?('MinLength')
+                                                constraints << 'MaxLength' if param_data.has_key?('MaxLength')
+                                                constraints << 'MinValue' if param_data.has_key?('MinValue')
+                                                constraints << 'MaxValue' if param_data.has_key?('MaxValue')
                                                 if constraints.any?
                                                     @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid parameter constraint(s): #{Blufin::Terminal::format_invalid(constraints.join(','))}. These don't apply to AWS-Specific parameters."
                                                 end
                                             else
-                                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid parameter type: #{Blufin::Terminal::format_invalid(data['Type'])}"
+                                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid parameter type: #{Blufin::Terminal::format_invalid(param_data['Type'])}"
                                             end
                                         end
                                         # Can only have Max/MinLength if this is a String.
-                                        if data.has_key?('MinLength') || data.has_key?('MaxLength') || data.has_key?('AllowedPattern')
-                                            unless data['Type'] == 'String'
+                                        if param_data.has_key?('MinLength') || param_data.has_key?('MaxLength') || param_data.has_key?('AllowedPattern')
+                                            unless param_data['Type'] == 'String'
                                                 constraints = []
-                                                constraints << 'MinLength' if data.has_key?('MinLength')
-                                                constraints << 'MaxLength' if data.has_key?('MaxLength')
-                                                constraints << 'AllowedPattern' if data.has_key?('AllowedPattern')
+                                                constraints << 'MinLength' if param_data.has_key?('MinLength')
+                                                constraints << 'MaxLength' if param_data.has_key?('MaxLength')
+                                                constraints << 'AllowedPattern' if param_data.has_key?('AllowedPattern')
                                                 @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid parameter constraint(s): #{Blufin::Terminal::format_invalid(constraints.join(','))}. To use these, type must be String."
                                             end
                                         end
                                         # Can only have Max/MinValue if this is a Number.
-                                        if data.has_key?('MinValue') || data.has_key?('MaxValue')
-                                            unless data['Type'] == 'Number'
+                                        if param_data.has_key?('MinValue') || param_data.has_key?('MaxValue')
+                                            unless param_data['Type'] == 'Number'
                                                 constraints = []
-                                                constraints << 'MinValue' if data.has_key?('MinValue')
-                                                constraints << 'MaxValue' if data.has_key?('MaxValue')
+                                                constraints << 'MinValue' if param_data.has_key?('MinValue')
+                                                constraints << 'MaxValue' if param_data.has_key?('MaxValue')
                                                 @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Invalid parameter constraint(s): #{Blufin::Terminal::format_invalid(constraints.join(','))}. To use these, type must be Number."
                                             end
                                         end
                                         # If Allowed Values is set, certain conditions must apply.
-                                        if data.has_key?('AllowedValues')
+                                        if param_data.has_key?('AllowedValues')
                                             %w(AllowedPattern MinLength MaxLength MinValue MaxValue).each do |invalid_key|
-                                                if data.has_key?(invalid_key)
-                                                    @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 AllowedValues is set so cannot have: #{Blufin::Terminal::format_invalid(data['invalid_key'])}"
+                                                if param_data.has_key?(invalid_key)
+                                                    @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 AllowedValues is set so cannot have: #{Blufin::Terminal::format_invalid(param_data['invalid_key'])}"
                                                 end
                                             end
                                             # Must be Array.
-                                            unless data['AllowedValues'].is_a?(Array)
-                                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 AllowedValues must be Array, instead got: #{Blufin::Terminal::format_invalid(data['AllowedValues'].class)}"
+                                            unless param_data['AllowedValues'].is_a?(Array)
+                                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 AllowedValues must be Array, instead got: #{Blufin::Terminal::format_invalid(param_data['AllowedValues'].class)}"
                                             end
                                         end
+                                        # Validate EC2UserData parameter (make sure cloud-init.txt exists).
+                                        if param_name == EC2_USER_DATA
+                                            cloud_init_file = "#{template_path}/#{EC2_USER_DATA_FILE}"
+                                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Template has #{Blufin::Terminal::format_highlight(EC2_USER_DATA)} parameter but no #{Blufin::Terminal::format_invalid(EC2_USER_DATA_FILE)} file." unless Blufin::Files::file_exists(cloud_init_file)
+                                        end
                                     end
                                 end
                                 # Validate description (if exists).
                                 if yml_data.has_key?(OPTION_DESCRIPTION)
                                     description = yml_data[OPTION_DESCRIPTION]
                                     # Validate replaceable value(s) exist.
-                                    matches = description.scan(/{{[A-Za-z0-9]+}}/)
+                                    matches     = description.scan(/{{[A-Za-z0-9]+}}/)
                                     matches.each do |match|
                                         match = match.gsub(/^{{/, '').gsub(/}}$/, '')
                                         unless parameters.keys.include?(match)
@@ -242,13 +255,14 @@ module AppCommand
                                 constant = constant.to_s
                                 expected_constants.delete(constant) if expected_constants.include?(constant)
                                 # Optional constants.
-                                intro            = Template::INTRO if constant == 'INTRO'
-                                stack_name       = Template::STACK_NAME if constant == 'STACK_NAME'
-                                projects         = Template::PROJECTS if constant == 'PROJECTS'
-                                environments     = Template::ENVIRONMENTS if constant == 'ENVIRONMENTS'
-                                regions          = Template::REGIONS if constant == 'REGIONS'
-                                timeout          = Template::TIMEOUT if constant == 'TIMEOUT'
-                                deployment_stack = Template::DEPLOYMENT_STACK if constant == 'DEPLOYMENT_STACK'
+                                intro              = Template::INTRO if constant == 'INTRO'
+                                stack_name         = Template::STACK_NAME if constant == 'STACK_NAME'
+                                projects           = Template::PROJECTS if constant == 'PROJECTS'
+                                environments       = Template::ENVIRONMENTS if constant == 'ENVIRONMENTS'
+                                regions            = Template::REGIONS if constant == 'REGIONS'
+                                timeout            = Template::TIMEOUT if constant == 'TIMEOUT'
+                                deployment_stack   = Template::DEPLOYMENT_STACK if constant == 'DEPLOYMENT_STACK'
+                                parameters_no_sort = Template::PARAMETERS_NO_SORT if constant == 'PARAMETERS_NO_SORT'
                             end
                             # Validate stack name.
                             if stack_name.nil? || stack_name.strip == ''
@@ -320,6 +334,16 @@ module AppCommand
                             Object.send(:remove_const, :Template)
                         end
                     end
+                    # Make sure no-sort parameters exist.
+                    unless parameters_no_sort.nil?
+                        if parameters_no_sort.is_a?(Array)
+                            parameters_no_sort.each do |pns|
+                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Non-existent #{Blufin::Terminal::format_highlight('PARAMETERS_NO_SORT')} parameter: #{Blufin::Terminal::format_invalid(pns)}" unless parameters.keys.include?(pns)
+                            end
+                        else
+                            @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 Expected constant #{Blufin::Terminal::format_highlight('PARAMETERS_NO_SORT')} to be Array, instead got: #{Blufin::Terminal::format_invalid(parameters_no_sort.class)}"
+                        end
+                    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)
@@ -331,6 +355,7 @@ module AppCommand
                     else
                         @templates[category][template]                    = {
                             :name                   => template,
+                            :path                   => template_path,
                             :broken                 => false,
                             :file_cloudformation    => file_cloudformation,
                             :file_ruby              => file_ruby,
@@ -339,6 +364,7 @@ module AppCommand
                             :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,
@@ -365,8 +391,8 @@ 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
@@ -430,10 +456,10 @@ module AppCommand
             capabilities_str = nil
 
             # Upload the template to S3.
-            s3_url = App::AWSCloudFormation::upload_cloudformation_template(category, template, @params[OPTION_DESCRIPTION])
+            s3_url           = App::AWSCloudFormation::upload_cloudformation_template(category, template, @params[OPTION_DESCRIPTION])
 
             # Validates the template.
-            validation = App::AWSCli::cloudformation_stack_validate(@params[OPTION_REGION], s3_url)
+            validation       = App::AWSCli::cloudformation_stack_validate(@params[OPTION_REGION], s3_url)
 
             # Check if validation output is JSON (and output appropriate format).
             begin
@@ -645,6 +671,10 @@ module AppCommand
                     OPTION_DESCRIPTION => 'Should this stack be protected against accidental Termination?'
                 }
             end
+            # If one of the parameters is EC2UserData, this parameter gets handled differently.
+            if @template[:parameters].is_a?(Hash) && @template[:parameters].has_key?(EC2_USER_DATA)
+                @template[:parameters][EC2_USER_DATA][OPTION_DESCRIPTION] = "#{EC2_USER_DATA_FILE} (base64 encoded & sent automatically)"
+            end
             # Get cached values (if exist and parameters haven't changed).
             # Even a one-character change in a description will invalidate the cache.
             cache_file = get_cache_file(category, template)
@@ -716,11 +746,11 @@ module AppCommand
                 puts
                 choices = []
             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'
@@ -767,10 +797,14 @@ module AppCommand
                 end
                 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 == EC2_USER_DATA
+                puts Blufin::Terminal::display_prompt_text(EC2_USER_DATA, EC2_USER_DATA_FILE)
+                return "#{@template[:path]}/#{EC2_USER_DATA_FILE}"
             elsif param_name == OPTION_TIMEOUT
                 return param_data[DEFAULT]
             elsif param_name == OPTION_TERM_PROTECT
-                return Blufin::Terminal::prompt_yes?('Protect against accidental Termination?')
+                # 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)")
             elsif @auto_fetch_resources.has_key?(param_name)
                 # Sort alphabetically.
                 options = fetch_autocomplete_options(param_name, silent: true)
@@ -787,9 +821,11 @@ module AppCommand
                     puts Blufin::Terminal::display_prompt_text(options_text, default_option)
                     return default_option
                 else
-                    # Sort alphabetically.
-                    options.uniq!
-                    options.sort!
+                    unless @template[:parameters_no_sort].is_a?(Array) && @template[:parameters_no_sort].include?(param_name)
+                        # Sort alphabetically.
+                        options.uniq!
+                        options.sort!
+                    end
                     # If we have a cached value, make that the first in the options list.
                     options = move_default_option_to_top(options, param_name) if @cache.has_key?(param_name)
                     puts Blufin::Terminal::display_prompt_help(param_data[OPTION_DESCRIPTION]) if param_data.has_key?(OPTION_DESCRIPTION)
@@ -921,6 +957,16 @@ module AppCommand
         def assemble_params(params)
             output = []
             params.each do |key, value|
+                if key == EC2_USER_DATA
+                    b64_cmd = Blufin::Tools::value_based_on_os(mac: "openssl base64 -in #{value}", linux: "base64 -w0 #{value}")
+                    result  = Blufin::Terminal::command_capture(b64_cmd, nil, nil, nil)[0]
+                    result = result.split("\n").join('')
+                    output << {
+                        'ParameterKey'   => key,
+                        'ParameterValue' => result
+                    }
+                    next
+                end
                 unless RESERVED_WORDS.include?(key.downcase)
                     output << {
                         'ParameterKey'   => key,
@@ -979,7 +1025,7 @@ module AppCommand
         # Replaces current random stack suffix with another one.
         # @return string
         def replace_stack_suffix(current)
-            current.gsub(/a[0-9a-z]{8}10w17[0-9a-z]{8}x/, random_stack_suffix)
+            current.gsub(/a[0-9a-z]{16}10w17[0-9a-z]{16}x/, random_stack_suffix)
         end
 
     end

data/lib/version.rb

@@ -1 +1 @@
-AWX_VERSION = '0.4.2'
+AWX_VERSION = '0.5.0'

data/opt/config/schema.yml

@@ -22,14 +22,37 @@ mapping:
           CloudFormation:
             type: map
             mapping:
-              S3Bucket:
-                required: yes
-              S3BucketPath:
+              Templates:
                 required: yes
-              S3BucketRegion:
-                required: yes
-              TemplatePath:
+                type: map
+                mapping:
+                  Local:
+                    type: map
+                    mapping:
+                      Path:
+                        required: yes
+                  S3Bucket:
+                    type: map
+                    mapping:
+                      Name:
+                        required: yes
+                      Path:
+                        required: yes
+                      Region:
+                        required: yes
+              Uploads:
                 required: yes
+                type: map
+                mapping:
+                  S3Bucket:
+                    type: map
+                    mapping:
+                      Name:
+                        required: yes
+                      Path:
+                        required: yes
+                      Region:
+                        required: yes
               Defaults:
                 type: map
                 required: yes

data/opt/config/template.yml

@@ -3,10 +3,18 @@ DynamoDBPath: <<-path/to/folder->>
 Profiles:
   - Profile: default
     CloudFormation:
-      S3Bucket: <<-S3-bucket-name->>
-      S3BucketPath: <<-S3-bucket-path/to/folder->>
-      S3BucketRegion: <<-S3-bucket-region->>
-      TemplatePath: <<-path/to/folder->>
+      Templates:
+        Local:
+          Path: <<-path->>
+        S3Bucket:
+          Name: <<-S3-bucket-name->>
+          Path: <<-S3-bucket-path->>
+          Region: <<-S3-bucket-region->>
+      Uploads:
+        S3Bucket:
+          Name: <<-S3-bucket-name->>
+          Path: <<-S3-bucket-path->>
+          Region: <<-S3-bucket-region->>
       Defaults:
         StackName: "{{CATEGORY}}-{{TEMPLATE}}-{{PROJECT}}-{{ENVIRONMENT}}-{{REGION}}-{{UUID}}"
         Timeout: 60

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awx
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blufin-lib
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An AWS-cli wrapper.