standardise identity ids

frontierhq · Jan 24, 2024 · b18fb5c · b18fb5c
1 parent a0732b9
commit b18fb5c
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 24 deletions.
diff --git a/modules/cognitive-account/src/main.tf b/modules/cognitive-account/src/main.tf
@@ -37,9 +37,12 @@ resource "azurerm_cognitive_account" "main" {
     }
   }
 
-  identity {
-    type         = var.identity_ids == null ? "SystemAssigned" : "SystemAssigned, UserAssigned"
-    identity_ids = var.identity_ids
+  dynamic "identity" {
+    for_each = var.identity != null ? [{}] : []
+    content {
+      type         = identity.value.type
+      identity_ids = identity.value.identity_ids
+    }
   }
 }
 

diff --git a/modules/cognitive-account/src/variables.tf b/modules/cognitive-account/src/variables.tf
@@ -17,9 +17,15 @@ variable "fqdns" {
   default = null
 }
 
-variable "identity_ids" {
-  type    = list(string)
-  default = null
+variable "identity" {
+  type = object({
+    type         = string
+    identity_ids = optional(list(string))
+  })
+  default = {
+    type         = "SystemAssigned"
+    identity_ids = []
+  }
 }
 
 variable "identifier" {

diff --git a/modules/cosmosdb-account/src/main.tf b/modules/cosmosdb-account/src/main.tf
@@ -45,8 +45,11 @@ resource "azurerm_cosmosdb_account" "main" {
     }
   }
 
-  identity {
-    type         = var.identity_ids == null ? "SystemAssigned" : "SystemAssigned, UserAssigned"
-    identity_ids = var.identity_ids
+  dynamic "identity" {
+    for_each = var.identity != null ? [{}] : []
+    content {
+      type         = identity.value.type
+      identity_ids = identity.value.identity_ids
+    }
   }
 }
diff --git a/modules/cosmosdb-account/src/variables.tf b/modules/cosmosdb-account/src/variables.tf
@@ -22,9 +22,15 @@ variable "failover_locations" {
   default = null
 }
 
-variable "identity_ids" {
-  type    = list(string)
-  default = null
+variable "identity" {
+  type = object({
+    type         = string
+    identity_ids = optional(list(string))
+  })
+  default = {
+    type         = "SystemAssigned"
+    identity_ids = []
+  }
 }
 
 variable "identifier" {

diff --git a/modules/linux-function-app/src/main.tf b/modules/linux-function-app/src/main.tf
@@ -45,9 +45,12 @@ resource "azurerm_linux_function_app" "main" {
     }
   }
 
-  identity {
-    type         = var.identity_ids == null ? "SystemAssigned" : "SystemAssigned, UserAssigned"
-    identity_ids = var.identity_ids
+  dynamic "identity" {
+    for_each = var.identity != null ? [{}] : []
+    content {
+      type         = identity.value.type
+      identity_ids = identity.value.identity_ids
+    }
   }
 }
 

diff --git a/modules/linux-function-app/src/variables.tf b/modules/linux-function-app/src/variables.tf
@@ -53,9 +53,15 @@ variable "identifier" {
   type = string
 }
 
-variable "identity_ids" {
-  type    = list(string)
-  default = null
+variable "identity" {
+  type = object({
+    type         = string
+    identity_ids = optional(list(string))
+  })
+  default = {
+    type         = "SystemAssigned"
+    identity_ids = []
+  }
 }
 
 variable "instrumentation_key" {

diff --git a/modules/linux-web-app/src/main.tf b/modules/linux-web-app/src/main.tf
@@ -44,9 +44,12 @@ resource "azurerm_linux_web_app" "main" {
     }
   }
 
-  identity {
-    type         = var.identity_ids == null ? "SystemAssigned" : "SystemAssigned, UserAssigned"
-    identity_ids = var.identity_ids
+  dynamic "identity" {
+    for_each = var.identity != null ? [{}] : []
+    content {
+      type         = identity.value.type
+      identity_ids = identity.value.identity_ids
+    }
   }
 }
 

diff --git a/modules/linux-web-app/src/variables.tf b/modules/linux-web-app/src/variables.tf
@@ -33,9 +33,15 @@ variable "identifier" {
   type = string
 }
 
-variable "identity_ids" {
-  type    = list(string)
-  default = null
+variable "identity" {
+  type = object({
+    type         = string
+    identity_ids = optional(list(string))
+  })
+  default = {
+    type         = "SystemAssigned"
+    identity_ids = []
+  }
 }
 
 variable "instrumentation_key" {