From aa63e41b558d7ee41d0656f559c8307916b64a35 Mon Sep 17 00:00:00 2001
From: Slawomir Koszewski <slawek@koszewscy.waw.pl>
Date: Tue, 24 Feb 2026 08:12:09 +0100
Subject: [PATCH] Refactor storage account variable names for clarity and
 consistency

---
 main.tf      |  8 ++++----
 variables.tf | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main.tf b/main.tf
index 0b08f60..066f643 100644
--- a/main.tf
+++ b/main.tf
@@ -2,10 +2,10 @@ data "azurerm_client_config" "current" {}
 
 locals {
   storage_account_name = (
-    var.storage_account_name != null &&
-    trimspace(var.storage_account_name) != "" ?
-    var.storage_account_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)}"
+    var.name != null &&
+    trimspace(var.name) != "" ?
+    var.name :
+    "${coalesce(var.base_name, "")}${substr(md5("${data.azurerm_client_config.current.subscription_id}/${var.rg_name}/${coalesce(var.base_name, "")}"), 0, 6)}"
   )
 }
 
diff --git a/variables.tf b/variables.tf
index 2335e62..03bbe50 100644
--- a/variables.tf
+++ b/variables.tf
@@ -6,21 +6,21 @@ variable "location" {
   type = string
 }
 
-variable "storage_account_base_name" {
+variable "base_name" {
   type    = string
   default = null
 }
 
-variable "storage_account_name" {
+variable "name" {
   type    = string
   default = null
 
   validation {
     condition = (
-      (var.storage_account_name != null && trimspace(var.storage_account_name) != "") ||
-      (var.storage_account_base_name != null && trimspace(var.storage_account_base_name) != "")
+      (var.name != null && trimspace(var.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."
   }
 }