Skip to content

Commit 941d7dc

Browse files
authored
[#1237] Event Logging Updates (#1358)
Updated event logging based on the above referenced ticket, hightlights include: - Regarding #1 - CLAMangerDelted event looks to be configured correctly via [this bit of code](https://github.com/communitybridge/easycla/blob/master/cla-backend-go/cla_manager/service.go#L352) - Add GitHub username to the approval list is configured to log the even per [this bit of code](https://github.com/communitybridge/easycla/blob/master/cla-backend-go/signatures/service.go#L663). All the events relating to the approval list should be generated from this function. Type is: `cla_manager.approval_list_updated` - Updated event code for ICLA and CCLA signature signing - Resolved #2 added additional details/parameters - Resolved #3 item above, parameters were not provided to event logger - Resolved #4 updated text - Resolved #5: ICLA is individual, CCLA is slang for both Corporate CLA signed by CLA Manager and Employee Signature. But, in this case you are mentioning it is the CLA document signed by the signatory. I have updated the event logging logic to account for logging all events. Signed-off-by: David Deal <[email protected]>
1 parent 9e95f36 commit 941d7dc

File tree

13 files changed

+120
-530
lines changed

13 files changed

+120
-530
lines changed

cla-backend-go/cla_manager/handlers.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
493493
msg := buildErrorMessageForDelete(params, sigErr)
494494
log.Warn(msg)
495495
return cla_manager.NewDeleteCLAManagerRequestBadRequest().WithPayload(&models.ErrorResponse{
496-
Message: "CLA Manager Delete Request - error reading CCLA Signatures - " + msg,
496+
Message: "EasyCLA - 400 Bad Request - CLA Manager Delete Request - error reading CCLA Signatures - " + msg,
497497
Code: "400",
498498
})
499499
}
@@ -505,7 +505,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
505505
sigModel := sigModels.Signatures[0]
506506
claManagers := sigModel.SignatureACL
507507
if !currentUserInACL(claUser, claManagers) {
508-
msg := fmt.Sprintf("CLA Manager %s / %s / %s not authorized to delete requests for company ID: %s, project ID: %s",
508+
msg := fmt.Sprintf("EasyCLA - 401 Unauthorized - CLA Manager %s / %s / %s not authorized to delete requests for company ID: %s, project ID: %s",
509509
claUser.UserID, claUser.Name, claUser.LFEmail, params.CompanyID, params.ProjectID)
510510
log.Debug(msg)
511511
return cla_manager.NewDeleteCLAManagerRequestUnauthorized().WithPayload(&models.ErrorResponse{
@@ -553,7 +553,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
553553
msg := fmt.Sprintf("User lookup for user by LFID: %s failed ", params.Body.UserLFID)
554554
log.Warn(msg)
555555
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
556-
Message: "Add CLA Manager - error getting user - " + msg,
556+
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting user - " + msg,
557557
Code: "400",
558558
})
559559
}
@@ -562,7 +562,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
562562
msg := fmt.Sprintf("User lookup for company by ID: %s failed ", params.CompanyID)
563563
log.Warn(msg)
564564
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
565-
Message: "Add CLA Manager - error getting company - " + msg,
565+
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting company - " + msg,
566566
Code: "400",
567567
})
568568
}
@@ -572,7 +572,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
572572
msg := fmt.Sprintf("User lookup for project by ID: %s failed ", params.ProjectID)
573573
log.Warn(msg)
574574
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
575-
Message: "Add CLA Manager - error getting project - " + msg,
575+
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error getting project - " + msg,
576576
Code: "400",
577577
})
578578
}
@@ -589,7 +589,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
589589
msg := buildErrorMessageAddManager("Add CLA Manager - signature lookup error", params, sigErr)
590590
log.Warn(msg)
591591
return cla_manager.NewAddCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
592-
Message: "Add CLA Manager - error reading CCLA Signatures - " + msg,
592+
Message: "EasyCLA - 400 Bad Request - Add CLA Manager - error reading CCLA Signatures - " + msg,
593593
Code: "400",
594594
})
595595
}
@@ -601,7 +601,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
601601
sigModel := sigModels.Signatures[0]
602602
claManagers := sigModel.SignatureACL
603603
if !currentUserInACL(claUser, claManagers) {
604-
msg := fmt.Sprintf("User %s / %s / %s is not authorized to add a CLA Manager for company ID: %s, project ID: %s",
604+
msg := fmt.Sprintf("EasyCLA - 401 Unauthorized - User %s / %s / %s is not authorized to add a CLA Manager for company ID: %s, project ID: %s",
605605
claUser.UserID, claUser.Name, claUser.LFEmail, params.CompanyID, params.ProjectID)
606606
log.Debug(msg)
607607
return cla_manager.NewAddCLAManagerUnauthorized().WithPayload(&models.ErrorResponse{
@@ -610,8 +610,8 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
610610
})
611611
}
612612

613+
// Audit Event sent from service upon success
613614
signature, addErr := service.AddClaManager(params.CompanyID, params.ProjectID, params.Body.UserLFID)
614-
615615
if addErr != nil {
616616
msg := buildErrorMessageAddManager("Add CLA Manager - Service Error", params, addErr)
617617
log.Warn(msg)
@@ -632,7 +632,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
632632
msg := fmt.Sprintf("User lookup for user by LFID: %s failed ", params.UserLFID)
633633
log.Warn(msg)
634634
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
635-
Message: "Delete CLA Manager - error getting user - " + msg,
635+
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting user - " + msg,
636636
Code: "400",
637637
})
638638
}
@@ -641,7 +641,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
641641
msg := fmt.Sprintf("User lookup for company by ID: %s failed ", params.CompanyID)
642642
log.Warn(msg)
643643
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
644-
Message: "Delete CLA Manager - error getting company - " + msg,
644+
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting company - " + msg,
645645
Code: "400",
646646
})
647647
}
@@ -651,7 +651,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
651651
msg := fmt.Sprintf("User lookup for project by ID: %s failed ", params.ProjectID)
652652
log.Warn(msg)
653653
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
654-
Message: "Delete CLA Manager - error getting project - " + msg,
654+
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error getting project - " + msg,
655655
Code: "400",
656656
})
657657
}
@@ -667,7 +667,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
667667
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Signature Lookup Error", params, sigErr)
668668
log.Warn(msg)
669669
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
670-
Message: "Delete CLA Manager - error reading CCLA Signatures - " + msg,
670+
Message: "EasyCLA - 400 Bad Request - Delete CLA Manager - error reading CCLA Signatures - " + msg,
671671
Code: "400",
672672
})
673673
}
@@ -688,10 +688,11 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
688688
})
689689
}
690690

