Merge branch 'main' of github.com:IndicoDataSolutions/tf_cod into dev…

…-12976-servicebus
IndicoDataSolutions · Feb 12, 2025 · d4bd578 · d4bd578
2 parents 4460ae6 + 95faec5
commit d4bd578
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/azure/main.tf b/azure/main.tf
@@ -271,13 +271,17 @@ module "storage" {
   depends_on = [
     azurerm_resource_group.cod-cluster
   ]
-  source               = "app.terraform.io/indico/indico-azure-blob/mod"
-  version              = "0.1.145" # 0.1.144 is a branch off 0.1.14
-  label                = var.label
-  region               = var.region
-  resource_group_name  = local.resource_group_name
-  storage_account_name = local.storage_account_name
-  keyvault_name        = var.keyvault_name
+  source                       = "app.terraform.io/indico/indico-azure-blob/mod"
+  version                      = "1.0.1"
+  label                        = var.label
+  region                       = var.region
+  resource_group_name          = local.resource_group_name
+  storage_account_name         = local.storage_account_name
+  keyvault_name                = var.keyvault_name
+  blob_type                    = var.blob_type
+  fileshare_name_override      = var.fileshare_name_override
+  blob_store_name_override     = var.blob_store_name_override
+  crunchy_backup_name_override = var.crunchy_backup_name_override
 }
 
 resource "azurerm_user_assigned_identity" "cluster_dns" {

diff --git a/azure/variables.tf b/azure/variables.tf
@@ -844,3 +844,30 @@ variable "servicebus_topic_name_override" {
   default     = null
   description = "Override the default servicebus topic name"
 }
+
+variable "blob_type" {
+  type    = string
+  default = "create"
+  validation {
+    condition     = var.blob_type == "create" || var.blob_type == "load"
+    error_message = "${var.blob_type} not valid. Type must be either create or load"
+  }
+}
+
+variable "fileshare_name_override" {
+  type        = string
+  default     = null
+  description = "Override the default indico-user-data file share name"
+}
+
+variable "blob_store_name_override" {
+  type        = string
+  default     = null
+  description = "Override the default indico-blob-store name"
+}
+
+variable "crunchy_backup_name_override" {
+  type        = string
+  default     = null
+  description = "Override the default crunchy-backup name"
+}