Merge pull request #4727 from linuxfoundation/unicron-4701-allow-bots-to-skip-cla-3

Fix logic issue

Author: lukaszgryglicki

cla-backend-go/signatures/service.go

@@ -1114,8 +1114,13 @@ func (s service) updateChangeRequest(ctx context.Context, ghOrg *models.GithubOr
 	}
 
 	log.WithFields(f).Debugf("commit authors status => signed: %+v and missing: %+v", signed, unsigned)
-	unsigned, signed = github.SkipWhitelistedBots(s.eventsService, ghOrg, gitHubRepoName, projectID, unsigned)
-	log.WithFields(f).Debugf("commit authors status after whitelisting bots => signed: %+v and missing: %+v", signed, unsigned)
+	var whitelisted []*github.UserCommitSummary
+	unsigned, whitelisted = github.SkipWhitelistedBots(s.eventsService, ghOrg, gitHubRepoName, projectID, unsigned)
+	if len(whitelisted) > 0 {
+		log.WithFields(f).Debugf("adding %d whitelisted actors to signed list", len(whitelisted))
+		signed = append(signed, whitelisted...)
+	}
+	log.WithFields(f).Debugf("commit authors status after whitelisting bots => signed: %+v, missing: %+v, whitelisted: %+v", signed, unsigned, whitelisted)
 
 	// update pull request
 	updateErr := github.UpdatePullRequest(ctx, ghOrg.OrganizationInstallationID, int(pullRequestID), gitHubOrgName, gitHubRepoName, githubRepository.ID, *latestSHA, signed, unsigned, s.claBaseAPIURL, s.claLandingPage, s.claLogoURL)

cla-backend-go/v2/sign/helpers.go

@@ -148,8 +148,13 @@ func (s service) updateChangeRequest(ctx context.Context, installationID, reposi
 
 	log.WithFields(f).Debugf("commit authors status => signed: %+v and missing: %+v", signed, unsigned)
 	if ghOrg != nil {
-		unsigned, signed = github.SkipWhitelistedBots(s.eventsService, ghOrg, gitHubRepoName, projectID, unsigned)
-		log.WithFields(f).Debugf("commit authors status after whitelisting bots => signed: %+v and missing: %+v", signed, unsigned)
+		var whitelisted []*github.UserCommitSummary
+		unsigned, whitelisted = github.SkipWhitelistedBots(s.eventsService, ghOrg, gitHubRepoName, projectID, unsigned)
+		if len(whitelisted) > 0 {
+			log.WithFields(f).Debugf("adding %d whitelisted actors to signed list", len(whitelisted))
+			signed = append(signed, whitelisted...)
+		}
+		log.WithFields(f).Debugf("commit authors status after whitelisting bots => signed: %+v, missing: %+v, whitelisted: %+v", signed, unsigned, whitelisted)
 	}
 
 	// update pull request

cla-backend/cla/models/github_models.py

@@ -741,7 +741,10 @@ def update_merge_group(self, installation_id, github_repository_id, merge_group_
         # Skip whitelisted bots per org/repo GitHub login/email regexps
         # repo can be defined as '*' (all repos) or re:<regexp> (regexp to match repo name) or 'repo-name' for exact match
         # the same for value which is GitHub login match then ; separator and then email match (same matching via * or re:<regexp> or exact-match) 
-        missing, signed = self.skip_whitelisted_bots(github_org, repository.get_repository_name(), missing)
+        missing, whitelisted = self.skip_whitelisted_bots(github_org, repository.get_repository_name(), missing)
+        if whitelisted is not None and len(whitelisted) > 0:
+            cla.log.debug(f"{fn} - adding {len(whitelisted)} whitelisted actors to signed list")
+            signed.extend(whitelisted)
 
         # update Merge group status
         self.update_merge_group_status(
@@ -906,7 +909,10 @@ def update_change_request(self, installation_id, github_repository_id, change_re
         # Skip whitelisted bots per org/repo GitHub login/email regexps
         # repo can be defined as '*' (all repos) or re:<regexp> (regexp to match repo name) or 'repo-name' for exact match
         # the same for value which is GitHub login match then ; separator and then email match (same matching via * or re:<regexp> or exact-match) 
-        missing, signed = self.skip_whitelisted_bots(github_org, repository.get_repository_name(), missing)
+        missing, whitelisted = self.skip_whitelisted_bots(github_org, repository.get_repository_name(), missing)
+        if whitelisted is not None and len(whitelisted) > 0:
+            cla.log.debug(f"{fn} - adding {len(whitelisted)} whitelisted actors to signed list")
+            signed.extend(whitelisted)
         # At this point, the signed and missing lists are now filled and updated with the commit user info
 
         cla.log.debug(