From 70ce5acdb02aa1786b69ca06ee6627501f534881 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 14 Dec 2021 12:51:46 -0800 Subject: [PATCH] (bug) Fix abs checkout when 'ABS_SSH_PRIVATE_KEY' is unset When `ABS_SSH_PRIVATE_KEY` is not set, `ENV['ABS_SSH_PRIVATE_KEY']` returns nil. Fixes the test for whether it's set to allow for a nil value. --- tasks/abs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/abs.rb b/tasks/abs.rb index f2ce348..5f5a855 100755 --- a/tasks/abs.rb +++ b/tasks/abs.rb @@ -77,7 +77,7 @@ def provision(platform, inventory_location, vars) node = { 'uri' => host['hostname'], 'config' => { 'transport' => 'ssh', 'ssh' => { 'user' => ENV['ABS_USER'], 'host-key-check' => false } }, 'facts' => { 'provisioner' => 'abs', 'platform' => host['type'], 'job_id' => job_id } } - if !ENV['ABS_SSH_PRIVATE_KEY'].empty? + if !ENV['ABS_SSH_PRIVATE_KEY'].nil? && !ENV['ABS_SSH_PRIVATE_KEY'].empty? node['config']['ssh']['private-key'] = ENV['ABS_SSH_PRIVATE_KEY'] else node['config']['ssh']['password'] = ENV['ABS_PASSWORD']