Merge pull request #1110 from xuzhang3/main

Bug fix `azuredevops_users` - Fix user not found
microsoft · Jul 24, 2024 · 90656af · 90656af
2 parents 30abfbf + ebdd429
commit 90656af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/azuredevops/internal/acceptancetests/data_users_test.go b/azuredevops/internal/acceptancetests/data_users_test.go
@@ -75,7 +75,7 @@ data "azuredevops_users" "test" {
 func hclDataUserAllSvc() string {
 	return `
 data "azuredevops_users" "test" {
-  subject_types = ["svc"]
+  subject_types = ["aad"]
 }`
 }
 

diff --git a/azuredevops/internal/service/graph/data_users.go b/azuredevops/internal/service/graph/data_users.go
@@ -174,6 +174,14 @@ func dataUsersRead(d *schema.ResourceData, m interface{}) error {
 		).
 		ToSlice(&descriptors)
 
+	if len(users) == 0 {
+		if principalName != "" {
+			return fmt.Errorf(" User not found. Principal Name: %s", principalName)
+		} else if originID != "" {
+			return fmt.Errorf(" User not found. Origin ID: %s", originID)
+		}
+	}
+
 	h := sha1.New()
 	if _, err := h.Write([]byte(strings.Join(descriptors, "-"))); err != nil {
 		return fmt.Errorf("Unable to compute hash for user descriptors: %v", err)