Skip to content

Commit dbd2b51

Browse files
Added fix for containerTool for IAC
1 parent 95ee628 commit dbd2b51

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ public KicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources, String
407407
return Execution.executeCommand(withConfigArguments(arguments), logger, KicsRealtimeResults::fromLine);
408408
}
409409

410-
public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath, String ignoredFilePath, java.util.function.Function<String, T> resultParser)
410+
public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath, String containerTool, String ignoredFilePath, java.util.function.Function<String, T> resultParser)
411411
throws IOException, InterruptedException, CxException {
412412
this.logger.info("Executing 'scan {}' command using the CLI.", subCommand);
413413
this.logger.info("Source: {} IgnoredFilePath: {}", sourcePath, ignoredFilePath);
@@ -416,6 +416,10 @@ public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath
416416
arguments.add(subCommand);
417417
arguments.add(CxConstants.SOURCE);
418418
arguments.add(sourcePath);
419+
if(StringUtils.isNotBlank(containerTool)){
420+
arguments.add(CxConstants.ENGINE);
421+
arguments.add(containerTool);
422+
}
419423
if (StringUtils.isNotBlank(ignoredFilePath)) {
420424
arguments.add(CxConstants.IGNORED_FILE_PATH);
421425
arguments.add(ignoredFilePath);
@@ -426,25 +430,26 @@ public <T> T realtimeScan(@NonNull String subCommand, @NonNull String sourcePath
426430
// OSS Realtime
427431
public OssRealtimeResults ossRealtimeScan(@NonNull String sourcePath, String ignoredFilePath)
428432
throws IOException, InterruptedException, CxException {
429-
return realtimeScan(CxConstants.SUB_CMD_OSS_REALTIME, sourcePath, ignoredFilePath, OssRealtimeResults::fromLine);
433+
return realtimeScan(CxConstants.SUB_CMD_OSS_REALTIME, sourcePath,"", ignoredFilePath, OssRealtimeResults::fromLine);
430434
}
431435

432436
// IAC Realtime
433-
public IacRealtimeResults iacRealtimeScan(@NonNull String sourcePath, String ignoredFilePath)
437+
public IacRealtimeResults iacRealtimeScan(@NonNull String sourcePath,String containerTool, String ignoredFilePath)
434438
throws IOException, InterruptedException, CxException {
435-
return realtimeScan(CxConstants.SUB_CMD_IAC_REALTIME, sourcePath, ignoredFilePath, IacRealtimeResults::fromLine);
439+
return realtimeScan(CxConstants.SUB_CMD_IAC_REALTIME, sourcePath,containerTool, ignoredFilePath, IacRealtimeResults::fromLine);
436440
}
437441

442+
438443
// Secrets Realtime
439444
public SecretsRealtimeResults secretsRealtimeScan(@NonNull String sourcePath, String ignoredFilePath)
440445
throws IOException, InterruptedException, CxException {
441-
return realtimeScan(CxConstants.SUB_CMD_SECRETS_REALTIME, sourcePath, ignoredFilePath, SecretsRealtimeResults::fromLine);
446+
return realtimeScan(CxConstants.SUB_CMD_SECRETS_REALTIME, sourcePath,"", ignoredFilePath, SecretsRealtimeResults::fromLine);
442447
}
443448

444449
// Containers Realtime
445450
public ContainersRealtimeResults containersRealtimeScan(@NonNull String sourcePath, String ignoredFilePath)
446451
throws IOException, InterruptedException, CxException {
447-
return realtimeScan(CxConstants.SUB_CMD_CONTAINERS_REALTIME, sourcePath, ignoredFilePath, ContainersRealtimeResults::fromLine);
452+
return realtimeScan(CxConstants.SUB_CMD_CONTAINERS_REALTIME, sourcePath, "",ignoredFilePath, ContainersRealtimeResults::fromLine);
448453
}
449454

450455
public KicsRemediation kicsRemediate(@NonNull String resultsFile, String kicsFile, String engine,String similarityIds)

0 commit comments

Comments
 (0)