Merge pull request #10 from bebyx/bug/primary-identity

Add missing primary_user_assigned_identity_id parameter

Author: Shr3ps

README.md

@@ -248,6 +248,7 @@ module "sql_single" {
 | outbound\_network\_restriction\_enabled | Whether outbound network traffic is restricted for this server. | `bool` | `false` | no |
 | point\_in\_time\_backup\_interval\_in\_hours | The hours between each differential backup. This is only applicable to live databases but not dropped databases. Value has to be 12 or 24. Defaults to 12 hours. | `number` | `12` | no |
 | point\_in\_time\_restore\_retention\_days | Point In Time Restore configuration. Value has to be between `7` and `35`. | `number` | `7` | no |
+| primary\_user\_assigned\_identity\_id | Specifies the primary user managed identity id. Required if type within the identity block is set to either SystemAssigned, UserAssigned or UserAssigned and should be set at same time as setting identity\_ids. | `string` | `null` | no |
 | public\_network\_access\_enabled | True to allow public network access for this server. | `bool` | `false` | no |
 | resource\_group\_name | Resource group name. | `string` | n/a | yes |
 | security\_storage\_account\_access\_key | Storage Account access key used to store security logs and reports. | `string` | `null` | no |

r-db.tf

@@ -79,7 +79,7 @@ resource "azurerm_mssql_database" "main" {
   dynamic "short_term_retention_policy" {
     # For elastic pool databases, exclude the block for HS SKUs
     # For single databases, always include the block
-    for_each = var.elastic_pool_enabled && startswith(local.elastic_pool_sku.name, "HS") ? [] : ["enabled"]
+    for_each = var.elastic_pool_enabled && try(startswith(local.elastic_pool_sku.name, "HS"), false) ? [] : ["enabled"]
     content {
       retention_days = var.point_in_time_restore_retention_days
       # backup_interval_in_hours is only supported for elastic pool databases

r-sql.tf

@@ -22,6 +22,8 @@ resource "azurerm_mssql_server" "main" {
     }
   }
 
+  primary_user_assigned_identity_id = var.primary_user_assigned_identity_id
+
   dynamic "identity" {
     for_each = var.identity[*]
     content {

variables.tf

@@ -331,3 +331,9 @@ variable "identity" {
   default  = {}
   nullable = false
 }
+
+variable "primary_user_assigned_identity_id" {
+  description = "Specifies the primary user managed identity id. Required if type within the identity block is set to either SystemAssigned, UserAssigned or UserAssigned and should be set at same time as setting identity_ids."
+  type        = string
+  default     = null
+}