Rework ACTION EXEC to embed the command in the action verb.

sbitio · Sep 8, 2015 · b071dd5 · b071dd5 · derjohn · Sep 8, 2015
1 parent 2efb3e1
commit b071dd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/puppet/parser/functions/monit_validate_tests.rb b/lib/puppet/parser/functions/monit_validate_tests.rb
@@ -77,8 +77,12 @@ module Puppet::Parser::Functions
         unless TEST_ACTIONS.include? test['action']
           raise Puppet::ParseError, exception_prefix + "invalid action '#{test['action']}'"
         else
-          if test['action'] == 'EXEC' and not test.key? 'exec'
-            raise Puppet::ParseError, exception_prefix + "missing command for exec action"
+          if test['action'] == 'EXEC'
+            unless test.key? 'exec'
+              raise Puppet::ParseError, exception_prefix + "missing command for exec action"
+            else
+              test['action'] = "EXEC \"#{test['exec']}\""
+            end
           end
         end
       end

diff --git a/templates/check/common.erb b/templates/check/common.erb
@@ -17,9 +17,6 @@
   <%- if test.key? 'tolerance' -%>
     FOR <%= test['tolerance'] %>
   <%- end -%>
-  THEN <%= test['action'] -%>
-  <%- if test.key? 'exec' -%>
- "<%= test['exec'] %>"
-  <%- end -%>
-<%- end %>
+  THEN <%= test['action'] %>
+<%- end -%>