awx 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e90638a061b61d334166c43df301ed3271c600e
-  data.tar.gz: acda1e0fdba41fe53d5d98cade2090b7338c7d4a
+  metadata.gz: 910e4c40a148fe59eec68a194f6e9b016a0b2309
+  data.tar.gz: 02cbf33f50a06df9da86d48b4a5e1c4d36e5ca4a
 SHA512:
-  metadata.gz: 1754f8dce230a75c0194de97e8e23823093a0fcc217d75448f3fa26db6f2c27d28932983d9376d6bd8309cb9f402cbb52472c90a6e355bc2ef269885a8edbf9d
-  data.tar.gz: 6cf30ff024d000928ef9eb9695cfcf3413839fc766c3a4b588b22a9859bf0bdf2c6588ecefdb27a27b3b95fa044df51c91139a9ffc0de91d7e9ce51c24b2afb5
+  metadata.gz: 19037d3497e7350d631f551ae84bef6bf02350ea00144f137afe2f4358e6c8ca2e38b7f5b30f67e58749c638717b7d29e5b026ec5386650d337b075946803010
+  data.tar.gz: f7359136c6337d784079ac00bb42142ffbd8872fee46515612f746a6d44ee09697779b79f32d0e5165c4e86cb91004a1622516eaef9802f92832fe33e766c217

data/lib/aws/aws_profile.rb

@@ -15,7 +15,7 @@ module App
         CLOUDFORMATION       = 'CloudFormation'
         SSH_KEYS             = 'SSHKeys'
         PROJECTS             = 'Projects'
-        DEPLOYMENTS          = 'Deployments'
+        STACKS               = 'Stacks'
 
         # Reads the config data and decides what profile to use.
         # @return void

data/lib/awx.rb

@@ -108,7 +108,7 @@ TEMPLATE
                 end
 
                 # i - INFRASTRUCTURE
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (profile.has_key?('Projects')) && (profile.has_key?('Deployments'))
+                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (profile.has_key?(App::AWSProfile::PROJECTS)) && (profile.has_key?(App::AWSProfile::STACKS))
                     awx.command :infrastructure, :aliases => [:i] do |infrastructure|
                         infrastructure.summary 'View, modify & deploy application(s) to pre-defined infrastructure'
                         infrastructure.action do |opts, args|
@@ -159,17 +159,17 @@ TEMPLATE
 
                 # u - UPLOAD
                 if ARGV[0] != 'setup' && ARGV[0] != 'x' && (
-                (profile.has_key?(App::AWSProfile::DEPLOYMENTS) && profile[App::AWSProfile::DEPLOYMENTS].has_key?('Local')) ||
+                (profile.has_key?(App::AWSProfile::STACKS) && profile[App::AWSProfile::STACKS].has_key?('Local')) ||
                     (profile.has_key?(App::AWSProfile::PROJECTS) && profile[App::AWSProfile::PROJECTS].has_key?('Local')) ||
                     (profile.has_key?(App::AWSProfile::CLOUDFORMATION) && profile[App::AWSProfile::CLOUDFORMATION]['Templates'].has_key?('Local')))
                     awx.command :upload, :aliases => [:u] do |upload|
                         upload.summary 'Upload configuration(s) to S3'
-                        # d - UPLOAD DEPLOYMENTS
-                        if profile.has_key?(App::AWSProfile::DEPLOYMENTS) && profile[App::AWSProfile::DEPLOYMENTS].has_key?('Local')
-                            upload.command :deployments, :aliases => [:d] do |upload_deployments|
-                                upload_deployments.summary 'Upload Deployments'
-                                upload_deployments.action do |opts, args|
-                                    args = args.unshift(AppCommand::Upload::DEPLOYMENTS)
+                        # d - UPLOAD STACKS
+                        if profile.has_key?(App::AWSProfile::STACKS) && profile[App::AWSProfile::STACKS].has_key?('Local')
+                            upload.command :stacks, :aliases => [:s] do |upload_stacks|
+                                upload_stacks.summary 'Upload Stacks'
+                                upload_stacks.action do |opts, args|
+                                    args = args.unshift(AppCommand::Upload::STACKS)
                                     AppCommand::Upload.new(opts, args).execute
                                 end
                             end

