@@ -11,15 +11,12 @@ locals {
1111 rg_name = var. resource_group . create ? azurerm_resource_group. this [" this" ]. name : data. azurerm_resource_group . existing [0 ]. name
1212 rg_loc = var. resource_group . create ? azurerm_resource_group. this [" this" ]. location : (try (var. resource_group . location , null ) != null ? var. resource_group . location : data. azurerm_resource_group . existing [0 ]. location )
1313
14- vm_type_prefix = local. is_linux ? " lnx" : " win"
15- # VMSS name rules: lowercase letters, numbers, hyphen; <= 63 chars
16- base_vmss_name_raw = " vmss-${ local . vm_type_prefix } -${ local . prefix } -${ try (var. vmss . name_suffix , " 001" )} "
17- base_vmss_name = substr (replace (lower (local. base_vmss_name_raw ), " /[^0-9a-z-]/" , " -" ), 0 , 63 )
18- vmss_name = coalesce (try (var. vmss . name , null ), local. base_vmss_name )
19-
2014 is_linux = lower (var. vmss . os_type ) == " linux"
2115 is_windows = lower (var. vmss . os_type ) == " windows"
2216
17+ # Resource names: use var.name directly as the full name
18+ vmss_name = var. name
19+
2320 # SSH public key
2421 ssh_public_key_raw = try (var. vmss . ssh_public_key , null )
2522 ssh_public_key = try (trimspace (tostring (local. ssh_public_key_raw )), " " )
@@ -43,7 +40,7 @@ locals {
4340 sig_gallery_name_raw = coalesce (try (var. gallery . gallery_name , null ), " sig_${ local . prefix } " )
4441 sig_gallery_name = substr (replace (replace (local. sig_gallery_name_raw , " -" , " _" ), " /[^0-9A-Za-z._]/" , " _" ), 0 , 80 )
4542
46- sig_image_name_raw = coalesce (try (var. gallery . image_name , null ), " img_${ local . prefix } _ ${ try (var . vmss . name_suffix , " 001 " ) } " )
43+ sig_image_name_raw = coalesce (try (var. gallery . image_name , null ), " img_${ local . vmss_name } " )
4744 sig_image_name = substr (replace (replace (local. sig_image_name_raw , " -" , " _" ), " /[^0-9A-Za-z._]/" , " _" ), 0 , 80 )
4845
4946 sig_should_create_gallery = local. gallery_enabled && try (var. gallery . create_gallery , true )
@@ -52,11 +49,7 @@ locals {
5249 # Autoscale
5350 autoscale_enabled = try (var. autoscale . enabled , false )
5451
55- autoscale_name = substr (
56- replace (lower (" as-${ local . vmss_name } -${ try (var. autoscale . name_suffix , " cpu" )} " ), " /[^0-9a-z-]/" , " -" ),
57- 0 ,
58- 80
59- )
52+ autoscale_name = " as-${ local . vmss_name } "
6053
6154 # Windows computer_name_prefix: max 9 chars
6255 windows_cnp_default = substr (replace (lower (local. prefix ), " /[^0-9a-z]/" , " " ), 0 , 9 )
@@ -65,8 +58,8 @@ locals {
6558 # VMSS ID (used by autoscale target)
6659 vmss_id = local. is_linux ? azurerm_linux_virtual_machine_scale_set. this [" this" ]. id : azurerm_windows_virtual_machine_scale_set. this [" this" ]. id
6760
68- nic_name = " nic-vmss- ${ local . vm_type_prefix } - ${ local . prefix } - ${ try (var . vmss . name_suffix , " 001 " ) } "
69- pip_name = " pip-vmss- ${ local . vm_type_prefix } - ${ local . prefix } - ${ try (var . vmss . name_suffix , " 001 " ) } "
61+ nic_name = " nic-${ local . vmss_name } "
62+ pip_name = " pip-${ local . vmss_name } "
7063
7164 diag_enabled = try (var. diagnostics . enabled , false ) && (try (var. diagnostics . log_analytics_workspace_id , null ) != null || try (var. diagnostics . storage_account_id , null ) != null || try (var. diagnostics . eventhub_authorization_rule_id , null ) != null )
7265}
0 commit comments