From 9c3f091dbcf2e2dde2cfa1f001a2304d3d814862 Mon Sep 17 00:00:00 2001 From: Patrick Marabeas Date: Mon, 15 Jun 2020 14:30:01 +1000 Subject: [PATCH] Add missing MailNickname validation logic --- azuread/data_users.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azuread/data_users.go b/azuread/data_users.go index f7381192b8..1be8280b49 100644 --- a/azuread/data_users.go +++ b/azuread/data_users.go @@ -26,7 +26,7 @@ func dataUsers() *schema.Resource { Type: schema.TypeList, Optional: true, Computed: true, - ConflictsWith: []string{"user_principal_names"}, + ConflictsWith: []string{"user_principal_names", "mail_nicknames"}, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validate.UUID, @@ -37,7 +37,7 @@ func dataUsers() *schema.Resource { Type: schema.TypeList, Optional: true, Computed: true, - ConflictsWith: []string{"object_ids"}, + ConflictsWith: []string{"object_ids", "mail_nicknames"}, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validate.NoEmptyStrings, @@ -181,11 +181,11 @@ func dataSourceUsersRead(d *schema.ResourceData, meta interface{}) error { mailNicknames := make([]string, 0, len(users)) var userList []map[string]interface{} for _, u := range users { - if !gracefulError && (u.ObjectID == nil || u.UserPrincipalName == nil) { + if !gracefulError && (u.ObjectID == nil || u.UserPrincipalName == nil || u.MailNickname == nil) { return fmt.Errorf("User with nil ObjectId or UPN was found: %v", u) } - if u.ObjectID != nil || u.UserPrincipalName != nil { + if u.ObjectID != nil || u.UserPrincipalName != nil || u.MailNickname != nil { oids = append(oids, *u.ObjectID) upns = append(upns, *u.UserPrincipalName) mailNicknames = append(mailNicknames, *u.MailNickname)