refactor out some pacakges to libs to avoid them improting from cli pkg (#1676)

motatoes · web-flow · commit 62d43de3464f · 2024-08-22T12:49:13.000+01:00
* refactor out some pacakges to libs to avoid them improting from cli pkg
diff --git a/.github/workflows/libs_test.yml b/.github/workflows/libs_test.yml
@@ -12,6 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Setup Opentofu
+        uses: opentofu/setup-opentofu@v1.0.3
+        with:
+          tofu_version: 1.6.0-alpha3
+
       - name: Download Go
         uses: actions/setup-go@v5
         with:
diff --git a/cli/pkg/digger/digger.go b/cli/pkg/digger/digger.go
@@ -19,8 +19,6 @@ import (
 	"time"
 
 	core_drift "github.com/diggerhq/digger/cli/pkg/core/drift"
-	"github.com/diggerhq/digger/cli/pkg/core/runners"
-	"github.com/diggerhq/digger/cli/pkg/core/terraform"
 	"github.com/diggerhq/digger/cli/pkg/usage"
 	utils "github.com/diggerhq/digger/cli/pkg/utils"
 	"github.com/diggerhq/digger/libs/comment_utils/reporting"
@@ -215,17 +213,17 @@ func run(command string, job orchestrator.Job, policyChecker policy.Checker, org
 		PrNumber:         *job.PullRequestNumber,
 	}
 
-	var terraformExecutor terraform.TerraformExecutor
+	var terraformExecutor execution.TerraformExecutor
 	projectPath := path.Join(workingDir, job.ProjectDir)
 	if job.Terragrunt {
-		terraformExecutor = terraform.Terragrunt{WorkingDir: projectPath}
+		terraformExecutor = execution.Terragrunt{WorkingDir: projectPath}
 	} else if job.OpenTofu {
-		terraformExecutor = terraform.OpenTofu{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
+		terraformExecutor = execution.OpenTofu{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
 	} else {
-		terraformExecutor = terraform.Terraform{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
+		terraformExecutor = execution.Terraform{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
 	}
 
-	commandRunner := runners.CommandRunner{}
+	commandRunner := execution.CommandRunner{}
 	planPathProvider := execution.ProjectPathProvider{
 		ProjectPath:      projectPath,
 		ProjectNamespace: projectNamespace,
@@ -582,17 +580,17 @@ func RunJob(
 			log.Fatalf("failed to fetch AWS keys, %v", err)
 		}
 
-		var terraformExecutor terraform.TerraformExecutor
+		var terraformExecutor execution.TerraformExecutor
 		projectPath := path.Join(workingDir, job.ProjectDir)
 		if job.Terragrunt {
-			terraformExecutor = terraform.Terragrunt{WorkingDir: projectPath}
+			terraformExecutor = execution.Terragrunt{WorkingDir: projectPath}
 		} else if job.OpenTofu {
-			terraformExecutor = terraform.OpenTofu{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
+			terraformExecutor = execution.OpenTofu{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
 		} else {
-			terraformExecutor = terraform.Terraform{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
+			terraformExecutor = execution.Terraform{WorkingDir: projectPath, Workspace: job.ProjectWorkspace}
 		}
 
-		commandRunner := runners.CommandRunner{}
+		commandRunner := execution.CommandRunner{}
 
 		planPathProvider := execution.ProjectPathProvider{
 			ProjectPath:      projectPath,
diff --git a/cli/pkg/integration/integration_test.go b/cli/pkg/integration/integration_test.go
@@ -3,6 +3,7 @@ package integration
 import (
 	"context"
 	"github.com/diggerhq/digger/libs/ci/generic"
+	"github.com/diggerhq/digger/libs/execution"
 	"github.com/diggerhq/digger/libs/locking"
 	"github.com/diggerhq/digger/libs/locking/aws"
 	"github.com/diggerhq/digger/libs/storage"
@@ -14,7 +15,6 @@ import (
 
 	"github.com/diggerhq/digger/libs/comment_utils/summary"
 
-	"github.com/diggerhq/digger/cli/pkg/core/terraform"
 	"github.com/diggerhq/digger/cli/pkg/digger"
 	"github.com/diggerhq/digger/cli/pkg/github/models"
 	dg_github "github.com/diggerhq/digger/libs/ci/github"
@@ -346,7 +346,7 @@ func TestHappyPath(t *testing.T) {
 
 	SkipCI(t)
 
-	dir := terraform.CreateTestTerraformProject()
+	dir := execution.CreateTestTerraformProject()
 
 	defer func(name string) {
 		err := os.RemoveAll(name)
@@ -355,8 +355,8 @@ func TestHappyPath(t *testing.T) {
 		}
 	}(dir)
 
-	terraform.CreateValidTerraformTestFile(dir)
-	terraform.CreateSingleEnvDiggerYmlFile(dir)
+	execution.CreateValidTerraformTestFile(dir)
+	execution.CreateSingleEnvDiggerYmlFile(dir)
 
 	diggerConfig, _, _, err := configuration.LoadDiggerConfig(dir, true, nil)
 	assert.NoError(t, err)
@@ -497,7 +497,7 @@ func TestMultiEnvHappyPath(t *testing.T) {
 	SkipCI(t)
 	t.Skip()
 
-	dir := terraform.CreateTestTerraformProject()
+	dir := execution.CreateTestTerraformProject()
 
 	defer func(name string) {
 		err := os.RemoveAll(name)
@@ -506,8 +506,8 @@ func TestMultiEnvHappyPath(t *testing.T) {
 		}
 	}(dir)
 
-	terraform.CreateValidTerraformTestFile(dir)
-	terraform.CreateMultiEnvDiggerYmlFile(dir)
+	execution.CreateValidTerraformTestFile(dir)
+	execution.CreateMultiEnvDiggerYmlFile(dir)
 
 	diggerConfig, _, _, err := configuration.LoadDiggerConfig(dir, true, nil)
 	assert.NoError(t, err)
@@ -713,7 +713,7 @@ workflows:
       - run: echo "hello"
 `
 
-	dir := terraform.CreateTestTerraformProject()
+	dir := execution.CreateTestTerraformProject()
 
 	defer func(name string) {
 		err := os.RemoveAll(name)
@@ -722,8 +722,8 @@ workflows:
 		}
 	}(dir)
 
-	terraform.CreateValidTerraformTestFile(dir)
-	terraform.CreateCustomDiggerYmlFile(dir, diggerCfg)
+	execution.CreateValidTerraformTestFile(dir)
+	execution.CreateCustomDiggerYmlFile(dir, diggerCfg)
 
 	diggerConfig, _, _, err := configuration.LoadDiggerConfig(dir, true, nil)
 	assert.NoError(t, err)
diff --git a/libs/execution/execution.go b/libs/execution/execution.go
@@ -15,8 +15,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/diggerhq/digger/cli/pkg/core/runners"
-	"github.com/diggerhq/digger/cli/pkg/core/terraform"
 	"github.com/diggerhq/digger/libs/comment_utils/reporting"
 	configuration "github.com/diggerhq/digger/libs/digger_config"
 )
@@ -98,8 +96,8 @@ type DiggerExecutor struct {
 	RunEnvVars        map[string]string
 	ApplyStage        *scheduler.Stage
 	PlanStage         *scheduler.Stage
-	CommandRunner     runners.CommandRun
-	TerraformExecutor terraform.TerraformExecutor
+	CommandRunner     CommandRun
+	TerraformExecutor TerraformExecutor
 	Reporter          reporting.Reporter
 	PlanStorage       storage.PlanStorage
 	PlanPathProvider  PlanPathProvider
diff --git a/libs/execution/opentofu.go b/libs/execution/opentofu.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"bytes"
diff --git a/libs/execution/opentofu_test.go b/libs/execution/opentofu_test.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/libs/execution/runners.go b/libs/execution/runners.go
@@ -1,4 +1,4 @@
-package runners
+package execution
 
 import (
 	"bytes"
diff --git a/libs/execution/terragrunt.go b/libs/execution/terragrunt.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"bytes"
diff --git a/libs/execution/test_utils.go b/libs/execution/test_utils.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"log"
diff --git a/libs/execution/tf.go b/libs/execution/tf.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"bytes"
diff --git a/libs/execution/tf_test.go b/libs/execution/tf_test.go
@@ -1,4 +1,4 @@
-package terraform
+package execution
 
 import (
 	"github.com/stretchr/testify/assert"
diff --git a/libs/go.mod b/libs/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/aws/smithy-go v1.20.2
 	github.com/bmatcuk/doublestar/v4 v4.6.1
 	github.com/caarlos0/env/v11 v11.1.0
-	github.com/diggerhq/digger/cli v0.0.0-20240705091808-75187a7aae8e
 	github.com/dineshba/tf-summarize v0.3.10
 	github.com/dominikbraun/graph v0.23.0
 	github.com/go-git/go-git/v5 v5.12.0
@@ -118,13 +117,15 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/flatbuffers v23.5.26+incompatible // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-github/v35 v35.3.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.4 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
 	github.com/gruntwork-io/gruntwork-cli v0.7.0 // indirect
 	github.com/gruntwork-io/terratest v0.41.0 // indirect
@@ -190,6 +191,7 @@ require (
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
diff --git a/libs/go.sum b/libs/go.sum
@@ -447,8 +447,6 @@ github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkz
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/diggerhq/digger/cli v0.0.0-20240705091808-75187a7aae8e h1:aRBJ92ZbJc6VQXx6zPihHuQoDotstDTwUi3C8gdbdgw=
-github.com/diggerhq/digger/cli v0.0.0-20240705091808-75187a7aae8e/go.mod h1:+UUif/7rqA5ElbNiYXyu6adjpXcafe5nSrY+IvFoJVA=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
diff --git a/libs/policy/policy.go b/libs/policy/policy.go
@@ -6,15 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"github.com/diggerhq/digger/libs/ci"
+	"github.com/open-policy-agent/opa/rego"
 	"io"
 	"log"
 	"net/http"
 	"net/url"
 	"os"
-
-	// "github.com/diggerhq/digger/cli/pkg/core/policy/AccessPolicyContext"
-	// TODO fix imports - publish?
-	"github.com/open-policy-agent/opa/rego"
 )
 
 const DefaultAccessPolicy = `

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package terraform`
	`1`	`+package execution`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package runners`
	`1`	`+package execution`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`