691+
// Audit Event sent from service upon success
691692
signature, deleteErr := service.RemoveClaManager(params.CompanyID, params.ProjectID, params.UserLFID)
692693

693694
if deleteErr != nil {
694-
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Service Error", params, deleteErr)
695+
msg := buildErrorMessageDeleteManager("EasyCLA - 400 Bad Request - Delete CLA Manager - Service Error", params, deleteErr)
695696
log.Warn(msg)
696697
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
697698
Message: msg,
@@ -700,7 +701,7 @@ func Configure(api *operations.ClaAPI, service IService, companyService company.
700701
}
701702

702703
if signature == nil {
703-
msg := buildErrorMessageDeleteManager("Delete CLA Manager - Response Signature Missing", params, deleteErr)
704+
msg := buildErrorMessageDeleteManager("EasyCLA - 400 Bad Request - Delete CLA Manager - Response Signature Missing", params, deleteErr)
704705
log.Warn(msg)
705706
return cla_manager.NewDeleteCLAManagerBadRequest().WithPayload(&models.ErrorResponse{
706707
Message: msg,

cla-backend-go/cla_manager/service.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,11 @@ func (s service) AddClaManager(companyID string, projectID string, LFID string)
252252
UserModel: userModel,
253253
ExternalProjectID: projectModel.ProjectExternalID,
254254
EventData: &events.CLAManagerCreatedEventData{
255-
UserName: userModel.Username,
256-
UserEmail: userModel.LfEmail,
257-
UserLFID: userModel.LfUsername,
255+
CompanyName: companyModel.CompanyName,
256+
ProjectName: projectModel.ProjectName,
257+
UserName: userModel.Username,
258+
UserEmail: userModel.LfEmail,
259+
UserLFID: userModel.LfUsername,
258260
},
259261
})
260262

0 commit comments

Comments
 (0)