fix using ARGS macro in wrapped scripts

Author: sni

pkg/snclient/check_wrap.go

@@ -49,10 +49,15 @@ func (l *CheckWrap) Check(ctx context.Context, snc *Agent, check *CheckData, _ [
 	var command string
 	if l.wrapped {
 		// substitute $ARGn$ in the command
+		log.Debugf("command string: %s", l.commandString)
+		macros["ARGS"] = strings.Join(check.rawArgs, " ")
+		macros["ARGS\""] = stringJoinQuoted(check.rawArgs, " ")
 		commandString := ReplaceRuntimeMacros(l.commandString, macros)
+
 		cmdToken := utils.Tokenize(commandString)
 		macros["SCRIPT"] = cmdToken[0]
 		macros["ARGS"] = strings.Join(cmdToken[1:], " ")
+		macros["ARGS\""] = stringJoinQuoted(cmdToken[1:], " ")
 		ext := strings.TrimPrefix(filepath.Ext(cmdToken[0]), ".")
 		log.Debugf("command wrapping for extension: %s", ext)
 		wrapping, ok := snc.config.Section("/settings/external scripts/wrappings").GetString(ext)
@@ -62,18 +67,13 @@ func (l *CheckWrap) Check(ctx context.Context, snc *Agent, check *CheckData, _ [
 		wrapping = l.fixWrappingCmd(ext, wrapping)
 		log.Debugf("%s wrapper: %s", ext, wrapping)
 		command = ReplaceRuntimeMacros(wrapping, macros)
+		log.Debugf("command after macros expanded: %s", command)
 	} else {
 		macros["ARGS"] = strings.Join(check.rawArgs, " ")
-		macros["ARGS\""] = strings.Join(func(arr []string) []string {
-			quoteds := make([]string, len(arr))
-			for i, v := range arr {
-				quoteds[i] = fmt.Sprintf("%q", v)
-			}
-
-			return quoteds
-		}(check.rawArgs), " ")
+		macros["ARGS\""] = stringJoinQuoted(check.rawArgs, " ")
 		log.Debugf("command before macros expanded: %s", l.commandString)
 		command = ReplaceRuntimeMacros(l.commandString, macros)
+		log.Debugf("command after macros expanded: %s", command)
 	}
 
 	timeoutSeconds := check.timeout
@@ -133,3 +133,12 @@ func (l *CheckWrap) fixWrappingCmd(ext, wrapping string) string {
 
 	return wrapping
 }
+
+func stringJoinQuoted(arr []string, sep string) string {
+	quoteds := make([]string, len(arr))
+	for i, v := range arr {
+		quoteds[i] = fmt.Sprintf("%q", v)
+	}
+
+	return strings.Join(quoteds, sep)
+}

pkg/snclient/check_wrap_test.go

@@ -62,6 +62,7 @@ check_win_subargs = t\scripts\check_args.ps1 $ARG1$
 [/settings/external scripts/wrapped scripts]
 check_dummy_wrapped_noparm = check_dummy.EXTENSION
 check_dummy_wrapped = check_dummy.EXTENSION $ARG1$ "$ARG2$"
+check_dummy_wrapped_args = check_dummy.EXTENSION $ARGS"$
 check_dummy_wrapped_ok = check_dummy.EXTENSION 0 "i am ok wrapped"
 check_dummy_wrapped_critical = check_dummy.EXTENSION 2 "i am critical wrapped"
 
@@ -160,6 +161,10 @@ func runTestCheckExternalWrapped(t *testing.T, snc *Agent) {
 	assert.Equalf(t, CheckExitOK, res.State, "state matches")
 	assert.Equalf(t, "OK: i am wrapped", string(res.BuildPluginOutput()), "output matches")
 
+	res = snc.RunCheck("check_dummy_wrapped_args", []string{"0", "i am wrapped"})
+	assert.Equalf(t, CheckExitOK, res.State, "state matches")
+	assert.Equalf(t, "OK: i am wrapped", string(res.BuildPluginOutput()), "output matches")
+
 	res = snc.RunCheck("check_dummy_wrapped_ok", []string{})
 	assert.Equalf(t, CheckExitOK, res.State, "state matches")
 	assert.Equalf(t, "OK: i am ok wrapped", string(res.BuildPluginOutput()), "output matches")