changed empty strings to nil, when passing emoty admin configs, also GetMember in Groups now runs in parallel

Author: Hubtrick-Git

internal/accesscontrol/external_entity_provider_rbac_test.go

@@ -176,7 +176,7 @@ func TestHasAccess(t *testing.T) {
 			nil,
 			thirdpartyIntegrationMock,
 			"external-entity-provider-id",
-			utils.Ptr(""),
+			nil,
 		)
 
 		hasAccess, err := rbac.HasAccess("user1")
@@ -191,7 +191,7 @@ func TestHasAccess(t *testing.T) {
 			nil,
 			thirdpartyIntegrationMock,
 			"external-entity-provider-id",
-			utils.Ptr(""),
+			nil,
 		)
 
 		hasAccess, err := rbac.HasAccess("user1")

internal/core/integrations/gitlabint/gitlab_integration.go

@@ -346,23 +346,35 @@ func (g *GitlabIntegration) ListGroups(ctx core.Context, userID string, provider
 		return nil, err
 	}
 
-	cleanedGroups := make([]*gitlab.Group, 0, len(groups))
-
+	errgroup := utils.ErrGroup[*gitlab.Group](10)
 	for _, group := range groups {
-		//only check if we are member of the given group
-		member, _, err := gitlabClient.GetMemberInGroup(ctx.Request().Context(), token.GitLabUserID, (*group).ID)
-		if err != nil {
-			if strings.Contains(err.Error(), "403 Forbidden") || strings.Contains(err.Error(), "404 Not Found") {
-				//swallow the error
-				continue
-			} else {
-				return nil, err
+		errgroup.Go(func() (*gitlab.Group, error) {
+			member, _, err := gitlabClient.GetMemberInGroup(ctx.Request().Context(), token.GitLabUserID, (*group).ID)
+			if err != nil {
+				if strings.Contains(err.Error(), "403 Forbidden") || strings.Contains(err.Error(), "404 Not Found") {
+					return nil, nil
+				} else {
+
+					return nil, err
+				}
 			}
-		}
-		if member.AccessLevel >= gitlab.ReporterPermissions {
-			cleanedGroups = append(cleanedGroups, group)
-		}
+			if member.AccessLevel >= gitlab.ReporterPermissions {
+				return group, nil
+			}
+			return nil, nil
+		})
+	}
 
+	allGroups, err := errgroup.WaitAndCollect()
+	if err != nil {
+		return nil, err
+	}
+	// filter all the nil values from the result
+	cleanedGroups := make([]*gitlab.Group, 0, len(groups))
+	for i := range allGroups {
+		if allGroups[i] != nil {
+			cleanedGroups = append(cleanedGroups, allGroups[i])
+		}
 	}
 
 	return utils.Map(cleanedGroups, func(el *gitlab.Group) models.Project {

internal/core/integrations/gitlabint/gitlab_oauth2.go

@@ -106,7 +106,7 @@ func parseGitlabEnvs() map[string]gitlabEnvConfig {
 				conf.botUserAccessToken = value
 			case "admintoken":
 				if value == "" {
-					conf.adminToken = utils.Ptr("")
+					conf.adminToken = nil
 				} else {
 					conf.adminToken = &value
 				}