Skip to content

Commit e639375

Browse files
committed
refactor: reorganize src/tofu module structure to eliminate redundant naming
- Move src/tofu/template_renderer.rs to src/tofu/template/renderer/mod.rs - Move src/tofu/cloud_init_template_renderer.rs to src/tofu/template/renderer/cloud_init.rs - Update src/tofu/mod.rs to use new template module structure - Create src/tofu/template/mod.rs with proper re-exports - Update all imports across codebase to use new module paths - Remove redundant '_template_renderer' suffix from file names - All 193 tests passing, all linters passing
1 parent b6f7eed commit e639375

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

src/commands/provision.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::steps::{
2727
PlanInfrastructureStep, RenderAnsibleTemplatesError, RenderAnsibleTemplatesStep,
2828
RenderOpenTofuTemplatesStep, WaitForCloudInitStep, WaitForSSHConnectivityStep,
2929
};
30-
use crate::tofu::{template_renderer::ProvisionTemplateError, TofuTemplateRenderer};
30+
use crate::tofu::{ProvisionTemplateError, TofuTemplateRenderer};
3131

3232
/// Comprehensive error type for the `ProvisionCommand`
3333
#[derive(Debug, thiserror::Error)]

src/steps/rendering/opentofu_templates.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::sync::Arc;
2121

2222
use tracing::{info, instrument};
2323

24-
use crate::tofu::template_renderer::{ProvisionTemplateError, TofuTemplateRenderer};
24+
use crate::tofu::{ProvisionTemplateError, TofuTemplateRenderer};
2525

2626
/// Simple step that renders `OpenTofu` templates to the build directory
2727
pub struct RenderOpenTofuTemplatesStep {

src/tofu/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
//!
1313
//! The module complements the `OpenTofu` command wrapper by providing the template
1414
15-
pub mod cloud_init_template_renderer;
16-
pub mod template_renderer;
15+
pub mod template;
1716

18-
pub use cloud_init_template_renderer::CloudInitTemplateRenderer;
19-
pub use template_renderer::TofuTemplateRenderer;
17+
pub use template::{CloudInitTemplateRenderer, ProvisionTemplateError, TofuTemplateRenderer};

src/tofu/template/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//! `OpenTofu` template functionality
2+
//!
3+
//! This module provides template-related functionality for `OpenTofu`,
4+
//! including specialized renderers for different types of configuration files.
5+
6+
pub mod renderer;
7+
8+
pub use renderer::cloud_init::{CloudInitTemplateError, CloudInitTemplateRenderer};
9+
pub use renderer::{ProvisionTemplateError, TofuTemplateRenderer};
File renamed without changes.

src/tofu/template_renderer.rs renamed to src/tofu/template/renderer/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@
3838
//! 10. **Extract provider-specific logic** - Separate LXD-specific logic to make it more
3939
//! extensible for other providers (Multipass, Docker, etc.) following the strategy pattern.
4040
41+
pub mod cloud_init;
42+
4143
use std::path::{Path, PathBuf};
4244
use std::sync::Arc;
4345
use thiserror::Error;
4446

4547
use crate::command_wrappers::ssh::credentials::SshCredentials;
4648
use crate::template::{TemplateManager, TemplateManagerError};
47-
use crate::tofu::cloud_init_template_renderer::{
49+
use crate::tofu::template::renderer::cloud_init::{
4850
CloudInitTemplateError, CloudInitTemplateRenderer,
4951
};
5052

0 commit comments

Comments
 (0)