Skip to content

CM-41217 - Fix restore file in monitor SCA scanning #263

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
MarshalX merged 3 commits into from
Nov 7, 2024
Merged

CM-41217 - Fix restore file in monitor SCA scanning #263

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a004ca
CM-41217 Add absolute path to document
naftalicy Nov 7, 2024
c89c81e
CM-41217 Fix absolute path
naftalicy Nov 7, 2024
9a06df8
Merge branch 'main' into CM-41217-sbt-lock-restore
naftalicy Nov 7, 2024
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
3 changes: 2 additions & 1 deletion cycode/cli/files_collector/sca/base_restore_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def get_manifest_file_path(self, document: Document) -> str:
def try_restore_dependencies(self, document: Document) -> Optional[Document]:
manifest_file_path = self.get_manifest_file_path(document)
restore_file_path = build_dep_tree_path(document.absolute_path, self.get_lock_file_name())
relative_restore_file_path = build_dep_tree_path(document.path, self.get_lock_file_name())
working_directory_path = self.get_working_directory(document)

if self.verify_restore_file_already_exist(restore_file_path):
Expand All @@ -70,7 +71,7 @@ def try_restore_dependencies(self, document: Document) -> Optional[Document]:
)
restore_file_content = get_file_content(restore_file_path)

return Document(restore_file_path, restore_file_content, self.is_git_diff)
return Document(relative_restore_file_path, restore_file_content, self.is_git_diff)

def get_working_directory(self, document: Document) -> Optional[str]:
return None
Expand Down