Skip to content

AST-37667 added ability to send the agent in the results command #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2024
Merged

AST-37667 added ability to send the agent in the results command #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f7764
AST-37667 send the agent in results command - using to display/not di…
cx-tamar-levi May 9, 2024
10e7752
AST-37667 fix test
cx-tamar-levi May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

@OrShamirCM OrShamirCM May 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a private method which means the plugin will not see the new contract. I'm not sure it's the right thing to do.

throws IOException, InterruptedException, CxException {
this.logger.info("Retrieving the scan result for scan id {}", scanId);

String tempDir = Files.createTempDirectory("cx").toAbsolutePath().toString();
Expand All @@ -274,7 +278,10 @@ public String results(@NonNull UUID scanId, ReportFormat reportFormat)
arguments.add(fileName);
arguments.add(CxConstants.OUTPUT_PATH);
arguments.add(tempDir);
Copy link
Contributor

@OrShamirCM OrShamirCM May 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's talk about the PR. Im thinking to have a default call for wrappers, as Plugins maybe


if (agent != null) {
arguments.add(CxConstants.AGENT);
arguments.add(agent);
}
return Execution.executeCommand(arguments,
logger, tempDir,
fileName + reportFormat.getExtension());
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/checkmarx/ast/ResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down