data/lib/core/{deployments.rb → stacks.rb}

@@ -1,25 +1,25 @@
 module App
 
-    class Deployments
+    class Stacks
 
-        SCHEMA_FILE              = "#{App::Opt::get_base_path}#{App::Opt::OPT_PATH}/awx/deployment-schema.yml"
+        SCHEMA_FILE              = "#{App::Opt::get_base_path}#{App::Opt::OPT_PATH}/awx/stacks-schema.yml"
 
-        @@deployments = nil
+        @@stacks = nil
 
         # Takes a Hash that will have all the deployment info.
         # @return void
-        def self.init(deployments)
-            raise RuntimeError, 'Cannot run App::Deployments::init() more than once.' unless @@deployments.nil?
-            raise RuntimeError, "Need either a Local or S3Bucket key, found neither: #{deployments.keys}" unless deployments.has_key?('Local') || deployments.has_key?('S3Bucket')
-            @@deployments = {}
+        def self.init(stacks)
+            raise RuntimeError, 'Cannot run App::Stacks::init() more than once.' unless @@stacks.nil?
+            raise RuntimeError, "Need either a Local or S3Bucket key, found neither: #{stacks.keys}" unless stacks.has_key?('Local') || stacks.has_key?('S3Bucket')
+            @@stacks = {}
 
-            if deployments.has_key?('Local')
-                source_file = File.expand_path(deployments['Local']['File'])
+            if stacks.has_key?('Local')
+                source_file = File.expand_path(stacks['Local']['File'])
                 # Throw error if source file doesn't exist.
                 Blufin::Terminal::error("Cannot find source file: #{Blufin::Terminal::format_directory(source_file)}") unless Blufin::Files::file_exists(source_file)
                 # Validate the source file against the expected schema.
                 process_source_file(source_file)
-            elsif deployments.has_key?('S3Bucket')
+            elsif stacks.has_key?('S3Bucket')
 
                 # TODO - Finish this once we start running this on an EC2 instance (build/deploy server).
                 # TODO - Whatever file we validate should be available on disk locally.
@@ -27,9 +27,6 @@ module App
 
             end
 
-
-
-
         end
 
         private

data/lib/routes/cloudformation_create.rb

@@ -5,34 +5,34 @@ module AppCommand
 
     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(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'
-        OPTION_TIMEOUT          = 'Timeout'
-        OPTION_DESCRIPTION      = 'Description'
-        OPTION_PROJECT          = 'Project'
-        OPTION_ENVIRONMENT      = 'Environment'
-        OPTION_REGION           = 'Region'
-        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'
-        CACHE_UUID              = 'cache_uuid'
-        TEST                    = 'test'
-        SPACER                  = '<<--Spacer-->>'
-        CAPABILITIES            = 'Capabilities'
-        RETURN_VALUE            = 'PjNkHK33EopWxCpzOQfuku3la'
-        SYSTEM                  = 'System'
-        NESTED                  = 'nested'
-        STACK                   = 'Stack'
+        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(cache_uuid category description environment owner project projectid region resource stack stackname template terminationprotection timeout)
+        OPTION_PROJECT_ID   = 'ProjectId'
+        OPTION_STACK_ID     = 'StackId'
+        OPTION_STACK_NAME   = 'StackName'
+        OPTION_TIMEOUT      = 'Timeout'
+        OPTION_DESCRIPTION  = 'Description'
+        OPTION_PROJECT      = 'Project'
+        OPTION_ENVIRONMENT  = 'Environment'
+        OPTION_REGION       = 'Region'
+        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'
+        CACHE_UUID          = 'cache_uuid'
+        TEST                = 'test'
+        SPACER              = '<<--Spacer-->>'
+        CAPABILITIES        = 'Capabilities'
+        RETURN_VALUE        = 'PjNkHK33EopWxCpzOQfuku3la'
+        SYSTEM              = 'System'
+        NESTED              = 'nested'
+        STACK               = 'Stack'
 
         def execute
 
@@ -131,7 +131,7 @@ module AppCommand
                     regions                = nil
                     timeout                = nil
                     single_serve           = false
-                    deployment_stack       = nil
+                    stack_id               = nil
                     parameters             = {}
                     parameters_no_sort     = nil
                     warnings_count         = @warnings.length
@@ -266,7 +266,7 @@ module AppCommand
                                 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'
+                                stack_id           = Template::STACK_ID if constant == 'STACK_ID'
                                 parameters_no_sort = Template::PARAMETERS_NO_SORT if constant == 'PARAMETERS_NO_SORT'
                             end
                             # Validate stack name.
@@ -276,8 +276,8 @@ module AppCommand
                             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)
