add logic for post merge queuing (#1640)

* add logic for post merge queuing

Author: motatoes

.github/workflows/next_deploy.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - develop    # change to main if needed
-      - feat/next3
+      - feat/next4
 
 jobs:
   deploy:

cli/pkg/spec/spec.go

@@ -14,6 +14,7 @@ import (
 	"github.com/samber/lo"
 	"log"
 	"os"
+	"os/exec"
 	"time"
 )
 
@@ -29,6 +30,17 @@ func RunSpec(
 	commentUpdaterProvider comment_summary.CommentUpdaterProvider,
 ) error {
 
+	// checking out to the commit ID
+	log.Printf("checking out to commit ID %v", spec.Job.Commit)
+	cmd := exec.Command("git", "checkout", spec.Job.Commit)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		log.Printf("error while checking out to commit SHA: %v", err)
+		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("error while checking out to commit sha: %v", err), 1)
+	}
+
 	job, err := jobProvider.GetJob(spec.Job)
 	if err != nil {
 		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get job: %v", err), 1)
@@ -107,8 +119,8 @@ func RunSpec(
 		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to get current dir. %s", err), 4)
 	}
 
-	// TODO: do not require conversion to gh service
-	allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, spec.JobId, true, false, commentId, currentDir)
+	reportTerraformOutput := spec.Reporter.ReportTerraformOutput
+	allAppliesSuccess, _, err := digger.RunJobs(jobs, prService, orgService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, spec.JobId, true, reportTerraformOutput, commentId, currentDir)
 	if !allAppliesSuccess || err != nil {
 		serializedBatch, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "")
 		if reportingError != nil {

libs/spec/models.go

@@ -5,8 +5,9 @@ import (
 )
 
 type ReporterSpec struct {
-	ReporterType      string `json:"reporter_type"`
-	ReportingStrategy string `json:"reporting_strategy"`
+	ReporterType          string `json:"reporter_type"`
+	ReportingStrategy     string `json:"reporting_strategy"`
+	ReportTerraformOutput bool   `json:"report_terraform_output"`
 }
 
 type LockSpec struct {

next/controllers/github.go

@@ -106,6 +106,12 @@ func (d DiggerController) GithubAppWebHook(c *gin.Context) {
 		}
 	case *github.PushEvent:
 		log.Printf("Got push event for %d", event.Repo.URL)
+		handlePushEventApplyAfterMerge(gh, event)
+		if err != nil {
+			log.Printf("handlePushEvent error: %v", err)
+			c.String(http.StatusInternalServerError, err.Error())
+			return
+		}
 	default:
 		log.Printf("Unhandled event, event type %v", reflect.TypeOf(event))
 	}
@@ -384,62 +390,6 @@ func handleInstallationDeletedEvent(installation *github.InstallationEvent) erro
 	return nil
 }
 
-func handlePushEvent(gh next_utils.GithubClientProvider, payload *github.PushEvent) error {
-	installationId := *payload.Installation.ID
-	repoName := *payload.Repo.Name
-	repoFullName := *payload.Repo.FullName
-	repoOwner := *payload.Repo.Owner.Login
-	cloneURL := *payload.Repo.CloneURL
-	ref := *payload.Ref
-	defaultBranch := *payload.Repo.DefaultBranch
-
-	link, err := dbmodels.DB.GetGithubAppInstallationLink(installationId)
-	if err != nil {
-		log.Printf("Error getting GetGithubAppInstallationLink: %v", err)
-		return fmt.Errorf("error getting github app link")
-	}
-
-	orgId := link.OrganizationID
-	diggerRepoName := strings.ReplaceAll(repoFullName, "/", "-")
-	repo, err := dbmodels.DB.GetRepo(orgId, diggerRepoName)
-	if err != nil {
-		log.Printf("Error getting Repo: %v", err)
-		return fmt.Errorf("error getting github app link")
-	}
-	if repo == nil {
-		log.Printf("Repo not found: Org: %v | repo: %v", orgId, diggerRepoName)
-		return fmt.Errorf("Repo not found: Org: %v | repo: %v", orgId, diggerRepoName)
-	}
-
-	_, token, err := next_utils.GetGithubService(gh, installationId, repoFullName, repoOwner, repoName)
-	if err != nil {
-		log.Printf("Error getting github service: %v", err)
-		return fmt.Errorf("error getting github service")
-	}
-
-	var isMainBranch bool
-	if strings.HasSuffix(ref, defaultBranch) {
-		isMainBranch = true
-	} else {
-		isMainBranch = false
-	}
-
-	err = utils.CloneGitRepoAndDoAction(cloneURL, defaultBranch, *token, func(dir string) error {
-		config, err := dg_configuration.LoadDiggerConfigYaml(dir, true, nil)
-		if err != nil {
-			log.Printf("ERROR load digger.yml: %v", err)
-			return fmt.Errorf("error loading digger.yml %v", err)
-		}
-		dbmodels.DB.UpdateRepoDiggerConfig(link.OrganizationID, *config, repo, isMainBranch)
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("error while cloning repo: %v", err)
-	}
-
-	return nil
-}
-
 func handlePullRequestEvent(gh next_utils.GithubClientProvider, payload *github.PullRequestEvent, ciBackendProvider ci_backends.CiBackendProvider) error {
 	installationId := *payload.Installation.ID
 	repoName := *payload.Repo.Name