fix: [sc-69853] Improve debug messaging for command execution (#23)

* fix: prevent shell check error to stop command execution

* fix: add logging_level on header

Author: mlataza

cmd/agent_smith/service.go

@@ -89,7 +89,7 @@ func (svc *serviceParams) Execute(stop <-chan struct{}, running chan<- struct{})
 	}
 
 	// Show header
-	logger.Info("Agent Smith started", "version", version.Version, "os", runtime.GOOS, "device_id", device.DeviceId)
+	logger.Info("Agent Smith started", "version", version.Version, "os", runtime.GOOS, "device_id", device.DeviceId, "logging_level", device.LoggingLevel)
 
 	defer func() {
 		logger.Info("Service stopped")

internal/interpreter/bash.go

@@ -17,6 +17,8 @@ import (
 	"golang.org/x/text/transform"
 )
 
+const bashVersionCheckCommand = "echo \"$BASH_VERSION\""
+
 func executeUsingBash(ctx context.Context, message *Message, device agent.Device, logger hclog.Logger) []byte {
 	// Parse the commands
 	commandBytes, err := base64.StdEncoding.DecodeString(message.Commands)
@@ -35,14 +37,14 @@ func executeUsingBash(ctx context.Context, message *Message, device agent.Device
 	shell := "bash"
 
 	if logger.IsDebug() {
-		cmd := exec.CommandContext(ctx, shell, "-c", "echo \"$BASH_VERSION\"")
-		outBytes, err := cmd.Output()
+		cmd := exec.CommandContext(ctx, shell, "-c", bashVersionCheckCommand)
+		combinedOutputBytes, err := cmd.CombinedOutput()
+		combinedOutput := string(combinedOutputBytes)
 		if err != nil {
-			logger.Error("Shell version check failed", "error", err)
-			return errorResultBytes(err)
+			logger.Error("Shell version check failed", "error", err, "combined_output", combinedOutput)
 		}
 
-		version := strings.TrimSpace(string(outBytes))
+		version := strings.TrimSpace(combinedOutput)
 
 		logger.Debug("Shell version", "shell", shell, "version", version)
 		logger.Debug("Commands to execute", "commands", commands)

internal/interpreter/powershell.go

@@ -18,6 +18,8 @@ import (
 	"golang.org/x/text/transform"
 )
 
+const powershellVersionCheckCommand = "\"$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)\""
+
 func executeUsingPowershell(ctx context.Context, message *Message, device agent.Device, logger hclog.Logger) []byte {
 	// Parse the commands
 	commandBytes, err := base64.StdEncoding.DecodeString(message.Commands)
@@ -39,14 +41,14 @@ func executeUsingPowershell(ctx context.Context, message *Message, device agent.
 	}
 
 	if logger.IsDebug() {
-		cmd := exec.CommandContext(ctx, shell, "-Command", "\"$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor).$($PSVersionTable.PSVersion.Build).$($PSVersionTable.PSVersion.Revision)\"")
-		outBytes, err := cmd.Output()
+		cmd := exec.CommandContext(ctx, shell, "-Command", powershellVersionCheckCommand)
+		combinedOutputBytes, err := cmd.CombinedOutput()
+		combinedOutput := string(combinedOutputBytes)
 		if err != nil {
-			logger.Error("Shell version check failed", "error", err)
-			return errorResultBytes(err)
+			logger.Error("Shell version check failed", "error", err, "combined_output", combinedOutput)
 		}
 
-		version := strings.TrimSpace(string(outBytes))
+		version := strings.TrimSpace(combinedOutput)
 
 		logger.Debug("Shell version", "shell", shell, "version", version)
 		logger.Debug("Commands to execute", "commands", commands)