-                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 #{Blufin::Terminal::format_highlight('DEPLOYMENT_STACK')} value is a reserved word: #{Blufin::Terminal::format_invalid(deployment_stack)}"
+                            if stack_id.is_a?(String) && %w(lambda).include?(stack_id.downcase)
+                                @warnings << "\x1B[38;5;196m#{template_name}\x1B[38;5;240m \xe2\x80\x94 #{Blufin::Terminal::format_highlight('STACK_ID')} value is a reserved word: #{Blufin::Terminal::format_invalid(stack_id)}"
                             end
                             # If any constants are missing, this should catch it.
                             expected_constants.each { |missing_constant| @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 file is missing a constant: #{Blufin::Terminal::format_invalid(missing_constant)}" }
@@ -352,7 +352,7 @@ module AppCommand
                                 :broken => 'Broken'
                             }
                         else
-                            @templates[category][template]                    = {
+                            @templates[category][template]            = {
                                 :name                   => template,
                                 :path                   => template_path,
                                 :broken                 => false,
@@ -373,7 +373,7 @@ module AppCommand
                                 :timeout                => timeout,
                                 :single_serve           => single_serve
                             }
-                            @templates[category][template][:deployment_stack] = deployment_stack unless deployment_stack.nil?
+                            @templates[category][template][:stack_id] = stack_id unless stack_id.nil?
                         end
                     end
                 end
@@ -413,14 +413,14 @@ module AppCommand
                             puts
                         end
 
-                        # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
+                        # TODO NOW - REMOVE:STACK_ID - This needs to be re-instated once we have the stacks.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)
+                        #     if @template.has_key?(:stack_id)
                         #         @projects = Blufin::Projects::get_deployments(
                         #             @params[OPTION_PROJECT],
-                        #             @template[:deployment_stack],
+                        #             @template[:stack_id],
                         #             @params[OPTION_REGION],
                         #             @params[OPTION_ENVIRONMENT]
                         #         )
@@ -529,9 +529,9 @@ module AppCommand
             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]
+            # TODO NOW - REMOVE:STACK_ID - This needs to be re-instated once we have the stacks.yml parsing.
+            # if @template.has_key?(:stack_id) && !@params[OPTION_PROJECT_ID].nil? && @params[OPTION_PROJECT_ID].length > 0
+            #     output[OPTION_STACK_ID] = @template[:stack_id]
             #     output[OPTION_PROJECT_ID]       = @params[OPTION_PROJECT_ID]
             # end
 
@@ -548,7 +548,7 @@ module AppCommand
             padding       = output.keys.max_by(&:length).length
             spacer_passed = false
             output.each do |key, value|
-                next if [OPTION_DEPLOYMENT_STACK, OPTION_PROJECT_ID, OPTION_TIMEOUT, OPTION_TERM_PROTECT, CAPABILITIES].include?(key)
+                next if [OPTION_STACK_ID, OPTION_PROJECT_ID, OPTION_TIMEOUT, OPTION_TERM_PROTECT, CAPABILITIES].include?(key)
                 if key == SPACER
                     spacer_passed = true
                     next
