From f92e781ec2aec3cb53ad76c56e027f6c4e4e950d Mon Sep 17 00:00:00 2001 From: Seth Reeser Date: Tue, 3 Aug 2021 11:00:29 -0400 Subject: [PATCH] Platform: Wrap catapult-build.rb Bamboo credentials in quotes to accommodate context. --- VERSION.yml | 2 +- catapult/catapult.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.yml b/VERSION.yml index 6396a24f..5bb102b4 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,5 +1,5 @@ --- -version: 4.3.1 +version: 4.3.2 major: description: "Catapult uses Semantic Versioning. During a MAJOR increment, incompatable API changes are made which require a manual upgrade path. Please follow these directions:" notice: "NEW MAJOR VERSION OF CATAPULT AVAILABLE" diff --git a/catapult/catapult.rb b/catapult/catapult.rb index 81ba58c6..9f16adf1 100644 --- a/catapult/catapult.rb +++ b/catapult/catapult.rb @@ -2117,7 +2117,7 @@ def Command::getSignatureKey(key, dateStamp, regionName, serviceName) @api_bamboo_cli_redirect = '2>' end - api_bamboo_cli_result = `\#{@api_bamboo_cli} --server \#{@configuration['company']['bamboo_base_url']} --password \#{api_bamboo_password} --user \#{api_bamboo_username} --action queueBuild --plan CAT-TEST \#{@api_bamboo_cli_redirect}`; result=$?.success? + api_bamboo_cli_result = `\#{@api_bamboo_cli} --server \#{@configuration['company']['bamboo_base_url']} --password \"\#{api_bamboo_password}\" --user \"\#{api_bamboo_username}\" --action queueBuild --plan CAT-TEST \#{@api_bamboo_cli_redirect}`; result=$?.success? if api_bamboo_cli_result.strip.include?('Connection refused') puts 'The Bamboo CLI seems to be down. Skipping attempt to queue build job for TEST environment...' elsif api_bamboo_cli_result.strip.include?('401')