Skip to content

Commit ebe5c26

Browse files
authored
Merge pull request #1350 from xuzhang3/f/feed_permission_enhance
`azuredevops_feed_permission` - Optimize error message
2 parents 6fa701e + 625aaa7 commit ebe5c26

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

azuredevops/internal/service/feed/resource_feed_permission.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ func resourceFeedPermissionCreate(d *schema.ResourceData, m interface{}) error {
113113
permission, identityResponse, err := getFeedPermission(d, m)
114114

115115
if err != nil && !utils.ResponseWasNotFound(err) {
116-
return fmt.Errorf("creating feed Permission for Feed : %s and Identity : %s, Error: %+v", feedId, identityDescriptor, err)
116+
return fmt.Errorf("Creating feed Permission for Feed : %s and Identity : %s, Error: %+v", feedId, identityDescriptor, err)
117117
}
118118

119119
if permission != nil {
120-
return fmt.Errorf("feed Permission for Feed : %s and Identity : %s already exists", feedId, identityDescriptor)
120+
return fmt.Errorf("Feed Permission for Feed : %s and Identity : %s already exists", feedId, identityDescriptor)
121121
}
122122

123123
_, err = clients.FeedClient.SetFeedPermissions(clients.Ctx, feed.SetFeedPermissionsArgs{
@@ -285,7 +285,11 @@ func getFeedPermission(d *schema.ResourceData, m interface{}) (*feed.FeedPermiss
285285
})
286286

287287
if err != nil {
288-
return nil, identityResponse, err
288+
if utils.ResponseWasNotFound(err) {
289+
return nil, identityResponse, fmt.Errorf(" Feed Permissions Not Found. Feed may exist at organization or project level."+
290+
" Please ensure you have set the `project_id` correctly. \n Project ID: %s\n Feed ID: %s\n Error: %+v", projectId, feedId, err)
291+
}
292+
return nil, identityResponse, fmt.Errorf(" \nProject ID: %s\n Feed ID: %s\n Error: %+v", projectId, feedId, err)
289293
}
290294

291295
for _, permission := range *permissions {

0 commit comments

Comments
 (0)