fix: renames earthfile package to avoid filesystem errors (#168)

Author: jmgilman

cli/cmd/cmds/run.go

@@ -3,7 +3,7 @@ package cmds
 import (
 	"github.com/input-output-hk/catalyst-forge/cli/pkg/earthly"
 	"github.com/input-output-hk/catalyst-forge/cli/pkg/run"
-	"github.com/input-output-hk/catalyst-forge/lib/tools/earthfile"
+	te "github.com/input-output-hk/catalyst-forge/lib/tools/earthly"
 )
 
 type RunCmd struct {
@@ -15,7 +15,7 @@ type RunCmd struct {
 }
 
 func (c *RunCmd) Run(ctx run.RunContext) error {
-	ref, err := earthfile.ParseEarthfileRef(c.Path)
+	ref, err := te.ParseEarthfileRef(c.Path)
 	if err != nil {
 		return err
 	}

cli/pkg/scan/earthfile.go

@@ -7,14 +7,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/input-output-hk/catalyst-forge/lib/tools/earthfile"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/earthly"
 	w "github.com/input-output-hk/catalyst-forge/lib/tools/walker"
 )
 
 // ScanEarthfiles scans the given root path for Earthfiles and returns a map
 // that maps the path of the Earthfile to the targets defined in the Earthfile.
-func ScanEarthfiles(rootPath string, walker w.Walker, logger *slog.Logger) (map[string]earthfile.Earthfile, error) {
-	earthfiles := make(map[string]earthfile.Earthfile)
+func ScanEarthfiles(rootPath string, walker w.Walker, logger *slog.Logger) (map[string]earthly.Earthfile, error) {
+	earthfiles := make(map[string]earthly.Earthfile)
 
 	err := walker.Walk(rootPath, func(path string, fileType w.FileType, openFile func() (w.FileSeeker, error)) error {
 		if fileType != w.FileTypeFile {
@@ -30,7 +30,7 @@ func ScanEarthfiles(rootPath string, walker w.Walker, logger *slog.Logger) (map[
 		defer file.Close()
 
 		logger.Info("parsing Earthfile", "path", path)
-		earthfile, err := earthfile.ParseEarthfile(context.Background(), file)
+		earthfile, err := earthly.ParseEarthfile(context.Background(), file)
 		if err != nil {
 			logger.Error("error parsing Earthfile", "path", path, "error", err)
 			return fmt.Errorf("error parsing %s: %w", path, err)

foundry/operator/config/rbac/role.yaml

@@ -7,7 +7,7 @@ rules:
 - apiGroups:
   - foundry.projectcatalyst.io
   resources:
-  - releases
+  - releasedeployments
   verbs:
   - create
   - delete
@@ -19,13 +19,13 @@ rules:
 - apiGroups:
   - foundry.projectcatalyst.io
   resources:
-  - releases/finalizers
+  - releasedeployments/finalizers
   verbs:
   - update
 - apiGroups:
   - foundry.projectcatalyst.io
   resources:
-  - releases/status
+  - releasedeployments/status
   verbs:
   - get
   - patch

lib/project/project/loader.go

@@ -13,7 +13,7 @@ import (
 	"github.com/input-output-hk/catalyst-forge/lib/project/injector"
 	"github.com/input-output-hk/catalyst-forge/lib/project/secrets"
 	sb "github.com/input-output-hk/catalyst-forge/lib/schema/blueprint"
-	"github.com/input-output-hk/catalyst-forge/lib/tools/earthfile"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/earthly"
 	"github.com/input-output-hk/catalyst-forge/lib/tools/fs"
 	"github.com/input-output-hk/catalyst-forge/lib/tools/fs/billy"
 	"github.com/input-output-hk/catalyst-forge/lib/tools/git"
@@ -97,15 +97,15 @@ func (p *DefaultProjectLoader) Load(projectPath string) (Project, error) {
 		return Project{}, fmt.Errorf("failed to check for Earthfile: %w", err)
 	}
 
-	var ef *earthfile.Earthfile
+	var ef *earthly.Earthfile
 	if exists {
 		p.logger.Info("Parsing Earthfile", "path", efPath)
 		eff, err := p.fs.Open(efPath)
 		if err != nil {
 			p.logger.Error("Failed to read Earthfile", "error", err, "path", efPath)
 			return Project{}, fmt.Errorf("failed to read Earthfile: %w", err)
 		}
-		efs, err := earthfile.ParseEarthfile(context.Background(), eff)
+		efs, err := earthly.ParseEarthfile(context.Background(), eff)
 		if err != nil {
 			p.logger.Error("Failed to parse Earthfile", "error", err, "path", efPath)
 			return Project{}, fmt.Errorf("failed to parse Earthfile: %w", err)

lib/project/project/project.go

@@ -10,7 +10,7 @@ import (
 	"github.com/input-output-hk/catalyst-forge/lib/project/blueprint"
 	"github.com/input-output-hk/catalyst-forge/lib/project/secrets"
 	sb "github.com/input-output-hk/catalyst-forge/lib/schema/blueprint"
-	"github.com/input-output-hk/catalyst-forge/lib/tools/earthfile"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/earthly"
 	"github.com/input-output-hk/catalyst-forge/lib/tools/git/repo"
 )
 
@@ -20,7 +20,7 @@ type Project struct {
 	Blueprint sb.Blueprint
 
 	// Earthfile is the project Earthfile.
-	Earthfile *earthfile.Earthfile
+	Earthfile *earthly.Earthfile
 
 	// Name is the project name.
 	Name string
@@ -121,7 +121,7 @@ func (p *Project) Raw() blueprint.RawBlueprint {
 func NewProject(
 	ctx *cue.Context,
 	repo *repo.GitRepo,
-	earthfile *earthfile.Earthfile,
+	earthfile *earthly.Earthfile,
 	name, path, repoRoot string,
 	blueprint sb.Blueprint,
 	tag *ProjectTag,

lib/tools/earthfile/earthfile.go renamed to lib/tools/earthly/earthfile.go

@@ -1,4 +1,4 @@
-package earthfile
+package earthly
 
 import (
 	"context"

lib/tools/earthfile/earthfile_test.go renamed to lib/tools/earthly/earthfile_test.go

@@ -1,4 +1,4 @@
-package earthfile
+package earthly
 
 import (
 	"context"