adding option to specify a custom lock file to be copied over pre-ins…

…tall
emarteca · Jul 7, 2023 · 76be9c1 · 76be9c1
1 parent 7d2f03b
commit 76be9c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/diagnose_github_repo.py b/src/diagnose_github_repo.py
@@ -27,6 +27,7 @@ class RepoWalker():
 	RM_AFTER_CLONING = False
 	SCRIPTS_OVER_CODE = []
 	CUSTOM_SETUP_SCRIPTS = []
+	CUSTOM_LOCK_FILES = []
 	QL_QUERIES = []
 
 	DO_INSTALL = True
@@ -93,6 +94,8 @@ def set_up_config( self, config_file):
 		cf_dict = config_json.get( "install", {})
 		self.DO_INSTALL = cf_dict.get("do_install", self.DO_INSTALL)
 		self.INSTALL_TIMEOUT = cf_dict.get("timeout", self.INSTALL_TIMEOUT)
+		self.CUSTOM_LOCK_FILES = [ os.path.abspath(os.path.dirname(config_file if config_file else __file__)) + "/" + p 
+											for p in cf_dict.get( "custom_lock_files", self.CUSTOM_LOCK_FILES)]
 
 		cf_dict = config_json.get( "build", {})
 		self.TRACK_BUILD = cf_dict.get("track_build", self.TRACK_BUILD)

diff --git a/src/diagnose_npm_package.py b/src/diagnose_npm_package.py
@@ -20,6 +20,7 @@ class NPMSpider(scrapy.Spider):
 	RM_AFTER_CLONING = False
 	SCRIPTS_OVER_CODE = []
 	CUSTOM_SETUP_SCRIPTS = []
+	CUSTOM_LOCK_FILES = []
 	QL_QUERIES = []
 
 	DO_INSTALL = True
@@ -85,6 +86,8 @@ def set_up_config( self, config_file):
 		cf_dict = config_json.get( "install", {})
 		self.DO_INSTALL = cf_dict.get("do_install", self.DO_INSTALL)
 		self.INSTALL_TIMEOUT = cf_dict.get("timeout", self.INSTALL_TIMEOUT)
+		self.CUSTOM_LOCK_FILES = [ os.path.abspath(os.path.dirname(config_file if config_file else __file__)) + "/" + p 
+											for p in cf_dict.get( "custom_lock_files", self.CUSTOM_LOCK_FILES)]
 
 		cf_dict = config_json.get( "build", {})
 		self.TRACK_BUILD = cf_dict.get("track_build", self.TRACK_BUILD)

diff --git a/src/test_JS_repo_lib.py b/src/test_JS_repo_lib.py
@@ -307,6 +307,11 @@ def diagnose_package( repo_link, crawler, commit_SHA=None):
 		return( on_diagnose_exit( json_out, crawler, cur_dir, repo_name))
 
 	manager = ""
+	# if there's custom lock files, copy them into the repo (repo is "." since we're in the repo currently)
+	if crawler.CUSTOM_LOCK_FILES != []:
+		for custom_lock in crawler.CUSTOM_LOCK_FILES:
+			run_command("cp " + custom_lock + " .")
+
 	# first, check if there is a custom install
 	# this runs custom scripts the same way as the scripts_over_code below; only 
 	# difference is it's before the npm-filter run