Merge pull request #404 from blackducksoftware/dev/dterry/IDETECT-389…

…3-pass-no-persistence-mode-flag

add no persistent mode flag to scan CLI to support BOM_COMPARE modes for signature scans

src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatch.java

@@ -59,11 +59,12 @@ public static ScanBatchBuilder newBuilder() {
     private final ReducedPersistence reducedPersistence;
     @Nullable
     private final String correlationId;
+    private final String bomCompareMode;
 
     public ScanBatch(File outputDirectory, boolean cleanupOutput, int scanMemoryInMegabytes, boolean dryRun, boolean debug, boolean verbose,
         String scanCliOpts, String additionalScanArguments, BlackDuckOnlineProperties blackDuckOnlineProperties, IndividualFileMatching individualFileMatching, HttpUrl blackDuckUrl,
         String blackDuckUsername, String blackDuckPassword, String blackDuckApiToken, ProxyInfo proxyInfo, boolean runInsecure, String projectName, String projectVersionName,
-        List<ScanTarget> scanTargets, boolean isRapid, ReducedPersistence reducedPersistence, @Nullable String correlationId) {
+        List<ScanTarget> scanTargets, boolean isRapid, ReducedPersistence reducedPersistence, @Nullable String correlationId, String bomCompareMode) {
         this.outputDirectory = outputDirectory;
         this.cleanupOutput = cleanupOutput;
         this.scanMemoryInMegabytes = scanMemoryInMegabytes;
@@ -86,6 +87,7 @@ public ScanBatch(File outputDirectory, boolean cleanupOutput, int scanMemoryInMe
         this.isRapid = isRapid;
         this.reducedPersistence = reducedPersistence;
         this.correlationId = correlationId;
+        this.bomCompareMode = bomCompareMode;
     }
 
     /**
@@ -126,7 +128,8 @@ private void addToScanCommands(File signatureScannerInstallDirectory, ScanPathsU
         File commandOutputDirectory = scanTarget.determineCommandOutputDirectory(scanPathsUtility, outputDirectory);
         ScanCommand scanCommand = new ScanCommand(signatureScannerInstallDirectory, commandOutputDirectory, commandDryRun, proxyInfo, scanCliOptsToUse, scanMemoryInMegabytes, commandScheme, commandHost,
             blackDuckApiToken, blackDuckUsername, blackDuckPassword, commandPort, runInsecure, scanTarget.getCodeLocationName(), blackDuckOnlineProperties,
-            individualFileMatching, scanTarget.getExclusionPatterns(), additionalScanArguments, scanTarget.getPath(), verbose, debug, projectName, projectVersionName, isRapid, reducedPersistence, correlationId);
+            individualFileMatching, scanTarget.getExclusionPatterns(), additionalScanArguments, scanTarget.getPath(), verbose, debug, projectName, projectVersionName, isRapid, reducedPersistence, correlationId,
+            bomCompareMode);
         scanCommands.add(scanCommand);
     }
 

src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java

@@ -62,13 +62,15 @@ public class ScanBatchBuilder extends IntegrationBuilder<ScanBatch> {
     private String correlationId;
 
     private List<ScanTarget> scanTargets = new ArrayList<>();
+
+    private String bomCompareMode;
 
     @Override
     protected ScanBatch buildWithoutValidation() {
         BlackDuckOnlineProperties blackDuckOnlineProperties = new BlackDuckOnlineProperties(snippetMatching, uploadSource, licenseSearch, copyrightSearch);
         return new ScanBatch(outputDirectory, cleanupOutput, scanMemoryInMegabytes, dryRun, debug, verbose, scanCliOpts, additionalScanArguments,
             blackDuckOnlineProperties, individualFileMatching, blackDuckUrl, blackDuckUsername, blackDuckPassword, blackDuckApiToken, proxyInfo, alwaysTrustServerCertificate,
-            projectName, projectVersionName, scanTargets, isRapid, reducedPersistence, correlationId);
+            projectName, projectVersionName, scanTargets, isRapid, reducedPersistence, correlationId, bomCompareMode);
     }
 
     @Override
@@ -375,5 +377,9 @@ public ScanBatchBuilder correlationId(String correlationId) {
     public String getCorrelationId() {
         return correlationId;
     }
-
+
+    public ScanBatchBuilder bomCompareMode(String bomCompareMode) {
+    	this.bomCompareMode = bomCompareMode;
+    	return this;
+    }
 }

src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java

@@ -50,12 +50,13 @@ public class ScanCommand {
     private final ReducedPersistence reducedPersistence;
     @Nullable
     private final String correlationId;
+    private final String bomCompareMode;
 
     public ScanCommand(File signatureScannerInstallDirectory, File outputDirectory, boolean dryRun, ProxyInfo proxyInfo, String scanCliOpts, int scanMemoryInMegabytes, String scheme, String host, String blackDuckApiToken,
         String blackDuckUsername, String blackDuckPassword, int port, boolean runInsecure, String name, BlackDuckOnlineProperties blackDuckOnlineProperties, IndividualFileMatching individualFileMatching, Set<String> excludePatterns,
         String additionalScanArguments, String targetPath, boolean verbose, boolean debug, String projectName, String versionName, boolean isRapid,
         ReducedPersistence reducedPersistence,
-        @Nullable String correlationId) {
+        @Nullable String correlationId, String bomCompareMode) {
         this.signatureScannerInstallDirectory = signatureScannerInstallDirectory;
         this.outputDirectory = outputDirectory;
         this.dryRun = dryRun;
@@ -82,6 +83,7 @@ public ScanCommand(File signatureScannerInstallDirectory, File outputDirectory,
         this.isRapid = isRapid;
         this.reducedPersistence = reducedPersistence;
         this.correlationId = correlationId;
+        this.bomCompareMode = bomCompareMode;
     }
 
     public List<String> createCommandForProcessBuilder(IntLogger logger, ScanPaths scannerPaths, String specificRunOutputDirectoryPath) throws IllegalArgumentException, IntegrationException {
@@ -138,6 +140,10 @@ public List<String> createCommandForProcessBuilder(IntLogger logger, ScanPaths s
 
         if (isRapid) {
             cmd.add("--no-persistence");
+
+            // --no-persistence-mode should never be used without --no-persistence so
+            // only set it in this block.
+            cmd.add("--no-persistence-mode=" + bomCompareMode);
         }
 
         populateReducedPersistence(cmd);

src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java

@@ -200,7 +200,30 @@ public void testDiscardUnmatchedFiles() throws IntegrationException {
     	List<String> commandList = createCommandList();
     	assertTrue(commandList.contains("--discard-unmatched-files"));
     }
+
+    @Test
+    public void testNoPersistentModeSpecifiedWithRapidModeSpecified() throws IntegrationException {
+    	scanBatchBuilder.rapid(true);
+    	scanBatchBuilder.bomCompareMode("BOM_COMPARE_STRICT");
+    	List<String> commandList = createCommandList();
+    	assertTrue(commandList.contains("--no-persistence-mode=BOM_COMPARE_STRICT"));
+    }
 
+    @Test
+    public void testNoPersistentModeNotSpecified() throws IntegrationException {
+    	scanBatchBuilder.rapid(false);
+    	List<String> commandList = createCommandList();
+    	assertFalse(commandList.contains("--no-persistence-mode=BOM_COMPARE_STRICT"));
+    }
+
+    @Test
+    public void testNoPersistentModeSpecifiedWithRapidModeNotSpecified() throws IntegrationException {
+    	scanBatchBuilder.rapid(false);
+    	scanBatchBuilder.bomCompareMode("BOM_COMPARE_STRICT");
+    	List<String> commandList = createCommandList();
+    	assertFalse(commandList.contains("--no-persistence-mode=BOM_COMPARE_STRICT"));
+    }
+
     private void populateBuilder(ScanBatchBuilder scanBatchBuilder) {
         try {
             scanBatchBuilder.blackDuckUrl(new HttpUrl("http://fakeserver.com"));