summarise

Author: motatoes

backend/controllers/github.go

@@ -34,7 +34,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path"
 	"path/filepath"
 	"reflect"
 	"runtime/debug"
@@ -596,8 +595,11 @@ func GetDiggerConfigForBranch(gh utils.GithubClientProvider, installationId int6
 	var dependencyGraph graph.Graph[string, dg_configuration.Project]
 
 	err = utils.CloneGitRepoAndDoAction(cloneUrl, branch, "", *token, func(dir string) error {
-		diggerYmlBytes, err := os.ReadFile(path.Join(dir, "digger.yml"))
-		diggerYmlStr = string(diggerYmlBytes)
+		diggerYmlStr, err = dg_configuration.ReadDiggerYmlFileContents(dir)
+		if err != nil {
+			log.Printf("could not load digger config: %v", err)
+			return err
+		}
 		config, _, dependencyGraph, err = dg_configuration.LoadDiggerConfig(dir, true, changedFiles)
 		if err != nil {
 			log.Printf("Error loading digger config: %v", err)

backend/controllers/projects.go

@@ -485,7 +485,6 @@ func (d DiggerController) SetJobStatusForProject(c *gin.Context) {
 	err = CreateTerraformOutputsSummary(d.GithubClientProvider, batch)
 	if err != nil {
 		log.Printf("could not generate terraform plans summary: %v", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "could not generate terraform plans summary"})
 	}
 
 	err = AutomergePRforBatchIfEnabled(d.GithubClientProvider, batch)
@@ -660,10 +659,13 @@ func CreateTerraformOutputsSummary(gh utils.GithubClientProvider, batch *models.
 		log.Printf("Error loading digger config from batch: %v", err)
 		return fmt.Errorf("error loading digger config from batch: %v", err)
 	}
-	
+
+	log.Printf("creating AI summary now")
+
 	config, _, err := digger_config.ConvertDiggerYamlToConfig(diggerConfigYml)
 
 	if batch.Status == orchestrator_scheduler.BatchJobSucceeded && config.Reporting.AiSummary == true {
+		log.Printf("initiating ai summary creation")
 		prService, err := GetPrServiceFromBatch(batch, gh)
 		if err != nil {
 			log.Printf("Error getting github service: %v", err)
@@ -678,6 +680,11 @@ func CreateTerraformOutputsSummary(gh utils.GithubClientProvider, batch *models.
 		apiToken := os.Getenv("DIGGER_AI_SUMMARY_API_TOKEN")
 
 		jobs, err := models.DB.GetDiggerJobsForBatch(batch.ID)
+		if err != nil {
+			log.Printf("could not get jobs for batch: %v", err)
+			return fmt.Errorf("could not get jobs for batch: %v", err)
+		}
+
 		var terraformOutputs = ""
 		for _, job := range jobs {
 			var jobSpec orchestrator_scheduler.JobJson

libs/digger_config/digger_config.go

@@ -30,6 +30,17 @@ type FileSystemTerragruntDirWalker struct {
 type FileSystemModuleDirWalker struct {
 }
 
+func ReadDiggerYmlFileContents(dir string) (string, error) {
+	var diggerYmlBytes []byte
+	diggerYmlBytes, err := os.ReadFile(path.Join(dir, "digger.yml"))
+	if err != nil {
+		// if file doesn't exist look for digger.yaml instead
+		diggerYmlBytes, err = os.ReadFile(path.Join(dir, "digger.yaml"))
+	}
+	diggerYmlStr := string(diggerYmlBytes)
+	return diggerYmlStr, nil
+}
+
 func CheckOrCreateDiggerFile(dir string) error {
 	// Check for digger.yml
 	ymlPath := filepath.Join(dir, "digger.yml")