Update checkmarx-ast-cli binaries with 2.0.63 (#271)

* Update checkmarx-ast-cli to 2.0.63

* change environment

* change environment

* change environment

* Update ci.yml

---------

Co-authored-by: pedrompflopes <[email protected]>

Author: cx-pedro-lopes

.github/workflows/ci.yml

@@ -37,7 +37,6 @@ jobs:
           CX_CLIENT_SECRET: ${{ secrets.CX_CLIENT_SECRET}}
           CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
           CX_TENANT: ${{ secrets.CX_TENANT }}
-          CX_SCAN_ID: ${{ secrets.CX_SCAN_ID }}
           CX_APIKEY: ${{ secrets.CX_APIKEY }}
 
 

checkmarx-ast-cli.version

@@ -1 +1 @@
-2.0.60
+2.0.63

src/main/resources/cx-linux

@@ -12,7 +12,6 @@
 
 public abstract class BaseTest {
 
-    public static final String CX_SCAN_ID = getEnvOrNull("CX_SCAN_ID");
     private static final String CX_BASE_URI = getEnvOrNull("CX_BASE_URI");
     private static final String CX_BASE_AUTH_URI = getEnvOrNull("CX_BASE_AUTH_URI");
     private static final String CX_TENANT = getEnvOrNull("CX_TENANT");

src/main/resources/cx-mac

@@ -9,31 +9,37 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 class PredicateTest extends BaseTest {
 
+    public static final String TO_VERIFY = "TO_VERIFY";
+    public static final String HIGH = "HIGH";
+
     @Test
-    void testTriageShow() throws Exception {
-        Scan scan = wrapper.scanShow(UUID.fromString(CX_SCAN_ID));
+    void testTriage() throws Exception {
+        Map<String, String> params = commonParams();
+        Scan scan = wrapper.scanCreate(params);
+        UUID scanId = UUID.fromString(scan.getId());
+
+        Assertions.assertEquals("Completed", wrapper.scanShow(scanId).getStatus());
 
-        Results results = wrapper.results(UUID.fromString(CX_SCAN_ID));
+        Results results = wrapper.results(scanId);
         Result result = results.getResults().stream().filter(res -> res.getType().equalsIgnoreCase(CxConstants.SAST)).findFirst().get();
 
         List<Predicate> predicates = wrapper.triageShow(UUID.fromString(scan.getProjectId()), result.getSimilarityId(), result.getType());
 
         Assertions.assertNotNull(predicates);
-    }
-
-    @Test
-    void testTriageUpdate() throws Exception {
-        Scan scan = wrapper.scanShow(UUID.fromString(CX_SCAN_ID));
 
-        Results results = wrapper.results(UUID.fromString(CX_SCAN_ID));
-        Result result = results.getResults().stream().filter(res -> res.getType().equalsIgnoreCase(CxConstants.SAST)).findFirst().get();
+        try {
+            wrapper.triageUpdate(UUID.fromString(scan.getProjectId()), result.getSimilarityId(), result.getType(), TO_VERIFY, "Edited via Java Wrapper", HIGH);
+        } catch (Exception e) {
+            Assertions.fail("Triage update failed. Should not throw exception");
+        }
 
         try {
-            wrapper.triageUpdate(UUID.fromString(scan.getProjectId()), result.getSimilarityId(), result.getType(), "to_verify", "Edited via Java Wrapper", "high");
+            wrapper.triageUpdate(UUID.fromString(scan.getProjectId()), result.getSimilarityId(), result.getType(), result.getState(), "Edited back to normal", result.getSeverity());
         } catch (Exception e) {
             Assertions.fail("Triage update failed. Should not throw exception");
         }

src/main/resources/cx.exe

@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 class ResultTest extends BaseTest {
@@ -68,23 +69,21 @@ void testResultsCodeBashing() throws Exception {
 
     @Test
     void testResultsBflJSON() throws Exception {
+        Map<String, String> params = commonParams();
+        Scan scan = wrapper.scanCreate(params);
+        UUID scanId = UUID.fromString(scan.getId());
+
+        Assertions.assertEquals("Completed", wrapper.scanShow(scanId).getStatus());
 
-        UUID scanId = UUID.fromString(CX_SCAN_ID);
         Results results = wrapper.results(scanId);
         Result result = results.getResults().stream().filter(res -> res.getType().equalsIgnoreCase(CxConstants.SAST)).findFirst().get();
         Data data = result.getData();
         String queryId = data.getQueryId();
         int bflNodeIndex = wrapper.getResultsBfl(scanId, queryId, data.getNodes());
         Assertions.assertTrue(bflNodeIndex == -1 || bflNodeIndex >= 0);
 
-    }
-
-    @Test
-    void testResultsBflWithInvalidQueryId() throws Exception {
-
-        UUID scanId = UUID.fromString(CX_SCAN_ID);
-        String queryId = "0000";
-        int bflNodeIndex = wrapper.getResultsBfl(scanId, queryId, new ArrayList<Node>());
-        Assertions.assertEquals(-1, bflNodeIndex);
+        String queryIdInvalid = "0000";
+        int bflNodeIndexInvalid = wrapper.getResultsBfl(scanId, queryIdInvalid, new ArrayList<Node>());
+        Assertions.assertEquals(-1, bflNodeIndexInvalid);
     }
 }