awx 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d63dfca777da31742b37438fadf3f0509242778
-  data.tar.gz: 055e37ab8992197e991510cdd6fa2ed5d70fc935
+  metadata.gz: 16021b5064f0049ca45a3b69fdf7dabc825b2dad
+  data.tar.gz: 474f2e36b2c3ee7e025f31baa95772712feab355
 SHA512:
-  metadata.gz: aa01ec9ffa346f05363cf32d456b993bb3d24115e61f5c742aed3ae640030b6c408d9e1f1eeda55507a2cad481473091245d21fd41849c9887a5a31350dcea24
-  data.tar.gz: 35812f1698392104fb8fc6a2c677ae3063c39f97e4a31df30eb80d375ae43e2d734fa2302b48a5c100d2b41e84135d43a4697e90693a735cba63738f5ce1b326
+  metadata.gz: 4e1bc9ede728cb476302200bc63d547a2c3cd37310b16aa349502f5bb980e1f551b47a0732b6be360c407a9d33f556f0584c48931bed46e9099cca63223f2a91
+  data.tar.gz: 26b34761934c99f5ba5c0ad3503893e5905938f0b06fab463d6a57c0cbebb82b3c5171292e99fb9d0b927db6f1c74804bbee11fbc0d3ec2e62d3cdcc75d668fb

data/lib/aws/aws_cli.rb

@@ -66,7 +66,7 @@ module App
 
         # Create a CloudFormation Stack.
         # @return string (StackID)
-        def self.cloudformation_stack_create(region, stack_name, s3_url, params: nil, tags: nil, capabilities: [], term_protect: false, term_script: false, timeout: nil)
+        def self.cloudformation_stack_create(region, stack_name, s3_url, params: nil, tags: nil, capabilities: [], term_protect: false, term_script: false, timeout: nil, open_chrome: true)
             params       = params.nil? ? '' : " --parameters '#{params.gsub("'", "\\'")}'"
             tags         = tags.nil? ? '' : " --tags '#{tags.gsub("'", "\\'")}'"
             capabilities = !capabilities.any? ? '' : " --capabilities #{capabilities.join(' ')}"
@@ -80,7 +80,7 @@ module App
                 if stack_send.has_key?('StackId')
                     Blufin::Terminal::success('Template was accepted by AWS.', ["\x1B[38;5;240mStackId \xe2\x80\x94 \x1B[38;5;40m#{stack_send['StackId']}"])
                     stack_url = "https://#{region}.console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks?filter=active&tab=events&stackId=#{URI::encode(stack_send['StackId'])}"
-                    system("/usr/bin/open -a '/Applications/Google Chrome.app' '#{stack_url}'")
+                    system("/usr/bin/open -a '/Applications/Google Chrome.app' '#{stack_url}'") if open_chrome
                 else
                     Blufin::Terminal::error("Key not found in response: #{Blufin::Terminal::format_invalid('StackId')}", stack_send.inspect, true)
                 end

data/lib/aws/aws_profile.rb

@@ -14,6 +14,8 @@ module App
         PROFILES             = 'Profiles'
         CLOUDFORMATION       = 'CloudFormation'
         SSH_KEYS             = 'SSHKeys'
+        PROJECTS             = 'Projects'
+        DEPLOYMENTS          = 'Deployments'
 
         # Reads the config data and decides what profile to use.
         # @return void
@@ -55,8 +57,8 @@ module App
                     cloudformation_template_path = @@profile[CLOUDFORMATION]['Templates']['Local']['Path']
                     errors << "Path not found: #{Blufin::Terminal::format_invalid(cloudformation_template_path)}" unless Blufin::Files::path_exists(cloudformation_template_path)
                 end
-                s3_region                    = @@profile[CLOUDFORMATION]['Uploads']['S3Bucket']['Region']
-                default_regions              = @@profile[CLOUDFORMATION]['Defaults']['Regions']
+                s3_region       = @@profile[CLOUDFORMATION]['Uploads']['S3Bucket']['Region']
+                default_regions = @@profile[CLOUDFORMATION]['Defaults']['Regions']
                 errors << "Invalid region: #{Blufin::Terminal::format_invalid(s3_region)}" unless App::AWS::VALID_REGIONS.include?(s3_region)
                 errors << "Need atleast 1 default region for: #{Blufin::Terminal::format_invalid('Profiles[].CloudFormation.Defaults.Regions')}" if default_regions.nil? || !default_regions.any?
                 default_regions.each do |default_region|

data/lib/awx.rb

@@ -29,6 +29,8 @@ module App
                 App::AWSProfile::init(Blufin::Config::get)
             end
 
+            profile = App::AWSProfile::get_profile
+
             Convoy::App.create do |awx|
 
                 awx.version AWX_VERSION
