refactor: reorganize templates directory structure

- Move templates/provision/tofu/ to templates/tofu/
- Move templates/provision/cloud-init.yml to templates/tofu/cloud-init.yml
- Remove empty templates/provision/ directory
- Update all code references to use new paths
- Update documentation in README.md
- All tests pass (unit, integration, container, e2e)

Author: josecelano

README.md

@@ -102,7 +102,7 @@ carmel exec -- ./bin/torrust-deploy provision
 
 This command will:
 
-1. Copy OpenTofu configuration templates from `templates/provision/` directory
+1. Copy OpenTofu configuration templates from `templates/tofu/` directory
 2. Initialize OpenTofu if needed
 3. Create a minimal Ubuntu 22.04 LTS VM with hardcoded configuration
 4. Wait for cloud-init completion via SSH monitoring

lib/TorrustDeploy/OpenTofu.pm

@@ -46,7 +46,7 @@ sub copy_templates {
     # Ensure tofu directory exists
     $tofu_dir->mkpath unless $tofu_dir->exists;
 
-    my $templates_dir = path('templates/provision');
+    my $templates_dir = path('templates');
 
     # Check if templates directory exists
     unless ($templates_dir->exists) {
@@ -65,7 +65,7 @@ sub copy_templates {
     say "Copied: $main_tf_template -> $main_tf_dest";
 
     # Copy cloud-init.yml template
-    my $cloud_init_template = $templates_dir->child('cloud-init.yml');
+    my $cloud_init_template = $templates_dir->child('tofu/cloud-init.yml');
     my $cloud_init_dest = $tofu_dir->child('cloud-init.yml');
 
     unless ($cloud_init_template->exists) {

t/e2e/provision.t

@@ -98,8 +98,8 @@ subtest 'cleanup leftover resources from previous runs' => sub {
 };
 
 # Ensure we have required templates
-ok(-f 'templates/provision/tofu/providers/libvirt/main.tf', 'Required OpenTofu template exists');
-ok(-f 'templates/provision/cloud-init.yml', 'Required cloud-init template exists');
+ok(-f 'templates/tofu/providers/libvirt/main.tf', 'Required OpenTofu template exists');
+ok(-f 'templates/tofu/cloud-init.yml', 'Required cloud-init template exists');
 
 subtest 'provision command executes successfully' => sub {
     plan tests => 3;

t/unit/command/provision.t

@@ -31,13 +31,13 @@ subtest 'Provision command is discoverable by app' => sub {
 
 subtest 'Template files exist and are readable' => sub {
     my $project_root = path($Bin)->parent->parent->parent;
-    my $templates_dir = $project_root->child('templates/provision');
+    my $templates_dir = $project_root->child('templates');
 
-    ok($templates_dir->exists, 'Templates/provision directory exists');
-    ok($templates_dir->is_dir, 'Templates/provision directory is a directory');
+    ok($templates_dir->exists, 'Templates directory exists');
+    ok($templates_dir->is_dir, 'Templates directory is a directory');
 
     my $main_tf_template = $templates_dir->child('tofu/providers/libvirt/main.tf');
-    my $cloud_init_template = $templates_dir->child('cloud-init.yml');
+    my $cloud_init_template = $templates_dir->child('tofu/cloud-init.yml');
 
     ok($main_tf_template->exists, 'main.tf template exists');
     ok($main_tf_template->is_file, 'main.tf template is a file');
@@ -50,15 +50,15 @@ subtest 'Template files exist and are readable' => sub {
 
 subtest 'Template files have expected content' => sub {
     my $project_root = path($Bin)->parent->parent->parent;
-    my $templates_dir = $project_root->child('templates/provision');
+    my $templates_dir = $project_root->child('templates');
 
     my $main_tf_content = $templates_dir->child('tofu/providers/libvirt/main.tf')->slurp_utf8;
     like($main_tf_content, qr/required_providers/, 'main.tf contains provider configuration');
     like($main_tf_content, qr/libvirt/, 'main.tf contains libvirt provider');
     like($main_tf_content, qr/libvirt_domain/, 'main.tf contains domain resource');
     like($main_tf_content, qr/torrust-tracker/, 'main.tf contains torrust-tracker VM name');
 
-    my $cloud_init_content = $templates_dir->child('cloud-init.yml')->slurp_utf8;
+    my $cloud_init_content = $templates_dir->child('tofu/cloud-init.yml')->slurp_utf8;
     like($cloud_init_content, qr/^#cloud-config/, 'cloud-init.yml has cloud-config header');
     like($cloud_init_content, qr/hostname:\s*torrust-tracker/, 'cloud-init.yml sets hostname');
     like($cloud_init_content, qr/name:\s*torrust/, 'cloud-init.yml creates torrust user');
@@ -77,10 +77,10 @@ subtest 'Provision command template copying functionality' => sub {
 
     # Test the _copy_templates method directly
     my $project_root = path($Bin)->parent->parent->parent;
-    my $templates_dir = $project_root->child('templates/provision');
+    my $templates_dir = $project_root->child('templates');
 
     # Test that template directory exists
-    ok($templates_dir->exists, 'Source templates/provision directory exists');
+    ok($templates_dir->exists, 'Source templates directory exists');
 
     # Create the target directory
     $test_tofu_dir->mkpath;
@@ -104,7 +104,7 @@ subtest 'Provision command template copying functionality' => sub {
 
     # Verify content matches the templates
     my $main_tf_template = $templates_dir->child('tofu/providers/libvirt/main.tf');
-    my $cloud_init_template = $templates_dir->child('cloud-init.yml');
+    my $cloud_init_template = $templates_dir->child('tofu/cloud-init.yml');
 
     is($target_main_tf->slurp_utf8, $main_tf_template->slurp_utf8, 'main.tf content matches template');
     is($target_cloud_init->slurp_utf8, $cloud_init_template->slurp_utf8, 'cloud-init.yml content matches template');

t/unit/opentofu.t

@@ -29,7 +29,7 @@ subtest 'OpenTofu template copying functionality' => sub {
     $test_tofu_dir->mkpath;
 
     # Verify templates directory exists before testing
-    my $templates_dir = path('templates/provision');
+    my $templates_dir = path('templates');
     skip_all "Templates directory not found: $templates_dir" unless $templates_dir->exists;
 
     # Test the copy_templates method
@@ -47,7 +47,7 @@ subtest 'OpenTofu template copying functionality' => sub {
 
     # Verify content matches the templates if templates exist
     my $main_tf_template = $templates_dir->child('tofu/providers/libvirt/main.tf');
-    my $cloud_init_template = $templates_dir->child('cloud-init.yml');
+    my $cloud_init_template = $templates_dir->child('tofu/cloud-init.yml');
 
     if ($main_tf_template->exists && $cloud_init_template->exists) {
         is($target_main_tf->slurp_utf8, $main_tf_template->slurp_utf8, 'main.tf content matches template');