Add missing MailNickname validation logic

hashicorp · Jun 15, 2020 · 9c3f091 · 9c3f091
1 parent a85f77f
commit 9c3f091
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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)