Fix/use right GitHub provider (#1623)

motatoes · web-flow · commit d306bef8dcba · 2024-07-16T12:08:23.000+01:00
* pass the right github providers in functions
diff --git a/backend/controllers/github.go b/backend/controllers/github.go
@@ -642,7 +642,7 @@ func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullR
 		return fmt.Errorf("error fetching ci backed %v", err)
 	}
 
-	err = TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, prNumber, ghService)
+	err = TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, prNumber, ghService, gh)
 	if err != nil {
 		log.Printf("TriggerDiggerJobs error: %v", err)
 		utils.InitCommentReporter(ghService, prNumber, fmt.Sprintf(":x: TriggerDiggerJobs error: %v", err))
@@ -947,7 +947,7 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 		utils.InitCommentReporter(ghService, issueNumber, fmt.Sprintf(":x: GetCiBackend error: %v", err))
 		return fmt.Errorf("error fetching ci backed %v", err)
 	}
-	err = TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, ghService)
+	err = TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, ghService, gh)
 	if err != nil {
 		log.Printf("TriggerDiggerJobs error: %v", err)
 		utils.InitCommentReporter(ghService, issueNumber, fmt.Sprintf(":x: TriggerDiggerJobs error: %v", err))
@@ -956,7 +956,7 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 	return nil
 }
 
