Ensure that command failures get reported

Author: Gavin Williams

lib/puppet/provider/elastic_user_command.rb

@@ -18,9 +18,11 @@ def self.homedir
   # Run the user management command with specified tool arguments.
   def self.command_with_path(args, configdir = nil)
     options = {
+      :combine            => true,
       :custom_environment => {
         'ES_PATH_CONF' => configdir || '/etc/elasticsearch'
-      }
+      },
+      :failonfail => true
     }
 
     execute(

lib/puppet/provider/elasticsearch_keystore/ruby.rb

@@ -28,11 +28,12 @@ def self.home_dir
   def self.run_keystore(args, instance, configdir = '/etc/elasticsearch', stdin = nil)
     options = {
       :custom_environment => {
-        'ES_INCLUDE' => File.join(defaults_dir, "elasticsearch-#{instance}"),
+        'ES_INCLUDE'   => File.join(defaults_dir, "elasticsearch-#{instance}"),
         'ES_PATH_CONF' => "#{configdir}/#{instance}"
       },
-      :uid => 'elasticsearch',
-      :gid => 'elasticsearch'
+      :uid        => 'elasticsearch',
+      :gid        => 'elasticsearch',
+      :failonfail => true
     }
 
     unless stdin.nil?

spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb

@@ -53,7 +53,9 @@
               'ES_INCLUDE' => defaults_file,
               'ES_PATH_CONF' => "/etc/elasticsearch/#{instance}"
             },
-            :uid => 'elasticsearch', :gid => 'elasticsearch'
+            :uid        => 'elasticsearch',
+            :gid        => 'elasticsearch',
+            :failonfail => true
           )
           .and_return(
             Puppet::Util::Execution::ProcessOutput.new(
@@ -113,7 +115,9 @@
               'ES_INCLUDE' => '/etc/default/elasticsearch-es-03',
               'ES_PATH_CONF' => '/etc/elasticsearch/es-03'
             },
-            :uid => 'elasticsearch', :gid => 'elasticsearch'
+            :uid        => 'elasticsearch',
+            :gid        => 'elasticsearch',
+            :failonfail => true
           )
           .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
       )