Safer version check

This prevents facter from getting stuck in an interactive session
voxpupuli · Sep 17, 2021 · 5778673 · 5778673
1 parent f104abf
commit 5778673
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/facter/splunkforwarder_version.rb b/lib/facter/splunkforwarder_version.rb
@@ -4,7 +4,7 @@
     cmd = if File.exist?('C:/Program Files/SplunkUniversalForwarder/bin/splunk.exe')
             '"C:/Program Files/SplunkUniversalForwarder/bin/splunk.exe" --version'
           elsif File.exist?('/opt/splunkforwarder/bin/splunk')
-            '/opt/splunkforwarder/bin/splunk --version'
+            '/opt/splunkforwarder/bin/splunk --version --accept-license --answer-yes --no-prompt'
           end
     if cmd
       output = Facter::Util::Resolution.exec(cmd)

diff --git a/spec/unit/facter/splunkforwarder_version_spec.rb b/spec/unit/facter/splunkforwarder_version_spec.rb
@@ -14,7 +14,7 @@
   it 'returns version for Linux' do
     allow(File).to receive(:exist?).with('C:/Program Files/SplunkUniversalForwarder/bin/splunk.exe').and_return(false)
     allow(File).to receive(:exist?).with('/opt/splunkforwarder/bin/splunk').and_return(true)
-    allow(Facter::Util::Resolution).to receive(:exec).with('/opt/splunkforwarder/bin/splunk --version').and_return('Splunk Universal Forwarder 7.0.2 (build 03bbabbd5c0f)')
+    allow(Facter::Util::Resolution).to receive(:exec).with('/opt/splunkforwarder/bin/splunk --version --accept-license --answer-yes --no-prompt').and_return('Splunk Universal Forwarder 7.0.2 (build 03bbabbd5c0f)')
     expect(Facter.fact(:splunkforwarder_version).value).to eq('7.0.2')
   end