remove runs reporting (#2076)

* remove runs reporting

* fix build

Author: motatoes

backend/bootstrap/main.go

@@ -192,7 +192,6 @@ func Bootstrap(templates embed.FS, diggerController controllers.DiggerController
 	authorized.GET("/orgs/:organisation/drift-policy", controllers.FindDriftPolicyForOrg)
 
 	authorized.GET("/repos/:repo/projects/:projectName/runs", controllers.RunHistoryForProject)
-	authorized.POST("/repos/:repo/projects/:projectName/runs", controllers.CreateRunForProject)
 
 	authorized.POST("/repos/:repo/projects/:projectName/jobs/:jobId/set-status", diggerController.SetJobStatusForProject)
 

backend/controllers/projects.go

@@ -1030,116 +1030,6 @@ type CreateProjectRunRequest struct {
 	Output    string    `json:"output"`
 }
 
-func CreateRunForProject(c *gin.Context) {
-	repoName := c.Param("repo")
-	projectName := c.Param("projectName")
-	orgId, exists := c.Get(middleware.ORGANISATION_ID_KEY)
-
-	if !exists {
-		slog.Warn("Organisation ID not found in context",
-			"repoName", repoName,
-			"projectName", projectName,
-		)
-		c.String(http.StatusForbidden, "Not allowed to access this resource")
-		return
-	}
-
-	slog.Info("Creating run for project",
-		"repoName", repoName,
-		"projectName", projectName,
-		"orgId", orgId,
-	)
-
-	org, err := models.DB.GetOrganisationById(orgId)
-	if err != nil {
-		slog.Error("Error fetching organisation",
-			"orgId", orgId,
-			"error", err,
-		)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error fetching organisation"})
-		return
-	}
-
-	var repo models.Repo
-	err = models.DB.GormDB.Where("name = ? AND organisation_id = ?", repoName, orgId).First(&repo).Error
-	if err != nil {
-		slog.Error("Error fetching repository",
-			"repoName", repoName,
-			"orgId", orgId,
-			"error", err,
-		)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error fetching repo"})
-		return
-	}
-
-	var project models.Project
-	err = models.DB.GormDB.Where("name = ? AND repo_id = ? AND organisation_id = ?", projectName, repo.ID, org.ID).First(&project).Error
-	if err != nil {
-		slog.Error("Error fetching project",
-			"projectName", projectName,
-			"repoName", repoName,
-			"error", err,
-		)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error fetching project"})
-		return
-	}
-
-	slog.Debug("Found project",
-		"projectId", project.ID,
-		"projectName", projectName,
-		"repoName", repoName,
-	)
-
-	var request CreateProjectRunRequest
-	err = c.BindJSON(&request)
-	if err != nil {
-		slog.Error("Error binding JSON request",
-			"projectName", projectName,
-			"error", err,
-		)
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Error binding JSON"})
-		return
-	}
-
-	run := models.ProjectRun{
-		StartedAt: request.StartedAt.UnixMilli(),
-		EndedAt:   request.EndedAt.UnixMilli(),
-		Status:    request.Status,
-		Command:   request.Command,
-		Output:    request.Output,
-		ProjectID: project.ID,
-		Project:   &project,
-	}
-
-	slog.Debug("Creating project run",
-		"projectId", project.ID,
-		"status", request.Status,
-		"command", request.Command,
-		"startedAt", request.StartedAt,
-		"endedAt", request.EndedAt,
-	)
-
-	err = models.DB.GormDB.Create(&run).Error
-	if err != nil {
-		slog.Error("Error creating run",
-			"projectName", projectName,
-			"projectId", project.ID,
-			"error", err,
-		)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error creating run"})
-		return
-	}
-
-	slog.Info("Successfully created run for project",
-		"runId", run.ID,
-		"projectName", projectName,
-		"projectId", project.ID,
-		"status", run.Status,
-	)
-
-	c.JSON(http.StatusOK, "")
-}
-
 func UpdateCommentsForBatchGroup(gh utils.GithubClientProvider, batch *models.DiggerBatch, serializedJobs []orchestrator_scheduler.SerializedJob) error {
 	slog.Debug("Updating comments for batch group",
 		"batchId", batch.ID,

cli/pkg/digger/digger.go

@@ -73,8 +73,6 @@ func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgServic
 	slog.Debug("Variable info", "TG_PROVIDER_CACHE_DIR", os.Getenv("TG_PROVIDER_CACHE_DIR"))
 	slog.Debug("Variable info", "TERRAGRUNT_PROVIDER_CACHE_DIR", os.Getenv("TERRAGRUNT_PROVIDER_CACHE_DIR"))
 
-	runStartedAt := time.Now()
-
 	exectorResults := make([]execution.DiggerExecutorResult, len(jobs))
 	appliesPerProject := make(map[string]bool)
 
@@ -98,13 +96,9 @@ func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgServic
 				continue
 			}
 
-			executorResult, output, err := run(command, job, policyChecker, orgService, SCMOrganisation, SCMrepository, job.PullRequestNumber, job.RequestedBy, reporter, lock, prService, job.Namespace, workingDir, planStorage, appliesPerProject)
+			executorResult, _, err := run(command, job, policyChecker, orgService, SCMOrganisation, SCMrepository, job.PullRequestNumber, job.RequestedBy, reporter, lock, prService, job.Namespace, workingDir, planStorage, appliesPerProject)
 			if err != nil {
 				slog.Error("error while running command for project", "command", command, "projectname", job.ProjectName, "error", err)
-				reportErr := backendApi.ReportProjectRun(SCMOrganisation+"-"+SCMrepository, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, output)
-				if reportErr != nil {
-					slog.Error("error reporting project Run err.", "error", reportErr)
-				}
 				appliesPerProject[job.ProjectName] = false
 				if executorResult != nil {
 					exectorResults[i] = *executorResult
@@ -114,10 +108,6 @@ func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgServic
 			}
 			exectorResults[i] = *executorResult
 
-			err = backendApi.ReportProjectRun(SCMOrganisation+"-"+SCMrepository, job.ProjectName, runStartedAt, time.Now(), "SUCCESS", command, output)
-			if err != nil {
-				slog.Error("Error reporting project Run", "error", err)
-			}
 		}
 	}
 
@@ -573,7 +563,6 @@ func RunJob(
 	driftNotification *core_drift.Notification,
 	workingDir string,
 ) error {
-	runStartedAt := time.Now()
 	SCMOrganisation, SCMrepository := utils.ParseRepoNamespace(repo)
 	slog.Info("Running commands for project", "commands", job.Commands, "project name", job.ProjectName)
 
@@ -591,10 +580,6 @@ func RunJob(
 				slog.Error("Error publishing comment.", "error", err)
 			}
 			slog.Error(msg)
-			err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "FORBIDDEN", command, msg)
-			if err != nil {
-				slog.Error("Error reporting Run.", "error", err)
-			}
 			return errors.New(msg)
 		}
 
@@ -652,61 +637,37 @@ func RunJob(
 			if err != nil {
 				slog.Error("Failed to send usage report.", "error", err)
 			}
-			_, _, _, plan, planJsonOutput, err := diggerExecutor.Plan()
+			_, _, _, _, planJsonOutput, err := diggerExecutor.Plan()
 			if err != nil {
 				msg := fmt.Sprintf("Failed to Run digger plan command. %v", err)
 				slog.Error(msg)
-				err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, msg)
-				if err != nil {
-					slog.Error("Error reporting Run.", "error", err)
-				}
 				return fmt.Errorf("%s", msg)
 			}
 			planIsAllowed, messages, err := policyChecker.CheckPlanPolicy(SCMrepository, SCMOrganisation, job.ProjectName, job.ProjectDir, planJsonOutput)
 			slog.Info(strings.Join(messages, "\n"))
 			if err != nil {
 				msg := fmt.Sprintf("Failed to validate plan %v", err)
 				slog.Error(msg)
-				err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, msg)
-				if err != nil {
-					slog.Error("Error reporting Run.", "error", err)
-				}
 				return fmt.Errorf("%s", msg)
 			}
 			if !planIsAllowed {
 				msg := fmt.Sprintf("Plan is not allowed")
 				slog.Error(msg)
-				err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, msg)
-				if err != nil {
-					slog.Error("Error reporting Run.", "error", err)
-				}
 				return fmt.Errorf("%s", msg)
 			} else {
-				err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "SUCCESS", command, plan)
-				if err != nil {
-					slog.Error("Error reporting Run.", "error", err)
-				}
 			}
 
 		case "digger apply":
 			err := usage.SendUsageRecord(requestedBy, job.EventName, "apply")
 			if err != nil {
 				slog.Error("Failed to send usage report.", "error", err)
 			}
