Modify copy of unpacked bundle

This resolves write issues when the provided and unpacked bundle is
readonly.

Author: rvermeulen

codeql_bundle/helpers/bundle.py

@@ -23,11 +23,14 @@ class BundleException(Exception):
 
 class Bundle:
     def __init__(self, bundle_path: Path) -> None:
-        self.tmp_dir = None
+        self.tmp_dir = TemporaryDirectory()
         if bundle_path.is_dir():
-            self.bundle_path = bundle_path
+            self.bundle_path = Path(self.tmp_dir.name) / bundle_path.name
+            shutil.copytree(
+                bundle_path,
+                self.bundle_path,
+            )
         elif bundle_path.is_file() and bundle_path.name.endswith(".tar.gz"):
-            self.tmp_dir = TemporaryDirectory()
             logging.info(
                 f"Unpacking provided bundle {bundle_path} to {self.tmp_dir.name}."
             )
@@ -40,6 +43,8 @@ def __init__(self, bundle_path: Path) -> None:
         self.codeql = CodeQL(self.bundle_path / "codeql")
         try:
             logging.info(f"Validating the CodeQL CLI version part of the bundle.")
+            unpacked_location = self.codeql.unpacked_location()
+            logging.debug(f"Found CodeQL CLI in {str(unpacked_location)}.")
             version = self.codeql.version()
             logging.info(f"Found CodeQL CLI version {version}.")
         except CodeQLException:

codeql_bundle/helpers/codeql.py

@@ -83,6 +83,14 @@ def version(self) -> Version:
         else:
             raise CodeQLException(f"Failed to run {cp.args} command!")
 
+    def unpacked_location(self) -> Path:
+        cp = self._exec("version", "--format=json")
+        if cp.returncode == 0:
+            version_info = json.loads(cp.stdout)
+            return Path(version_info["unpackedLocation"])
+        else:
+            raise CodeQLException(f"Failed to run {cp.args} command!")
+
     def supports_qlx(self) -> bool:
         return self.version() >= Version("2.11.4")
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codeql-bundle"
-version = "0.1.3"
+version = "0.1.4"
 description = "Tool to create custom CodeQL bundles"
 authors = ["Remco Vermeulen <[email protected]>"]
 readme = "README.md"