[cleanup] plansdk

devbox.go

@@ -11,7 +11,6 @@ import (
 	"go.jetpack.io/devbox/internal/devconfig"
 	"go.jetpack.io/devbox/internal/impl"
 	"go.jetpack.io/devbox/internal/impl/devopt"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 	"go.jetpack.io/devbox/internal/services"
 )
 
@@ -46,9 +45,6 @@ type Devbox interface {
 	Services() (services.Services, error)
 	// Shell generates the devbox environment and launches nix-shell as a child process.
 	Shell(ctx context.Context) error
-	// ShellPlan creates a plan of the actions that devbox will take to generate its
-	// shell environment.
-	ShellPlan(ctx context.Context) (*plansdk.FlakePlan, error)
 	StartProcessManager(ctx context.Context, requestedServices []string, background bool, processComposeFileOrDir string) error
 	StartServices(ctx context.Context, services ...string) error
 	StopServices(ctx context.Context, allProjects bool, services ...string) error

internal/boxcli/root.go

@@ -59,7 +59,6 @@ func RootCmd() *cobra.Command {
 	command.AddCommand(installCmd())
 	command.AddCommand(integrateCmd())
 	command.AddCommand(logCmd())
-	command.AddCommand(planCmd())
 	command.AddCommand(removeCmd())
 	command.AddCommand(runCmd())
 	command.AddCommand(searchCmd())

internal/planner/plansdk/analyzer.go → internal/initrec/analyzer/analyzer.go

@@ -1,7 +1,7 @@
 // Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
 // Use of this source code is governed by the license in the LICENSE file.
 
-package plansdk
+package analyzer
 
 import (
 	"path/filepath"

internal/planner/plansdk/version.go → internal/initrec/analyzer/version.go

@@ -1,7 +1,7 @@
 // Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
 // Use of this source code is governed by the license in the LICENSE file.
 
-package plansdk
+package analyzer
 
 import (
 	"regexp"

internal/planner/plansdk/version_test.go → internal/initrec/analyzer/version_test.go

@@ -1,7 +1,7 @@
 // Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
 // Use of this source code is governed by the license in the LICENSE file.
 
-package plansdk
+package analyzer
 
 import (
 	"testing"

internal/initrec/recommenders/dotnet/dotnet.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 
 	"go.jetpack.io/devbox/internal/cuecfg"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 type Project struct {
@@ -31,7 +31,7 @@ type Recommender struct {
 var _ recommenders.Recommender = (*Recommender)(nil)
 
 func (r *Recommender) IsRelevant() bool {
-	a, err := plansdk.NewAnalyzer(r.SrcDir)
+	a, err := analyzer.NewAnalyzer(r.SrcDir)
 	if err != nil {
 		// We should log that an error has occurred.
 		return false
@@ -56,7 +56,7 @@ func (r *Recommender) Packages() []string {
 }
 
 func project(srcDir string) (*Project, error) {
-	a, err := plansdk.NewAnalyzer(srcDir)
+	a, err := analyzer.NewAnalyzer(srcDir)
 	if err != nil {
 		// We should log that an error has occurred.
 		return nil, err

internal/initrec/recommenders/haskell/haskell.go

@@ -4,8 +4,8 @@
 package haskell
 
 import (
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 // This Project struct corresponds to the package.yaml generated during `stack new <project-name>`.
@@ -27,7 +27,7 @@ type Recommender struct {
 var _ recommenders.Recommender = (*Recommender)(nil)
 
 func (r *Recommender) IsRelevant() bool {
-	a, err := plansdk.NewAnalyzer(r.SrcDir)
+	a, err := analyzer.NewAnalyzer(r.SrcDir)
 	if err != nil {
 		// We should log that an error has occurred.
 		return false

internal/initrec/recommenders/java/java.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/creekorful/mvnparser"
 	"github.com/pkg/errors"
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 
 	"go.jetpack.io/devbox/internal/cuecfg"
 	"go.jetpack.io/devbox/internal/fileutil"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 // misc. nix packages
@@ -113,8 +113,8 @@ func getJavaPackage(srcDir string, builderTool string) (string, error) {
 	return defaultJava, nil
 }
 
-func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, error) {
-	sourceVersion, _ := plansdk.NewVersion("0")
+func parseJavaVersion(srcDir string, builderTool string) (*analyzer.Version, error) {
+	sourceVersion, _ := analyzer.NewVersion("0")
 
 	if builderTool == MavenType {
 		pomXMLPath := filepath.Join(srcDir, mavenFileName)
@@ -126,7 +126,7 @@ func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, erro
 		}
 		compilerSourceVersion, ok := parsedPom.Properties["maven.compiler.source"]
 		if ok {
-			sourceVersion, err = plansdk.NewVersion(compilerSourceVersion)
+			sourceVersion, err = analyzer.NewVersion(compilerSourceVersion)
 			if err != nil {
 				return nil, errors.WithMessage(err, "error parsing java version from pom file")
 			}
@@ -144,7 +144,7 @@ func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, erro
 			line := fileScanner.Text()
 			if strings.Contains(line, "sourceCompatibility = ") {
 				compilerSourceVersion := strings.TrimSpace(strings.Split(line, "=")[1])
-				sourceVersion, err = plansdk.NewVersion(compilerSourceVersion)
+				sourceVersion, err = analyzer.NewVersion(compilerSourceVersion)
 				if err != nil {
 					return nil, errors.WithMessage(err, "error parsing java version from gradle file")
 				}

internal/initrec/recommenders/javascript/nodejs.go

@@ -8,8 +8,8 @@ import (
 
 	"go.jetpack.io/devbox/internal/cuecfg"
 	"go.jetpack.io/devbox/internal/fileutil"
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 type Recommender struct {
@@ -62,9 +62,9 @@ func (r *Recommender) nodePackage(project *nodeProject) string {
 	return defaultNodeJSPkg
 }
 
-func (r *Recommender) nodeVersion(project *nodeProject) *plansdk.Version {
+func (r *Recommender) nodeVersion(project *nodeProject) *analyzer.Version {
 	if r != nil {
-		if v, err := plansdk.NewVersion(project.Engines.Node); err == nil {
+		if v, err := analyzer.NewVersion(project.Engines.Node); err == nil {
 			return v
 		}
 	}

internal/initrec/recommenders/python/python_poetry.go

@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 
 	"github.com/pelletier/go-toml/v2"
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 
 	"go.jetpack.io/devbox/internal/fileutil"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 type RecommenderPoetry struct {
@@ -37,15 +37,15 @@ func (r *RecommenderPoetry) Packages() []string {
 }
 
 // TODO: This can be generalized to all python planners
-func (r *RecommenderPoetry) PythonVersion() *plansdk.Version {
-	defaultVersion, _ := plansdk.NewVersion("3.10.6")
+func (r *RecommenderPoetry) PythonVersion() *analyzer.Version {
+	defaultVersion, _ := analyzer.NewVersion("3.10.6")
 	project := r.pyProject()
 
 	if project == nil {
 		return defaultVersion
 	}
 
-	if v, err := plansdk.NewVersion(project.Tool.Poetry.Dependencies.Python); err == nil {
+	if v, err := analyzer.NewVersion(project.Tool.Poetry.Dependencies.Python); err == nil {
 		return v
 	}
 	return defaultVersion

internal/initrec/recommenders/zig/zig.go

@@ -4,8 +4,8 @@
 package zig
 
 import (
+	"go.jetpack.io/devbox/internal/initrec/analyzer"
 	"go.jetpack.io/devbox/internal/initrec/recommenders"
-	"go.jetpack.io/devbox/internal/planner/plansdk"
 )
 
 type Recommender struct {
@@ -16,7 +16,7 @@ type Recommender struct {
 var _ recommenders.Recommender = (*Recommender)(nil)
 
 func (r *Recommender) IsRelevant() bool {
-	a, err := plansdk.NewAnalyzer(r.SrcDir)
+	a, err := analyzer.NewAnalyzer(r.SrcDir)
 	if err != nil {
 		// We should log that an error has occurred.
 		return false

internal/searcher/client.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/pkg/errors"
 	"go.jetpack.io/devbox/internal/boxcli/usererr"
 	"go.jetpack.io/devbox/internal/devpkg"
 	"go.jetpack.io/devbox/internal/envir"
@@ -19,33 +20,26 @@ import (
 
 const searchAPIEndpoint = "https://search.devbox.sh"
 
-func searchHost() string {
-	return envir.GetValueOrDefault(envir.DevboxSearchHost, searchAPIEndpoint)
-}
-
 type client struct {
-	endpoint string
+	host string
 }
 
-var cachedClient *client
-
 func Client() *client {
-	if cachedClient == nil {
-		endpoint, _ := url.JoinPath(searchHost(), "search")
-		// TODO: how to handle error
-		cachedClient = &client{
-			endpoint: endpoint,
-		}
+	return &client{
+		host: envir.GetValueOrDefault(envir.DevboxSearchHost, searchAPIEndpoint),
 	}
-	return cachedClient
 }
 
 func (c *client) Search(query string, options ...func() string) (*SearchResult, error) {
 	if query == "" {
 		return nil, fmt.Errorf("query should not be empty")
 	}
 
-	searchURL := c.endpoint + "?q=" + url.QueryEscape(query)
+	endpoint, err := url.JoinPath(c.host, "search")
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	searchURL := endpoint + "?q=" + url.QueryEscape(query)
 
 	for _, op := range options {
 		searchURL += op()