Skip to content

Commit ee94a9d

Browse files
lukaszgryglickilukaszgryglicki
committed
gofmt
Signed-off-by: Lukasz Gryglicki <[email protected]>
1 parent 375af59 commit ee94a9d

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

‎cla-backend-go/signatures/repository.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,18 +3319,18 @@ func (repo repository) UpdateApprovalList(ctx context.Context, claManager *model
33193319
} else {
33203320

33213321
// Update gerrit user
3322-
// if utils.StringInSlice(user.LfUsername, gerritICLAECLAs) {
3323-
// gerritIclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeICLA)
3324-
// if gerritIclaErr != nil {
3325-
// msg := fmt.Sprintf("unable to remove gerrit user: %s from group: %s", user.LfUsername, approvalList.ClaGroupID)
3326-
// log.WithFields(f).WithError(gerritIclaErr).Warn(msg)
3327-
// }
3328-
// eclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeECLA)
3329-
// if eclaErr != nil {
3330-
// msg := fmt.Sprintf("unable to remove gerrit user: %s from group: %s", user.LfUsername, approvalList.ClaGroupID)
3331-
// log.WithFields(f).WithError(eclaErr).Warn(msg)
3332-
// }
3333-
// }
3322+
// if utils.StringInSlice(user.LfUsername, gerritICLAECLAs) {
3323+
// gerritIclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeICLA)
3324+
// if gerritIclaErr != nil {
3325+
// msg := fmt.Sprintf("unable to remove gerrit user: %s from group: %s", user.LfUsername, approvalList.ClaGroupID)
3326+
// log.WithFields(f).WithError(gerritIclaErr).Warn(msg)
3327+
// }
3328+
// eclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeECLA)
3329+
// if eclaErr != nil {
3330+
// msg := fmt.Sprintf("unable to remove gerrit user: %s from group: %s", user.LfUsername, approvalList.ClaGroupID)
3331+
// log.WithFields(f).WithError(eclaErr).Warn(msg)
3332+
// }
3333+
// }
33343334
results <- &ICLAUserResponse{
33353335
ICLASignature: &models.IclaSignature{
33363336
GithubUsername: icla.UserGHUsername,
@@ -4078,19 +4078,19 @@ func (repo repository) verifyUserApprovals(ctx context.Context, userID, signatur
40784078
}
40794079

40804080
// Update Gerrit group users
4081-
// if utils.StringInSlice(user.LfUsername, approvalList.GerritICLAECLAs) {
4082-
// log.WithFields(f).Debugf("removing gerrit user:%s from claGroup: %s ...", user.LfUsername, approvalList.ClaGroupID)
4083-
// iclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeICLA)
4084-
// if iclaErr != nil {
4085-
// msg := fmt.Sprintf("unable to remove gerrit user:%s from group:%s", user.LfUsername, approvalList.ClaGroupID)
4086-
// log.WithFields(f).Warn(msg)
4087-
// }
4088-
// eclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeECLA)
4089-
// if eclaErr != nil {
4090-
// msg := fmt.Sprintf("unable to remove gerrit user:%s from group:%s", user.LfUsername, approvalList.ClaGroupID)
4091-
// log.WithFields(f).Warn(msg)
4092-
// }
4093-
// }
4081+
// if utils.StringInSlice(user.LfUsername, approvalList.GerritICLAECLAs) {
4082+
// log.WithFields(f).Debugf("removing gerrit user:%s from claGroup: %s ...", user.LfUsername, approvalList.ClaGroupID)
4083+
// iclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeICLA)
4084+
// if iclaErr != nil {
4085+
// msg := fmt.Sprintf("unable to remove gerrit user:%s from group:%s", user.LfUsername, approvalList.ClaGroupID)
4086+
// log.WithFields(f).Warn(msg)
4087+
// }
4088+
// eclaErr := repo.gerritService.RemoveUserFromGroup(ctx, &authUser, approvalList.ClaGroupID, user.LfUsername, utils.ClaTypeECLA)
4089+
// if eclaErr != nil {
4090+
// msg := fmt.Sprintf("unable to remove gerrit user:%s from group:%s", user.LfUsername, approvalList.ClaGroupID)
4091+
// log.WithFields(f).Warn(msg)
4092+
// }
4093+
// }
40944094
}
40954095
}
40964096
} else if approvalList.Criteria == utils.GitHubOrgCriteria {

‎cla-backend-go/v2/sign/service.go‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,16 +1011,16 @@ func (s *service) SignedIndividualCallbackGerrit(ctx context.Context, payload []
10111011
})
10121012

