awx 0.6.3 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/aws/aws_profile.rb +2 -8
- data/lib/routes/cloudformation_create.rb +1 -1
- data/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3c1fe64f6e362a10c20a84be02b1fba867cf27b4
|
|
4
|
+
data.tar.gz: b1a4e205bae565473acfac096bc4b47f164ea496
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2e65309238ea95bc1f4d94b8a7542c1797984138aa63f49bf368e605cee5fb5a22d920372589cddcd7327706487afc5a88f7d929cb570007eafdcd8d2f6a7765
|
|
7
|
+
data.tar.gz: 8237b4af274eb4d4251f6bdbe9e40c954c654262ceb24173c49394ebce082cc6fa461c1dee9eb9bf26e2656b098c38bec5bc67894438f38959fcaac90302c075
|
data/lib/aws/aws_profile.rb
CHANGED
|
@@ -68,7 +68,7 @@ module App
|
|
|
68
68
|
download_s3_ssh_users(true)
|
|
69
69
|
|
|
70
70
|
# Check the credentials exist.
|
|
71
|
-
if Blufin::Files::file_exists(FILE_AWS_CREDENTIALS)
|
|
71
|
+
if Blufin::Files::file_exists(FILE_AWS_CREDENTIALS)
|
|
72
72
|
@@credentials = App::AWSCredentials.new
|
|
73
73
|
profile = @@profile[PROFILE]
|
|
74
74
|
config = Blufin::Files::file_exists(FILE_AWS_CONFIG) ? ParseConfig.new(FILE_AWS_CONFIG) : nil
|
|
@@ -86,10 +86,9 @@ module App
|
|
|
86
86
|
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?
|
|
87
87
|
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?
|
|
88
88
|
else
|
|
89
|
-
@@credentials = nil # Just in case
|
|
89
|
+
@@credentials = nil # Just in case :)
|
|
90
90
|
# Returns 'yes' if running on EC2 instance, 'no' if not.
|
|
91
91
|
return if `#{App::Opt::get_base_path}/#{App::Opt::OPT_PATH}/shell/ec2-check` == 'yes'
|
|
92
|
-
return
|
|
93
92
|
errors << "aws-cli error. Cannot find file: #{Blufin::Terminal::format_invalid(FILE_AWS_CREDENTIALS)}"
|
|
94
93
|
end
|
|
95
94
|
|
|
@@ -107,11 +106,6 @@ module App
|
|
|
107
106
|
# Convenience method to just get the profile name.
|
|
108
107
|
# @return string
|
|
109
108
|
def self.get_profile_name
|
|
110
|
-
|
|
111
|
-
# TODO - REMOVE
|
|
112
|
-
puts "\x1B[38;5;154m#{@@profile[PROFILE]}\x1B[0m \xe2\x86\x92 \x1B[38;5;240m#{@@credentials.inspect}"
|
|
113
|
-
puts
|
|
114
|
-
|
|
115
109
|
return nil if @@credentials.nil?
|
|
116
110
|
@@profile[PROFILE]
|
|
117
111
|
end
|
|
@@ -573,7 +573,7 @@ module AppCommand
|
|
|
573
573
|
# If no 'after' actions necessary, give option to terminate script.
|
|
574
574
|
term_script = false
|
|
575
575
|
if @template[:method_after_create].nil? && !@template[:single_serve]
|
|
576
|
-
options = [{:text => "Yes \xe2\x80\x94
|
|
576
|
+
options = [{:text => "Yes \xe2\x80\x94 Don't exit script.", :value => false}, {:text => 'No', :value => true}]
|
|
577
577
|
help_text = "Select 'No' to end the script immediately. Status can still be viewed in the AWS console."
|
|
578
578
|
term_script = Blufin::Terminal::prompt_select('Wait for stack to build?', options, help: help_text)
|
|
579
579
|
puts
|
data/lib/version.rb
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
AWX_VERSION = '0.6.
|
|
1
|
+
AWX_VERSION = '0.6.4'
|