changing result to results show (#76)

* changing result to results show

* changing result to results show + new logo

* fix predicate test

Co-authored-by: Pedro Lopes <[email protected]>

Author: tiagobcx

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ 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 }}
         run: mvn -B test --file pom.xml
   cx-scan:
     runs-on: ubuntu-latest

logo.png

@@ -28,7 +28,7 @@ public final class CxConstants {
     static final String SUB_CMD_CREATE = "create";
     static final String CMD_TRIAGE = "triage";
     static final String SUB_CMD_UPDATE = "update";
-    static final String CMD_RESULT = "result";
+    static final String CMD_RESULT = "results";
     static final String FORMAT = "--format";
     static final String SCAN_INFO_FORMAT = "--scan-info-format";
     static final String FORMAT_JSON = "json";

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

@@ -222,6 +222,7 @@ public String results(@NonNull UUID scanId, ReportFormat reportFormat)
 
         List<String> arguments = new ArrayList<>();
         arguments.add(CxConstants.CMD_RESULT);
+        arguments.add(CxConstants.SUB_CMD_SHOW);
         arguments.add(CxConstants.SCAN_ID);
         arguments.add(scanId.toString());
         arguments.add(CxConstants.REPORT_FORMAT);

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

@@ -20,6 +20,8 @@ public void init() throws Exception {
         wrapper = new CxWrapper(getConfig(), getLogger());
     }
 
+    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/test/java/com/checkmarx/ast/BaseTest.java

@@ -15,12 +15,9 @@ class PredicateTest extends BaseTest {
 
     @Test
     void testTriageShow() throws Exception {
-        List<Scan> scanList = wrapper.scanList(String.format("statuses=Completed"));
-        Scan scan = scanList.get(0);
-        Assertions.assertTrue(scanList.size() > 0);
-        String scanId = scanList.get(0).getId();
+        Scan scan = wrapper.scanShow(UUID.fromString(CX_SCAN_ID));
 
-        Results results = wrapper.results(UUID.fromString(scanId));
+        Results results = wrapper.results(UUID.fromString(CX_SCAN_ID));
         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());
@@ -30,12 +27,9 @@ void testTriageShow() throws Exception {
 
     @Test
     void testTriageUpdate() throws Exception {
-        List<Scan> scanList = wrapper.scanList(String.format("statuses=Completed"));
-        Scan scan = scanList.get(0);
-        Assertions.assertTrue(scanList.size() > 0);
-        String scanId = scanList.get(0).getId();
+        Scan scan = wrapper.scanShow(UUID.fromString(CX_SCAN_ID));
 
-        Results results = wrapper.results(UUID.fromString(scanId));
+        Results results = wrapper.results(UUID.fromString(CX_SCAN_ID));
         Result result = results.getResults().stream().filter(res -> res.getType().equalsIgnoreCase(CxConstants.SAST)).findFirst().get();
 
         try {