Promote GitHub Issues Drift Notifier to CE

Author: ZIJ

cli/pkg/drift/Provider.go

@@ -15,11 +15,14 @@ type DriftNotificationProviderBasic struct{}
 
 func (d DriftNotificationProviderBasic) Get(prService ci.PullRequestService) (core_drift.Notification, error) {
 	slackNotificationUrl := os.Getenv("INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL")
+	githubIssues := os.Getenv("INPUT_DRIFT_GITHUB_ISSUES")
 	var notification core_drift.Notification
 	if slackNotificationUrl != "" {
 		notification = &SlackNotification{slackNotificationUrl}
+	} else if githubIssues != "" {
+		notification = &GithubIssueNotification{GithubService: &prService}
 	} else {
-		return nil, fmt.Errorf("could not identify drift mode, please specify slack using env variable INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL")
+		return nil, fmt.Errorf("could not identify drift mode, please specify using INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL or INPUT_DRIFT_GITHUB_ISSUES")
 	}
 	return notification, nil
 }

cli/pkg/drift/github_issue.go

@@ -0,0 +1,51 @@
+package drift
+
+import (
+    "fmt"
+    orchestrator "github.com/diggerhq/digger/libs/ci"
+    "github.com/samber/lo"
+    "log"
+)
+
+type GithubIssueNotification struct {
+    GithubService   *orchestrator.PullRequestService
+    RelatedPrNumber *int64
+}
+
+func (ghi *GithubIssueNotification) SendNotificationForProject(projectName string, repoFullName 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)
+    existingIssues, err := (*ghi.GithubService).ListIssues()
+    if err != nil {
+        log.Printf("failed to retrieve issues: %v", err)
+        return fmt.Errorf("failed to retrieve 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 {
+        labels := []string{"digger"}
+        _, err := (*ghi.GithubService).PublishIssue(title, message, &labels)
+        if err != nil {
+            log.Printf("error while publishing issue: %v", err)
+        }
+        return err
+    }
+}
+
+func (ghi *GithubIssueNotification) SendErrorNotificationForProject(projectName string, repoFullName string, err error) error {
+    return nil
+}
+
+func (ghi *GithubIssueNotification) Flush() error {
+    return nil
+}
+

docs/ce/features/drift-detection.mdx

@@ -70,7 +70,6 @@ jobs:
     - name: digger drift detection
       uses: diggerhq/digger@vLatest
       with:
-        ee: 'true'
         mode: drift-detection
         setup-aws: true
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

drift/main.go

@@ -10,8 +10,8 @@ import (
 	"os"
 
 	"github.com/diggerhq/digger/backend/ci_backends"
-    "github.com/diggerhq/digger/drift/controllers"
-    "github.com/diggerhq/digger/drift/middleware"
+	"github.com/diggerhq/digger/drift/controllers"
+	"github.com/diggerhq/digger/drift/middleware"
 	"github.com/getsentry/sentry-go"
 	sentrygin "github.com/getsentry/sentry-go/gin"
 	"github.com/gin-gonic/gin"

ee/cli/pkg/drift/github_issue.go

@@ -3,7 +3,7 @@ package drift
 import (
 	"fmt"
 	core_drift "github.com/diggerhq/digger/cli/pkg/core/drift"
-	"github.com/diggerhq/digger/cli/pkg/drift"
+	ce_drift "github.com/diggerhq/digger/cli/pkg/drift"
 	"github.com/diggerhq/digger/libs/ci"
 	"os"
 )
@@ -16,11 +16,11 @@ func (d DriftNotificationProviderAdvanced) Get(prService ci.PullRequestService)
 	DriftAsGithubIssues := os.Getenv("INPUT_DRIFT_GITHUB_ISSUES")
 	var notification core_drift.Notification
 	if slackNotificationUrl != "" {
-		notification = &drift.SlackNotification{Url: slackNotificationUrl}
+		notification = &ce_drift.SlackNotification{Url: slackNotificationUrl}
 	} else if slackNotificationAdvancedUrl != "" {
 		notification = NewSlackAdvancedAggregatedNotificationWithAiSummary(slackNotificationAdvancedUrl)
 	} else if DriftAsGithubIssues != "" {
-		notification = &GithubIssueNotification{GithubService: &prService}
+		notification = &ce_drift.GithubIssueNotification{GithubService: &prService}
 	} else {
 		return nil, fmt.Errorf("could not identify drift mode, please specify using env variable INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL, INPUT_DRIFT_DETECTION_ADVANCED_SLACK_NOTIFICATION_URL or INPUT_DRIFT_GITHUB_ISSUES")
 	}

ee/cli/pkg/drift/provider.go

@@ -9,13 +9,13 @@ import (
     "net/http"
     "os"
 
-    "github.com/diggerhq/digger/backend/ci_backends"
-    "github.com/diggerhq/digger/drift/controllers"
-    "github.com/diggerhq/digger/drift/middleware"
-    "github.com/getsentry/sentry-go"
-    sentrygin "github.com/getsentry/sentry-go/gin"
-    "github.com/gin-gonic/gin"
-    sloggin "github.com/samber/slog-gin"
+	"github.com/diggerhq/digger/backend/ci_backends"
+	"github.com/diggerhq/digger/drift/controllers"
+	"github.com/diggerhq/digger/drift/middleware"
+	"github.com/getsentry/sentry-go"
+	sentrygin "github.com/getsentry/sentry-go/gin"
+	"github.com/gin-gonic/gin"
+	sloggin "github.com/samber/slog-gin"
 )
 
 func init() {