From 5ae1286cd52dae8a013ca02147b56264f896d8dc Mon Sep 17 00:00:00 2001 From: motatoes Date: Fri, 21 Nov 2025 16:26:01 -0800 Subject: [PATCH] removal of unused functions, log error messages, correctly ommit conclusion when '' --- backend/controllers/projects_helpers.go | 117 ++---------------------- libs/ci/github/github.go | 2 +- 2 files changed, 9 insertions(+), 110 deletions(-) diff --git a/backend/controllers/projects_helpers.go b/backend/controllers/projects_helpers.go index dd3a27581..2a3ea20a3 100644 --- a/backend/controllers/projects_helpers.go +++ b/backend/controllers/projects_helpers.go @@ -111,74 +111,6 @@ func GenerateChecksSummaryForJob( job *models.DiggerJob) (string, error) { } - - -func UpdateCommitStatusForBatch(gh utils.GithubClientProvider, batch *models.DiggerBatch) error { - slog.Info("Updating PR status for batch", - "batchId", batch.ID, - "prNumber", batch.PrNumber, - "batchStatus", batch.Status, - "batchType", batch.BatchType, - ) - - prService, err := utils.GetPrServiceFromBatch(batch, gh) - if err != nil { - slog.Error("Error getting PR service", - "batchId", batch.ID, - "error", err, - ) - return fmt.Errorf("error getting github service: %v", err) - } - - diggerYmlString := batch.DiggerConfig - diggerConfigYml, err := digger_config.LoadDiggerConfigYamlFromString(diggerYmlString) - if err != nil { - slog.Error("Error loading Digger config from batch", - "batchId", batch.ID, - "error", err, - ) - return fmt.Errorf("error loading digger config from batch: %v", err) - } - - config, _, err := digger_config.ConvertDiggerYamlToConfig(diggerConfigYml) - if err != nil { - slog.Error("Error converting Digger YAML to config", - "batchId", batch.ID, - "error", err, - ) - return fmt.Errorf("error converting Digger YAML to config: %v", err) - } - - disableDiggerApplyStatusCheck := config.DisableDiggerApplyStatusCheck - - isPlanBatch := batch.BatchType == orchestrator_scheduler.DiggerCommandPlan - - serializedBatch, err := batch.MapToJsonStruct() - if err != nil { - slog.Error("Error mapping batch to json struct", - "batchId", batch.ID, - "error", err, - ) - return fmt.Errorf("error mapping batch to json struct: %v", err) - } - slog.Debug("Updating PR status for batch", - "batchId", batch.ID, "prNumber", batch.PrNumber, "batchStatus", batch.Status, "batchType", batch.BatchType, - "newStatus", serializedBatch.ToCommitStatusCheck()) - if isPlanBatch { - prService.SetStatus(batch.PrNumber, serializedBatch.ToCommitStatusCheck(), "digger/plan") - if disableDiggerApplyStatusCheck == false { - prService.SetStatus(batch.PrNumber, "pending", "digger/apply") - } - - } else { - prService.SetStatus(batch.PrNumber, "success", "digger/plan") - if disableDiggerApplyStatusCheck == false { - prService.SetStatus(batch.PrNumber, serializedBatch.ToCommitStatusCheck(), "digger/apply") - } - } - return nil -} - func UpdateCheckRunForBatch(gh utils.GithubClientProvider, batch *models.DiggerBatch) error { slog.Info("Updating PR status for batch", "batchId", batch.ID, @@ -272,7 +204,10 @@ func UpdateCheckRunForBatch(gh utils.GithubClientProvider, batch *models.DiggerB &message, utils.GetActionsForBatch(batch), } - ghPrService.UpdateCheckRun(*batch.CheckRunId, opts) + _, err = ghPrService.UpdateCheckRun(*batch.CheckRunId, opts) + if err != nil { + slog.Error("Error updating check run", "error", err, "batchId", batch.ID, "prNumber", batch.PrNumber) + } } else { if disableDiggerApplyStatusCheck == false { status := serializedBatch.ToCheckRunStatus() @@ -286,51 +221,15 @@ func UpdateCheckRunForBatch(gh utils.GithubClientProvider, batch *models.DiggerB &message, utils.GetActionsForBatch(batch), } - ghPrService.UpdateCheckRun(*batch.CheckRunId, opts) + _, err = ghPrService.UpdateCheckRun(*batch.CheckRunId, opts) + if err != nil { + slog.Error("Error updating check run", "batchId", batch.ID, "prNumber", batch.PrNumber) + } } } return nil } -func UpdateCommitStatusForJob(gh utils.GithubClientProvider, job *models.DiggerJob) error { - batch := job.Batch - slog.Info("Updating PR status for job", - "jobId", job.DiggerJobID, - "prNumber", batch.PrNumber, - "jobStatus", job.Status, - "batchType", batch.BatchType, - ) - - prService, err := utils.GetPrServiceFromBatch(batch, gh) - if err != nil { - slog.Error("Error getting PR service", - "batchId", batch.ID, - "error", err, - ) - return fmt.Errorf("error getting github service: %v", err) - } - - var jobSpec orchestrator_scheduler.JobJson - err = json.Unmarshal([]byte(job.SerializedJobSpec), &jobSpec) - if err != nil { - slog.Error("Could not unmarshal job spec", "jobId", job.DiggerJobID, "error", err) - return fmt.Errorf("could not unmarshal json string: %v", err) - } - - isPlan := jobSpec.IsPlan() - status, err := models.GetCommitStatusForJob(job) - if err != nil { - return fmt.Errorf("could not get status check for job: %v", err) - } - slog.Debug("Updating PR status for job", "jobId", job.DiggerJobID, "status", status) - if isPlan { - prService.SetStatus(batch.PrNumber, status, jobSpec.GetProjectAlias()+"/plan") - prService.SetStatus(batch.PrNumber, "neutral", jobSpec.GetProjectAlias()+"/apply") - } else { - prService.SetStatus(batch.PrNumber, status, jobSpec.GetProjectAlias()+"/apply") - } - return nil -} // more modern check runs on github have their own page func UpdateCheckRunForJob(gh utils.GithubClientProvider, job *models.DiggerJob) error { diff --git a/libs/ci/github/github.go b/libs/ci/github/github.go index f86583356..8e0a2c013 100644 --- a/libs/ci/github/github.go +++ b/libs/ci/github/github.go @@ -438,7 +438,7 @@ func (svc GithubService) UpdateCheckRun(checkRunId string, options GithubCheckRu opts.Status = github.String(*newStatus) } - if conclusion != nil { + if conclusion != nil && *conclusion != "" { opts.Conclusion = github.String(*conclusion) }