@@ -45,7 +47,7 @@ TEMPLATE
                 awx.description 'An abstraction layer built around the AWS-cli (written by: Albert Rannetsperger)'
 
                 # c - CLOUD FORMATION
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && App::AWSProfile::get_profile.has_key?(App::AWSProfile::CLOUDFORMATION)
+                if ARGV[0] != 'setup' && ARGV[0] != 'x' && profile.has_key?(App::AWSProfile::CLOUDFORMATION)
                     awx.command :cloudformation, :aliases => [:c] do |awx_cloudformation|
                         awx_cloudformation.summary 'Create, list and delete cloud-formation stacks'
                         # c - CLOUD FORMATION CREATE
@@ -93,7 +95,7 @@ TEMPLATE
                 end
 
                 # d - DEPLOY (DEPRECATED)
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (App::AWSProfile::get_profile.has_key?('Projects'))
+                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (profile.has_key?('Projects'))
                     awx.command :deploy_deprecated, :aliases => [:d] do |deploy_deprecated|
                         deploy_deprecated.summary "Deploy application(s) to AWS #{Blufin::Terminal::format_invalid('@deprecated')}"
                         deploy_deprecated.options do |opts|
@@ -106,7 +108,7 @@ TEMPLATE
                 end
 
                 # i - INFRASTRUCTURE
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (App::AWSProfile::get_profile.has_key?('Projects')) && (App::AWSProfile::get_profile.has_key?('Deployments'))
+                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (profile.has_key?('Projects')) && (profile.has_key?('Deployments'))
                     awx.command :infrastructure, :aliases => [:i] do |infrastructure|
                         infrastructure.summary 'View, modify & deploy application(s) to pre-defined infrastructure'
                         infrastructure.action do |opts, args|
@@ -137,12 +139,12 @@ TEMPLATE
                 end
 
                 # s - SSH
-                    awx.command :ssh, :aliases => [:s] do |ssh|
-                        ssh.summary 'SSH into EC2 instances'
-                        ssh.action do |opts, args|
-                            AppCommand::SSH.new(opts, args).execute
-                        end
+                awx.command :ssh, :aliases => [:s] do |ssh|
+                    ssh.summary 'SSH into EC2 instances'
+                    ssh.action do |opts, args|
+                        AppCommand::SSH.new(opts, args).execute
                     end
+                end
 
                 # S - SWITCH
                 if ARGV[0] != 'setup' && ARGV[0] != 'x' && App::AWSProfile::get_profile_names.length > 1 && !App::AWSProfile::get_credentials.nil?
@@ -156,21 +158,34 @@ TEMPLATE
                 end
 
                 # u - UPLOAD
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && (App::AWSProfile::get_profile.has_key?(App::AWSProfile::CLOUDFORMATION) || App::AWSProfile::get_profile.has_key?('Projects'))
+                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::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)
+                                    AppCommand::Upload.new(opts, args).execute
+                                end
+                            end
+                        end
                         # p - UPLOAD PROJECTS
-                        if App::AWSProfile::get_profile.has_key?('Projects')
+                        if profile.has_key?(App::AWSProfile::PROJECTS) && profile[App::AWSProfile::PROJECTS].has_key?('Local')
                             upload.command :projects, :aliases => [:p] do |upload_projects|
                                 upload_projects.summary 'Upload Projects'
                                 upload_projects.action do |opts, args|
-                                    args = args.unshift(AppCommand::Upload::PROJECTS)
+                                    args = args.unshift(App::AWSProfile::PROJECTS)
                                     AppCommand::Upload.new(opts, args).execute
                                 end
                             end
                         end
-                        # t - UPLOAD TEMPLATE
-                        if App::AWSProfile::get_profile.has_key?(App::AWSProfile::CLOUDFORMATION)
+                        # t - UPLOAD TEMPLATES
+                        if profile.has_key?(App::AWSProfile::CLOUDFORMATION) && profile[App::AWSProfile::CLOUDFORMATION]['Templates'].has_key?('Local')
                             upload.command :templates, :aliases => [:t] do |upload_templates|
                                 upload_templates.summary 'Upload Templates'
                                 upload_templates.action do |opts, args|

data/lib/routes/cloudformation_create.rb

@@ -398,7 +398,7 @@ module AppCommand
             category, template, @template = select_template_prompt
 
             # Will be something like: "ec2/build-server"
-            template_name =  "#{category}/#{template}"
+            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).
@@ -570,10 +570,12 @@ module AppCommand
 
             if Blufin::Terminal::prompt_yes_no("Review: #{App::AWSOutputter::render_selection(category, template)}", params_output, 'Create Stack?', false)
 
+                is_ec2      = `#{App::Opt::get_base_path}/#{App::Opt::OPT_PATH}/shell/ec2-check`.to_s.gsub("\n", '') =~ /yes/i
+
                 # If no 'after' actions necessary, give option to terminate script.
                 term_script = false
