AST-12643 SCA Details

- Add supportsQuickFix field to SCA results and each package path

Author: diogopcx

src/main/java/com/checkmarx/ast/results/result/DependencyPath.java

@@ -20,20 +20,23 @@ public class DependencyPath {
     List<String> locations;
     boolean isResolved;
     boolean isDevelopment;
+    boolean supportsQuickFix;
 
 
     public DependencyPath(@JsonProperty("Id") String id,
                           @JsonProperty("name") String name,
                           @JsonProperty("version") String version,
                           @JsonProperty("locations") List<String> locations,
                           @JsonProperty("isResolved") boolean isResolved,
-                          @JsonProperty("isDevelopment") boolean isDevelopment) {
+                          @JsonProperty("isDevelopment") boolean isDevelopment,
+                          @JsonProperty("supportsQuickFix") boolean supportsQuickFix) {
 
         Id = id;
         this.name = name;
         this.version = version;
         this.locations = locations;
         this.isResolved = isResolved;
         this.isDevelopment = isDevelopment;
+        this.supportsQuickFix = supportsQuickFix;
     }
 }

src/main/java/com/checkmarx/ast/results/result/ScaPackageData.java

@@ -18,16 +18,19 @@ public class ScaPackageData {
     String fixLink;
     List<List<DependencyPath>> dependencyPaths;
     boolean outdated;
+    boolean supportsQuickFix;
 
 
     public ScaPackageData(@JsonProperty("Id") String id,
                           @JsonProperty("fixLink") String fixLink,
                           @JsonProperty("dependencyPaths") List<List<DependencyPath>> dependencyPaths,
-                          @JsonProperty("outdated") boolean outdated) {
+                          @JsonProperty("outdated") boolean outdated,
+                          @JsonProperty("supportsQuickFix") boolean supportsQuickFix) {
 
         Id = id;
         this.fixLink = fixLink;
         this.dependencyPaths = dependencyPaths;
         this.outdated = outdated;
+        this.supportsQuickFix = supportsQuickFix;
     }
 }

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

@@ -53,7 +53,7 @@ public final class CxConstants {
     static final String ADDITONAL_PARAMS = "--additional-params";
     static final String ENGINE = "--engine";
     static final String SUB_CMD_KICS_REALTIME = "kics-realtime";
-    static final String SCA_REMEDIATION_PACKAGE_FILE = "--package-file";
+    static final String SCA_REMEDIATION_PACKAGE_FILES = "--package-files";
     static final String SCA_REMEDIATION_PACKAGE = "--package";
     static final String SCA_REMEDIATION_PACKAGE_VERSION = "--package-version";
     static final String CMD_UTILS = "utils";

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

@@ -13,14 +13,17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
 import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 public class CxWrapper {
 
@@ -284,20 +287,19 @@ private List<String> buildResultsArgumentsArray(UUID scanId, ReportFormat report
         return arguments;
     }
 
-    public String scaRemediation(String packageFile, String packages, String packageVersion) throws CxException, IOException, InterruptedException {
+    public String scaRemediation(String packageFiles, String packages, String packageVersion) throws CxException, IOException, InterruptedException {
         List<String> arguments = new ArrayList<>();
         arguments.add(CxConstants.CMD_UTILS);
         arguments.add(CxConstants.CMD_REMEDIATION);
         arguments.add(CxConstants.SUB_CMD_REMEDIATION_SCA);
-        arguments.add(CxConstants.SCA_REMEDIATION_PACKAGE_FILE);
-        arguments.add(packageFile);
+        arguments.add(CxConstants.SCA_REMEDIATION_PACKAGE_FILES);
+        arguments.add(packageFiles);
         arguments.add(CxConstants.SCA_REMEDIATION_PACKAGE);
         arguments.add(packages);
         arguments.add(CxConstants.SCA_REMEDIATION_PACKAGE_VERSION);
         arguments.add(packageVersion);
 
         return Execution.executeCommand(withConfigArguments(arguments), logger, line -> null);
-
     }
 
     public int getResultsBfl(@NonNull UUID scanId, @NonNull String queryId, List<Node> resultNodes)