Merge pull request #60 from ConductorOne/lauren/log-member-counts

Add profile fields/use simple param for reduced api response

Author: laurenleach

pkg/connector/client/client.go

@@ -277,7 +277,9 @@ func (c *GitlabClient) ListProjects(ctx context.Context, groupID string, nextLin
 	opts := KeysetPaginationOpts{OrderBy: "id", Sort: "asc"}
 
 	newNextLink, rateLimitDesc, err := c.listWithKeysetPagination(ctx, endpoint, nextLink, &projects, opts,
-		WithQueryParam("include_subgroups", "true"))
+		WithQueryParam("include_subgroups", "true"),
+		WithQueryParam("simple", "true"),
+	)
 	if err != nil {
 		return nil, "", rateLimitDesc, err
 	}

pkg/connector/client/models.go

@@ -5,24 +5,29 @@ import (
 )
 
 type User struct {
-	ID             int      `json:"id"`
-	Email          string   `json:"email"`
-	Username       string   `json:"username"`
-	Name           string   `json:"name"`
-	State          string   `json:"state"`
-	LastActivityOn *ISOTime `json:"last_activity_on"`
+	ID              int      `json:"id"`
+	Email           string   `json:"email"`
+	Username        string   `json:"username"`
+	Name            string   `json:"name"`
+	State           string   `json:"state"`
+	LastActivityOn  *ISOTime `json:"last_activity_on"`
+	MembershipState string   `json:"membership_state"`
+	Locked          bool     `json:"locked"`
 }
 
 type PendingInviteUser struct {
 	InviteEmail string `json:"invite_email"`
 }
 
 type Group struct {
-	ID          int    `json:"id"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	FullName    string `json:"full_name"`
-	ParentID    int    `json:"parent_id"`
+	ID                int      `json:"id"`
+	Name              string   `json:"name"`
+	Description       string   `json:"description"`
+	FullName          string   `json:"full_name"`
+	ParentID          int      `json:"parent_id"`
+	Archived          bool     `json:"archived"`
+	Visibility        string   `json:"visibility"`
+	MarkedForDeletion *ISOTime `json:"marked_for_deletion"`
 }
 
 type Namespace struct {
@@ -50,6 +55,8 @@ type GroupMember struct {
 	State             string        `json:"state"`
 	AccessLevel       int           `json:"access_level"`
 	GroupSAMLIdentity *SAMLIdentity `json:"group_saml_identity"`
+	MembershipState   string        `json:"membership_state"`
+	Locked            bool          `json:"locked"`
 }
 
 type ProjectMember struct {

pkg/connector/groups.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/conductorone/baton-gitlab/pkg/connector/client"
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
@@ -275,7 +276,14 @@ func groupResource(group *client.Group, parentResourceID *v2.ResourceId, isOnPre
 		"name":        group.Name,
 		"full_name":   group.FullName,
 		"description": group.Description,
+		"archived":    group.Archived,
+		"visibility":  group.Visibility,
 	}
+
+	if group.MarkedForDeletion != nil && !time.Time(*group.MarkedForDeletion).IsZero() {
+		profile["marked_for_deletion"] = time.Time(*group.MarkedForDeletion)
+	}
+
 	if group.ParentID != 0 {
 		profile["parent_group_id"] = group.ParentID
 	}

pkg/connector/users.go

@@ -391,6 +391,8 @@ func userResource(user any) (*v2.Resource, error) {
 	var name string
 	var state string
 	var accessLevel int
+	var membershipState string
+	var locked *bool
 	// NOTE: The last login attribute is only visible in the DC version (on-premise/self-hosted). To get this attribute you need admin permissions and in the cloud version it does not exist.
 	// https://docs.gitlab.com/api/users/
 	var lastLogin time.Time
@@ -403,6 +405,9 @@ func userResource(user any) (*v2.Resource, error) {
 		name = user.Name
 		username = user.Username
 		accessLevel = user.AccessLevel
+		membershipState = user.MembershipState
+		lockedVal := user.Locked
+		locked = &lockedVal
 	case *client.ProjectMember:
 		id = user.ID
 		email = user.Email
@@ -452,12 +457,16 @@ func userResource(user any) (*v2.Resource, error) {
 	}
 
 	profile := map[string]interface{}{
-		"first_name":   name,
-		"username":     username,
-		"email":        email,
-		"state":        state,
-		"access_level": accessLevel,
-		"id":           id,
+		"first_name":       name,
+		"username":         username,
+		"email":            email,
+		"state":            state,
+		"access_level":     accessLevel,
+		"id":               id,
+		"membership_state": membershipState,
+	}
+	if locked != nil {
+		profile["locked"] = *locked
 	}
 
 	userTraitOptions := []resourceSdk.UserTraitOption{