diff --git a/pkg/connector/gitlab/groups_endpoints.go b/pkg/connector/gitlab/groups_endpoints.go index f4919c3..d12e2fb 100644 --- a/pkg/connector/gitlab/groups_endpoints.go +++ b/pkg/connector/gitlab/groups_endpoints.go @@ -8,7 +8,7 @@ import ( gitlabSDK "gitlab.com/gitlab-org/api/client-go" ) -func (o *Client) ListGroups(ctx context.Context, nextPageStr string) ([]*gitlabSDK.Group, *gitlabSDK.Response, error) { +func (o *Client) ListGroups(ctx context.Context) ([]*gitlabSDK.Group, *gitlabSDK.Response, error) { groups, res, err := o.Groups.ListGroups(&gitlabSDK.ListGroupsOptions{ ListOptions: gitlabSDK.ListOptions{}, }, diff --git a/pkg/connector/gitlab/projects_endpoints.go b/pkg/connector/gitlab/projects_endpoints.go index d3ffaf3..46ea803 100644 --- a/pkg/connector/gitlab/projects_endpoints.go +++ b/pkg/connector/gitlab/projects_endpoints.go @@ -8,7 +8,7 @@ import ( gitlabSDK "gitlab.com/gitlab-org/api/client-go" ) -func (o *Client) ListProjects(ctx context.Context, groupId, nextPageStr string) ([]*gitlabSDK.Project, *gitlabSDK.Response, error) { +func (o *Client) ListProjects(ctx context.Context, groupId string) ([]*gitlabSDK.Project, *gitlabSDK.Response, error) { projects, res, err := o.Groups.ListGroupProjects(groupId, &gitlabSDK.ListGroupProjectsOptions{ ListOptions: gitlabSDK.ListOptions{}, }, diff --git a/pkg/connector/groups.go b/pkg/connector/groups.go index 2ec2357..44d0fae 100644 --- a/pkg/connector/groups.go +++ b/pkg/connector/groups.go @@ -49,10 +49,7 @@ func (o *groupBuilder) List(ctx context.Context, parentResourceID *v2.ResourceId var err error if pToken.Token == "" { - groups, res, err = o.ListGroups(ctx, pToken.Token) - if err != nil { - return nil, "", nil, err - } + groups, res, err = o.ListGroups(ctx) } else { groups, res, err = o.ListGroupsPaginate(ctx, pToken.Token) } diff --git a/pkg/connector/projects.go b/pkg/connector/projects.go index 71d384d..2e2ccb2 100644 --- a/pkg/connector/projects.go +++ b/pkg/connector/projects.go @@ -54,10 +54,7 @@ func (o *projectBuilder) List(ctx context.Context, parentResourceID *v2.Resource var err error if pToken.Token == "" { - projects, res, err = o.ListProjects(ctx, parentResourceID.Resource, pToken.Token) - if err != nil { - return nil, "", nil, err - } + projects, res, err = o.ListProjects(ctx, parentResourceID.Resource) } else { projects, res, err = o.ListProjectsPaginate(ctx, parentResourceID.Resource, pToken.Token) }