refactoring ee cli to use providers

diggerhq · Jun 5, 2024 · 042245f · 042245f
1 parent c0d097e
commit 042245f
Show file tree

Hide file tree

Showing 18 changed files with 663 additions and 1,275 deletions.
diff --git a/cli/cmd/digger/apply.go b/cli/cmd/digger/apply.go
@@ -3,6 +3,7 @@ package main
 import (
 	core_backend "github.com/diggerhq/digger/cli/pkg/core/backend"
 	core_policy "github.com/diggerhq/digger/cli/pkg/core/policy"
+	"github.com/diggerhq/digger/cli/pkg/usage"
 	"github.com/diggerhq/digger/libs/comment_utils/reporting"
 	core_locking "github.com/diggerhq/digger/libs/locking"
 	"github.com/diggerhq/digger/libs/orchestrator"
@@ -28,7 +29,7 @@ var applyCmd = &cobra.Command{
 
 		prService, orgService, reporter, err := runConfig.GetServices()
 		if err != nil {
-			reportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
+			usage.ReportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
 		}
 
 		apply(runConfig.Actor, args[0], runConfig.RepoNamespace, runConfig.PRNumber, lock, PolicyChecker, *reporter, *prService, *orgService, BackendApi)

diff --git a/cli/cmd/digger/default.go b/cli/cmd/digger/default.go
@@ -5,6 +5,7 @@ import (
 	"github.com/diggerhq/digger/cli/pkg/azure"
 	"github.com/diggerhq/digger/cli/pkg/digger"
 	"github.com/diggerhq/digger/cli/pkg/usage"
+	comment_updater "github.com/diggerhq/digger/libs/comment_utils/summary"
 	"github.com/spf13/cobra"
 	"log"
 	"os"
@@ -20,7 +21,7 @@ var defaultCmd = &cobra.Command{
 		switch ci {
 		case digger.GitHub:
 			logLeader = os.Getenv("GITHUB_ACTOR")
-			gitHubCI(lock, PolicyChecker, BackendApi, ReportStrategy)
+			gitHubCI(lock, PolicyChecker, BackendApi, ReportStrategy, comment_updater.CommentUpdaterProviderBasic{})
 		case digger.GitLab:
 			logLeader = os.Getenv("CI_PROJECT_NAME")
 			gitLabCI(lock, PolicyChecker, BackendApi, ReportStrategy)

diff --git a/cli/cmd/digger/destroy.go b/cli/cmd/digger/destroy.go
@@ -3,6 +3,7 @@ package main
 import (
 	core_backend "github.com/diggerhq/digger/cli/pkg/core/backend"
 	core_policy "github.com/diggerhq/digger/cli/pkg/core/policy"
+	"github.com/diggerhq/digger/cli/pkg/usage"
 	"github.com/diggerhq/digger/libs/comment_utils/reporting"
 	core_locking "github.com/diggerhq/digger/libs/locking"
 	"github.com/diggerhq/digger/libs/orchestrator"
@@ -28,7 +29,7 @@ var destroyCmd = &cobra.Command{
 
 		prService, orgService, reporter, err := runConfig.GetServices()
 		if err != nil {
-			reportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
+			usage.ReportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
 		}
 
 		destroy(runConfig.Actor, args[0], runConfig.RepoNamespace, runConfig.PRNumber, lock, PolicyChecker, *reporter, *prService, *orgService, BackendApi)

diff --git a/cli/cmd/digger/main.go b/cli/cmd/digger/main.go
diff --git a/cli/cmd/digger/plan.go b/cli/cmd/digger/plan.go
@@ -3,6 +3,7 @@ package main
 import (
 	core_backend "github.com/diggerhq/digger/cli/pkg/core/backend"
 	core_policy "github.com/diggerhq/digger/cli/pkg/core/policy"
+	"github.com/diggerhq/digger/cli/pkg/usage"
 	"github.com/diggerhq/digger/libs/comment_utils/reporting"
 	core_locking "github.com/diggerhq/digger/libs/locking"
 	"github.com/diggerhq/digger/libs/orchestrator"
@@ -28,7 +29,7 @@ var planCmd = &cobra.Command{
 
 		prService, orgService, reporter, err := runConfig.GetServices()
 		if err != nil {
-			reportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
+			usage.ReportErrorAndExit(runConfig.Actor, "Unrecognised reporter: "+runConfig.Reporter, 1)
 		}
 
 		plan(runConfig.Actor, args[0], runConfig.RepoNamespace, runConfig.PRNumber, lock, PolicyChecker, *reporter, *prService, *orgService, BackendApi)

diff --git a/cli/cmd/digger/root.go b/cli/cmd/digger/root.go
@@ -88,8 +88,8 @@ func PreRun(cmd *cobra.Command, args []string) {
 	hostName := os.Getenv("DIGGER_HOSTNAME")
 	token := os.Getenv("DIGGER_TOKEN")
 	orgName := os.Getenv("DIGGER_ORGANISATION")
-	BackendApi = NewBackendApi(hostName, token)
-	PolicyChecker = NewPolicyChecker(hostName, orgName, token)
+	BackendApi = backend.NewBackendApi(hostName, token)
+	PolicyChecker = policy.NewPolicyChecker(hostName, orgName, token)
 
 	if os.Getenv("REPORTING_STRATEGY") == "comments_per_run" || os.Getenv("ACCUMULATE_PLANS") == "true" {
 		ReportStrategy = &reporting.CommentPerRunStrategy{
@@ -118,38 +118,6 @@ func PreRun(cmd *cobra.Command, args []string) {
 	log.Println("Lock provider has been created successfully")
 }
 
-func NewBackendApi(hostName string, authToken string) core_backend.Api {
-	var backendApi core_backend.Api
-	if os.Getenv("NO_BACKEND") == "true" {
-		log.Println("WARNING: running in 'backendless' mode. Features that require backend will not be available.")
-		backendApi = backend.NoopApi{}
-	} else {
-		backendApi = backend.DiggerApi{
-			DiggerHost: hostName,
-			AuthToken:  authToken,
-			HttpClient: http.DefaultClient,
-		}
-	}
-	return backendApi
-}
-
-func NewPolicyChecker(hostname string, organisationName string, authToken string) core_policy.Checker {
-	var policyChecker core_policy.Checker
-	if os.Getenv("NO_BACKEND") == "true" {
-		log.Println("WARNING: running in 'backendless' mode. Features that require backend will not be available.")
-		policyChecker = policy.NoOpPolicyChecker{}
-	} else {
-		policyChecker = policy.DiggerPolicyChecker{
-			PolicyProvider: &policy.DiggerHttpPolicyProvider{
-				DiggerHost:         hostname,
-				DiggerOrganisation: organisationName,
-				AuthToken:          authToken,
-				HttpClient:         http.DefaultClient,
-			}}
-	}
-	return policyChecker
-}
-
 var rootCmd = &cobra.Command{
 	Use:              "digger",
 	Short:            "An open source IaC orchestration tool",

diff --git a/cli/pkg/backend/diggerapi.go b/cli/pkg/backend/diggerapi.go
@@ -4,13 +4,15 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/diggerhq/digger/cli/pkg/core/backend"
 	"github.com/diggerhq/digger/cli/pkg/core/execution"
 	"github.com/diggerhq/digger/libs/orchestrator/scheduler"
 	"github.com/diggerhq/digger/libs/terraform_utils"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
+	"os"
 	"path/filepath"
 	"time"
 )
@@ -185,3 +187,18 @@ func (d DiggerApi) ReportProjectJobStatus(repo string, projectName string, jobId
 
 	return &response, nil
 }
+
+func NewBackendApi(hostName string, authToken string) backend.Api {
+	var backendApi backend.Api
+	if os.Getenv("NO_BACKEND") == "true" {
+		log.Println("WARNING: running in 'backendless' mode. Features that require backend will not be available.")
+		backendApi = NoopApi{}
+	} else {
+		backendApi = DiggerApi{
+			DiggerHost: hostName,
+			AuthToken:  authToken,
+			HttpClient: http.DefaultClient,
+		}
+	}
+	return backendApi
+}