From 1a9253cfd9d090168618b8ef4cbd861f432b645c Mon Sep 17 00:00:00 2001 From: hmmachadocx Date: Fri, 9 Sep 2022 17:07:34 +0100 Subject: [PATCH 1/2] AST-14564 - IDE | Jetbrains | Polling for scan status - Add scanCancel to be called from jetbrains; --- src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java index 3d1526bc..93aa2ad8 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java @@ -125,6 +125,15 @@ private List buildScanCreateArgumentsArray(@NonNull Map return arguments; } + public Object scanCancel(String scanId) + throws IOException, InterruptedException, CxException { + this.logger.info("Executing 'scan cancel' command using the CLI."); + + List arguments = buildScanCancelArguments(UUID.fromString(scanId)); + + return Execution.executeCommand(arguments, logger, line -> null); + } + public List buildScanCancelArguments(@NonNull UUID scanId) { List arguments = new ArrayList<>(); arguments.add(CxConstants.CMD_SCAN); From 15803bcd0981a8ef17355d81bafc6e5094a3c3c2 Mon Sep 17 00:00:00 2001 From: hmmachadocx Date: Mon, 26 Sep 2022 15:01:09 +0100 Subject: [PATCH 2/2] AST-14564 - IDE | Jetbrains | Polling for scan status - Change scanCancel method to return void; - Added test; --- src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java | 4 ++-- src/test/java/com/checkmarx/ast/ScanTest.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java index 93aa2ad8..875f694e 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java @@ -125,13 +125,13 @@ private List buildScanCreateArgumentsArray(@NonNull Map return arguments; } - public Object scanCancel(String scanId) + public void scanCancel(String scanId) throws IOException, InterruptedException, CxException { this.logger.info("Executing 'scan cancel' command using the CLI."); List arguments = buildScanCancelArguments(UUID.fromString(scanId)); - return Execution.executeCommand(arguments, logger, line -> null); + Execution.executeCommand(arguments, logger, line -> null); } public List buildScanCancelArguments(@NonNull UUID scanId) { diff --git a/src/test/java/com/checkmarx/ast/ScanTest.java b/src/test/java/com/checkmarx/ast/ScanTest.java index 292c67aa..a1813f47 100644 --- a/src/test/java/com/checkmarx/ast/ScanTest.java +++ b/src/test/java/com/checkmarx/ast/ScanTest.java @@ -32,6 +32,13 @@ void testScanCreate() throws Exception { Assertions.assertEquals("Completed", wrapper.scanShow(UUID.fromString(scan.getId())).getStatus()); } + @Test + void testScanCancel() throws Exception { + Map params = commonParams(); + Scan scan = wrapper.scanCreate(params, "--async --sast-incremental"); + Assertions.assertDoesNotThrow(() -> wrapper.scanCancel(scan.getId())); + } + @Test void testKicsRealtimeScan() throws Exception { KicsRealtimeResults scan = wrapper.kicsRealtimeScan("target/test-classes/Dockerfile","","v");