Skip to content

Commit d74b0e5

Browse files
committed
fix duplication of SCA related files in ZIP archive
1 parent 0be85fd commit d74b0e5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cycode/cli/files_collector/sca/npm/restore_npm_dependencies.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ def get_lock_file_name(self) -> str:
3737
def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
3838
return os.path.isfile(restore_file_path)
3939

40-
def prepare_manifest_file_path_for_command(self, manifest_file_path: str) -> str:
40+
@staticmethod
41+
def prepare_manifest_file_path_for_command(manifest_file_path: str) -> str:
4142
return manifest_file_path.replace(os.sep + NPM_MANIFEST_FILE_NAME, '')

cycode/cli/files_collector/sca/sca_code_scanner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,15 @@ def try_restore_dependencies(
124124
def add_dependencies_tree_document(
125125
ctx: typer.Context, documents_to_scan: List[Document], is_git_diff: bool = False
126126
) -> None:
127-
documents_to_add: Dict[str, Document] = {}
127+
documents_to_add: Dict[str, Document] = {document.path: document for document in documents_to_scan}
128128
restore_dependencies_list = restore_handlers(ctx, is_git_diff)
129129

130130
for restore_dependencies in restore_dependencies_list:
131131
for document in documents_to_scan:
132132
try_restore_dependencies(ctx, documents_to_add, restore_dependencies, document)
133133

134-
documents_to_scan.extend(list(documents_to_add.values()))
134+
# mutate original list using slice assignment
135+
documents_to_scan[:] = list(documents_to_add.values())
135136

136137

137138
def restore_handlers(ctx: typer.Context, is_git_diff: bool) -> List[BaseRestoreDependencies]:

0 commit comments

Comments
 (0)