From b0ce6e796854a978473fa433ddaeac64d28f7f3e Mon Sep 17 00:00:00 2001
From: Teo Voinea <58236992+tevoinea@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:17:02 -0400
Subject: [PATCH] Create directories if they don't exist in the template
 (#3522)

* Create directories if they don't exist in the template

* fmt
---
 src/agent/onefuzz-task/src/local/template.rs     |  8 ++++----
 .../onefuzz-task/tests/template_integration.rs   | 16 ++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/agent/onefuzz-task/src/local/template.rs b/src/agent/onefuzz-task/src/local/template.rs
index 73ae6e5e48..64b342744d 100644
--- a/src/agent/onefuzz-task/src/local/template.rs
+++ b/src/agent/onefuzz-task/src/local/template.rs
@@ -136,16 +136,16 @@ impl RunContext {
         name: impl AsRef<str>,
         path: impl AsRef<Path>,
     ) -> Result<SyncedDir> {
-        if !path.as_ref().exists() {
-            std::fs::create_dir_all(&path)?;
-        }
-
         self.to_sync_dir(name, path)?
             .monitor_count(&self.event_sender)
     }
 
     pub fn to_sync_dir(&self, name: impl AsRef<str>, path: impl AsRef<Path>) -> Result<SyncedDir> {
         let path = path.as_ref();
+        if !path.exists() {
+            std::fs::create_dir_all(path)?;
+        }
+
         let name = name.as_ref();
         let current_dir = std::env::current_dir()?;
         if self.create_job_dir {
diff --git a/src/agent/onefuzz-task/tests/template_integration.rs b/src/agent/onefuzz-task/tests/template_integration.rs
index d0e68e5d02..bcfefd3bda 100644
--- a/src/agent/onefuzz-task/tests/template_integration.rs
+++ b/src/agent/onefuzz-task/tests/template_integration.rs
@@ -4,6 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use path_absolutize::Absolutize;
 use tokio::fs;
 
 use anyhow::Result;
@@ -131,25 +132,20 @@ async fn create_test_directory(config: &Path, target_exe: &Path) -> Result<TestL
     test_directory = test_directory.canonicalize()?;
 
     let mut inputs_directory = PathBuf::from(&test_directory).join("inputs");
-    fs::create_dir(&inputs_directory).await?;
-    inputs_directory = inputs_directory.canonicalize()?;
+    inputs_directory = inputs_directory.absolutize()?.into();
 
     let mut crashes_directory = PathBuf::from(&test_directory).join("crashes");
-    fs::create_dir(&crashes_directory).await?;
-    crashes_directory = crashes_directory.canonicalize()?;
+    crashes_directory = crashes_directory.absolutize()?.into();
 
     let mut crashdumps_directory = PathBuf::from(&test_directory).join("crashdumps");
-    fs::create_dir(&crashdumps_directory).await?;
-    crashdumps_directory = crashdumps_directory.canonicalize()?;
+    crashdumps_directory = crashdumps_directory.absolutize()?.into();
 
     let mut coverage_directory = PathBuf::from(&test_directory).join("coverage");
-    fs::create_dir(&coverage_directory).await?;
-    coverage_directory = coverage_directory.canonicalize()?;
+    coverage_directory = coverage_directory.absolutize()?.into();
 
     let mut regression_reports_directory =
         PathBuf::from(&test_directory).join("regression_reports");
-    fs::create_dir(&regression_reports_directory).await?;
-    regression_reports_directory = regression_reports_directory.canonicalize()?;
+    regression_reports_directory = regression_reports_directory.absolutize()?.into();
 
     let mut target_in_test = PathBuf::from(&test_directory).join("fuzz.exe");
     fs::copy(target_exe, &target_in_test).await?;