-			_, _, output, err := diggerExecutor.Apply()
+			_, _, _, err = diggerExecutor.Apply()
 			if err != nil {
 				msg := fmt.Sprintf("Failed to Run digger apply command. %v", err)
 				slog.Error(msg)
-				err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "FAILED", command, msg)
-				if err != nil {
-					slog.Error("Error reporting Run.", "error", err)
-				}
 				return fmt.Errorf("%s", msg)
 			}
-			err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "SUCCESS", command, output)
-			if err != nil {
-				slog.Error("Error reporting Run.", "error", err)
-			}
 		case "digger destroy":
 			err := usage.SendUsageRecord(requestedBy, job.EventName, "destroy")
 			if err != nil {
@@ -719,14 +680,10 @@ func RunJob(
 			}
 
 		case "digger drift-detect":
-			output, err := runDriftDetection(policyChecker, SCMOrganisation, SCMrepository, job.ProjectName, requestedBy, job.EventName, diggerExecutor, driftNotification)
+			_, err = runDriftDetection(policyChecker, SCMOrganisation, SCMrepository, job.ProjectName, requestedBy, job.EventName, diggerExecutor, driftNotification)
 			if err != nil {
 				return fmt.Errorf("failed to Run digger drift-detect command. %v", err)
 			}
-			err = backendApi.ReportProjectRun(repo, job.ProjectName, runStartedAt, time.Now(), "SUCCESS", command, output)
-			if err != nil {
-				slog.Error("Error reporting Run.", "error", err)
-			}
 		}
 
 	}

