From 68737cb93153be25da7c6b36e9d51fda3acd8fb1 Mon Sep 17 00:00:00 2001 From: treydock Date: Thu, 27 May 2021 14:28:13 -0400 Subject: [PATCH] Allow cluster batch_connect_ssh_allow? to return nil if not defined (#289) --- lib/ood_core/cluster.rb | 6 +++--- spec/cluster_spec.rb | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ood_core/cluster.rb b/lib/ood_core/cluster.rb index 1879009bd..70c70a32f 100644 --- a/lib/ood_core/cluster.rb +++ b/lib/ood_core/cluster.rb @@ -148,12 +148,12 @@ def allow? end # Whether this cluster supports SSH to batch connect nodes - # @return [Boolean] whether cluster supports SSH to batch connect node + # @return [Boolean, nil] whether cluster supports SSH to batch connect node def batch_connect_ssh_allow? return @batch_connect_ssh_allow if defined?(@batch_connect_ssh_allow) - return @batch_connect_ssh_allow = true if batch_connect_config.nil? + return @batch_connect_ssh_allow = nil if batch_connect_config.nil? - @batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, true) + @batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, nil) end # The comparison operator diff --git a/spec/cluster_spec.rb b/spec/cluster_spec.rb index f865ff803..a04e8a154 100644 --- a/spec/cluster_spec.rb +++ b/spec/cluster_spec.rb @@ -53,6 +53,11 @@ end it 'has default for batch_connect_ssh_allow?' do + expect(owens.batch_connect_ssh_allow?).to be_nil + end + + it 'can enable batch_connect_ssh_allow?' do + owens = OodCore::Cluster.new({id: "owens", batch_connect: { ssh_allow: true } }) expect(owens.batch_connect_ssh_allow?).to be true end