Merge pull request #1026 from calcium-machine/develop-catapult

Platform: Support personal user Bamboo accounts.
devopsgroup-io · Jul 20, 2021 · d2deb8f · d2deb8f
2 parents f6d7ac1 + b2c85bd
commit d2deb8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/VERSION.yml b/VERSION.yml
@@ -1,5 +1,5 @@
 ---
-version: 4.3.0
+version: 4.3.1
 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
@@ -2094,8 +2094,8 @@ def Command::getSignatureKey(key, dateStamp, regionName, serviceName)
       @configuration = YAML.load_file('#{working_dir}/secrets/configuration.yml')
 
       # override bamboo credentials when defined in configuration-user.yml
-      if File.exist?(File.expand_path('/secondary/calcium/secrets/configuration-user.yml'))
-        @configuration_user = YAML.load_file('/secondary/calcium/secrets/configuration-user.yml')
+      if File.exist?(File.expand_path('#{working_dir}/secrets/configuration-user.yml'))
+        @configuration_user = YAML.load_file('#{working_dir}/secrets/configuration-user.yml')
         api_bamboo_username = @configuration_user['settings']['bamboo_username'] ? @configuration_user['settings']['bamboo_username'] : @configuration['company']['bamboo_username']
         api_bamboo_password = @configuration_user['settings']['bamboo_password'] ? @configuration_user['settings']['bamboo_password'] : @configuration['company']['bamboo_password']
       else