Skip to content

Commit e608812

Browse files
authored
Merge pull request #33 from ConductorOne/lauren/inc-376-ret-no-members
return in group grants when member ids len is 0
2 parents 7448d0d + 4b7da44 commit e608812

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

pkg/connector/group.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,23 +133,15 @@ func (g *groupResourceType) Grants(ctx context.Context, resource *v2.Resource, p
133133
}
134134

135135
memberIDs := mapGroupMembers(groupMembers)
136-
targetMembers, _, err := g.client.GetUsers(
137-
ctx,
138-
servicenow.PaginationVars{
139-
Limit: len(memberIDs),
140-
},
141-
memberIDs,
142-
)
143-
if err != nil {
144-
return nil, "", nil, fmt.Errorf("servicenow-connector: failed to list members under group %s: %w", resource.Id.Resource, err)
136+
if len(memberIDs) == 0 {
137+
return []*v2.Grant{}, nextPageToken, nil, nil
145138
}
146139

147140
var rv []*v2.Grant
148-
for _, member := range targetMembers {
149-
memberCopy := member
150-
ur, err := userResource(&memberCopy)
141+
for _, member := range memberIDs {
142+
rID, err := rs.NewResourceID(resourceTypeUser, member)
151143
if err != nil {
152-
return nil, "", nil, err
144+
return nil, "", nil, fmt.Errorf("baton-servicenow: error creating principal id")
153145
}
154146

155147
// grant group membership
@@ -158,7 +150,7 @@ func (g *groupResourceType) Grants(ctx context.Context, resource *v2.Resource, p
158150
grant.NewGrant(
159151
resource,
160152
groupMembership,
161-
ur.Id,
153+
rID,
162154
),
163155
)
164156
}

0 commit comments

Comments
 (0)