awx 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 387197029107fc3f0061d3a18ed29c4cfb411540
-  data.tar.gz: 51d23676040bac0444f4ac73f261fd48e08f0e24
+  metadata.gz: 41303bbb644a98338fb8cb92edc742f09e51aee7
+  data.tar.gz: dc6356a37d780996e215f4edca139ffc98bd06b8
 SHA512:
-  metadata.gz: f96e2cc1fe271437e8422cd3866bc4f9d9c0474a4ca4d392e0f7e15788ee02ac0fa3f5348f5611d105e39f3b3aeaaee7879f7a5ee7dbad4917c330a17e3393d1
-  data.tar.gz: f0a15ab29c5674987ebacef867fef0d0ab320e8e5d684e3d9f13b653cf03dd38a0b3b441ac1008681b1c2c3ebf901e1223efc18cbd74063f47acfce9b251e74e
+  metadata.gz: '0796592c71cc98b79fbda89dea698616de11ee17f667cfa18c11ab8dbcf7903287a7e69c3cb87b7154623e887b366c4242be6eed2c914edf0d124548529fd6cb'
+  data.tar.gz: 6eef364efe94d7aa45e97f9d7b50910583cfc648304601cb2d3cb5b21c8819de23bf272540e66a5e3c34730b4e8c7ac8b3115a8c36dcb8e90325c441a698fdef

data/lib/aws/aws.rb

@@ -4,6 +4,13 @@ module App
 
         VALID_REGIONS = %w(ap-south-1 eu-west-3 eu-west-2 eu-west-1 ap-northeast-2 ap-northeast-1 sa-east-1 ca-central-1 ap-southeast-1 ap-southeast-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2)
 
+        # Returns either ' --profile [profile-name]' or '', depending on whether the machine we're running on has credentials or is an EC2 (which uses IAM roles).
+        # @return string
+        def self.get_profile_for_cli
+            profile_name = App::AWSProfile::get_profile_name
+            profile_name.nil? ? '' : " --profile #{profile_name}"
+        end
+
     end
 
 end

data/lib/aws/aws_cli.rb

@@ -73,7 +73,9 @@ module App
             term_protect = term_protect ? ' --enable-termination-protection' : ' --no-enable-termination-protection'
             timeout      = timeout.nil? ? '' : " --timeout-in-minutes #{timeout}"
             command      = "cloudformation create-stack --stack-name #{stack_name} --template-url #{s3_url}#{params}#{tags}#{capabilities}#{term_protect}#{timeout}"
-            App::AWSOutputter::output_cli_command("aws #{command} --region #{region} --profile #{App::AWSProfile::get_profile_name}")
+            profile_name = App::AWSProfile::get_profile_name
+            profile      = profile_name.nil? ? '' : " --profile #{profile_name}"
+            App::AWSOutputter::output_cli_command("aws #{command} --region #{region}#{profile}")
             puts
             stack_send = execute_as_proc("Sending CloudFormation Stack: #{Blufin::Terminal::format_highlight(stack_name)}", command, region, json: true)
             begin
@@ -131,9 +133,9 @@ module App
             raise RuntimeError, "Invalid region: #{region}" unless get_regions.include?(region) || region == REGION_SKIP
             begin
                 region = region == REGION_SKIP ? '' : " --region #{region}"
-                puts "\x1B[38;5;70m$ \x1B[38;5;240maws #{command}#{region} --profile #{App::AWSProfile::get_profile_name}\x1B[0m" if verbose
+                puts "\x1B[38;5;70m$ \x1B[38;5;240maws #{command}#{region}#{App::AWS::get_profile_for_cli}\x1B[0m" if verbose
                 if json
-                    result = `aws #{command}#{region} --profile #{App::AWSProfile::get_profile_name} 2>/tmp/execute-output-aws`
+                    result = `aws #{command}#{region}#{App::AWS::get_profile_for_cli} 2>/tmp/execute-output-aws`
                     # If no JSON, simply return the output.
                     return `cat /tmp/execute-output-aws` if result == ''
                     begin
