Skip to content
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

fix(general): update checks_metadata structure #3929

Merged
merged 4 commits into from
Nov 24, 2022
Merged

fix(general): update checks_metadata structure #3929

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b169ff3
update metadata structure
arielkru Nov 23, 2022
1d39827
linting
arielkru Nov 23, 2022
d59d9ac
linting
arielkru Nov 23, 2022
effeccb
use {} instead of dict()
arielkru Nov 23, 2022
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
19 changes: 13 additions & 6 deletions checkov/common/bridgecrew/wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import json
import itertools
from typing import Any, TYPE_CHECKING
from collections import defaultdict

import dpath.util

Expand Down Expand Up @@ -37,9 +38,14 @@ def _put_json_object(s3_client: BaseClient, json_obj: Any, bucket: str, object_p


def _extract_checks_metadata(report: Report, full_repo_object_key: str) -> dict[str, dict[str, Any]]:
return {check.check_id: dict({k: getattr(check, k, "") for k in check_metadata_keys},
**{'file_object_path': full_repo_object_key + check.file_path}) for check in
list(itertools.chain(report.passed_checks, report.failed_checks, report.skipped_checks))}
metadata: dict[str, dict[str, Any]] = defaultdict(dict)
for check in itertools.chain(report.passed_checks, report.failed_checks, report.skipped_checks):
metadata_key = f'{check.file_path}:{check.resource}'
check_meta = {k: getattr(check, k, "") for k in check_metadata_keys}
check_meta['file_object_path'] = full_repo_object_key + check.file_path
metadata[metadata_key][check.check_id] = check_meta

return metadata


def reduce_scan_reports(scan_reports: list[Report]) -> dict[str, _ReducedScanReport]:
Expand Down Expand Up @@ -69,7 +75,8 @@ def reduce_scan_reports(scan_reports: list[Report]) -> dict[str, _ReducedScanRep


def persist_checks_results(
reduced_scan_reports: dict[str, _ReducedScanReport], s3_client: BaseClient, bucket: str, full_repo_object_key: str
reduced_scan_reports: dict[str, _ReducedScanReport], s3_client: BaseClient, bucket: str,
full_repo_object_key: str
) -> dict[str, str]:
"""
Save reduced scan reports into bridgecrew's platform
Expand All @@ -84,7 +91,7 @@ def persist_checks_results(


def persist_run_metadata(
run_metadata: dict[str, str | list[str]], s3_client: BaseClient, bucket: str, full_repo_object_key: str
run_metadata: dict[str, str | list[str]], s3_client: BaseClient, bucket: str, full_repo_object_key: str
) -> None:
object_path = f'{full_repo_object_key}/{checkov_results_prefix}/run_metadata.json'
try:
Expand All @@ -95,7 +102,7 @@ def persist_run_metadata(


def enrich_and_persist_checks_metadata(
scan_reports: list[Report], s3_client: BaseClient, bucket: str, full_repo_object_key: str
scan_reports: list[Report], s3_client: BaseClient, bucket: str, full_repo_object_key: str
) -> dict[str, dict[str, str]]:
"""
Save checks metadata into bridgecrew's platform
Expand Down