config option to disable digger/apply status check (#2128)

* config option to disable digger/apply status check

* add status check

Author: motatoes

backend/controllers/projects_helpers.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/diggerhq/digger/backend/models"
 	"github.com/diggerhq/digger/backend/utils"
+	"github.com/diggerhq/digger/libs/digger_config"
 	orchestrator_scheduler "github.com/diggerhq/digger/libs/scheduler"
 	"log/slog"
 )
@@ -26,6 +27,27 @@ func UpdateCheckStatusForBatch(gh utils.GithubClientProvider, batch *models.Digg
 		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()
@@ -41,10 +63,15 @@ func UpdateCheckStatusForBatch(gh utils.GithubClientProvider, batch *models.Digg
 		"newStatus", serializedBatch.ToStatusCheck())
 	if isPlanBatch {
 		prService.SetStatus(batch.PrNumber, serializedBatch.ToStatusCheck(), "digger/plan")
-		prService.SetStatus(batch.PrNumber, "pending", "digger/apply")
+		if disableDiggerApplyStatusCheck == false {
+			prService.SetStatus(batch.PrNumber, "pending", "digger/apply")
+		}
+
 	} else {
 		prService.SetStatus(batch.PrNumber, "success", "digger/plan")
-		prService.SetStatus(batch.PrNumber, serializedBatch.ToStatusCheck(), "digger/apply")
+		if disableDiggerApplyStatusCheck == false {
+			prService.SetStatus(batch.PrNumber, serializedBatch.ToStatusCheck(), "digger/apply")
+		}
 	}
 	return nil
 }

docs/ce/howto/apply-on-merge.mdx

@@ -8,6 +8,7 @@ You can configure Digger to run apply on merge with the following entries in `di
 
 ```
 disable_digger_apply_comment: true
+disable_digger_apply_status_check: true
 
 projects:
  ...

libs/digger_config/config.go

