Default 'JAVA_HOME' to the Elasticsearch shipped one if not provided

Author: Gavin Williams

lib/puppet/provider/elastic_plugin.rb

@@ -136,9 +136,12 @@ def with_environment(&block)
     }
     saved_vars = {}
 
-    unless @resource[:java_home].nil? or @resource[:java_home] == ''
-      env_vars['JAVA_HOME'] = @resource[:java_home]
-    end
+    # Use 'java_home' param if supplied, otherwise default to Elasticsearch shipped JDK
+    env_vars['JAVA_HOME'] = if @resource[:java_home].nil? or @resource[:java_home] == ''
+                              "#{homedir}/jdk"
+                            else
+                              @resource[:java_home]
+                            end
 
     env_vars['ES_JAVA_OPTS'] = env_vars['ES_JAVA_OPTS'].join(' ')
 

spec/unit/provider/elasticsearch_plugin/shared_examples.rb

@@ -118,12 +118,12 @@
     end
 
     describe 'java_home unset' do
-      existing_java_home = ENV['JAVA_HOME']
-      it 'does not change JAVA_HOME env var' do
+      elasticsearch_java_home = '/usr/share/elasticsearch/jdk'
+      it 'defaults to the elasticsearch bundled JDK' do
         resource[:java_home] = ''
         expect(provider.with_environment do
           ENV['JAVA_HOME']
-        end).to eq(existing_java_home)
+        end).to eq(elasticsearch_java_home)
       end
     end