fix: [#37] add data directory cleanup to E2E preflight

- Add cleanup_data_environment() helper to preflight_cleanup.rs
- Clean data/{environment_name} directory before E2E test runs
- Call from both container and VM preflight cleanup functions
- Prevents "environment already exists" errors from stale state
- Ensures proper test isolation by starting with clean data directory
- Follows same pattern as build and templates directory cleanup

Co-authored-by: josecelano <[email protected]>

Author: Copilot

src/testing/e2e/tasks/container/preflight_cleanup.rs

@@ -8,7 +8,8 @@
 use crate::shared::command::CommandExecutor;
 use crate::testing::e2e::context::TestContext;
 use crate::testing::e2e::tasks::preflight_cleanup::{
-    cleanup_build_directory, cleanup_templates_directory, PreflightCleanupError,
+    cleanup_build_directory, cleanup_data_environment, cleanup_templates_directory,
+    PreflightCleanupError,
 };
 use tracing::{info, warn};
 
@@ -44,6 +45,9 @@ pub fn preflight_cleanup_previous_resources(
     // Clean the templates directory to ensure fresh embedded template extraction for E2E tests
     cleanup_templates_directory(env)?;
 
+    // Clean the data directory to ensure fresh environment state for E2E tests
+    cleanup_data_environment(env)?;
+
     // Clean up any hanging Docker containers from interrupted test runs
     cleanup_hanging_docker_containers(env);
 

src/testing/e2e/tasks/preflight_cleanup.rs

@@ -192,3 +192,79 @@ pub fn cleanup_templates_directory(
         }
     }
 }
+
+/// Cleans the data directory for the test environment to ensure fresh state for E2E tests
+///
+/// This function removes the environment's data directory if it exists, ensuring that
+/// E2E tests start with a clean state and don't encounter conflicts with stale
+/// environment data from previous test runs. This prevents "environment already exists"
+/// errors and ensures proper test isolation.
+///
+/// # Safety
+///
+/// This function is only intended for E2E test environments and should never
+/// be called in production code paths. It's designed to provide test isolation
+/// by ensuring fresh environment state for each test run.
+///
+/// # Arguments
+///
+/// * `test_context` - The test context containing the environment configuration
+///
+/// # Returns
+///
+/// Returns `Ok(())` if cleanup succeeds or if the data directory doesn't exist.
+///
+/// # Errors
+///
+/// Returns a `PreflightCleanupError::ResourceConflicts` error if the data directory
+/// cannot be removed due to permission issues or file locks.
+pub fn cleanup_data_environment(test_context: &TestContext) -> Result<(), PreflightCleanupError> {
+    use std::path::Path;
+
+    // Construct the data directory path: data/{environment_name}
+    let data_dir = Path::new("data").join(test_context.environment.name().as_str());
+
+    if !data_dir.exists() {
+        info!(
+            operation = "data_directory_cleanup",
+            status = "clean",
+            path = %data_dir.display(),
+            "Data directory doesn't exist, skipping cleanup"
+        );
+        return Ok(());
+    }
+
+    info!(
+        operation = "data_directory_cleanup",
+        path = %data_dir.display(),
+        "Cleaning data directory for previous test environment"
+    );
+
+    match std::fs::remove_dir_all(&data_dir) {
+        Ok(()) => {
+            info!(
+                operation = "data_directory_cleanup",
+                status = "success",
+                path = %data_dir.display(),
+                "Data directory cleaned successfully"
+            );
+            Ok(())
+        }
+        Err(e) => {
+            warn!(
+                operation = "data_directory_cleanup",
+                status = "failed",
+                path = %data_dir.display(),
+                error = %e,
+                "Failed to clean data directory"
+            );
+            Err(PreflightCleanupError::ResourceConflicts {
+                details: format!(
+                    "Failed to clean data directory '{}': {}",
+                    data_dir.display(),
+                    e
+                ),
+            })
+        }
+    }
+}

src/testing/e2e/tasks/virtual_machine/preflight_cleanup.rs

@@ -9,7 +9,8 @@ use crate::adapters::tofu;
 use crate::infrastructure::external_tools::tofu::OPENTOFU_SUBFOLDER;
 use crate::testing::e2e::context::TestContext;
 use crate::testing::e2e::tasks::preflight_cleanup::{
-    cleanup_build_directory, cleanup_templates_directory, PreflightCleanupError,
+    cleanup_build_directory, cleanup_data_environment, cleanup_templates_directory,
+    PreflightCleanupError,
 };
 use tracing::{info, warn};
 
@@ -44,6 +45,9 @@ pub fn preflight_cleanup_previous_resources(
     // Clean the templates directory to ensure fresh embedded template extraction for E2E tests
     cleanup_templates_directory(test_context)?;
 
+    // Clean the data directory to ensure fresh environment state for E2E tests
+    cleanup_data_environment(test_context)?;
+
     // Clean any existing OpenTofu infrastructure from previous test runs
     cleanup_opentofu_infrastructure(test_context)?;