Merge branch 'main' into dev

Author: mlehotskylf

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

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

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

@@ -137,7 +137,12 @@ func Handler(ctx context.Context) error {
 		v1ProjectClaGroupRepo,
 	})
 
-	gerritService := gerrits.NewService(gerritRepo)
+	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
+		LfBaseURL:    configFile.LFGroup.ClientURL,
+		ClientID:     configFile.LFGroup.ClientID,
+		ClientSecret: configFile.LFGroup.ClientSecret,
+		RefreshToken: configFile.LFGroup.RefreshToken,
+	})
 
 	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)
+	gerritService = gerrits.NewService(gerritsRepo, nil)
 	signatureRepo = signatures.NewRepository(awsSession, stage, companyRepo, usersRepo, eventsService, &ghRepo, ghOrgRepo, gerritService, approvalRepo)
 
 	log.Info("initialized repositories\n")

cla-backend-go/cmd/server.go

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

cla-backend-go/gerrits/mocks/mock_repository.go

@@ -27,15 +27,18 @@ type Gerrit struct {
 // toModel converts the gerrit structure into a response model
 func (g *Gerrit) toModel() *models.Gerrit {
 	return &models.Gerrit{
-		DateCreated:  g.DateCreated,
-		DateModified: g.DateModified,
-		GerritID:     strfmt.UUID4(g.GerritID),
-		GerritName:   g.GerritName,
-		GerritURL:    strfmt.URI(g.GerritURL),
-		GroupIDCcla:  g.GroupIDCcla,
-		ProjectID:    g.ProjectID,
-		Version:      g.Version,
-		ProjectSFID:  g.ProjectSFID,
+		DateCreated:   g.DateCreated,
+		DateModified:  g.DateModified,
+		GerritID:      strfmt.UUID4(g.GerritID),
+		GerritName:    g.GerritName,
+		GerritURL:     strfmt.URI(g.GerritURL),
+		GroupIDCcla:   g.GroupIDCcla,
+		GroupIDIcla:   g.GroupIDIcla,
+		GroupNameCcla: g.GroupNameCcla,
+		GroupNameIcla: g.GroupNameIcla,
+		ProjectID:     g.ProjectID,
+		Version:       g.Version,
+		ProjectSFID:   g.ProjectSFID,
 	}
 }
 

cla-backend-go/gerrits/models.go

@@ -71,15 +71,18 @@ func (repo *repo) AddGerrit(ctx context.Context, input *models.Gerrit) (*models.
 	}
 	_, currentTime := utils.CurrentTime()
 	gerrit := &Gerrit{
-		DateCreated:  currentTime,
-		DateModified: currentTime,
-		GerritID:     gerritID.String(),
-		GerritName:   input.GerritName,
-		GerritURL:    input.GerritURL.String(),
-		GroupIDCcla:  input.GroupIDCcla,
-		ProjectID:    input.ProjectID,
-		ProjectSFID:  input.ProjectSFID,
-		Version:      input.Version,
+		DateCreated:   currentTime,
+		DateModified:  currentTime,
+		GerritID:      gerritID.String(),
+		GerritName:    input.GerritName,
+		GerritURL:     input.GerritURL.String(),
+		GroupIDCcla:   input.GroupIDCcla,
+		GroupIDIcla:   input.GroupIDIcla,
+		GroupNameCcla: input.GroupNameCcla,
+		GroupNameIcla: input.GroupNameIcla,
+		ProjectID:     input.ProjectID,
+		ProjectSFID:   input.ProjectSFID,
+		Version:       input.Version,
 	}
 	av, err := dynamodbattribute.MarshalMap(gerrit)
 	if err != nil {