only get direct members

Author: laurenleach

pkg/connector/client/client.go

@@ -304,6 +304,20 @@ func (c *GitlabClient) GetProject(ctx context.Context, projectID string) (*Proje
 func (c *GitlabClient) ListProjectMembers(ctx context.Context, projectID string, nextPageToken string) ([]*ProjectMember, string, *v2.RateLimitDescription, error) {
 	var members []*ProjectMember
 
+	apiURL, _ := url.Parse(fmt.Sprintf("/api/v4/projects/%s/members", PathEscape(projectID)))
+	WithOffsetPagination(apiURL, nextPageToken)
+	headers, rateLimitDesc, err := c.doRequest(ctx, http.MethodGet, apiURL.String(), &members, nil)
+	if err != nil {
+		return nil, "", rateLimitDesc, err
+	}
+
+	nextToken := headers.Get("X-Next-Page")
+	return members, nextToken, rateLimitDesc, nil
+}
+
+func (c *GitlabClient) ListAllProjectMembers(ctx context.Context, projectID string, nextPageToken string) ([]*ProjectMember, string, *v2.RateLimitDescription, error) {
+	var members []*ProjectMember
+
 	apiURL, _ := url.Parse(fmt.Sprintf("/api/v4/projects/%s/members/all", PathEscape(projectID)))
 	WithOffsetPagination(apiURL, nextPageToken)
 	headers, rateLimitDesc, err := c.doRequest(ctx, http.MethodGet, apiURL.String(), &members, nil)

pkg/connector/projects.go

@@ -122,6 +122,7 @@ func (o *projectBuilder) Grants(ctx context.Context, resource *v2.Resource, pTok
 	}
 
 	for _, user := range users {
+
 		entitlementId := fmt.Sprintf("group:%s:%s", groupId.Resource, client.AccessLevelValue(user.AccessLevel).String())
 		principalId, err := resourceSdk.NewResourceID(userResourceType, user.ID)
 		if err != nil {
@@ -131,7 +132,7 @@ func (o *projectBuilder) Grants(ctx context.Context, resource *v2.Resource, pTok
 		grantOptions := []grant.GrantOption{
 			grant.WithAnnotation(&v2.GrantExpandable{
 				EntitlementIds: []string{entitlementId},
-				Shallow:        true,
+				Shallow:        false,
 			}),
 		}
 

pkg/connector/users.go

@@ -116,7 +116,7 @@ func (u *userBuilder) listCloudVersion(ctx context.Context, parentResourceID *v2
 	case projectResourceType.Id:
 		var projectMembers []*client.ProjectMember
 		var rateLimitDescProjectMembers *v2.RateLimitDescription
-		projectMembers, nextPageToken, rateLimitDescProjectMembers, err = u.client.ListProjectMembers(ctx, parentResourceID.Resource, pToken.Token)
+		projectMembers, nextPageToken, rateLimitDescProjectMembers, err = u.client.ListAllProjectMembers(ctx, parentResourceID.Resource, pToken.Token)
 		if rateLimitDescProjectMembers != nil {
 			outputAnnotations.WithRateLimiting(rateLimitDescProjectMembers)
 		}