diff --git a/src/main/java/com/blackduck/integration/detect/configuration/DetectConfigurationFactory.java b/src/main/java/com/blackduck/integration/detect/configuration/DetectConfigurationFactory.java index 22404925fc..92510b585a 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/DetectConfigurationFactory.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/DetectConfigurationFactory.java @@ -228,9 +228,7 @@ public DetectToolFilter createToolFilter(RunDecision runDecision, BlackDuckDecis AllNoneEnumCollection excludedTools = detectConfiguration.getValue(DetectProperties.DETECT_TOOLS_EXCLUDED); ExcludeIncludeEnumFilter filter = new ExcludeIncludeEnumFilter<>(excludedTools, includedTools, scanTypeEvidenceMap); - boolean iacEnabled = includedTools.containsValue(DetectTool.IAC_SCAN) || !detectConfiguration.getValue(DetectProperties.DETECT_IAC_SCAN_PATHS).isEmpty(); - - return new DetectToolFilter(filter, impactEnabled.orElse(false), iacEnabled, runDecision, blackDuckDecision); + return new DetectToolFilter(filter, impactEnabled.orElse(false), runDecision, blackDuckDecision); } public RapidScanOptions createRapidScanOptions() { diff --git a/src/main/java/com/blackduck/integration/detect/util/filter/DetectToolFilter.java b/src/main/java/com/blackduck/integration/detect/util/filter/DetectToolFilter.java index 5fcaeab8ac..f8a798c602 100644 --- a/src/main/java/com/blackduck/integration/detect/util/filter/DetectToolFilter.java +++ b/src/main/java/com/blackduck/integration/detect/util/filter/DetectToolFilter.java @@ -18,7 +18,6 @@ public class DetectToolFilter { private final ExcludeIncludeEnumFilter excludedIncludedFilter; private final boolean impactEnabled; - private final boolean iacEnabled; private final RunDecision runDecision; private final BlackDuckDecision blackDuckDecision; @@ -35,13 +34,11 @@ public class DetectToolFilter { public DetectToolFilter( ExcludeIncludeEnumFilter excludedIncludedFilter, boolean impactEnabled, - boolean iacEnabled, RunDecision runDecision, BlackDuckDecision blackDuckDecision ) { this.excludedIncludedFilter = excludedIncludedFilter; this.impactEnabled = impactEnabled; - this.iacEnabled = iacEnabled; this.runDecision = runDecision; this.blackDuckDecision = blackDuckDecision; } @@ -50,9 +47,6 @@ public boolean shouldInclude(DetectTool detectTool) { //Only turn tools OFF, tur if (detectTool == DetectTool.IMPACT_ANALYSIS) { return impactEnabled; } - if (detectTool == DetectTool.IAC_SCAN) { - return iacEnabled; - } if (detectTool == DetectTool.DETECTOR && runDecision.getDockerMode() == DetectTargetType.IMAGE) { return false; }