From 79b535bb597d66306b88dc59199ba6d56f593ccf Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Fri, 27 Feb 2026 01:25:25 +0000
Subject: [PATCH] fix: code quality improvements

- Remove duplicate variables (alpaca_count, llama_count)
- Remove unused variables (vm_name, disk_type)
- Fix outputs to use correct variable names
- Fix cloud-init template to not overwrite source file
- Fix hardcoded hostname in cloud-init template
- Fix typo in SSH_KEY_PUBLIC description
---
 terraform/cloud-init.tf                       |  6 ++---
 ...init_global.yaml => cloud_init_global.tpl} |  3 +--
 terraform/outputs.tf                          |  5 ++---
 terraform/terraform.tfvars                    |  4 +---
 terraform/variables.tf                        | 22 +------------------
 5 files changed, 7 insertions(+), 33 deletions(-)
 rename terraform/files/{cloud_init_global.yaml => cloud_init_global.tpl} (98%)

diff --git a/terraform/cloud-init.tf b/terraform/cloud-init.tf
index 39f2a71..969bc9b 100644
--- a/terraform/cloud-init.tf
+++ b/terraform/cloud-init.tf
@@ -1,7 +1,5 @@
-### Global cloud-init template (for all VMs)
-
 data "template_file" "cloud_init_global" {
-  template = file("${path.module}/files/cloud_init_global.yaml")
+  template = file("${path.module}/files/cloud_init_global.tpl")
 
   vars = {
     hostname       = "generic"
@@ -13,5 +11,5 @@ data "template_file" "cloud_init_global" {
 
 resource "local_file" "cloud_init_global" {
   content  = data.template_file.cloud_init_global.rendered
-  filename = "${path.module}/files/cloud_init_global.yaml"
+  filename = "${path.module}/files/rendered/cloud_init_global.yaml"
 }
diff --git a/terraform/files/cloud_init_global.yaml b/terraform/files/cloud_init_global.tpl
similarity index 98%
rename from terraform/files/cloud_init_global.yaml
rename to terraform/files/cloud_init_global.tpl
index 1236010..daf3b15 100644
--- a/terraform/files/cloud_init_global.yaml
+++ b/terraform/files/cloud_init_global.tpl
@@ -1,6 +1,5 @@
 #cloud-config
-#cloud-config
-hostname: myvm
+hostname: ${hostname}
 manage_etc_hosts: true
 resolv_conf:
   nameservers:
diff --git a/terraform/outputs.tf b/terraform/outputs.tf
index 6c767ec..148cb0f 100644
--- a/terraform/outputs.tf
+++ b/terraform/outputs.tf
@@ -1,6 +1,6 @@
 output "alpaca_vm_ids" {
   value = {
-    for i in range(var.alpaca_count) :
+    for i in range(var.alpaca_vm_count) :
     "alpaca-${i + 1}" => proxmox_vm_qemu.alpacas[i].vmid
   }
 }
@@ -11,7 +11,7 @@ output "alpaca_vm_names" {
 
 output "llama_vm_ids" {
   value = {
-    for i in range(var.llama_count) :
+    for i in range(var.llama_vm_count) :
     "llama-${i + 1}" => proxmox_vm_qemu.llamas[i].vmid
   }
 }
@@ -19,4 +19,3 @@ output "llama_vm_ids" {
 output "llama_vm_names" {
   value = [for vm in proxmox_vm_qemu.llamas : vm.name]
 }
-
diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars
index 486074c..b91f2d7 100644
--- a/terraform/terraform.tfvars
+++ b/terraform/terraform.tfvars
@@ -1,12 +1,10 @@
 target_node    = "flex"
 clone_template = "ubuntu-cloudinit"
-vm_name        = "alpine-vm"
 cores          = 1
 memory         = 1024
 disk_size      = "15G"
 sockets        = 1
 bridge         = "vmbr0"
-disk_type      = "scsi"
 storage        = "Flash"
 pm_api_url     = "https://100.105.0.115:8006/api2/json"
-pm_user        = "terraform-prov@pve"
\ No newline at end of file
+pm_user        = "terraform-prov@pve"
diff --git a/terraform/variables.tf b/terraform/variables.tf
index c05239f..737b552 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -10,10 +10,6 @@ variable "clone_template" {
   type = string
 }
 
-variable "vm_name" {
-  type = string
-}
-
 variable "cores" {
   type = number
 }
@@ -34,10 +30,6 @@ variable "bridge" {
   type = string
 }
 
-variable "disk_type" {
-  type = string
-}
-
 variable "storage" {
   type = string
 }
@@ -50,18 +42,6 @@ variable "pm_user" {
   type = string
 }
 
-variable "alpaca_count" {
-  type        = number
-  default     = 1
-  description = "How many Alpaca VMs to create"
-}
-
-variable "llama_count" {
-  type        = number
-  default     = 1
-  description = "How many Llama VMs to create"
-}
-
 variable "alpaca_vm_count" {
   type        = number
   default     = 1
@@ -81,5 +61,5 @@ variable "TS_AUTHKEY" {
 
 variable "SSH_KEY_PUBLIC" {
   type        = string
-  description = "My Public SSH key fo ssh auth list"
+  description = "My Public SSH key for ssh auth list"
 }