From ea4a1abb8aa24d250b3fb7ca816ea15ee277113f Mon Sep 17 00:00:00 2001
From: Cheick Keita <chkeita@microsoft.com>
Date: Mon, 21 Aug 2023 09:39:54 -0700
Subject: [PATCH] Fix local path generation (#3432)

* Fix local path generation

* format

* fix test
---
 src/agent/onefuzz-agent/src/log_uploader.rs | 29 ---------------------
 src/agent/onefuzz/src/blob/url.rs           | 23 +++++++++++++---
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/agent/onefuzz-agent/src/log_uploader.rs b/src/agent/onefuzz-agent/src/log_uploader.rs
index 6bccc0bef2..d424013421 100644
--- a/src/agent/onefuzz-agent/src/log_uploader.rs
+++ b/src/agent/onefuzz-agent/src/log_uploader.rs
@@ -210,32 +210,3 @@ async fn sync_file(
     blob_client.append_block(Body::from(f)).await?;
     Ok(len)
 }
-
-#[cfg(test)]
-mod tests {
-    use std::io::Seek;
-
-    use anyhow::Result;
-    use tokio::io::{AsyncReadExt, AsyncSeekExt};
-
-    #[allow(clippy::unused_io_amount)]
-    #[tokio::test]
-    #[ignore]
-
-    async fn test_seek_behavior() -> Result<()> {
-        let path = "C:\\temp\\test.ps1";
-        let mut std_file = std::fs::File::open(path)?;
-        std_file.seek(std::io::SeekFrom::Start(3))?;
-
-        let mut tokio_file = tokio::fs::File::from_std(std_file);
-
-        let buf = &mut [0u8; 5];
-        tokio_file.read(buf).await?;
-        println!("******** buf {:?}", buf);
-        tokio_file.seek(std::io::SeekFrom::Start(0)).await?;
-        tokio_file.read(buf).await?;
-        println!("******** buf {:?}", buf);
-
-        Ok(())
-    }
-}
diff --git a/src/agent/onefuzz/src/blob/url.rs b/src/agent/onefuzz/src/blob/url.rs
index f55ffbb23a..134b59dea0 100644
--- a/src/agent/onefuzz/src/blob/url.rs
+++ b/src/agent/onefuzz/src/blob/url.rs
@@ -192,10 +192,15 @@ impl BlobContainerUrl {
     }
 
     pub fn as_path(&self, prefix: impl AsRef<Path>) -> Result<PathBuf> {
-        let dir = self
-            .account()
-            .ok_or_else(|| anyhow!("Invalid container Url"))?;
-        Ok(prefix.as_ref().join(dir))
+        match (self.account(), self.container()) {
+            (Some(account), Some(container)) => {
+                let mut path = PathBuf::new();
+                path.push(account);
+                path.push(container);
+                Ok(prefix.as_ref().join(path))
+            }
+            _ => bail!("Invalid container Url"),
+        }
     }
 }
 
@@ -526,4 +531,14 @@ mod tests {
             "id:000000,sig:06,src:000000,op:havoc,rep:128"
         );
     }
+
+    #[test]
+    fn test_as_path() -> Result<()> {
+        let root = PathBuf::from(r"/onefuzz");
+        let url = BlobContainerUrl::parse("https://myaccount.blob.core.windows.net/mycontainer")?;
+        let path = url.as_path(root)?;
+        assert_eq!(PathBuf::from(r"/onefuzz/myaccount/mycontainer"), path);
+
+        Ok(())
+    }
 }