libs/backendapi/backend.go

@@ -8,7 +8,6 @@ import (
 
 type Api interface {
 	ReportProject(repo string, projectName string, configuration string) error
-	ReportProjectRun(repo string, projectName string, startedAt time.Time, endedAt time.Time, status string, command string, output string) error
 	ReportProjectJobStatus(repo string, projectName string, jobId string, status string, timestamp time.Time, summary *iac_utils.IacSummary, planJson string, PrCommentUrl string, PrCommentId string, terraformOutput string, iacUtils iac_utils.IacUtils) (*scheduler.SerializedBatch, error)
 	UploadJobArtefact(zipLocation string) (*int, *string, error)
 	DownloadJobArtefact(downloadTo string) (*string, error)

libs/backendapi/diggerapi.go

@@ -28,10 +28,6 @@ func (n NoopApi) ReportProject(namespace string, projectName string, configurati
 	return nil
 }
 
-func (n NoopApi) ReportProjectRun(namespace string, projectName string, startedAt time.Time, endedAt time.Time, status string, command string, output string) error {
-	return nil
-}
-
 func (n NoopApi) ReportProjectJobStatus(repo string, projectName string, jobId string, status string, timestamp time.Time, summary *iac_utils.IacSummary, planJson string, PrCommentUrl string, PrCommentId string, terraformOutput string, iacUtils iac_utils.IacUtils) (*scheduler.SerializedBatch, error) {
 	return nil, nil
 }
@@ -91,51 +87,6 @@ func (d DiggerApi) ReportProject(namespace string, projectName string, configura
 	return nil
 }
 
-func (d DiggerApi) ReportProjectRun(namespace string, projectName string, startedAt time.Time, endedAt time.Time, status string, command string, output string) error {
-	u, err := url.Parse(d.DiggerHost)
-	if err != nil {
-		slog.Error("not able to parse digger cloud url", "error", err)
-		return fmt.Errorf("not able to parse digger cloud url: %v", err)
-	}
-
-	u.Path = filepath.Join(u.Path, "repos", namespace, "projects", projectName, "runs")
-
-	request := map[string]interface{}{
-		"startedAt": startedAt,
-		"endedAt":   endedAt,
-		"status":    status,
-		"command":   command,
-		"output":    output,
-	}
-
-	jsonData, err := json.Marshal(request)
-	if err != nil {
-		slog.Error("not able to marshal request", "error", err)
-		return fmt.Errorf("not able to marshal request: %v", err)
-	}
-
-	req, err := http.NewRequest("POST", u.String(), bytes.NewBuffer(jsonData))
-
-	if err != nil {
-		return fmt.Errorf("error while creating request: %v", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", d.AuthToken))
-
-	resp, err := d.HttpClient.Do(req)
-
-	if err != nil {
-		return fmt.Errorf("error while sending request: %v", err)
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("unexpected status when reporting a project run: %v", resp.StatusCode)
-	}
-
-	return nil
-}
-
 func (d DiggerApi) ReportProjectJobStatus(repo string, projectName string, jobId string, status string, timestamp time.Time, summary *iac_utils.IacSummary, planJson string, PrCommentUrl string, PrCommentId string, terraformOutput string, iacUtils iac_utils.IacUtils) (*scheduler.SerializedBatch, error) {
 	repoNameForBackendReporting := strings.ReplaceAll(repo, "/", "-")
 	u, err := url.Parse(d.DiggerHost)

libs/backendapi/mocks.go

@@ -13,10 +13,6 @@ func (t MockBackendApi) ReportProject(namespace string, projectName string, conf
 	return nil
 }
 
-func (t MockBackendApi) ReportProjectRun(repo string, projectName string, startedAt time.Time, endedAt time.Time, status string, command string, output string) error {
-	return nil
-}
-
 func (t MockBackendApi) ReportProjectJobStatus(repo string, projectName string, jobId string, status string, timestamp time.Time, summary *iac_utils.IacSummary, planJson string, PrCommentUrl string, PrCommentId string, terraformOutput string, iacUtils iac_utils.IacUtils) (*scheduler.SerializedBatch, error) {
 	return nil, nil
 }