@@ -560,9 +560,9 @@ module AppCommand
                 end
             end
 
-            if @template.has_key?(:deployment_stack)
+            if @template.has_key?(:stack_id)
                 params_output << "\x1B[38;5;240m#{OPTION_PROJECT_ID.rjust(padding, ' ')} : \x1B[38;5;246m#{output[OPTION_PROJECT_ID]}" if output.has_key?(OPTION_PROJECT_ID)
-                params_output << "\x1B[38;5;240m#{OPTION_DEPLOYMENT_STACK.rjust(padding, ' ')} : \x1B[38;5;246m#{output[OPTION_DEPLOYMENT_STACK]}" if output.has_key?(OPTION_DEPLOYMENT_STACK)
+                params_output << "\x1B[38;5;240m#{OPTION_STACK_ID.rjust(padding, ' ')} : \x1B[38;5;246m#{output[OPTION_STACK_ID]}" if output.has_key?(OPTION_STACK_ID)
             end
             params_output << "\x1B[38;5;240m#{OPTION_TIMEOUT.rjust(padding, ' ')} : \x1B[38;5;246m#{output[OPTION_TIMEOUT]} Minute(s)\x1B[0m"
             params_output << "\x1B[38;5;240m#{OPTION_TERM_PROTECT.rjust(padding, ' ')} : #{output[OPTION_TERM_PROTECT] ? "\x1B[38;5;246mYES\x1B[0m" : "\x1B[38;5;246mNO\x1B[0m"}" unless @template[:single_serve]
@@ -706,8 +706,8 @@ module AppCommand
                 }
             end
 
-            # TODO NOW - REMOVE:DEPLOYMENT_STACK - This needs to be re-instated once we have the deployments.yml parsing.
-            # unless @template[:deployment_stack].nil?
+            # TODO NOW - REMOVE:STACK_ID - This needs to be re-instated once we have the stacks.yml parsing.
+            # unless @template[:stack_id].nil?
             #     @template[:parameters][OPTION_PROJECT_ID] = {
             #         'Type'             => 'String',
             #         OPTION_DESCRIPTION => 'Project ID (used for associating this Stack with an existing Project).'
@@ -1072,11 +1072,11 @@ module AppCommand
                 }
             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)
+            # TODO NOW - REMOVE:STACK_ID - This needs to be re-instated once we have the deployments.yml parsing.
+            # if @template.has_key?(:stack_id) && params.has_key?(OPTION_PROJECT_ID)
             #     output << {
-            #         'Key'   => OPTION_DEPLOYMENT_STACK,
-            #         'Value' => @template[:deployment_stack].to_s
+            #         'Key'   => OPTION_STACK_ID,
+            #         'Value' => @template[:stack_id].to_s
             #     }
             #     output << {
             #         'Key'   => OPTION_PROJECT_ID,

data/lib/routes/infrastructure.rb

@@ -11,8 +11,8 @@ module AppCommand
 
                 @profile = App::AWSProfile::get_profile
 
-                Blufin::Projects::init(@profile['Projects'])
-                App::Deployments::init(@profile['Deployments'])
+                Blufin::Projects::init(@profile[App::AWSProfile::PROJECTS])
+                App::Stacks::init(@profile[App::AWSProfile::STACKS])
 
                 opts_validate
                 opts_routing

data/lib/routes/upload.rb

@@ -2,9 +2,9 @@ module AppCommand
 
     class Upload < ::Convoy::ActionCommand::Base
 
-        DEPLOYMENTS = 'Deployments'
-        PROJECTS    = 'Projects'
-        TEMPLATES   = 'Templates'
+        STACKS    = 'Stacks'
+        PROJECTS  = 'Projects'
+        TEMPLATES = 'Templates'
 
         def execute
 
@@ -35,11 +35,11 @@ module AppCommand
             # Get the local path based on upload action.
             # @profile keys DO NOT need to be validated because we already check them in the awx.rb routing code.
             case @action
-                when DEPLOYMENTS
-                    local_path = @profile[App::AWSProfile::DEPLOYMENTS]['Local']['File']
-                    s3_bucket  = @profile[App::AWSProfile::DEPLOYMENTS]['S3Bucket']['Name']
-                    s3_path    = @profile[App::AWSProfile::DEPLOYMENTS]['S3Bucket']['File']
-                    s3_region  = @profile[App::AWSProfile::DEPLOYMENTS]['S3Bucket']['Region']
+                when STACKS
+                    local_path = @profile[App::AWSProfile::STACKS]['Local']['File']
+                    s3_bucket  = @profile[App::AWSProfile::STACKS]['S3Bucket']['Name']
+                    s3_path    = @profile[App::AWSProfile::STACKS]['S3Bucket']['File']
+                    s3_region  = @profile[App::AWSProfile::STACKS]['S3Bucket']['Region']
                 when PROJECTS
                     local_path = @profile[App::AWSProfile::PROJECTS]['Local']['File']
                     s3_bucket  = @profile[App::AWSProfile::PROJECTS]['S3Bucket']['Name']
@@ -83,7 +83,7 @@ module AppCommand
         # @return void
         def determine_action
             action = @args.shift
-            raise RuntimeError, "Invalid action: #{action}. This is an error with your code not your input." unless [DEPLOYMENTS, PROJECTS, TEMPLATES].include?(action)
+            raise RuntimeError, "Invalid action: #{action}. This is an error with your code not your input." unless [STACKS, PROJECTS, TEMPLATES].include?(action)
             action
         end
 

data/lib/version.rb

@@ -1 +1 @@
-AWX_VERSION = '0.6.10'
+AWX_VERSION = '0.6.11'

data/opt/awx/{deployment-schema.yml → stacks-schema.yml}

@@ -1,6 +1,6 @@
 type: map
 mapping:
-  Scripts:
+  DeploymentScripts:
     type: seq
     required: yes
     sequence:
@@ -30,7 +30,7 @@ mapping:
               Region:
                 required: yes
                 pattern: /^[a-z]{2}-[a-z]{2,20}-\d$/
-          Deployments:
+          Stacks:
             type: seq
             required: yes
             sequence:
@@ -45,7 +45,7 @@ mapping:
                       - type: str
                   Script:
                     required: yes
-                  Stack:
+                  StackId:
                     required: yes
                   StackParameters:
                     type: seq

data/opt/config/schema.yml

@@ -101,7 +101,7 @@ mapping:
                     required: yes
                   Region:
                     required: yes
-          Deployments:
+          Stacks:
             type: map
             mapping:
               Local:

data/opt/config/template.yml

@@ -33,7 +33,7 @@ Profiles:
         Name: <<-S3-bucket-name->>
         File: <<-S3-bucket-path/to/file->>
         Region: <<-S3-bucket-region->>
-    Deployments:
+    Stacks:
       Local:
         File: <<-path/to/file->>
       S3Bucket:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awx
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blufin-lib
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +98,9 @@ files:
 - lib/aws/aws_reports.rb
 - lib/aws/aws_validator.rb
 - lib/awx.rb
-- lib/core/deployments.rb
 - lib/core/opt.rb
 - lib/core/replacer.rb
+- lib/core/stacks.rb
 - lib/routes/cloudformation_create.rb
 - lib/routes/cloudformation_delete.rb
 - lib/routes/cloudformation_detect_drift.rb
@@ -112,8 +112,8 @@ files:
 - lib/routes/switch.rb
 - lib/routes/upload.rb
 - lib/version.rb
-- opt/awx/deployment-schema.yml
 - opt/awx/reports.yml
+- opt/awx/stacks-schema.yml
 - opt/config/schema.yml
 - opt/config/template.yml
 - opt/shell/ec2-check