Merge pull request #4414 from nickmango/feature/gerrit-ldap

Feature/gerrit ldap

cla-backend-go/api_client/api_client.go

@@ -0,0 +1,27 @@
+// Copyright The Linux Foundation and each contributor to CommunityBridge.
+// SPDX-License-Identifier: MIT
+
+package apiclient
+
+import (
+	"context"
+	"net/http"
+)
+
+type APIClient interface {
+	GetData(ctx context.Context, url string) (*http.Response, error)
+}
+
+type RestAPIClient struct {
+	Client *http.Client
+}
+
+// GetData makes a get request to the specified url
+
+func (c *RestAPIClient) GetData(ctx context.Context, url string) (*http.Response, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}

cla-backend-go/cmd/dynamo_events_lambda/main.go

@@ -115,12 +115,7 @@ func init() {
 	githubOrganizationsService := github_organizations.NewService(githubOrganizationsRepo, repositoriesRepo, projectClaGroupRepo)
 	repositoriesService := repositories.NewService(repositoriesRepo, githubOrganizationsRepo, projectClaGroupRepo)
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:    configFile.LFGroup.ClientURL,
-		ClientID:     configFile.LFGroup.ClientID,
-		ClientSecret: configFile.LFGroup.ClientSecret,
-		RefreshToken: configFile.LFGroup.RefreshToken,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 	// Services
 	projectService := service.NewService(projectRepo, repositoriesRepo, gerritRepo, projectClaGroupRepo, usersRepo)
 

cla-backend-go/cmd/gitlab_repository_check/handler/handler.go

@@ -137,12 +137,7 @@ func Handler(ctx context.Context) error {
 		v1ProjectClaGroupRepo,
 	})
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:    configFile.LFGroup.ClientURL,
-		ClientID:     configFile.LFGroup.ClientID,
-		ClientSecret: configFile.LFGroup.ClientSecret,
-		RefreshToken: configFile.LFGroup.RefreshToken,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 
 	approvalsTableName := "cla-" + stage + "-approvals"
 

cla-backend-go/cmd/migrate_approval_list/main.go

@@ -81,7 +81,7 @@ func init() {
 		v1ProjectClaGroupRepo,
 	})
 	ghOrgRepo = github_organizations.NewRepository(awsSession, stage)
-	gerritService = gerrits.NewService(gerritsRepo, nil)
+	gerritService = gerrits.NewService(gerritsRepo)
 	signatureRepo = signatures.NewRepository(awsSession, stage, companyRepo, usersRepo, eventsService, &ghRepo, ghOrgRepo, gerritService, approvalRepo)
 
 	log.Info("initialized repositories\n")

cla-backend-go/cmd/server.go

@@ -273,13 +273,7 @@ func server(localMode bool) http.Handler {
 		v1ProjectClaGroupRepo,
 	})
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:     configFile.LFGroup.ClientURL,
-		ClientID:      configFile.LFGroup.ClientID,
-		ClientSecret:  configFile.LFGroup.ClientSecret,
-		RefreshToken:  configFile.LFGroup.RefreshToken,
-		EventsService: eventsService,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 
 	// Signature repository handler
 	signaturesRepo := signatures.NewRepository(awsSession, stage, v1CompanyRepo, usersRepo, eventsService, gitV1Repository, githubOrganizationsRepo, gerritService, approvalsRepo)