@@ -12,23 +12,24 @@ const AutomergeStrategyRebase AutomergeStrategy = "rebase"
 const DefaultBranchName = "__default__"
 
 type DiggerConfig struct {
-	ApplyAfterMerge            bool
-	AllowDraftPRs              bool
-	CommentRenderMode          string
-	DependencyConfiguration    DependencyConfiguration
-	DeletePriorComments        bool
-	DisableDiggerApplyComment  bool
-	RespectLayers              bool
-	PrLocks                    bool
-	Projects                   []Project
-	AutoMerge                  bool
-	AutoMergeStrategy          AutomergeStrategy
-	Telemetry                  bool
-	Workflows                  map[string]Workflow
-	MentionDriftedProjectsInPR bool
-	TraverseToNestedProjects   bool
-	Reporting                  ReporterConfig
-	ReportTerraformOutputs     bool
+	ApplyAfterMerge               bool
+	AllowDraftPRs                 bool
+	CommentRenderMode             string
+	DependencyConfiguration       DependencyConfiguration
+	DeletePriorComments           bool
+	DisableDiggerApplyComment     bool
+	DisableDiggerApplyStatusCheck bool
+	RespectLayers                 bool
+	PrLocks                       bool
+	Projects                      []Project
+	AutoMerge                     bool
+	AutoMergeStrategy             AutomergeStrategy
+	Telemetry                     bool
+	Workflows                     map[string]Workflow
+	MentionDriftedProjectsInPR    bool
+	TraverseToNestedProjects      bool
+	Reporting                     ReporterConfig
+	ReportTerraformOutputs        bool
 }
 
 type ReporterConfig struct {

libs/digger_config/converters.go

@@ -217,6 +217,12 @@ func ConvertDiggerYamlToConfig(diggerYaml *DiggerConfigYaml) (*DiggerConfig, gra
 		diggerConfig.DisableDiggerApplyComment = false
 	}
 
+	if diggerYaml.DisableDiggerApplyStatusCheck != nil {
+		diggerConfig.DisableDiggerApplyStatusCheck = *diggerYaml.DisableDiggerApplyStatusCheck
+	} else {
+		diggerConfig.DisableDiggerApplyStatusCheck = false
+	}
+
 	if diggerYaml.ReportTerraformOutputs != nil {
 		diggerConfig.ReportTerraformOutputs = *diggerYaml.ReportTerraformOutputs
 	} else {

libs/digger_config/yaml.go

@@ -8,24 +8,25 @@ import (
 )
 
 type DiggerConfigYaml struct {
-	ApplyAfterMerge            *bool                        `yaml:"apply_after_merge"`
-	RespectLayers              *bool                        `yaml:"respect_layers"`
-	AllowDraftPRs              *bool                        `yaml:"allow_draft_prs"`
-	DependencyConfiguration    *DependencyConfigurationYaml `yaml:"dependency_configuration"`
-	DeletePriorComments        *bool                        `yaml:"delete_prior_comments"`
-	DisableDiggerApplyComment  *bool                        `yaml:"disable_digger_apply_comment"`
-	PrLocks                    *bool                        `yaml:"pr_locks"`
-	Projects                   []*ProjectYaml               `yaml:"projects"`
-	AutoMerge                  *bool                        `yaml:"auto_merge"`
-	AutoMergeStrategy          *string                      `yaml:"auto_merge_strategy"`
-	CommentRenderMode          *string                      `yaml:"comment_render_mode"`
-	Workflows                  map[string]*WorkflowYaml     `yaml:"workflows"`
-	Telemetry                  *bool                        `yaml:"telemetry,omitempty"`
-	GenerateProjectsConfig     *GenerateProjectsConfigYaml  `yaml:"generate_projects"`
-	TraverseToNestedProjects   *bool                        `yaml:"traverse_to_nested_projects"`
-	MentionDriftedProjectsInPR *bool                        `yaml:"mention_drifted_projects_in_pr"`
-	ReportTerraformOutputs     *bool                        `yaml:"report_terraform_outputs"`
-	Reporting                  *ReportingConfigYaml         `yaml:"reporting"`
+	ApplyAfterMerge               *bool                        `yaml:"apply_after_merge"`
+	RespectLayers                 *bool                        `yaml:"respect_layers"`
+	AllowDraftPRs                 *bool                        `yaml:"allow_draft_prs"`
+	DependencyConfiguration       *DependencyConfigurationYaml `yaml:"dependency_configuration"`
+	DeletePriorComments           *bool                        `yaml:"delete_prior_comments"`
+	DisableDiggerApplyComment     *bool                        `yaml:"disable_digger_apply_comment"`
+	DisableDiggerApplyStatusCheck *bool                        `yaml:"disable_digger_apply_status_check,omitempty"`
+	PrLocks                       *bool                        `yaml:"pr_locks"`
+	Projects                      []*ProjectYaml               `yaml:"projects"`
+	AutoMerge                     *bool                        `yaml:"auto_merge"`
+	AutoMergeStrategy             *string                      `yaml:"auto_merge_strategy"`
+	CommentRenderMode             *string                      `yaml:"comment_render_mode"`
+	Workflows                     map[string]*WorkflowYaml     `yaml:"workflows"`
+	Telemetry                     *bool                        `yaml:"telemetry,omitempty"`
+	GenerateProjectsConfig        *GenerateProjectsConfigYaml  `yaml:"generate_projects"`
+	TraverseToNestedProjects      *bool                        `yaml:"traverse_to_nested_projects"`
+	MentionDriftedProjectsInPR    *bool                        `yaml:"mention_drifted_projects_in_pr"`
+	ReportTerraformOutputs        *bool                        `yaml:"report_terraform_outputs"`
+	Reporting                     *ReportingConfigYaml         `yaml:"reporting"`
 }
 
 type ReportingConfigYaml struct {