From 53f7764fc1be98e263a84839cbd40a7ee430d202 Mon Sep 17 00:00:00 2001 From: tamarleviCm Date: Thu, 9 May 2024 09:28:51 +0300 Subject: [PATCH 1/2] AST-37667 send the agent in results command - using to display/not display the container results --- src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java index 3485e5f2..587cff8a 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java @@ -263,6 +263,10 @@ public Results results(@NonNull UUID scanId) throws IOException, InterruptedExce public String results(@NonNull UUID scanId, ReportFormat reportFormat) throws IOException, InterruptedException, CxException { + return results(scanId, reportFormat, null); + } + public String results(@NonNull UUID scanId, ReportFormat reportFormat, String agent) + throws IOException, InterruptedException, CxException { this.logger.info("Retrieving the scan result for scan id {}", scanId); String tempDir = Files.createTempDirectory("cx").toAbsolutePath().toString(); @@ -274,7 +278,10 @@ public String results(@NonNull UUID scanId, ReportFormat reportFormat) arguments.add(fileName); arguments.add(CxConstants.OUTPUT_PATH); arguments.add(tempDir); - + if (agent != null) { + arguments.add(CxConstants.AGENT); + arguments.add(agent); + } return Execution.executeCommand(arguments, logger, tempDir, fileName + reportFormat.getExtension()); From 10e77527b60ffe7efd4e60fca8030ade558b0d43 Mon Sep 17 00:00:00 2001 From: tamarleviCm Date: Thu, 9 May 2024 10:54:06 +0300 Subject: [PATCH 2/2] AST-37667 fix test --- src/test/java/com/checkmarx/ast/ResultTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/checkmarx/ast/ResultTest.java b/src/test/java/com/checkmarx/ast/ResultTest.java index 43899150..1f281ff2 100644 --- a/src/test/java/com/checkmarx/ast/ResultTest.java +++ b/src/test/java/com/checkmarx/ast/ResultTest.java @@ -55,7 +55,6 @@ void testResultsStructure() throws Exception { Assertions.assertTrue(scanList.size() > 0); String scanId = scanList.get(0).getId(); Results results = wrapper.results(UUID.fromString(scanId)); - results.getResults().stream().filter(result -> "sast".equalsIgnoreCase(result.getType())).findFirst(); Assertions.assertEquals(results.getTotalCount(), results.getResults().size()); }