Skip to content

CM-25340 - Fix list modification while in a for loop #143

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

Merged
merged 1 commit into from
Jul 18, 2023
Merged

CM-25340 - Fix list modification while in a for loop #143

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
16 changes: 9 additions & 7 deletions cycode/cli/helpers/sca_code_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ def perform_pre_hook_range_scan_actions(
def add_ecosystem_related_files_if_exists(
documents: List[Document], repo: Optional[Repo] = None, commit_rev: Optional[str] = None
) -> None:
documents_to_add: List[Document] = []
for doc in documents:
ecosystem = get_project_file_ecosystem(doc)
if ecosystem is None:
logger.debug('failed to resolve project file ecosystem: %s', doc.path)
continue
documents_to_add = get_doc_ecosystem_related_project_files(doc, documents, ecosystem, commit_rev, repo)
documents.extend(documents_to_add)

documents_to_add.extend(get_doc_ecosystem_related_project_files(doc, documents, ecosystem, commit_rev, repo))

documents.extend(documents_to_add)


def get_doc_ecosystem_related_project_files(
Expand All @@ -59,11 +62,10 @@ def get_doc_ecosystem_related_project_files(
for ecosystem_project_file in consts.PROJECT_FILES_BY_ECOSYSTEM_MAP.get(ecosystem):
file_to_search = join_paths(get_file_dir(doc.path), ecosystem_project_file)
if not is_project_file_exists_in_documents(documents, file_to_search):
file_content = (
get_file_content_from_commit(repo, commit_rev, file_to_search)
if repo
else get_file_content(file_to_search)
)
if repo:
file_content = get_file_content_from_commit(repo, commit_rev, file_to_search)
else:
file_content = get_file_content(file_to_search)

if file_content is not None:
documents_to_add.append(Document(file_to_search, file_content))
Expand Down