- Merged Iac fixes in ignore changes

Author: cx-anjali-deore

checkmarx-ast-cli.version

@@ -1 +1 @@
-2.3.42
+2.3.42-iac-engine-fallbackPath

src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java

@@ -31,15 +31,17 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+
+import static com.checkmarx.ast.wrapper.Execution.*;
 
 public class CxWrapper {
 
     private static final CollectionType BRANCHES_TYPE = TypeFactory.defaultInstance()
             .constructCollectionType(List.class, String.class);
+    private static final String OS_LINUX = "linux";
+    private static final String OS_WINDOWS = "windows";
+    private static final String OS_MAC = "mac";
 
     @NonNull
     private final CxConfig cxConfig;
@@ -413,6 +415,49 @@ public KicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources, String
         return Execution.executeCommand(withConfigArguments(arguments), logger, KicsRealtimeResults::fromLine);
     }
 
+    public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath, String containerTool, String ignoredFilePath, java.util.function.Function<String, T> resultParser)
+    public String checkEngineExist(@NonNull String engineName) throws CxException, IOException, InterruptedException {
+             String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+             String osType=Execution.getOperatingSystemType(osName);
+                return this.checkEngine(engineName,osType);
+    }
+
+    private  String checkEngine(String engineName, String osType ) throws CxException, IOException, InterruptedException {
+        List<String> arguments = new ArrayList<>();
+        switch (osType){
+            case OS_MAC:
+                String enginePath;
+                arguments.add("/bin/sh");
+                arguments.add("-c");
+                arguments.add("command -v " + engineName);
+                try{
+                    enginePath= Execution.executeCommand((arguments), logger, line->line);
+                }
+                throw new CxException(
+                        1,
+                        "Engine '" + engineName + "' is not installed or not found at /usr/local/bin)."
+                );
+
+
+                return enginePath;
+            case OS_WINDOWS:
+            case OS_LINUX:
+                arguments.add(engineName);
+                arguments.add("--version");
+                try {
+                    Execution.executeCommand(arguments, logger, line -> line);
+                    return engineName;
+                } catch (CxException | IOException e) {
+                    throw new CxException(
+                            1,engineName+" is not installed or is not accessible from the system PATH."
+                    );
+                }
+            default:
+                throw new IllegalArgumentException("Unsupported OS: " + osType);
+        }
+
+    }
+
     public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath, String containerTool, String ignoredFilePath, java.util.function.Function<String, T> resultParser)
             throws IOException, InterruptedException, CxException {
         this.logger.info("Executing 'scan {}' command using the CLI.", subCommand);

src/main/java/com/checkmarx/ast/wrapper/Execution.java

@@ -1,5 +1,6 @@
 package com.checkmarx.ast.wrapper;
 
+import com.checkmarx.ast.kicsRealtimeResults.KicsRealtimeResults;
 import lombok.NonNull;
 import org.slf4j.Logger;
 
@@ -12,10 +13,7 @@
 import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -171,7 +169,7 @@ private static String detectBinaryName(@NonNull Logger logger) {
         return fileName;
     }
 
-    private static String getOperatingSystemType(String osName) {
+    public static String getOperatingSystemType(String osName) {
         if (osName.contains(OS_LINUX)) {
             return OS_LINUX;
         } else if (osName.contains(OS_WINDOWS)) {
@@ -217,4 +215,6 @@ private static String md5(InputStream a) {
         }
         return md5;
     }
+
+
 }

src/main/resources/cx.exe

@@ -16,10 +16,10 @@ void testTelemetryAIEventSuccessfulCaseWithMinimalParametersAiLog() throws CxExc
         // Test case: AI logging with specific parameters and some empty values
         Assertions.assertDoesNotThrow(() -> {
             String result = wrapper.telemetryAIEvent(
-                    "Copilot",                         // aiProvider
-                    "JetBrains IntelliJ IDEA",                  // agent
+                    "Cursor",                                   // aiProvider
+                    "Cursos",                                   // agent
                     "click",                                    // eventType
-                    "viewDetails",                              // subType
+                    "ast-results.viewPackageDetails",          // subType
                     "secrets",                                  // engine
                     "high",                                     // problemSeverity
                     "",                                         // scanType (empty)
@@ -34,7 +34,7 @@ void testTelemetryAIEventSuccessfulCaseWithMinimalParametersDetectionLog() throw
         // Test case: Detection logging with most parameters empty and specific scan data
         Assertions.assertDoesNotThrow(() -> {
             String result = wrapper.telemetryAIEvent(
-                    "",                                // aiProvider (empty)
+                    "",                                         // aiProvider (empty)
                     "",                                         // agent (empty)
                     "",                                         // eventType (empty)
                     "",                                         // subType (empty)
@@ -52,7 +52,7 @@ void testTelemetryAIEventSuccessfulCaseWithEdgeCaseParameters() throws CxExcepti
         // Test case: Edge case with minimal required parameters
         Assertions.assertDoesNotThrow(() -> {
             String result = wrapper.telemetryAIEvent(
-                    "test-provider",                   // aiProvider (minimal value)
+                    "test-provider",                            // aiProvider (minimal value)
                     "java-wrapper",                             // agent (minimal value)
                     "",                                         // eventType (empty)
                     "",                                         // subType (empty)
@@ -64,4 +64,4 @@ void testTelemetryAIEventSuccessfulCaseWithEdgeCaseParameters() throws CxExcepti
             );
         }, "Telemetry AI event should execute successfully for edge case");
     }
-}
+}