Added identity property for mssql_server for IAM (#33)

* Added identity property for mssql_server for IAM * Added missing porperty for mssql_server * Add identity in mssql_server output Co-authored-by: Abdullah Khairi Kamarul Zaman <[email protected]>
aztfmod · Sep 25, 2020 · fbc5ec6 · fbc5ec6
1 parent 70eac03
commit fbc5ec6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/modules/databases/mssql_server/output.tf b/modules/databases/mssql_server/output.tf
@@ -3,5 +3,13 @@ output id {
 }
 
 output rbac_id {
-  value = azurerm_mssql_server.mssql.identity[0].principal_id
+  value = try(azurerm_mssql_server.mssql.identity[0].principal_id, null)
+}
+
+output identity {
+  value = try(azurerm_mssql_server.mssql.identity, null)
+}
+
+output azuread_administrator  {
+  value = try(azurerm_mssql_server.mssql.azuread_administrator , null)
 }
diff --git a/modules/databases/mssql_server/server.tf b/modules/databases/mssql_server/server.tf
@@ -1,4 +1,3 @@
-
 resource "azurerm_mssql_server" "mssql" {
 
   name                          = azurecaf_name.mssql.result
@@ -8,6 +7,7 @@ resource "azurerm_mssql_server" "mssql" {
   administrator_login           = var.settings.administrator_login
   administrator_login_password  = try(var.settings.administrator_login_password, azurerm_key_vault_secret.sql_admin_password.0.value)
   public_network_access_enabled = try(var.settings.public_network_access_enabled, true)
+  connection_policy             = try(var.settings.connection_policy, null)
   tags                          = try(var.settings.tags, null)
 
   dynamic "azuread_administrator" {
@@ -20,6 +20,14 @@ resource "azurerm_mssql_server" "mssql" {
     }
   }
 
+  dynamic "identity" {
+    for_each = lookup(var.settings, "identity", {}) == {} ? [] : [1]
+
+    content {
+      type = var.settings.identity.type
+    }
+  }
+
 }
 
 resource "azurecaf_name" "mssql" {