awx 0.6.1 → 0.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/aws/aws_cli.rb +1 -3
- data/lib/routes/deploy_deprecated.rb +3 -3
- 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: 86597ddd6cebe29adf8a640b8e66240e156ca7e0
|
4
|
+
data.tar.gz: 7370526a2ca822a5cc861973545c55648f73e225
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dfbbfe9d20989b06ef25a0802d6bdea542f7be1e030860719d52fed23148c7ab946fe2d7f3e703b5a668bab20b8eaa33e875c11fd7bd95083e8f2613b3b57036
|
7
|
+
data.tar.gz: e114f8a2c1bc0639bac2a1328f13f14582bd155369638122bbed5dc5988f34cf7447f8c6e0d77694ca1bfce176d2c423b184b8fc3b917b395ed78f48599778a6
|
data/lib/aws/aws_cli.rb
CHANGED
@@ -73,9 +73,7 @@ module App
|
|
73
73
|
term_protect = term_protect ? ' --enable-termination-protection' : ' --no-enable-termination-protection'
|
74
74
|
timeout = timeout.nil? ? '' : " --timeout-in-minutes #{timeout}"
|
75
75
|
command = "cloudformation create-stack --stack-name #{stack_name} --template-url #{s3_url}#{params}#{tags}#{capabilities}#{term_protect}#{timeout}"
|
76
|
-
|
77
|
-
profile = profile_name.nil? ? '' : " --profile #{profile_name}"
|
78
|
-
App::AWSOutputter::output_cli_command("aws #{command} --region #{region}#{profile}")
|
76
|
+
App::AWSOutputter::output_cli_command("aws #{command} --region #{region}#{App::AWS::get_profile_for_cli}")
|
79
77
|
puts
|
80
78
|
stack_send = execute_as_proc("Sending CloudFormation Stack: #{Blufin::Terminal::format_highlight(stack_name)}", command, region, json: true)
|
81
79
|
begin
|
@@ -366,7 +366,7 @@ module AppCommand
|
|
366
366
|
sleep(0.01)
|
367
367
|
threads << Thread.new {
|
368
368
|
cmd = <<TEMPLATE
|
369
|
-
aws resourcegroupstaggingapi get-resources --resource-type-filters cloudformation --tag-filters '[{"Key":"Project","Values":["#{project_name}"]},{"Key":"ProjectId","Values":["#{project_id}"]},{"Key":"Environment","Values":["#{deployment[:environment]}"]},{"Key":"DeploymentStack","Values":["#{deployment[:stack]}"]}]' --
|
369
|
+
aws resourcegroupstaggingapi get-resources --resource-type-filters cloudformation --tag-filters '[{"Key":"Project","Values":["#{project_name}"]},{"Key":"ProjectId","Values":["#{project_id}"]},{"Key":"Environment","Values":["#{deployment[:environment]}"]},{"Key":"DeploymentStack","Values":["#{deployment[:stack]}"]}]' --region #{region}#{App::AWS::get_profile_for_cli}
|
370
370
|
TEMPLATE
|
371
371
|
App::AWSOutputter::output_cli_command(cmd) unless silent
|
372
372
|
res_one = `#{cmd}`
|
@@ -385,7 +385,7 @@ TEMPLATE
|
|
385
385
|
stack_name = stack_arn.to_s.strip.gsub(/^arn:aws:cloudformation:(.)*:[0-9]{10,14}:stack\//, '')
|
386
386
|
stack_name = stack_name.to_s.strip.gsub(/\/[a-z0-9\-]+$/, '')
|
387
387
|
cmd = <<TEMPLATE
|
388
|
-
aws cloudformation describe-stacks --stack-name #{stack_name} --
|
388
|
+
aws cloudformation describe-stacks --stack-name #{stack_name} --region #{region}#{App::AWS::get_profile_for_cli}
|
389
389
|
TEMPLATE
|
390
390
|
res_two = `#{cmd}`
|
391
391
|
begin
|
@@ -478,7 +478,7 @@ TEMPLATE
|
|
478
478
|
end
|
479
479
|
end
|
480
480
|
# If this is an AWS command we need to add --region and --profile flags.
|
481
|
-
command = "#{command.strip} --region #{region}
|
481
|
+
command = "#{command.strip} --region #{region}#{App::AWS::get_profile_for_cli}" if command =~ /^aws/i
|
482
482
|
final_commands << command
|
483
483
|
end
|
484
484
|
final_commands
|
data/lib/version.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
AWX_VERSION = '0.6.
|
1
|
+
AWX_VERSION = '0.6.2'
|