fix: refactored variables; updated description

Author: owlleg6

main.tf

@@ -6,7 +6,7 @@ locals {
 }
 
 resource "azurerm_public_ip" "this" {
-  count = var.network_interface.public_ip_enabled ? 1 : 0
+  count = var.public_ip_enabled ? 1 : 0
 
   name                = local.public_ip
   resource_group_name = var.resource_group
@@ -23,8 +23,8 @@ resource "azurerm_network_interface" "this" {
   ip_configuration {
     name                          = "ip-config-${var.project}-${var.env}-${var.location}"
     subnet_id                     = var.subnet_id
-    private_ip_address_allocation = var.network_interface.private_ip_address_allocation
-    public_ip_address_id          = var.network_interface.public_ip_enabled ? azurerm_public_ip.this[0].id : null
+    private_ip_address_allocation = var.network_interface_private_ip_address_allocation
+    public_ip_address_id          = try(azurerm_public_ip.this[0].id, null)
   }
 }
 
@@ -35,7 +35,7 @@ resource "azurerm_linux_virtual_machine" "this" {
   size                            = var.vm_size
   admin_username                  = var.vm_admin_username
   tags                            = var.tags
-  network_interface_ids           = [azurerm_network_interface.this.id, ]
+  network_interface_ids           = [azurerm_network_interface.this.id]
   admin_password                  = var.vm_admin_password
   disable_password_authentication = var.password_access_enabled ? false : true
 

outputs.tf

@@ -4,6 +4,11 @@ output "id" {
 }
 
 output "identity" {
-  value       = try(azurerm_linux_virtual_machine.this.identity[0].principal_id, null)
+  value       = var.identity_enabled ? azurerm_linux_virtual_machine.this.identity : [] #[0].principal_id : ""
   description = "linux virtual machine Identities list"
 }
+
+output "public_ip" {
+  value = azurerm_public_ip.this[0].ip_address
+  description = "Linux Virtual Machine public IP address"
+}

variables.tf

@@ -48,27 +48,27 @@ variable "tags" {
   default     = {}
 }
 
+variable "subnet_id" {
+  type        = string
+  description = "The ID of the Subnet where this Network Interface should be located in."
+}
+
+variable "public_ip_enabled" {
+  type        = bool
+  description = "Boolean flag to enable Public Ip address creation and assignment to Virtual Machine"
+  default     = true
+}
+
 variable "public_ip_allocation_method" {
   type        = string
   description = "Defines the allocation method for this IP address. Possible values are Static or Dynamic"
   default     = "Dynamic"
 }
 
-variable "subnet_id" {
+variable "network_interface_private_ip_address_allocation" {
   type        = string
-  description = "The ID of the Subnet where this Network Interface should be located in."
-}
-
-variable "network_interface" {
-  type = object({
-    private_ip_address_allocation = string
-    public_ip_enabled             = bool
-  })
-  description = "Objects to configure network interface"
-  default = {
-    private_ip_address_allocation = "Dynamic"
-    public_ip_enabled             = true
-  }
+  description = "The allocation method used for the Private IP Address."
+  default     = "Dynamic"
 }
 
 variable "vm_size" {
@@ -99,40 +99,30 @@ variable "admin_ssh_key" {
 
 variable "os_disk" {
   type = object({
-    caching              = string
-    storage_account_type = string
+    caching              = optional(string, "ReadWrite")
+    storage_account_type = optional(string, "Standard_LRS")
   })
   description = "Objects to configure os disk reference for virtual machine"
-  default = {
-    caching              = "ReadWrite"
-    storage_account_type = "Standard_LRS"
-  }
 }
 
 variable "source_image_reference" {
   type = object({
-    publisher = string
-    offer     = string
-    sku       = string
-    version   = string
+    publisher = optional(string, "Canonical")
+    offer     = optional(string, "0001-com-ubuntu-server-focal")
+    sku       = optional(string, "20_04-lts")
+    version   = optional(string, "latest")
   })
   description = "Objects to configure source image reference for virtual machine"
-  default = {
-    publisher = "Canonical"
-    offer     = "0001-com-ubuntu-server-focal"
-    sku       = "20_04-lts"
-    version   = "latest"
-  }
 }
 
 variable "identity_enabled" {
   type        = bool
-  description = "identity enabled"
+  description = "Boolean flag than enables creation of System Assigned identity to VM"
   default     = false
 }
 
 variable "password_access_enabled" {
   type        = bool
-  description = "Vm password access enabled"
+  description = "Boolean flag that enables access using password"
   default     = false
 }