10131013
// Add User to Gerrit Group
1014-
// if claUser.LfUsername != "" {
1015-
// log.WithFields(f).Debugf("adding user to gerrit group: %s", claUser.LfUsername)
1016-
// err = s.gerritService.AddUserToGroup(ctx, nil, signature.ProjectID, claUser.LfUsername, utils.ClaTypeICLA)
1017-
// if err != nil {
1018-
// log.WithFields(f).WithError(err).Warnf("unable to add user to gerrit group")
1019-
// return err
1020-
// }
1021-
// } else {
1022-
// log.WithFields(f).Warnf("user LF username is empty")
1023-
// }
1014+
// if claUser.LfUsername != "" {
1015+
// log.WithFields(f).Debugf("adding user to gerrit group: %s", claUser.LfUsername)
1016+
// err = s.gerritService.AddUserToGroup(ctx, nil, signature.ProjectID, claUser.LfUsername, utils.ClaTypeICLA)
1017+
// if err != nil {
1018+
// log.WithFields(f).WithError(err).Warnf("unable to add user to gerrit group")
1019+
// return err
1020+
// }
1021+
// } else {
1022+
// log.WithFields(f).Warnf("user LF username is empty")
1023+
// }
10241024

10251025
} else {
10261026
log.WithFields(f).Debugf("envelope not signed - status: %s", status)
@@ -1199,29 +1199,29 @@ func (s *service) SignedCorporateCallback(ctx context.Context, payload []byte, c
11991199
})
12001200

12011201
// Check if project is a gerrit instance
1202-
// var gerrits []*v1Models.Gerrit
1203-
// gerritList, err := s.gerritService.GetClaGroupGerrits(ctx, projectID)
1204-
// if err != nil {
1205-
// log.WithFields(f).WithError(err).Warnf("unable to get gerrit instances for project: %s", projectID)
1206-
// gerrits = []*v1Models.Gerrit{}
1207-
// } else {
1208-
// log.WithFields(f).Debugf("gerrit instances found for project: %s", projectID)
1209-
// gerrits = gerritList.List
1210-
// }
1211-
//
1212-
// // Add User to Gerrit Group
1213-
// if len(gerrits) > 0 {
1214-
// if user.LfUsername != "" {
1215-
// log.WithFields(f).Debugf("adding user to gerrit group: %s", user.LfUsername)
1216-
// err = s.gerritService.AddUserToGroup(ctx, nil, projectID, user.LfUsername, utils.ClaTypeCCLA)
1217-
// if err != nil {
1218-
// log.WithFields(f).WithError(err).Warnf("unable to add user to gerrit group")
1219-
// return err
1220-
// }
1221-
// } else {
1222-
// log.WithFields(f).Warnf("user LF username is empty")
1223-
// }
1224-
// }
1202+
// var gerrits []*v1Models.Gerrit
1203+
// gerritList, err := s.gerritService.GetClaGroupGerrits(ctx, projectID)
1204+
// if err != nil {
1205+
// log.WithFields(f).WithError(err).Warnf("unable to get gerrit instances for project: %s", projectID)
1206+
// gerrits = []*v1Models.Gerrit{}
1207+
// } else {
1208+
// log.WithFields(f).Debugf("gerrit instances found for project: %s", projectID)
1209+
// gerrits = gerritList.List
1210+
// }
1211+
//
1212+
// // Add User to Gerrit Group
1213+
// if len(gerrits) > 0 {
1214+
// if user.LfUsername != "" {
1215+
// log.WithFields(f).Debugf("adding user to gerrit group: %s", user.LfUsername)
1216+
// err = s.gerritService.AddUserToGroup(ctx, nil, projectID, user.LfUsername, utils.ClaTypeCCLA)
1217+
// if err != nil {
1218+
// log.WithFields(f).WithError(err).Warnf("unable to add user to gerrit group")
1219+
// return err
1220+
// }
1221+
// } else {
1222+
// log.WithFields(f).Warnf("user LF username is empty")
1223+
// }
1224+
// }
12251225

12261226
return nil
12271227

0 commit comments

Comments
 (0)