update

hashicorp · Mar 10, 2021 · 12e1ab6 · 12e1ab6
1 parent 1b25cbb
commit 12e1ab6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/azurerm/internal/services/authorization/role_assignment_resource.go b/azurerm/internal/services/authorization/role_assignment_resource.go
@@ -177,11 +177,17 @@ func resourceArmRoleAssignmentCreate(d *schema.ResourceData, meta interface{}) e
 			RoleDefinitionID: utils.String(roleDefinitionId),
 			PrincipalID:      utils.String(principalId),
 			Description:      utils.String(d.Get("description").(string)),
-			Condition:        utils.String(d.Get("condition").(string)),
-			ConditionVersion: utils.String(d.Get("condition_version").(string)),
 		},
 	}
 
+	if v, ok := d.GetOk("condition"); ok {
+		properties.RoleAssignmentProperties.Condition = utils.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("condition_version"); ok {
+		properties.RoleAssignmentProperties.ConditionVersion = utils.String(v.(string))
+	}
+
 	skipPrincipalCheck := d.Get("skip_service_principal_aad_check").(bool)
 	if skipPrincipalCheck {
 		properties.RoleAssignmentProperties.PrincipalType = authorization.ServicePrincipal

diff --git a/...rvices/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md b/...rvices/preview/authorization/mgmt/2018-09-01-preview/authorization/CHANGELOG.md
diff --git a/...rvices/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md b/...rvices/preview/authorization/mgmt/2020-04-01-preview/authorization/CHANGELOG.md