-                if @template[:method_after_create].nil? && !@template[:single_serve]
-                    options     = [{:text => "Yes \xe2\x80\x94 Don't exit script.", :value => false}, {:text => 'No', :value => true}]
+                if @template[:method_after_create].nil? && !@template[:single_serve] && !is_ec2
+                    options     = [{:text => "Yes \xe2\x80\x94 Wait.", :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
@@ -596,7 +598,8 @@ module AppCommand
                                                          capabilities: capabilities_arr,
                                                          term_protect: @template[:single_serve] ? false : @params[OPTION_TERM_PROTECT],
                                                          term_script:  term_script,
-                                                         timeout:      @params[OPTION_TIMEOUT])
+                                                         timeout:      @params[OPTION_TIMEOUT],
+                                                         open_chrome:  !is_ec2)
 
                 # Call :after_create() -- if exists.
                 @template[:method_after_create].call(@params) unless @template[:method_after_create].nil?

data/lib/routes/upload.rb

@@ -2,16 +2,18 @@ module AppCommand
 
     class Upload < ::Convoy::ActionCommand::Base
 
-        PROJECTS  = 'Projects'
-        TEMPLATES = 'Templates'
+        DEPLOYMENTS = 'Deployments'
+        PROJECTS    = 'Projects'
+        TEMPLATES   = 'Templates'
 
         def execute
 
             begin
 
-                @opts   = command_options
-                @args   = arguments
-                @action = determine_action
+                @opts    = command_options
+                @args    = arguments
+                @action  = determine_action
+                @profile = App::AWSProfile::get_profile
 
                 opts_validate
                 opts_routing
@@ -30,7 +32,48 @@ module AppCommand
 
         def opts_routing
 
-            raise RuntimeError, "Not yet implemented! -> #{@action}"
+            # 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 PROJECTS
+                    local_path = @profile[App::AWSProfile::PROJECTS]['Local']['File']
+                    s3_bucket  = @profile[App::AWSProfile::PROJECTS]['S3Bucket']['Name']
+                    s3_path    = @profile[App::AWSProfile::PROJECTS]['S3Bucket']['File']
+                    s3_region  = @profile[App::AWSProfile::PROJECTS]['S3Bucket']['Region']
+                when TEMPLATES
+                    local_path = @profile[App::AWSProfile::CLOUDFORMATION]['Templates']['Local']['Path']
+                    s3_bucket  = @profile[App::AWSProfile::CLOUDFORMATION]['Templates']['S3Bucket']['Name']
+                    s3_path    = @profile[App::AWSProfile::CLOUDFORMATION]['Templates']['S3Bucket']['Path']
+                    s3_region  = @profile[App::AWSProfile::CLOUDFORMATION]['Templates']['S3Bucket']['Region']
+                else
+                    raise RuntimeError, "Unrecognized action: #{@action}"
+            end
+
+            # Check that path/file exists.
+            if [TEMPLATES].include?(@action)
+                Blufin::Terminal::error("Path not found: #{Blufin::Terminal::format_directory(local_path)}") unless Blufin::Files::path_exists(local_path)
+                is_file = false
+            else
+                Blufin::Terminal::error("File not found: #{Blufin::Terminal::format_directory(local_path)}") unless Blufin::Files::file_exists(local_path)
+                is_file = true
+            end
+
+            # Do a dryrun first.
+            puts
+            Blufin::AWS::upload_s3_data(s3_bucket, s3_path, local_path, profile: @profile[App::AWSProfile::PROFILE], region: s3_region, is_file: is_file, dryrun: true)
+            puts
+
+            if Blufin::Terminal::prompt_yes?('Sync these files to S3?')
+                # Upload path to S3.
+                s3_path = Blufin::AWS::upload_s3_data(s3_bucket, s3_path, local_path, profile: @profile[App::AWSProfile::PROFILE], region: s3_region, is_file: is_file)
+                # Success Message.
+                Blufin::Terminal::success('Files have been successfully uploaded to S3.', s3_path)
+            end
 
         end
 
@@ -40,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 [PROJECTS, TEMPLATES].include?(action)
+            raise RuntimeError, "Invalid action: #{action}. This is an error with your code not your input." unless [DEPLOYMENTS, PROJECTS, TEMPLATES].include?(action)
             action
         end
 

data/lib/version.rb

@@ -1 +1 @@
-AWX_VERSION = '0.6.8'
+AWX_VERSION = '0.6.9'

data/opt/config/schema.yml

@@ -44,8 +44,8 @@ mapping:
                       Region:
                         required: yes
               Uploads:
-                required: yes
                 type: map
+                required: yes
                 mapping:
                   S3Bucket:
                     type: map
@@ -75,6 +75,7 @@ mapping:
             mapping:
               S3Bucket:
                 type: map
+                required: yes
                 mapping:
                   Name:
                     required: yes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awx
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blufin-lib