Refactor storage account variable names for clarity and consistency

This commit is contained in:
2026-02-24 08:12:09 +01:00
parent ba7be7d8d9
commit aa63e41b55
2 changed files with 9 additions and 9 deletions

View File

@@ -2,10 +2,10 @@ data "azurerm_client_config" "current" {}
locals { locals {
storage_account_name = ( storage_account_name = (
var.storage_account_name != null && var.name != null &&
trimspace(var.storage_account_name) != "" ? trimspace(var.name) != "" ?
var.storage_account_name : var.name :
"${coalesce(var.storage_account_base_name, "")}${substr(md5("${data.azurerm_client_config.current.subscription_id}/${var.rg_name}/${coalesce(var.storage_account_base_name, "")}"), 0, 6)}" "${coalesce(var.base_name, "")}${substr(md5("${data.azurerm_client_config.current.subscription_id}/${var.rg_name}/${coalesce(var.base_name, "")}"), 0, 6)}"
) )
} }

View File

@@ -6,21 +6,21 @@ variable "location" {
type = string type = string
} }
variable "storage_account_base_name" { variable "base_name" {
type = string type = string
default = null default = null
} }
variable "storage_account_name" { variable "name" {
type = string type = string
default = null default = null
validation { validation {
condition = ( condition = (
(var.storage_account_name != null && trimspace(var.storage_account_name) != "") || (var.name != null && trimspace(var.name) != "") ||
(var.storage_account_base_name != null && trimspace(var.storage_account_base_name) != "") (var.base_name != null && trimspace(var.base_name) != "")
) )
error_message = "Provide storage_account_name or storage_account_base_name with a non-empty value." error_message = "Provide name or base_name with a non-empty value."
} }
} }