awx 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41303bbb644a98338fb8cb92edc742f09e51aee7
-  data.tar.gz: dc6356a37d780996e215f4edca139ffc98bd06b8
+  metadata.gz: 86597ddd6cebe29adf8a640b8e66240e156ca7e0
+  data.tar.gz: 7370526a2ca822a5cc861973545c55648f73e225
 SHA512:
-  metadata.gz: '0796592c71cc98b79fbda89dea698616de11ee17f667cfa18c11ab8dbcf7903287a7e69c3cb87b7154623e887b366c4242be6eed2c914edf0d124548529fd6cb'
-  data.tar.gz: 6eef364efe94d7aa45e97f9d7b50910583cfc648304601cb2d3cb5b21c8819de23bf272540e66a5e3c34730b4e8c7ac8b3115a8c36dcb8e90325c441a698fdef
+  metadata.gz: dfbbfe9d20989b06ef25a0802d6bdea542f7be1e030860719d52fed23148c7ab946fe2d7f3e703b5a668bab20b8eaa33e875c11fd7bd95083e8f2613b3b57036
+  data.tar.gz: e114f8a2c1bc0639bac2a1328f13f14582bd155369638122bbed5dc5988f34cf7447f8c6e0d77694ca1bfce176d2c423b184b8fc3b917b395ed78f48599778a6

data/lib/aws/aws_cli.rb

@@ -73,9 +73,7 @@ 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}"
-            profile_name = App::AWSProfile::get_profile_name
-            profile      = profile_name.nil? ? '' : " --profile #{profile_name}"
-            App::AWSOutputter::output_cli_command("aws #{command} --region #{region}#{profile}")
+            App::AWSOutputter::output_cli_command("aws #{command} --region #{region}#{App::AWS::get_profile_for_cli}")
             puts
             stack_send = execute_as_proc("Sending CloudFormation Stack: #{Blufin::Terminal::format_highlight(stack_name)}", command, region, json: true)
             begin

data/lib/routes/deploy_deprecated.rb

@@ -366,7 +366,7 @@ module AppCommand
                     sleep(0.01)
                     threads << Thread.new {
                         cmd = <<TEMPLATE
-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]}"]}]' --profile #{profile} --region #{region}
+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}
 TEMPLATE
                         App::AWSOutputter::output_cli_command(cmd) unless silent
                         res_one = `#{cmd}`
@@ -385,7 +385,7 @@ TEMPLATE
                                             stack_name = stack_arn.to_s.strip.gsub(/^arn:aws:cloudformation:(.)*:[0-9]{10,14}:stack\//, '')
                                             stack_name = stack_name.to_s.strip.gsub(/\/[a-z0-9\-]+$/, '')
                                             cmd = <<TEMPLATE
-aws cloudformation describe-stacks --stack-name #{stack_name} --profile #{profile} --region #{region}
+aws cloudformation describe-stacks --stack-name #{stack_name} --region #{region}#{App::AWS::get_profile_for_cli}
 TEMPLATE
                                             res_two = `#{cmd}`
                                             begin
@@ -478,7 +478,7 @@ TEMPLATE
                     end
                 end
                 # If this is an AWS command we need to add --region and --profile flags.
-                command = "#{command.strip} --region #{region} --profile #{profile}" if command =~ /^aws/i
+                command = "#{command.strip} --region #{region}#{App::AWS::get_profile_for_cli}" if command =~ /^aws/i
                 final_commands << command
             end
             final_commands

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awx
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Albert Rannetsperger