refactor: convert ansible and opentofu subfolder fields to constants

Move ansible_subfolder and opentofu_subfolder from Config struct to dedicated constants in their respective infrastructure modules:

- Add ANSIBLE_SUBFOLDER constant to src/infrastructure/ansible/mod.rs
- Add OPENTOFU_SUBFOLDER constant to src/infrastructure/tofu/mod.rs
- Remove ansible_subfolder and opentofu_subfolder fields from Config struct
- Update all usage sites to reference new constants instead of config fields

This improves code organization by placing constants in their logical infrastructure modules and reduces Config struct complexity.

Author: josecelano

src/config/mod.rs

@@ -30,18 +30,6 @@ pub struct Config {
     /// will be left running for manual inspection or reuse.
     pub keep_env: bool,
 
-    /// Subdirectory name for Ansible-related files within the build directory.
-    ///
-    /// Ansible playbooks, inventory files, and configuration templates
-    /// will be rendered to `build_dir/{ansible_subfolder}/`.
-    pub ansible_subfolder: String,
-
-    /// Subdirectory name for OpenTofu-related files within the build directory.
-    ///
-    /// OpenTofu/Terraform configuration files and state will be managed
-    /// in `build_dir/{opentofu_subfolder}/`. Example: "tofu/lxd".
-    pub opentofu_subfolder: String,
-
     /// Directory containing template files for rendering configurations.
     ///
     /// This directory should contain subdirectories for different template
@@ -66,8 +54,6 @@ pub struct Config {
 impl Config {
     /// Creates a new configuration with the provided parameters.
     ///
-    /// The `ansible_subfolder` is set to "ansible" and `opentofu_subfolder` is set to "tofu/lxd" internally.
-    ///
     /// ```rust
     /// # use std::path::PathBuf;
     /// # use torrust_tracker_deploy::config::Config;
@@ -87,8 +73,6 @@ impl Config {
     ) -> Self {
         Self {
             keep_env,
-            ansible_subfolder: "ansible".to_string(),
-            opentofu_subfolder: "tofu/lxd".to_string(),
             templates_dir,
             project_root,
             build_dir,

src/container.rs

@@ -19,7 +19,9 @@ use crate::infrastructure::adapters::ansible::AnsibleClient;
 use crate::infrastructure::adapters::lxd::LxdClient;
 use crate::infrastructure::adapters::opentofu::OpenTofuClient;
 use crate::infrastructure::ansible::AnsibleTemplateRenderer;
+use crate::infrastructure::ansible::ANSIBLE_SUBFOLDER;
 use crate::infrastructure::tofu::TofuTemplateRenderer;
+use crate::infrastructure::tofu::OPENTOFU_SUBFOLDER;
 use crate::shared::ssh::SshCredentials;
 
 /// Service clients and renderers for performing actions
@@ -49,14 +51,13 @@ impl Services {
         let template_manager = Arc::new(template_manager);
 
         // Create OpenTofu client pointing to build/opentofu_subfolder directory
-        let opentofu_client =
-            OpenTofuClient::new(config.build_dir.join(&config.opentofu_subfolder));
+        let opentofu_client = OpenTofuClient::new(config.build_dir.join(OPENTOFU_SUBFOLDER));
 
         // Create LXD client for instance management
         let lxd_client = LxdClient::new();
 
         // Create Ansible client pointing to build/ansible_subfolder directory
-        let ansible_client = AnsibleClient::new(config.build_dir.join(&config.ansible_subfolder));
+        let ansible_client = AnsibleClient::new(config.build_dir.join(ANSIBLE_SUBFOLDER));
 
         // Create provision template renderer
         let tofu_template_renderer = TofuTemplateRenderer::new(

src/e2e/context.rs

@@ -26,6 +26,7 @@ use tracing::{info, warn};
 use crate::config::Config;
 use crate::container::Services;
 use crate::domain::Environment;
+use crate::infrastructure::tofu::OPENTOFU_SUBFOLDER;
 
 /// Errors that can occur during test context creation and initialization
 #[derive(Debug, thiserror::Error)]
@@ -317,7 +318,7 @@ impl Drop for TestContext {
                 TestContextType::VirtualMachine => {
                     // Try basic cleanup in case async cleanup failed
                     // Using emergency_destroy for consistent OpenTofu handling
-                    let tofu_dir = self.config.build_dir.join(&self.config.opentofu_subfolder);
+                    let tofu_dir = self.config.build_dir.join(OPENTOFU_SUBFOLDER);
 
                     if let Err(e) =
                         crate::infrastructure::adapters::opentofu::emergency_destroy(&tofu_dir)

src/e2e/environment.rs

@@ -27,6 +27,7 @@ use tracing::{info, warn};
 use crate::config::Config;
 use crate::container::Services;
 use crate::domain::{InstanceName, ProfileName};
+use crate::infrastructure::tofu::OPENTOFU_SUBFOLDER;
 use crate::shared::{ssh::SshCredentials, Username};
 
 /// Errors that can occur during test context creation and initialization
@@ -339,7 +340,7 @@ impl Drop for TestContext {
                 TestContextType::VirtualMachine => {
                     // Try basic cleanup in case async cleanup failed
                     // Using emergency_destroy for consistent OpenTofu handling
-                    let tofu_dir = self.config.build_dir.join(&self.config.opentofu_subfolder);
+                    let tofu_dir = self.config.build_dir.join(OPENTOFU_SUBFOLDER);
 
                     if let Err(e) =
                         crate::infrastructure::adapters::opentofu::emergency_destroy(&tofu_dir)

src/e2e/tasks/virtual_machine/preflight_cleanup.rs

@@ -10,6 +10,7 @@ use crate::e2e::tasks::preflight_cleanup::{
 };
 use crate::infrastructure::adapters::lxd::client::LxdClient;
 use crate::infrastructure::adapters::opentofu::{self};
+use crate::infrastructure::tofu::OPENTOFU_SUBFOLDER;
 use tracing::{info, warn};
 
 /// Performs comprehensive pre-flight cleanup for VM-based E2E tests
@@ -84,10 +85,7 @@ pub fn cleanup_lingering_resources(
 fn cleanup_opentofu_infrastructure(
     test_context: &TestContext,
 ) -> Result<(), PreflightCleanupError> {
-    let tofu_dir = test_context
-        .config
-        .build_dir
-        .join(&test_context.config.opentofu_subfolder);
+    let tofu_dir = test_context.config.build_dir.join(OPENTOFU_SUBFOLDER);
 
     if !tofu_dir.exists() {
         info!(

src/infrastructure/ansible/mod.rs

@@ -5,7 +5,12 @@
 //!
 //! The main component is `AnsibleTemplateRenderer` which handles the generation
 //! of Ansible configuration files with dynamic content like VM IP addresses and SSH keys.
-
 pub mod template;
 
 pub use template::{AnsibleTemplateRenderer, InventoryTemplateRenderer};
+
+/// Subdirectory name for Ansible-related files within the build directory.
+///
+/// Ansible playbooks, inventory files, and configuration templates
+/// will be rendered to `build_dir/{ANSIBLE_SUBFOLDER}/`.
+pub const ANSIBLE_SUBFOLDER: &str = "ansible";

src/infrastructure/tofu/mod.rs

@@ -11,7 +11,12 @@
 //! - Template processing for infrastructure definitions
 //!
 //! The module complements the `OpenTofu` command wrapper by providing the template
-
 pub mod template;
 
 pub use template::{CloudInitTemplateRenderer, ProvisionTemplateError, TofuTemplateRenderer};
+
+/// Subdirectory name for OpenTofu-related files within the build directory.
+///
+/// OpenTofu/Terraform configuration files and state will be managed
+/// in `build_dir/{OPENTOFU_SUBFOLDER}/`. Example: "tofu/lxd".
+pub const OPENTOFU_SUBFOLDER: &str = "tofu/lxd";