Address copilot review feedback

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

Author: lukaszgryglicki

cla-backend-go/github/bots.go

@@ -5,12 +5,13 @@ package github
 
 import (
 	"fmt"
+	"regexp"
+	"strings"
+
 	"github.com/linuxfoundation/easycla/cla-backend-go/events"
 	"github.com/linuxfoundation/easycla/cla-backend-go/gen/v1/models"
 	log "github.com/linuxfoundation/easycla/cla-backend-go/logging"
 	"github.com/sirupsen/logrus"
-	"regexp"
-	"strings"
 )
 
 // propertyMatches returns true if value matches the pattern.
@@ -74,10 +75,10 @@ func isActorSkipped(actor *UserCommitSummary, config string) bool {
 		username string
 		email    string
 	)
-	if actor.CommitAuthor != nil && actor.CommitAuthor.Login != nil {
+	if actor != nil && actor.CommitAuthor != nil && actor.CommitAuthor.Login != nil {
 		username = *actor.CommitAuthor.Login
 	}
-	if actor.CommitAuthor != nil && actor.CommitAuthor.Email != nil {
+	if actor != nil && actor.CommitAuthor != nil && actor.CommitAuthor.Email != nil {
 		email = *actor.CommitAuthor.Email
 	}
 
@@ -167,10 +168,14 @@ func SkipWhitelistedBots(ev events.Service, orgModel *models.GithubOrganization,
 		log.WithFields(f).Debug("No skip_cla config found for repo, skipping whitelisted bots check")
 		return actorsMissingCLA, []*UserCommitSummary{}
 	}
+	const nullStr = "(null)"
 
 	for _, actor := range actorsMissingCLA {
 		if isActorSkipped(actor, config) {
-			id, login, username, email := "(null)", "(null)", "(null)", "(null)"
+			if actor == nil {
+				continue
+			}
+			id, login, username, email := nullStr, nullStr, nullStr, nullStr
 			if actor.CommitAuthor != nil && actor.CommitAuthor.ID != nil {
 				id = fmt.Sprintf("%v", *actor.CommitAuthor.ID)
 			}

cla-backend/cla/models/github_models.py

@@ -1040,6 +1040,8 @@ def skip_whitelisted_bots(self, org_model, org_repo, actors_missing_cla) -> Tupl
             out_actors_missing_cla = []
             whitelisted_actors = []
             for actor in actors_missing_cla:
+                if actor is None:
+                    continue
                 try:
                     if self.is_actor_skipped(actor, config):
                         actor_data = "id='{}',login='{}',username='{}',email='{}'".format(

utils/skip_cla_entry.sh

@@ -3,7 +3,7 @@
 # put-item    Overwrites/adds the entire `skip_cla` entry.
 # add-key     Adds or updates a key/value inside the skip_cla map (preserves other keys)
 # delete-key  Removes a key from the skip_cla map
-# delete-item Deletes the entire `skip_cla`entry.
+# delete-item Deletes the entire `skip_cla` entry.
 #
 # MODE=add-key ./utils/skip_cla_entry.sh sun-test-org 'repo1' 're:vee?rendra' '*'
 # ./utils/scan.sh github-orgs organization_name sun-test-org