feat: Add storage account creds

wandb · Oct 21, 2022 · 2d543be · 2d543be
1 parent d972bd9
commit 2d543be
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/main.tf b/main.tf
@@ -41,6 +41,7 @@ module "database" {
 }
 
 module "storage" {
+  count               = local.create_blob_container ? 1 : 0
   source              = "./modules/storage"
   namespace           = var.namespace
   resource_group_name = azurerm_resource_group.default.name
@@ -76,8 +77,8 @@ module "app_aks" {
 }
 
 locals {
-  blob_container = local.create_blob_container ? "${module.storage.account.name}/${module.storage.container.name}" : var.blob_container
-  queue          = var.use_internal_queue ? "internal://" : "az://${module.storage.account.name}/${module.storage.queue.name}"
+  blob_container = local.create_blob_container ? "${module.storage.0.account.name}/${module.storage.0.container.name}" : var.blob_container
+  queue          = var.use_internal_queue ? "internal://" : "az://${module.storage.0.account.name}/${module.storage.0.queue.name}"
 }
 
 module "aks_app" {
@@ -101,8 +102,8 @@ module "aks_app" {
   wandb_version = var.wandb_version
 
   other_wandb_env = {
-    "AZURE_STORAGE_KEY"     = module.storage.account.primary_access_key,
-    "AZURE_STORAGE_ACCOUNT" = module.storage.account.name,
+    "AZURE_STORAGE_KEY"     = local.create_blob_container ? module.storage.0.account.primary_access_key:var.storage_key
+    "AZURE_STORAGE_ACCOUNT" = local.create_blob_container ? module.storage.0.account.name:var.storage_account
   }
 
   # If we dont wait, tf will start trying to deploy while the work group is

diff --git a/outputs.tf b/outputs.tf
@@ -30,9 +30,13 @@ output "cluster_ca_certificate" {
 }
 
 output "storage_account" {
-  value = module.storage.account
+  value = local.create_blob_container ? module.storage.0.account:null
 }
 
 output "storage_container" {
-  value = module.storage.container
+  value = local.create_blob_container ? module.storage.0.container:null
+}
+
+output "blob_container" {
+  value = local.blob_container
 }
diff --git a/variables.tf b/variables.tf
@@ -132,11 +132,23 @@ variable "create_redis" {
 ##########################################
 # External Bucket                        #
 ##########################################
-# Most users will not need these settings. They are ment for users who want a
+# Most users will not need these settings. They are meant for users who want a
 # bucket in a different account.
 
 variable "blob_container" {
   type        = string
   description = "Use an existing bucket."
   default     = ""
 }
+
+variable "storage_account" {
+  type        = string
+  description = "Azure storage account name"
+  default     = ""
+}
+
+variable "storage_key" {
+  type        = string
+  description = "Azure primary storage access key"
+  default     = ""
+}