-func TriggerDiggerJobs(ciBackend ci_backends.CiBackend, repoFullName string, repoOwner string, repoName string, batchId *uuid.UUID, prNumber int, prService ci.PullRequestService) error {
+func TriggerDiggerJobs(ciBackend ci_backends.CiBackend, repoFullName string, repoOwner string, repoName string, batchId *uuid.UUID, prNumber int, prService ci.PullRequestService, gh utils.GithubClientProvider) error {
 	_, err := models.DB.GetDiggerBatch(batchId)
 	if err != nil {
 		log.Printf("failed to get digger batch, %v\n", err)
@@ -979,7 +979,7 @@ func TriggerDiggerJobs(ciBackend ci_backends.CiBackend, repoFullName string, rep
 		log.Printf("jobString: %v \n", jobString)
 
 		// TODO: make workflow file name configurable
-		err = services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, batchId, &job)
+		err = services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, batchId, &job, gh)
 		if err != nil {
 			log.Printf("failed to trigger CI workflow, %v\n", err)
 			return fmt.Errorf("failed to trigger CI workflow, %v\n", err)
diff --git a/backend/controllers/projects.go b/backend/controllers/projects.go
@@ -435,7 +435,7 @@ func (d DiggerController) SetJobStatusForProject(c *gin.Context) {
 
 			repoFullNameSplit := strings.Split(jobLink.RepoFullName, "/")
 			client, _, err := ghClientProvider.Get(installations[0].GithubAppId, installationLink.GithubInstallationId)
-			err = services.DiggerJobCompleted(client, &job.Batch.ID, job, jobLink.RepoFullName, repoFullNameSplit[0], repoFullNameSplit[1], workflowFileName)
+			err = services.DiggerJobCompleted(client, &job.Batch.ID, job, jobLink.RepoFullName, repoFullNameSplit[0], repoFullNameSplit[1], workflowFileName, d.GithubClientProvider)
 			if err != nil {
 				log.Printf("Error triggering job: %v", err)
 				return
diff --git a/backend/services/scheduler.go b/backend/services/scheduler.go
@@ -5,13 +5,14 @@ import (
 	"github.com/diggerhq/digger/backend/ci_backends"
 	"github.com/diggerhq/digger/backend/config"
 	"github.com/diggerhq/digger/backend/models"
+	"github.com/diggerhq/digger/backend/utils"
 	orchestrator_scheduler "github.com/diggerhq/digger/libs/scheduler"
 	"github.com/google/go-github/v61/github"
 	"github.com/google/uuid"
 	"log"
 )
 
-func DiggerJobCompleted(client *github.Client, batchId *uuid.UUID, parentJob *models.DiggerJob, repoFullName string, repoOwner string, repoName string, workflowFileName string) error {
+func DiggerJobCompleted(client *github.Client, batchId *uuid.UUID, parentJob *models.DiggerJob, repoFullName string, repoOwner string, repoName string, workflowFileName string, gh utils.GithubClientProvider) error {
 	log.Printf("DiggerJobCompleted parentJobId: %v", parentJob.DiggerJobID)
 
 	jobLinksForParent, err := models.DB.GetDiggerJobParentLinksByParentId(&parentJob.DiggerJobID)
@@ -45,18 +46,18 @@ func DiggerJobCompleted(client *github.Client, batchId *uuid.UUID, parentJob *mo
 				return err
 			}
 			ciBackend := ci_backends.GithubActionCi{Client: client}
-			ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, batchId, job)
+			ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, batchId, job, gh)
 		}
 
 	}
 	return nil
 }
 
-func ScheduleJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner string, repoName string, batchId *uuid.UUID, job *models.DiggerJob) error {
+func ScheduleJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner string, repoName string, batchId *uuid.UUID, job *models.DiggerJob, gh utils.GithubClientProvider) error {
 	maxConcurrencyForBatch := config.DiggerConfig.GetInt("max_concurrency_per_batch")
 	if maxConcurrencyForBatch == 0 {
 		// concurrency limits not set
-		err := TriggerJob(ciBackend, repoFullname, repoOwner, repoName, batchId, job)
+		err := TriggerJob(gh, ciBackend, repoFullname, repoOwner, repoName, batchId, job)
 		if err != nil {
 			log.Printf("Could not trigger job: %v", err)
 			return err
@@ -79,7 +80,7 @@ func ScheduleJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner
 			models.DB.UpdateDiggerJob(job)
 			return nil
 		} else {
-			err := TriggerJob(ciBackend, repoFullname, repoOwner, repoName, batchId, job)
+			err := TriggerJob(gh, ciBackend, repoFullname, repoOwner, repoName, batchId, job)
 			if err != nil {
 				log.Printf("Could not trigger job: %v", err)
 				return err
@@ -89,7 +90,7 @@ func ScheduleJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner
 	return nil
 }
 
-func TriggerJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner string, repoName string, batchId *uuid.UUID, job *models.DiggerJob) error {
+func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend, repoFullname string, repoOwner string, repoName string, batchId *uuid.UUID, job *models.DiggerJob) error {
 	log.Printf("TriggerJob jobId: %v", job.DiggerJobID)
 
 	if job.SerializedJobSpec == nil {
@@ -111,7 +112,7 @@ func TriggerJob(ciBackend ci_backends.CiBackend, repoFullname string, repoOwner
 		return fmt.Errorf("coult not get spec %v", err)
 	}
 
-	vcsToken, err := GetVCSTokenFromJob(*job)
+	vcsToken, err := GetVCSTokenFromJob(*job, gh)
 	if err != nil {
 		log.Printf("could not get vcs token: %v", err)
 		return fmt.Errorf("coult not get vcs token: %v", err)
diff --git a/backend/services/spec.go b/backend/services/spec.go
@@ -12,14 +12,14 @@ import (
 	"strconv"
 )
 
-func GetVCSTokenFromJob(job models.DiggerJob) (*string, error) {
+func GetVCSTokenFromJob(job models.DiggerJob, gh utils.GithubClientProvider) (*string, error) {
 	// TODO: make it VCS generic
 	batch := job.Batch
 	var token string
 	switch batch.VCS {
 	case models.DiggerVCSGithub:
 		_, ghToken, err := utils.GetGithubService(
-			utils.DiggerGithubRealClientProvider{},
+			gh,
 			job.Batch.GithubInstallationId,
 			job.Batch.RepoFullName,
 			job.Batch.RepoOwner,
diff --git a/backend/tasks/runs.go b/backend/tasks/runs.go
@@ -4,13 +4,14 @@ import (
 	"github.com/diggerhq/digger/backend/ci_backends"
 	"github.com/diggerhq/digger/backend/models"
 	"github.com/diggerhq/digger/backend/services"
+	"github.com/diggerhq/digger/backend/utils"
 	"github.com/diggerhq/digger/libs/ci"
 	"github.com/diggerhq/digger/libs/ci/github"
 	orchestrator_scheduler "github.com/diggerhq/digger/libs/scheduler"
 	"log"
 )
 
-func RunQueuesStateMachine(queueItem *models.DiggerRunQueueItem, service ci.PullRequestService) {
+func RunQueuesStateMachine(queueItem *models.DiggerRunQueueItem, service ci.PullRequestService, gh utils.GithubClientProvider) {
 	dr := queueItem.DiggerRun
 	switch queueItem.DiggerRun.Status {
 	case models.RunQueued:
@@ -30,7 +31,7 @@ func RunQueuesStateMachine(queueItem *models.DiggerRunQueueItem, service ci.Pull
 			return
 		}
 
-		vcsToken, err := services.GetVCSTokenFromJob(*job)
+		vcsToken, err := services.GetVCSTokenFromJob(*job, gh)
 		if err != nil {
 			log.Printf("could not get vcs token: %v", err)
 			return
@@ -103,7 +104,7 @@ func RunQueuesStateMachine(queueItem *models.DiggerRunQueueItem, service ci.Pull
 			return
 		}
 
-		vcsToken, err := services.GetVCSTokenFromJob(*job)
+		vcsToken, err := services.GetVCSTokenFromJob(*job, gh)
 		if err != nil {
 			log.Printf("could not get vcs token: %v", err)
 			return
diff --git a/backend/tasks/runs_test.go b/backend/tasks/runs_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/diggerhq/digger/backend/models"
+	"github.com/diggerhq/digger/backend/utils"
 	github2 "github.com/diggerhq/digger/libs/ci/github"
 	orchestrator_scheduler "github.com/diggerhq/digger/libs/scheduler"
 	"github.com/diggerhq/digger/libs/spec"
@@ -152,7 +153,7 @@ func TestThatRunQueueItemMovesFromQueuedToPlanningAfterPickup(t *testing.T) {
 		models.DB.UpdateDiggerBatch(batch)
 		queueItem, _ = models.DB.GetDiggerRunQueueItem(queueItem.ID)
 
-		RunQueuesStateMachine(queueItem, ciService)
+		RunQueuesStateMachine(queueItem, ciService, utils.DiggerGithubClientMockProvider{})
 		diggerRunRefreshed, _ := models.DB.GetDiggerRun(diggerRun.ID)
 		assert.Equal(t, testParam.NextExpectedStatus, diggerRunRefreshed.Status)
 	}
diff --git a/backend/tasks/tasks.go b/backend/tasks/tasks.go
@@ -42,7 +42,7 @@ func main() {
 				log.Printf("failed to get github service for DiggerRun ID: %v: %v", dr.ID, err)
 				continue
 			}
-			RunQueuesStateMachine(&queueItem, service)
+			RunQueuesStateMachine(&queueItem, service, &utils.DiggerGithubRealClientProvider{})
 		}
 	})
 
@@ -64,7 +64,7 @@ func main() {
 			}
 
 			ciBackend := ci_backends.GithubActionCi{Client: service.Client}
-			services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, &batch.ID, &job)
+			services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, &batch.ID, &job, &utils.DiggerGithubRealClientProvider{})
 		}
 	})
 
diff --git a/backend/utils/github.go b/backend/utils/github.go
@@ -122,7 +122,7 @@ func (gh DiggerGithubClientMockProvider) NewClient(netClient *net.Client) (*gith
 	return ghClient, nil
 }
 
-func (gh *DiggerGithubClientMockProvider) Get(githubAppId int64, installationId int64) (*github.Client, *string, error) {
+func (gh DiggerGithubClientMockProvider) Get(githubAppId int64, installationId int64) (*github.Client, *string, error) {
 	ghClient, _ := gh.NewClient(gh.MockedHTTPClient)
 	token := "token"
 	return ghClient, &token, nil
diff --git a/ee/backend/controllers/gitlab.go b/ee/backend/controllers/gitlab.go
@@ -515,7 +515,7 @@ func handleIssueCommentEvent(gitlabProvider utils.GitlabProvider, payload *gitla
 		utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: GetCiBackend error: %v", err))
 		return fmt.Errorf("error fetching ci backed %v", err)
 	}
-	err = controllers.TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, glService)
+	err = controllers.TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, glService, nil)
 	if err != nil {
 		log.Printf("TriggerDiggerJobs error: %v", err)
 		utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: TriggerDiggerJobs error: %v", err))

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func main() {`
`42`	`42`	`log.Printf("failed to get github service for DiggerRun ID: %v: %v", dr.ID, err)`
`43`	`43`	`continue`
`44`	`44`	`}`
`45`		`- RunQueuesStateMachine(&queueItem, service)`
	`45`	`+ RunQueuesStateMachine(&queueItem, service, &utils.DiggerGithubRealClientProvider{})`
`46`	`46`	`}`
`47`	`47`	`})`
`48`	`48`
`@@ -64,7 +64,7 @@ func main() {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`ciBackend := ci_backends.GithubActionCi{Client: service.Client}`
`67`		`- services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, &batch.ID, &job)`
	`67`	`+ services.ScheduleJob(ciBackend, repoFullName, repoOwner, repoName, &batch.ID, &job, &utils.DiggerGithubRealClientProvider{})`
`68`	`68`	`}`
`69`	`69`	`})`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func (gh DiggerGithubClientMockProvider) NewClient(netClient net.Client) (gith`
`122`	`122`	`return ghClient, nil`
`123`	`123`	`}`
`124`	`124`
`125`		`-func (gh DiggerGithubClientMockProvider) Get(githubAppId int64, installationId int64) (github.Client, *string, error) {`
	`125`	`+func (gh DiggerGithubClientMockProvider) Get(githubAppId int64, installationId int64) (github.Client, string, error) {`
`126`	`126`	`ghClient, _ := gh.NewClient(gh.MockedHTTPClient)`
`127`	`127`	`token := "token"`
`128`	`128`	`return ghClient, &token, nil`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ func handleIssueCommentEvent(gitlabProvider utils.GitlabProvider, payload *gitla`
`515`	`515`	`utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: GetCiBackend error: %v", err))`
`516`	`516`	`return fmt.Errorf("error fetching ci backed %v", err)`
`517`	`517`	`}`
`518`		`- err = controllers.TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, glService)`
	`518`	`+ err = controllers.TriggerDiggerJobs(ciBackend, repoFullName, repoOwner, repoName, batchId, issueNumber, glService, nil)`
`519`	`519`	`if err != nil {`
`520`	`520`	`log.Printf("TriggerDiggerJobs error: %v", err)`
`521`	`521`	`utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: TriggerDiggerJobs error: %v", err))`