Fix logging multiple events and messages

Signed-off-by: Lukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

cla-backend-go/github/bots.go

@@ -222,29 +222,33 @@ func SkipAllowlistedBots(ev events.Service, orgModel *models.GithubOrganization,
 	}
 	log.WithFields(f).Debugf("final skip_cla config for repo %s is %+v; actorsMissingCLA: [%s]", orgRepo, configArray, strings.Join(actorDebugData, ", "))
 
+	seenActors := make(map[string]struct{})
 	for _, actor := range actorsMissingCLA {
 		if actor == nil {
 			continue
 		}
 		actorData := actorToString(actor)
 		log.WithFields(f).Debugf("Checking actor: %s for skip_cla config: %+v", actorData, configArray)
 		if isActorSkipped(actor, configArray) {
-			msg := fmt.Sprintf(
-				"Skipping CLA check for repo='%s', actor: %s due to skip_cla config: %+v",
-				orgRepo, actorData, configArray,
-			)
-			log.WithFields(f).Info(msg)
-			eventData := events.BypassCLAEventData{
-				Repo:   orgRepo,
-				Config: config,
-				Actor:  actorData,
+			_, seen := seenActors[actorData]
+			if !seen {
+				seenActors[actorData] = struct{}{}
+				msg := fmt.Sprintf(
+					"Skipping CLA check for repo='%s', actor: %s due to skip_cla config: %+v",
+					orgRepo, actorData, configArray,
+				)
+				log.WithFields(f).Info(msg)
+				eventData := events.BypassCLAEventData{
+					Repo:   orgRepo,
+					Config: config,
+					Actor:  actorData,
+				}
+				ev.LogEvent(&events.LogEventArgs{
+					EventType: events.BypassCLA,
+					EventData: &eventData,
+					ProjectID: projectID,
+				})
 			}
-			ev.LogEvent(&events.LogEventArgs{
-				EventType: events.BypassCLA,
-				EventData: &eventData,
-				ProjectID: projectID,
-			})
-			log.WithFields(f).Debugf("event logged")
 			actor.Authorized = true
 			allowlistedActors = append(allowlistedActors, actor)
 		} else {

cla-backend/cla/models/github_models.py

@@ -1091,6 +1091,7 @@ def skip_allowlisted_bots(self, org_model, org_repo, actors_missing_cla) -> Tupl
             cla.log.debug("final skip_cla config for repo %s is %s; actors_missing_cla: [%s]", org_repo, config, ", ".join(actor_debug_data))
             out_actors_missing_cla = []
             allowlisted_actors = []
+            seen_actors = set()
             for actor in actors_missing_cla:
                 if actor is None:
                     continue
@@ -1103,19 +1104,21 @@ def skip_allowlisted_bots(self, org_model, org_repo, actors_missing_cla) -> Tupl
                     )
                     cla.log.debug("Checking actor: %s for skip_cla config: %s", actor_data, config)
                     if self.is_actor_skipped(actor, config):
-                        msg = "Skipping CLA check for repo='{}', actor: {} due to skip_cla config: '{}'".format(
-                            org_repo,
-                            actor_data,
-                            config,
-                        )
-                        cla.log.info(msg)
-                        Event.create_event(
-                            event_type=EventType.BypassCLA,
-                            event_data=msg,
-                            event_summary=msg,
-                            event_user_name=actor_data,
-                            contains_pii=True,
-                        )
+                        if not actor_data in seen_actors:
+                            seen_actors.add(actor_data)
+                            msg = "Skipping CLA check for repo='{}', actor: {} due to skip_cla config: '{}'".format(
+                                org_repo,
+                                actor_data,
+                                config,
+                            )
+                            cla.log.info(msg)
+                            Event.create_event(
+                                event_type=EventType.BypassCLA,
+                                event_data=msg,
+                                event_summary=msg,
+                                event_user_name=actor_data,
+                                contains_pii=True,
+                            )
                         actor.authorized = True
                         allowlisted_actors.append(actor)
                         continue