Merge pull request #1664 from diggerhq/feat/github-issues-dedup

deduplicatoin of github issues drift

Author: ZIJ

cli/pkg/bitbucket/bitbucket.go

@@ -133,6 +133,10 @@ func (svc BitbucketAPI) PublishIssue(title string, body string) (int64, error) {
 	return 0, fmt.Errorf("implement me")
 }
 
+func (svc BitbucketAPI) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (b BitbucketAPI) EditComment(prNumber int, id string, comment string) error {
 	url := fmt.Sprintf("%s/repositories/%s/%s/pullrequests/%d/comments/%s", bitbucketBaseURL, b.RepoWorkspace, b.RepoName, prNumber, id)
 

cli/pkg/digger/digger_test.go

@@ -1,6 +1,7 @@
 package digger
 
 import (
+	"fmt"
 	"github.com/diggerhq/digger/libs/ci"
 	"github.com/diggerhq/digger/libs/execution"
 	orchestrator "github.com/diggerhq/digger/libs/scheduler"
@@ -97,6 +98,10 @@ func (m *MockPRManager) PublishIssue(title string, body string) (int64, error) {
 	return 0, nil
 }
 
+func (m *MockPRManager) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (m *MockPRManager) SetStatus(prNumber int, status string, statusContext string) error {
 	m.Commands = append(m.Commands, RunInfo{"SetStatus", strconv.Itoa(prNumber) + " " + status + " " + statusContext, time.Now()})
 	return nil

ee/cli/pkg/drift/github_issue.go

@@ -3,6 +3,8 @@ package drift
 import (
 	"fmt"
 	orchestrator "github.com/diggerhq/digger/libs/ci"
+	"github.com/samber/lo"
+	"log"
 )
 
 type GithubIssueNotification struct {
@@ -11,8 +13,30 @@ type GithubIssueNotification struct {
 }
 
 func (ghi GithubIssueNotification) Send(projectName string, plan string) error {
+	log.Printf("Info: Sending drift notification regarding project: %v", projectName)
 	title := fmt.Sprintf("Drift detected in project: %v", projectName)
 	message := fmt.Sprintf(":bangbang: Drift detected in digger project %v details below: \n\n```\n%v\n```", projectName, plan)
-	_, err := (*ghi.GithubService).PublishIssue(title, message)
-	return err
+	existingIssues, err := (*ghi.GithubService).ListIssues()
+	if err != nil {
+		log.Printf("failed to retrive issues: %v", err)
+		return fmt.Errorf("failed to retrive issues: %v", err)
+	}
+
+	theIssue, exists := lo.Find(existingIssues, func(item *orchestrator.Issue) bool {
+		return item.Title == title
+	})
+	if exists {
+		_, err := (*ghi.GithubService).UpdateIssue(theIssue.ID, theIssue.Title, message)
+		if err != nil {
+			log.Printf("error while updating issue: %v", err)
+		}
+		return err
+	} else {
+		_, err := (*ghi.GithubService).PublishIssue(title, message)
+		if err != nil {
+			log.Printf("error while publishing issue: %v", err)
+		}
+		return err
+	}
+	return nil
 }

libs/ci/azure/azure.go

@@ -196,6 +196,10 @@ func (svc *AzureReposService) PublishIssue(title string, body string) (int64, er
 	return 0, fmt.Errorf("implement me")
 }
 
+func (svc *AzureReposService) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (a *AzureReposService) SetStatus(prNumber int, status string, statusContext string) error {
 	var gitStatusState git.GitStatusState
 	if status == "success" {

libs/ci/ci.go

@@ -7,6 +7,7 @@ type PullRequestService interface {
 	PublishComment(prNumber int, comment string) (*Comment, error)
 	ListIssues() ([]*Issue, error)
 	PublishIssue(title string, body string) (int64, error)
+	UpdateIssue(ID int64, title string, body string) (int64, error)
 	EditComment(prNumber int, id string, comment string) error
 	CreateCommentReaction(id string, reaction string) error
 	GetComments(prNumber int) ([]Comment, error)

libs/ci/github/github.go

@@ -147,6 +147,14 @@ func (svc GithubService) PublishIssue(title string, body string) (int64, error)
 	return *githubissue.ID, err
 }
 
+func (svc GithubService) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	githubissue, _, err := svc.Client.Issues.Edit(context.Background(), svc.Owner, svc.RepoName, int(ID), &github.IssueRequest{Title: &title, Body: &body})
+	if err != nil {
+		return 0, fmt.Errorf("could not edit issue: %v", err)
+	}
+	return *githubissue.ID, err
+}
+
 func (svc GithubService) PublishComment(prNumber int, comment string) (*ci.Comment, error) {
 	githubComment, _, err := svc.Client.Issues.CreateComment(context.Background(), svc.Owner, svc.RepoName, prNumber, &github.IssueComment{Body: &comment})
 	if err != nil {

libs/ci/github/mocks.go

@@ -47,6 +47,10 @@ func (t MockCiService) PublishIssue(title string, body string) (int64, error) {
 	return 0, fmt.Errorf("implement me")
 }
 
+func (svc MockCiService) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (t MockCiService) SetStatus(prNumber int, status string, statusContext string) error {
 	return nil
 }

libs/ci/gitlab/gitlab.go

@@ -196,6 +196,10 @@ func (svc GitLabService) PublishIssue(title string, body string) (int64, error)
 	return 0, fmt.Errorf("implement me")
 }
 
+func (svc GitLabService) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 // SetStatus GitLab implementation is using https://docs.gitlab.com/15.11/ee/api/status_checks.html (external status checks)
 // https://docs.gitlab.com/ee/user/project/merge_requests/status_checks.html#add-a-status-check-service
 // only supported by 'Ultimate' plan

libs/ci/mocks.go

@@ -1,5 +1,7 @@
 package ci
 
+import "fmt"
+
 type MockPullRequestManager struct {
 	ChangedFiles []string
 	Teams        []string
@@ -25,6 +27,10 @@ func (t MockPullRequestManager) PublishIssue(title string, body string) (int64,
 	return 0, nil
 }
 
+func (t MockPullRequestManager) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (t MockPullRequestManager) SetStatus(prNumber int, status string, statusContext string) error {
 	return nil
 }

libs/comment_utils/reporting/reporting_test.go

@@ -47,6 +47,10 @@ func (t MockCiService) PublishIssue(title string, body string) (int64, error) {
 	return 0, fmt.Errorf("implement me")
 }
 
+func (svc MockCiService) UpdateIssue(ID int64, title string, body string) (int64, error) {
+	return 0, fmt.Errorf("implement me")
+}
+
 func (t MockCiService) SetStatus(prNumber int, status string, statusContext string) error {
 	return nil
 }