Report no-changes plans correctly (#790)

* report no changes correctly * fix for no collapsible comments Former-commit-id: c94d8ca
diggerhq · Nov 16, 2023 · d61f7ed · d61f7ed
1 parent ff5816c
commit d61f7ed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/cmd/digger/main.go b/cmd/digger/main.go
@@ -138,9 +138,10 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 		planStorage := newPlanStorage(ghToken, repoOwner, repositoryName, githubActor, job.PullRequestNumber)
 
 		reporter := &reporting.CiReporter{
-			CiService:      &githubPrService,
-			PrNumber:       *job.PullRequestNumber,
-			ReportStrategy: reportingStrategy,
+			CiService:         &githubPrService,
+			PrNumber:          *job.PullRequestNumber,
+			ReportStrategy:    reportingStrategy,
+			IsSupportMarkdown: true,
 		}
 
 		jobs := []orchestrator.Job{orchestrator.JsonToJob(job)}
@@ -304,9 +305,10 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 		planStorage := newPlanStorage(ghToken, repoOwner, repositoryName, githubActor, &prNumber)
 
 		reporter := &reporting.CiReporter{
-			CiService:      &githubPrService,
-			PrNumber:       prNumber,
-			ReportStrategy: reportingStrategy,
+			CiService:         &githubPrService,
+			PrNumber:          prNumber,
+			ReportStrategy:    reportingStrategy,
+			IsSupportMarkdown: true,
 		}
 
 		jobs = digger.SortedCommandsByDependency(jobs, &dependencyGraph)

diff --git a/pkg/digger/digger.go b/pkg/digger/digger.go
@@ -223,8 +223,8 @@ func run(command string, job orchestrator.Job, policyChecker policy.Checker, org
 			}
 			return msg, fmt.Errorf(msg)
 		} else if planPerformed {
-			reportTerraformPlanOutput(reporter, projectLock.LockId(), plan)
 			if isNonEmptyPlan {
+				reportTerraformPlanOutput(reporter, projectLock.LockId(), plan)
 				planIsAllowed, messages, err := policyChecker.CheckPlanPolicy(SCMrepository, job.ProjectName, planJsonOutput)
 				if err != nil {
 					msg := fmt.Sprintf("Failed to validate plan. %v", err)
@@ -259,6 +259,8 @@ func run(command string, job orchestrator.Job, policyChecker policy.Checker, org
 						log.Printf("Failed to report plan. %v", err)
 					}
 				}
+			} else {
+				reportTerraformPlanOutput(reporter, projectLock.LockId(), "No changes in terraform plan\n")
 			}
 			err := prService.SetStatus(*job.PullRequestNumber, "success", job.ProjectName+"/plan")
 			if err != nil {