fix builtins

jetify-com · Feb 26, 2024 · 8aaec6b · 8aaec6b
1 parent dd716a7
commit 8aaec6b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/internal/devbox/devbox.go b/internal/devbox/devbox.go
@@ -1058,7 +1058,7 @@ func (d *Devbox) AllInstallablePackages() ([]*devpkg.Package, error) {
 func (d *Devbox) Includes() []plugin.Includable {
 	includes := []plugin.Includable{}
 	for _, includePath := range d.cfg.Include() {
-		if include, err := plugin.Parse(includePath); err == nil {
+		if include, err := d.pluginManager.ParseInclude(includePath); err == nil {
 			includes = append(includes, include)
 		}
 	}

diff --git a/internal/plugin/github.go b/internal/plugin/github.go
@@ -69,7 +69,7 @@ func (p *githubPlugin) FileContent(subpath string) ([]byte, error) {
 		p.Owner,
 		p.Repo,
 		lo.Ternary(p.Rev == "", "master", p.Rev),
-		p.withFilename(p.Dir),
+		p.Dir,
 		subpath,
 	)
 	if err != nil {

diff --git a/internal/plugin/github_test.go b/internal/plugin/github_test.go
@@ -80,7 +80,7 @@ func TestNewGithubPlugin(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
-			actual, _ := Parse(testCase.Include)
+			actual, _ := parseReflike(testCase.Include)
 			assert.Equal(t, &testCase.expected, actual)
 		})
 	}

diff --git a/internal/plugin/hooks.go b/internal/plugin/hooks.go
@@ -17,7 +17,7 @@ func (m *Manager) InitHooks(
 		allPkgs = append(allPkgs, pkg)
 	}
 	for _, include := range includes {
-		name, err := Parse(include)
+		name, err := m.ParseInclude(include)
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/plugin/includes.go b/internal/plugin/includes.go
@@ -0,0 +1,14 @@
+package plugin
+
+import (
+	"strings"
+
+	"go.jetpack.io/devbox/internal/devpkg"
+)
+
+func (m *Manager) ParseInclude(include string) (Includable, error) {
+	if t, name, _ := strings.Cut(include, ":"); t == "plugin" {
+		return devpkg.PackageFromStringWithDefaults(name, m.lockfile), nil
+	}
+	return parseReflike(include)
+}
diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go
@@ -63,7 +63,7 @@ func (c *config) Services() (services.Services, error) {
 }
 
 func (m *Manager) Include(included string) error {
-	name, err := Parse(included)
+	name, err := m.ParseInclude(included)
 	if err != nil {
 		return err
 	}
@@ -190,7 +190,7 @@ func (m *Manager) Env(
 		allPkgs = append(allPkgs, pkg)
 	}
 	for _, included := range includes {
-		input, err := Parse(included)
+		input, err := m.ParseInclude(included)
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/plugin/reflike.go b/internal/plugin/reflike.go
@@ -21,7 +21,7 @@ type Includable interface {
 	FileContent(subpath string) ([]byte, error)
 }
 
-func Parse(s string) (Includable, error) {
+func parseReflike(s string) (Includable, error) {
 	ref, err := flake.ParseRef(s)
 	if err != nil {
 		return nil, err

diff --git a/internal/plugin/services.go b/internal/plugin/services.go
@@ -22,7 +22,7 @@ func (m *Manager) GetServices(
 		allPkgs = append(allPkgs, pkg)
 	}
 	for _, include := range includes {
-		name, err := Parse(include)
+		name, err := m.ParseInclude(include)
 		if err != nil {
 			return nil, err
 		}