@@ -142,12 +144,12 @@ module App
                         raise RuntimeError, "JSON Parsing Failed:\n\n#{e.message}"
                     end
                 else
-                    result = system("aws #{command}#{region} --profile #{App::AWSProfile::get_profile_name} 1>/dev/null 2>/tmp/execute-output-aws")
+                    result = system("aws #{command}#{region}#{App::AWS::get_profile_for_cli} 1>/dev/null 2>/tmp/execute-output-aws")
                     `cat /tmp/execute-output-aws` unless result
                     return result
                 end
             rescue => e
-                Blufin::Terminal::error("Command Failed: #{Blufin::Terminal::format_command("aws #{command}#{region} --profile #{App::AWSProfile::get_profile_name}")}", e.message, true)
+                Blufin::Terminal::error("Command Failed: #{Blufin::Terminal::format_command("aws #{command}#{region}#{App::AWS::get_profile_for_cli}")}", e.message, true)
             end
         end
 

data/lib/aws/aws_profile.rb

@@ -86,6 +86,8 @@ module App
                 errors << "aws-cli error. Cannot find #{profile}: #{Blufin::Terminal::format_invalid('aws_access_key_id')} in: #{Blufin::Terminal::format_directory(FILE_AWS_CREDENTIALS)}" if @@credentials.aws_key.nil?
                 errors << "aws-cli error. Cannot find #{profile}: #{Blufin::Terminal::format_invalid('aws_secret_access_key')} in: #{Blufin::Terminal::format_directory(FILE_AWS_CREDENTIALS)}" if @@credentials.aws_secret.nil?
             else
+                # Returns 'yes' if running on EC2 instance, 'no' if not.
+                return if `#{App::Opt::get_base_path}/#{App::Opt::OPT_PATH}/shell/ec2-check` == 'yes'
                 errors << "aws-cli error. Cannot find file: #{Blufin::Terminal::format_invalid(FILE_AWS_CREDENTIALS)}"
             end
 
@@ -103,6 +105,7 @@ module App
         # Convenience method to just get the profile name.
         # @return string
         def self.get_profile_name
+            return nil if @@credentials.nil?
             @@profile[PROFILE]
         end
 

data/lib/aws/aws_reports.rb

@@ -127,7 +127,7 @@ module App
                 response[region] = {} if response[region].nil?
                 sleep(0.01) unless silent
                 threads << Thread.new {
-                    cmd = "aws #{resource[App::AWSReports::KEY_CLI][App::AWSReports::KEY_COMMAND]}#{region == App::AWSReports::CONST_GLOBAL ? '' : " --region #{region}"} --profile #{App::AWSProfile::get_profile_name}"
+                    cmd = "aws #{resource[App::AWSReports::KEY_CLI][App::AWSReports::KEY_COMMAND]}#{region == App::AWSReports::CONST_GLOBAL ? '' : " --region #{region}"}#{App::AWS::get_profile_for_cli}"
                     App::AWSOutputter::output_cli_command(cmd) unless silent
                     json = `#{cmd}`
                     begin

data/lib/awx.rb

@@ -145,7 +145,7 @@ TEMPLATE
                     end
 
                 # S - SWITCH
-                if ARGV[0] != 'setup' && ARGV[0] != 'x' && App::AWSProfile::get_profile_names.length > 1
+                if ARGV[0] != 'setup' && ARGV[0] != 'x' && App::AWSProfile::get_profile_names.length > 1 && !App::AWSProfile::get_credentials.nil?
                     # Only show if we have multiple profiles.
                     awx.command :switch, :aliases => [:S] do |switch|
                         switch.summary 'Switch Profiles'

data/lib/routes/cloudformation_create.rb

@@ -573,7 +573,7 @@ module AppCommand
                 # 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 Script will wait until stack is fully built.", :value => false}, {:text => 'No', :value => true}]
+                    options     = [{:text => "Yes \xe2\x80\x94 Wait for stack to finish building.", :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

data/lib/routes/cloudformation_detect_drift.rb

@@ -41,7 +41,7 @@ module AppCommand
             stacks.each do |stack|
                 sleep(0.01)
                 threads << Thread.new {
-                    cmd = "aws cloudformation detect-stack-drift --stack-name #{stack[:name]} --region #{stack[:region]} --profile #{App::AWSProfile::get_profile_name} >> #{TMP_OUTPUT} 2>&1"
+                    cmd = "aws cloudformation detect-stack-drift --stack-name #{stack[:name]} --region #{stack[:region]}#{App::AWS::get_profile_for_cli} >> #{TMP_OUTPUT} 2>&1"
                     App::AWSOutputter::output_cli_command(cmd)
                     `#{cmd}`
                 }

data/lib/routes/list.rb

@@ -41,7 +41,7 @@ module AppCommand
                 raise RuntimeError, 'Not yet implemented!'
             end
 
-            # Throw error if -m is set with any other flas.
+            # Throw error if -m is set with any other flags.
             Blufin::Terminal::error("When #{Blufin::Terminal::format_flag('m')} is set, no other flags can be set.", "Found: #{Blufin::Routes::flags_set(@opts).to_i - 1} other flag(s).", true) if @opts[:metadata] && Blufin::Routes::flags_set(@opts).to_i > 1
 
             if @opts[:json_prompt]
@@ -149,7 +149,9 @@ module AppCommand
                         cmd_regions = @regions.join(',')
                         cmd_regions = resource[App::AWSReports::KEY_REGIONS].join(',') if resource.has_key?(App::AWSReports::KEY_REGIONS)
                         cmd_regions = "\x1B[38;5;#{cmd_color}m[\x1B[38;5;246m#{cmd_regions}\x1B[38;5;#{cmd_color}m]"
-                        App::AWSOutputter::output_cli_command("aws #{resource[App::AWSReports::KEY_CLI][App::AWSReports::KEY_COMMAND]} --region #{cmd_regions}\x1B[38;5;240m --profile \x1B[38;5;246m#{App::AWSProfile::get_profile_name}\x1B[0m")
+                        profile_name = App::AWSProfile::get_profile_name
+                        profile_output = profile_name.nil? ? '' : "\x1B[38;5;240 --profile \x1B[38;5;246m#{profile_name}"
+                        App::AWSOutputter::output_cli_command("aws #{resource[App::AWSReports::KEY_CLI][App::AWSReports::KEY_COMMAND]} --region #{cmd_regions}#{profile_output}\x1B[0m")
                         threads << Thread.new {
                             uber_results[resource_title] = App::AWSReports::get_aws_data(@regions, resource, resource_title, silent: true)
                         }

data/lib/version.rb

@@ -1 +1 @@
-AWX_VERSION = '0.6.0'
+AWX_VERSION = '0.6.1'

data/opt/shell/ec2-check

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Checks if we are running on an EC2 instance.
+# https://serverfault.com/questions/462903/how-to-know-if-a-machine-is-an-ec2-instance
+
+if [ -f /sys/hypervisor/uuid ]; then
+  if [ `head -c 3 /sys/hypervisor/uuid` == "ec2" ]; then
+    echo yes
+  else
+    echo no
+  fi
+elif [ -r /sys/devices/virtual/dmi/id/product_uuid ]; then
+  if [ `head -c 3 /sys/devices/virtual/dmi/id/product_uuid` == "EC2" ]; then
+    echo yes
+  else
+    echo no
+  fi
+else
+  if $(curl -s -m 1 http://169.254.169.254/latest/dynamic/instance-identity/document | grep -q availabilityZone) ; then
+    echo yes
+  else
+    echo no
+  fi
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awx
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-08 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.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - opt/awx/reports.yml
 - opt/config/schema.yml
 - opt/config/template.yml
+- opt/shell/ec2-check
 homepage: http://rubygems.org/gems/awx
 licenses:
 - MIT