log when directory clearing fails (#1782)

* log when directory clearing fails
diggerhq · Oct 29, 2024 · cbdc36e · cbdc36e
1 parent 19dff18
commit cbdc36e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/backend/controllers/github.go b/backend/controllers/github.go
@@ -388,8 +388,13 @@ func handlePushEvent(gh utils.GithubClientProvider, payload *github.PushEvent) e
 }
 
 func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullRequestEvent, ciBackendProvider ci_backends.CiBackendProvider) error {
+	appId, err := strconv.ParseInt(os.Getenv("GITHUB_APP_ID"), 10, 64)
+	if err != nil {
+		log.Printf("error getting github app isntallation id: %v", err)
+		return fmt.Errorf("error getting github app installation id")
+	}
+
 	installationId := *payload.Installation.ID
-	appId := *payload.Installation.AppID
 	repoName := *payload.Repo.Name
 	repoOwner := *payload.Repo.Owner.Login
 	repoFullName := *payload.Repo.FullName
@@ -697,8 +702,13 @@ func getBatchType(jobs []orchestrator_scheduler.Job) orchestrator_scheduler.Digg
 }
 
 func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.IssueCommentEvent, ciBackendProvider ci_backends.CiBackendProvider) error {
+	appId, err := strconv.ParseInt(os.Getenv("GITHUB_APP_ID"), 10, 64)
+	if err != nil {
+		log.Printf("error getting github app isntallation id: %v", err)
+		return fmt.Errorf("error getting github app installation id")
+	}
+
 	installationId := *payload.Installation.ID
-	appId := *payload.Installation.AppID
 	repoName := *payload.Repo.Name
 	repoOwner := *payload.Repo.Owner.Login
 	repoFullName := *payload.Repo.FullName

diff --git a/backend/utils/github.go b/backend/utils/github.go
@@ -52,7 +52,13 @@ func CloneGitRepoAndDoAction(repoUrl string, branch string, token string, action
 		log.Printf("PlainClone error: %v\n", err)
 		return err
 	}
-	defer os.RemoveAll(dir)
+	defer func() {
+		log.Printf("removing cloned directory %v", dir)
+		ferr := os.RemoveAll(dir)
+		if ferr != nil {
+			log.Printf("WARN: removal of dir %v failed: %v", dir, ferr)
+		}
+	}()
 
 	err = action(dir)
 	if err != nil {