- Modified fallback mechanism of container engine location for IAC scan

Author: cx-anjali-deore

internal/services/realtimeengine/iacrealtime/container-manager.go

@@ -1,13 +1,11 @@
 package iacrealtime
 
 import (
-	"github.com/google/uuid"
-	"os/exec"
-	"strings"
-
 	"github.com/checkmarx/ast-cli/internal/commands/util"
 	commonParams "github.com/checkmarx/ast-cli/internal/params"
+	"github.com/google/uuid"
 	"github.com/spf13/viper"
+	"os/exec"
 )
 
 // IContainerManager interface for container operations
@@ -31,6 +29,10 @@ func (dm *ContainerManager) GenerateContainerID() string {
 }
 
 func (dm *ContainerManager) RunKicsContainer(engine, volumeMap string) error {
+	engine, err := engineNameResolution(engine)
+	if err != nil {
+		return err
+	}
 	args := []string{
 		"run", "--rm",
 		"-v", volumeMap,
@@ -41,18 +43,7 @@ func (dm *ContainerManager) RunKicsContainer(engine, volumeMap string) error {
 		"-o", ContainerPath,
 		"--report-formats", ContainerFormat,
 	}
+	_, err = exec.Command(engine, args...).CombinedOutput()
 
-	_, err := exec.Command(engine, args...).CombinedOutput()
-
-	var msg string
-	if err != nil {
-		msg = err.Error()
-		if strings.Contains(msg, util.InvalidEngineError) {
-			enginePath, err := checkEnginePresentInPath(engine)
-			if err != nil {
-				_, err = exec.Command(enginePath, args...).CombinedOutput()
-			}
-		}
-	}
 	return err
 }

internal/services/realtimeengine/iacrealtime/iac-realtime.go

@@ -7,6 +7,7 @@ import (
 	"github.com/checkmarx/ast-cli/internal/services/realtimeengine"
 	"github.com/checkmarx/ast-cli/internal/wrappers"
 	"os"
+	"os/exec"
 	"path/filepath"
 )
 
@@ -137,11 +138,15 @@ func (svc *IacRealtimeService) validateFilePath(filePath string) error {
 	return nil
 }
 
-func checkEnginePresentInPath(engineName string) (string, error) {
+func engineNameResolution(engineName string) (string, error) {
+	if _, err := exec.LookPath(engineName); err == nil {
+		return engineName, nil
+	}
+
 	fallbackPath := filepath.Join("/usr/local/bin", engineName)
 	info, err := os.Stat(fallbackPath)
 	if err == nil && !info.IsDir() {
 		return fallbackPath, nil
 	}
-	return "", fmt.Errorf(engineName + " not found in PATH or /usr/local/bin")
+	return "", fmt.Errorf(engineName + " not found in PATH or in /usr/local/bin")
 }