Skip to content

fix: allow multiple directories to be specified for runs #7334

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: allow multiple directories to be specified for runs #7334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions checkov/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,15 +529,27 @@ def run(self, banner: str = checkov_banner, tool: str = default_tool, source_typ
logger.error(f'Directory {root_folder} does not exist; skipping it')
continue
file = self.config.file
self.scan_reports = runner_registry.run(

# Create new runners for each directory to avoid shared state
new_directory_runners = []
for runner in self.runners:
new_directory_runner = runner.__class__()
new_directory_runners.append(new_directory_runner)
new_directory_runner_registry = RunnerRegistry(banner, runner_filter, *new_directory_runners, tool=tool)
current_scan_reports = new_directory_runner_registry.run(
root_folder=root_folder,
external_checks_dir=external_checks_dir,
files=file,
)
self.graphs = runner_registry.check_type_to_graph
self.resource_subgraph_maps = runner_registry.check_type_to_resource_subgraph_map
if runner_registry.is_error_in_reports(self.scan_reports):
self.exit_run()

# Accumulate results from all directories instead of replacing
if not hasattr(self, 'scan_reports') or self.scan_reports is None:
self.scan_reports = []
self.scan_reports.extend(current_scan_reports)
self.graphs = new_directory_runner_registry.check_type_to_graph
self.resource_subgraph_maps = new_directory_runner_registry.check_type_to_resource_subgraph_map
if new_directory_runner_registry.is_error_in_reports(current_scan_reports):
logger.warning(f'Errors detected in scan reports for directory {root_folder}, continuing with next directory')
if baseline:
baseline.compare_and_reduce_reports(self.scan_reports)

Expand All @@ -563,13 +575,15 @@ def run(self, banner: str = checkov_banner, tool: str = default_tool, source_typ

if self.config.create_baseline:
overall_baseline = Baseline()
for report in self.scan_reports:
for report in current_scan_reports:
overall_baseline.add_findings_from_report(report)
created_baseline_path = os.path.join(os.path.abspath(root_folder), '.checkov.baseline')
with open(created_baseline_path, 'w') as f:
json.dump(overall_baseline.to_dict(), f, indent=4)
exit_codes.append(self.print_results(
runner_registry=runner_registry,
# Print results for this directory only
exit_codes.append(new_directory_runner_registry.print_reports(
scan_reports=current_scan_reports,
config=self.config,
url=self.url,
created_baseline_path=created_baseline_path,
baseline=baseline,
Expand Down