fix next pathway digger

Author: motatoes

cli/pkg/spec/next.go

@@ -6,7 +6,6 @@ import (
 	"github.com/diggerhq/digger/cli/pkg/usage"
 	backend2 "github.com/diggerhq/digger/libs/backendapi"
 	comment_summary "github.com/diggerhq/digger/libs/comment_utils/summary"
-	"github.com/diggerhq/digger/libs/digger_config"
 	"github.com/diggerhq/digger/libs/scheduler"
 	"github.com/diggerhq/digger/libs/spec"
 	"github.com/samber/lo"
@@ -116,27 +115,21 @@ func RunSpecNext(
 		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get policy provider: %v", err), 1)
 	}
 
-	changedFiles, err := prService.GetChangedFiles(*spec.Job.PullRequestNumber)
-	if err != nil {
-		log.Printf("error getting changed files: %v", err)
-		reporterError(spec, backendApi, err)
-		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get changed files: %v", err), 1)
-	}
-
-	diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, changedFiles)
-	if err != nil {
-		log.Printf("error getting digger config: %v", err)
-		reporterError(spec, backendApi, err)
-		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
-	}
-	log.Printf("Digger digger_config read successfully\n")
+	//changedFiles, err := prService.GetChangedFiles(*spec.Job.PullRequestNumber)
+	//if err != nil {
+	//	usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get changed files: %v", err), 1)
+	//}
+	//diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", false, changedFiles)
+	//if err != nil {
+	//	usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
+	//}
+	//log.Printf("Digger digger_config read successfully\n")
 
-	commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
-	if err != nil {
-		log.Printf("error getting comment updater: %v", err)
-		reporterError(spec, backendApi, err)
-		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get comment updater: %v", err), 8)
-	}
+	commentUpdater := comment_summary.NoopCommentUpdater{}
+	//commentUpdater, err := commentUpdaterProvider.Get(*diggerConfig)
+	//if err != nil {
+	//	usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get comment updater: %v", err), 8)
+	//}
 
 	planStorage, err := PlanStorageProvider.GetPlanStorage(spec.VCS.RepoOwner, spec.VCS.RepoName, *spec.Job.PullRequestNumber)
 	if err != nil {
@@ -167,12 +160,12 @@ func RunSpecNext(
 	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, "", "")
+		_, reportingError := backendApi.ReportProjectJobStatus(spec.VCS.RepoName, spec.Job.ProjectName, spec.JobId, "failed", time.Now(), nil, "", "")
 		if reportingError != nil {
 			usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed run commands. %s", err), 5)
 		}
-		commentUpdater.UpdateComment(serializedBatch.Jobs, serializedBatch.PrNumber, prService, commentId)
-		digger.UpdateAggregateStatus(serializedBatch, prService)
+		//commentUpdater.UpdateComment(serializedBatch.Jobs, serializedBatch.PrNumber, prService, commentId)
+		//digger.UpdateAggregateStatus(serializedBatch, prService)
 		usage.ReportErrorAndExit(spec.VCS.RepoOwner, fmt.Sprintf("Failed to run commands. %s", err), 5)
 	}
 	usage.ReportErrorAndExit(spec.VCS.RepoOwner, "Digger finished successfully", 0)

next/services/scheduler.go

@@ -76,7 +76,7 @@ func TriggerJob(gh utils.GithubClientProvider, ciBackend ci_backends.CiBackend,
 		return fmt.Errorf("could not get variable spec from job: %v", err)
 	}
 
-	spec, err := GetSpecFromJob(*job, lib_spec.SpecTypeNextJob)
+	spec, err := GetSpecFromJob(*job, lib_spec.SpecTypeApplyBeforeMergeJob)
 	if err != nil {
 		log.Printf("could not get spec: %v", err)
 		return fmt.Errorf("coult not get spec %v", err)