Fix bundle creation (#93)

.gitignore

@@ -1,3 +1,7 @@
+# Don't include any debug bundle generated during a run of Broker or FOSSA CLI.
+fossa.broker.debug.tar.gz
+fossa.debug.json.gz
+
 # Node isn't used for this actual project, but we have a node test fixture
 # to make tests run faster.
 node_modules

CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## v0.2.2
+
+Bug fix: 
+
+- Broker now copies its debug bundle (generated during `broker fix`) from the system temp location instead of renaming.
+  This resolves issues preventing debug bundles from being stored for Linux installations where the temporary location
+  and the home folder are on separate mount points.
+
 ## v0.2.1
 
 Features:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "broker"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "The bridge between FOSSA and internal DevOps services"
 readme = "README.md"

src/debug/bundler.rs

@@ -1,6 +1,6 @@
 //! Trait and implementations used by `bundle` to create debug bundles.
 
-use std::path::Path;
+use std::{fs, path::Path};
 
 use error_stack::Result;
 use libflate::gzip;
@@ -50,6 +50,7 @@ impl TarGz {
     ///
     /// This bundles the provided debug artifacts using a backing temp file,
     /// which is moved to a final location with the `finalize` method.
+    #[tracing::instrument]
     pub fn new() -> Result<Self, Error> {
         let file = NamedTempFile::new().context(Error::CreateTempFile)?;
         let encoder = gzip::Encoder::new(file).context(Error::CreateBundler)?;
@@ -62,6 +63,7 @@ impl TarGz {
 impl Bundler for TarGz {
     type Error = std::io::Error;
 
+    #[tracing::instrument(skip_all, fields(path = %path.as_ref().display(), name = %name.as_ref().display()))]
     fn add_file<P, N>(&mut self, path: P, name: N) -> std::result::Result<(), Self::Error>
     where
         P: AsRef<Path>,
@@ -70,11 +72,17 @@ impl Bundler for TarGz {
         self.inner.append_path_with_name(path, name)
     }
 
+    #[tracing::instrument(skip_all, fields(destination = %destination.as_ref().display()))]
     fn finalize<P: AsRef<Path>>(self, destination: P) -> std::result::Result<Bundle, Self::Error> {
         let zip = self.inner.into_inner()?;
         let handle = zip.finish().into_result()?;
         handle.as_file().sync_all()?;
-        handle.persist(&destination)?;
+
+        // `handle.persist` fails if asked to persist across mounts, since internally it uses a rename.
+        // Instead, just copy the file from temp.
+        let path = handle.into_temp_path();
+        fs::copy(&path, destination.as_ref())?;
+
         Ok(Bundle {
             location: destination.as_ref().to_path_buf(),
         })