Skip to content

Commit

Permalink
Merge pull request #4409 from nickmango/revert-ldap-gerrit
Browse files Browse the repository at this point in the history
Revert "Revert "Revert "Revert "[#4358,#4359] Feature/LDAP Decommissi…
  • Loading branch information
nickmango authored Aug 13, 2024
2 parents 961f4f9 + 74f4f6d commit bc09d73
Show file tree
Hide file tree
Showing 15 changed files with 835 additions and 707 deletions.
7 changes: 6 additions & 1 deletion cla-backend-go/cmd/dynamo_events_lambda/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cla-backend-go/cmd/migrate_approval_list/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 7 additions & 1 deletion cla-backend-go/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
143 changes: 0 additions & 143 deletions cla-backend-go/gerrits/mocks/mock_repository.go

This file was deleted.

21 changes: 12 additions & 9 deletions cla-backend-go/gerrits/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down
21 changes: 12 additions & 9 deletions cla-backend-go/gerrits/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit bc09d73

Please sign in to comment.