fix: fix variables

dmytro_velychko3 · dmytro_velychko3 · commit f8086c3130b6 · 2023-07-17T11:12:11.000+03:00
diff --git a/README.md b/README.md
@@ -59,20 +59,23 @@ module "linux_virtual_machine" {
 | <a name="input_project"></a> [project](#input\_project)| Project name | `string` | n/a | yes |
 | <a name="input_env"></a> [env](#input\_env)| Environment name | `string` | n/a | yes |
 | <a name="input_resource_group"></a> [resource\_group](#input\_resource\_group)| The name of the resource group | `string` | n/a | yes |
-| <a name="input_location"></a> [location](#input\_location)| Azure location | `string` | n/a | yes |
 | <a name="input_suffix"></a> [suffix](#input\_suffix)| Optional suffix that would be added to the end of resources names. It is recommended to use dash at the beginning of variable (e.x., '-example') | `string` | "" | no |
+| <a name="input_location"></a> [location](#input\_location)| Azure location | `string` | n/a | yes |
 | <a name="input_custom_virtual_machine_name"></a> [custom\_virtual\_machine\_name](#input\_custom\_virtual\_machine\_name)| Specifies the name of the virtual machine name resource | `string` | null | no |
 | <a name="input_custom_network_interface_name"></a> [custom\_network\_interface\_name](#input\_custom\_network\_interface\_name)| Specifies the name of the virtual machine interface name resource | `string` | null | no |
 | <a name="input_custom_public_ip_name"></a> [custom\_public\_ip\_name](#input\_custom\_public\_ip\_name)| Specifies the name of the public ip name name resource | `string` | null | no |
 | <a name="input_tags"></a> [tags](#input\_tags)| Resource tags | map(any) | {} | no |
 | <a name="input_public_ip_allocation_method"></a> [public\_ip\_allocation\_method](#input\_public\_ip\_allocation_method)| Defines the allocation method for this IP address. Possible values are Static or Dynamic | map(any) | Dynamic | no |
 | <a name="input_subnet_id"></a> [subnet\_id](#input\_subnet\_id)| The ID of the Subnet where this Network Interface should be located in. | `string` | n/a | yes |
 | <a name="input_network_interface"></a> [network\_interface](#input\_network\_interface)| Objects to configure network interface | <pre>object({<br>  private_ip_address_allocation = string<br>  public_ip_enabled             = bool<br>})</pre> | <pre>{<br>  private_ip_address_allocation = "Dynamic"<br>  public_ip_enabled             = true<br>}</pre> | no |
-| <a name="input_virtual_machine"></a> [virtual\_machine](#input\_virtual\_machine)| Objects to configure virtual_machine | <pre>object({<br>  size           = string<br>  admin_username = string<br>})</pre> | <pre>{<br>  size           = "Standard_F2"<br>  admin_username = "adminuser"<br>}</pre> | no |
+| <a name="input_vm_size"></a> [vm\_size](#input\_vm\_size)| The SKU which should be used for this Virtual Machine. | `string` | Standard_F2 | no |
+| <a name="input_vm_admin_username"></a> [vm\_admin\_username](#input\_vm\_admin\_username)| The username of the local administrator used for the Virtual Machine. | `string` | adminuser | no |
+| <a name="input_vm_admin_password"></a> [vm\_admin\_password](#input\_vm\_admin\_password)| The password of the local administrator used for the Virtual Machine. | `string` | null | no |
 | <a name="input_admin_ssh_key"></a> [admin\_ssh\_key](#input\_admin\_ssh\_key)| Objects to configure ssh key reference for virtual machine | <pre>object({<br>  username   = string<br>  public_key = string<br>})</pre> | n/a | yes |
 | <a name="input_os_disk"></a> [os\_disk](#input\_os\_disk)| Objects to configure os disk reference for virtual machine | <pre>object({<br>  caching              = string<br>  storage_account_type = string<br>})</pre> | <pre>{<br>  caching              = "ReadWrite"<br>  storage_account_type = "Standard_LRS"<br>}</pre> | no |
 | <a name="input_source_image_reference"></a> [source\_image\_reference](#input\_source\_image\_reference)| Objects to configure source image reference for virtual machine | <pre>object({<br>  publisher = string<br>  offer     = string<br>  sku       = string<br>  version   = string<br>})</pre> | <pre>{<br>  publisher = "Canonical"<br>  offer     = "0001-com-ubuntu-server-focal"<br>  sku       = "20_04-lts"<br>  version   = "latest"<br>}</pre> | no |
-| <a name="input_password_access_enable"></a> [password\_access\_enable](#input\_password\_access\_enable)| Password access enable | `bool` | true | no |
+| <a name="input_identity_enabled"></a> [identity\_enabled](#input\_identity\_enabled)| identity enabled | `bool` | false | no |
+| <a name="input_password_access_enabled"></a> [password\_access\_enabled](#input\_password\_access\_enabled)| Vm password access enabled | `bool` | false | no |
                                                                                                                                                                                                                                                                                                        
 ## Modules
 
@@ -92,8 +95,7 @@ No modules.
 | Name                                                                                                                          | Description                                          |
 | ----------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
 | <a name="output_id"></a> [id](#output\_id) | The ID of the Linux Virtual Machine |
-| <a name="output_identity"></a> [identity](#output\_identity) | linux virtual machine identity |
-| <a name="output_password"></a> [password](#output\_password) | The password of the Linux Virtual Machine |
+| <a name="output_access_connector_identity"></a> [access\_connector\_identity](#output\_access\_connector\_identity) | linux virtual machine identity |
 <!-- END_TF_DOCS -->
 
 ## License
diff --git a/main.tf b/main.tf
@@ -1,25 +1,17 @@
 locals {
   suffix                 = length(var.suffix) == 0 ? "" : "-${var.suffix}"
-  virtual_machine_name   = var.custom_virtual_machine_name == null ? "wm-${var.project}-${var.env}-${var.location}${local.suffix}" : "${var.custom_virtual_machine_name}${local.suffix}"
+  virtual_machine_name   = var.custom_virtual_machine_name == null ? "vm-${var.project}-${var.env}-${var.location}${local.suffix}" : "${var.custom_virtual_machine_name}${local.suffix}"
   network_interface_name = var.custom_network_interface_name == null ? "nic-${var.project}-${var.env}-${var.location}${local.suffix}" : "${var.custom_network_interface_name}${local.suffix}"
   public_ip              = var.custom_public_ip_name == null ? "ip-${var.project}-${var.env}-${var.location}${local.suffix}" : "${var.custom_public_ip_name}${local.suffix}"
 }
 
-resource "random_string" "this" {
-  count = var.password_access_enable ? 1 : 0
-
-  length           = 16
-  special          = true
-  override_special = "/@£I"
-}
-
 resource "azurerm_public_ip" "this" {
   count = var.network_interface.public_ip_enabled ? 1 : 0
 
   name                = local.public_ip
   resource_group_name = var.resource_group
   location            = var.location
-  allocation_method   = var.allocation_method
+  allocation_method   = var.public_ip_allocation_method
 }
 
 resource "azurerm_network_interface" "this" {
@@ -40,22 +32,29 @@ resource "azurerm_linux_virtual_machine" "this" {
   name                            = local.virtual_machine_name
   resource_group_name             = var.resource_group
   location                        = var.location
-  size                            = var.virtual_machine.size
-  admin_username                  = var.virtual_machine.admin_username
+  size                            = var.vm_size
+  admin_username                  = var.vm_admin_username
   tags                            = var.tags
   network_interface_ids           = [azurerm_network_interface.this.id, ]
-  disable_password_authentication = var.password_access_enable ? false : true
-  admin_password                  = var.password_access_enable ? random_string.this[0].result : null
+  admin_password                  = var.vm_admin_password
+  disable_password_authentication = var.password_access_enabled ? false : true
 
-  identity {
-    type = "SystemAssigned"
-  }
+  dynamic "identity" {
+    for_each = var.identity_enabled ? [1] : []
 
-  admin_ssh_key {
-    username   = var.password_access_enable ? null : var.admin_ssh_key.username
-    public_key = var.password_access_enable ? null : var.admin_ssh_key.public_key
+    content {
+      type = "SystemAssigned"
+    }
   }
 
+  dynamic "admin_ssh_key" {
+    for_each = var.password_access_enabled ? [] : [1]
+
+    content {
+      username   = var.admin_ssh_key.username
+      public_key = var.admin_ssh_key.public_key
+    }
+  }
 
   os_disk {
     caching              = var.os_disk.caching
diff --git a/outputs.tf b/outputs.tf
@@ -4,11 +4,6 @@ output "id" {
 }
 
 output "access_connector_identity" {
-  value       = azurerm_linux_virtual_machine.this.identity[0].principal_id
+  value       = var.identity_enabled ? azurerm_linux_virtual_machine.this.identity[0].principal_id : ""
   description = "linux virtual machine Identities list"
 }
-
-output "password" {
-  value       = var.password_access_enable ? random_string.this[0].result : ""
-  description = "The password of the Linux Virtual Machine"
-}
diff --git a/variables.tf b/variables.tf
@@ -48,7 +48,7 @@ variable "tags" {
   default     = {}
 }
 
-variable "allocation_method" {
+variable "public_ip_allocation_method" {
   type        = string
   description = "Defines the allocation method for this IP address. Possible values are Static or Dynamic"
   default     = "Dynamic"
@@ -71,22 +71,28 @@ variable "network_interface" {
   }
 }
 
-variable "virtual_machine" {
-  type = object({
-    size           = string
-    admin_username = string
-  })
-  description = "Objects to configure virtual_machine"
-  default = {
-    size           = "Standard_F2"
-    admin_username = "adminuser"
-  }
+variable "vm_size" {
+  type        = string
+  description = "The SKU which should be used for this Virtual Machine."
+  default     = "Standard_F2"
+}
+
+variable "vm_admin_username" {
+  type        = string
+  description = "The username of the local administrator used for the Virtual Machine."
+  default     = "adminuser"
+}
+
+variable "vm_admin_password" {
+  type        = string
+  description = "The username of the local administrator used for the Virtual Machine."
+  default     = null
 }
 
 variable "admin_ssh_key" {
   type = object({
-    username   = string
-    public_key = string
+    username   = optional(string, "adminuser")
+    public_key = optional(string)
   })
   description = "Objects to configure ssh key reference for virtual machine"
 }
@@ -119,8 +125,14 @@ variable "source_image_reference" {
   }
 }
 
-variable "password_access_enable" {
+variable "identity_enabled" {
+  type        = bool
+  description = "identity enabled"
+  default     = false
+}
+
+variable "password_access_enabled" {
   type        = bool
-  description = "Password access enable"
-  default     = true
+  description = "Vm password access enabled"
+  default     = false
 }

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ output "id" {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`output "access_connector_identity" {`
`7`		`- value = azurerm_linux_virtual_machine.this.identity[0].principal_id`
	`7`	`+ value = var.identity_enabled ? azurerm_linux_virtual_machine.this.identity[0].principal_id : ""`
`8`	`8`	`description = "linux virtual machine Identities list"`
`9`	`9`	`}`
`10`		`-`
`11`		`-output "password" {`
`12`		`- value = var.password_access_enable ? random_string.this[0].result : ""`
`13`		`- description = "The password of the Linux Virtual Machine"`
`14`		`-}`