Skip to content

Commit ceb5ae4

Browse files
authored
[cleanup] plansdk (#1188)
## Summary - Remove `devbox plan` command. This is no longer used anywhere. - this means we can remove `devbox.ShellPlan` from the public interface - Move `plansdk.Analyzer` to `initrec/analyzer/analyzer.go`. It is exclusively used in `initrec/recommenders`. - Move plansdk/version to analyzer/version. It is also exclusively used in `initrec/recommenders`. My next PR will likely refactor `plansdk` further since it now has two unrelated structs: `FlakeInput` and `NixpkgsInfo`. ## How was it tested? - opened `devbox shell` in `examples/development/go/hello-world/`. - ran `go run .` - [ ] testscripts should pass
1 parent 1c0a398 commit ceb5ae4

File tree

12 files changed

+22
-83
lines changed

12 files changed

+22
-83
lines changed

devbox.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"go.jetpack.io/devbox/internal/devconfig"
1212
"go.jetpack.io/devbox/internal/impl"
1313
"go.jetpack.io/devbox/internal/impl/devopt"
14-
"go.jetpack.io/devbox/internal/planner/plansdk"
1514
"go.jetpack.io/devbox/internal/services"
1615
)
1716

@@ -46,9 +45,6 @@ type Devbox interface {
4645
Services() (services.Services, error)
4746
// Shell generates the devbox environment and launches nix-shell as a child process.
4847
Shell(ctx context.Context) error
49-
// ShellPlan creates a plan of the actions that devbox will take to generate its
50-
// shell environment.
51-
ShellPlan(ctx context.Context) (*plansdk.FlakePlan, error)
5248
StartProcessManager(ctx context.Context, requestedServices []string, background bool, processComposeFileOrDir string) error
5349
StartServices(ctx context.Context, services ...string) error
5450
StopServices(ctx context.Context, allProjects bool, services ...string) error

internal/boxcli/plan.go

Lines changed: 0 additions & 56 deletions
This file was deleted.

internal/boxcli/root.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func RootCmd() *cobra.Command {
5959
command.AddCommand(installCmd())
6060
command.AddCommand(integrateCmd())
6161
command.AddCommand(logCmd())
62-
command.AddCommand(planCmd())
6362
command.AddCommand(removeCmd())
6463
command.AddCommand(runCmd())
6564
command.AddCommand(searchCmd())

internal/planner/plansdk/analyzer.go renamed to internal/initrec/analyzer/analyzer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
22
// Use of this source code is governed by the license in the LICENSE file.
33

4-
package plansdk
4+
package analyzer
55

66
import (
77
"path/filepath"

internal/planner/plansdk/version.go renamed to internal/initrec/analyzer/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
22
// Use of this source code is governed by the license in the LICENSE file.
33

4-
package plansdk
4+
package analyzer
55

66
import (
77
"regexp"

internal/planner/plansdk/version_test.go renamed to internal/initrec/analyzer/version_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
22
// Use of this source code is governed by the license in the LICENSE file.
33

4-
package plansdk
4+
package analyzer
55

66
import (
77
"testing"

internal/initrec/recommenders/dotnet/dotnet.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"strings"
99

1010
"github.com/pkg/errors"
11+
"go.jetpack.io/devbox/internal/initrec/analyzer"
1112

1213
"go.jetpack.io/devbox/internal/cuecfg"
1314
"go.jetpack.io/devbox/internal/initrec/recommenders"
14-
"go.jetpack.io/devbox/internal/planner/plansdk"
1515
)
1616

1717
type Project struct {
@@ -31,7 +31,7 @@ type Recommender struct {
3131
var _ recommenders.Recommender = (*Recommender)(nil)
3232

3333
func (r *Recommender) IsRelevant() bool {
34-
a, err := plansdk.NewAnalyzer(r.SrcDir)
34+
a, err := analyzer.NewAnalyzer(r.SrcDir)
3535
if err != nil {
3636
// We should log that an error has occurred.
3737
return false
@@ -56,7 +56,7 @@ func (r *Recommender) Packages() []string {
5656
}
5757

5858
func project(srcDir string) (*Project, error) {
59-
a, err := plansdk.NewAnalyzer(srcDir)
59+
a, err := analyzer.NewAnalyzer(srcDir)
6060
if err != nil {
6161
// We should log that an error has occurred.
6262
return nil, err

internal/initrec/recommenders/haskell/haskell.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package haskell
55

66
import (
7+
"go.jetpack.io/devbox/internal/initrec/analyzer"
78
"go.jetpack.io/devbox/internal/initrec/recommenders"
8-
"go.jetpack.io/devbox/internal/planner/plansdk"
99
)
1010

1111
// This Project struct corresponds to the package.yaml generated during `stack new <project-name>`.
@@ -27,7 +27,7 @@ type Recommender struct {
2727
var _ recommenders.Recommender = (*Recommender)(nil)
2828

2929
func (r *Recommender) IsRelevant() bool {
30-
a, err := plansdk.NewAnalyzer(r.SrcDir)
30+
a, err := analyzer.NewAnalyzer(r.SrcDir)
3131
if err != nil {
3232
// We should log that an error has occurred.
3333
return false

internal/initrec/recommenders/java/java.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111

1212
"github.com/creekorful/mvnparser"
1313
"github.com/pkg/errors"
14+
"go.jetpack.io/devbox/internal/initrec/analyzer"
1415

1516
"go.jetpack.io/devbox/internal/cuecfg"
1617
"go.jetpack.io/devbox/internal/fileutil"
1718
"go.jetpack.io/devbox/internal/initrec/recommenders"
18-
"go.jetpack.io/devbox/internal/planner/plansdk"
1919
)
2020

2121
// misc. nix packages
@@ -113,8 +113,8 @@ func getJavaPackage(srcDir string, builderTool string) (string, error) {
113113
return defaultJava, nil
114114
}
115115

116-
func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, error) {
117-
sourceVersion, _ := plansdk.NewVersion("0")
116+
func parseJavaVersion(srcDir string, builderTool string) (*analyzer.Version, error) {
117+
sourceVersion, _ := analyzer.NewVersion("0")
118118

119119
if builderTool == MavenType {
120120
pomXMLPath := filepath.Join(srcDir, mavenFileName)
@@ -126,7 +126,7 @@ func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, erro
126126
}
127127
compilerSourceVersion, ok := parsedPom.Properties["maven.compiler.source"]
128128
if ok {
129-
sourceVersion, err = plansdk.NewVersion(compilerSourceVersion)
129+
sourceVersion, err = analyzer.NewVersion(compilerSourceVersion)
130130
if err != nil {
131131
return nil, errors.WithMessage(err, "error parsing java version from pom file")
132132
}
@@ -144,7 +144,7 @@ func parseJavaVersion(srcDir string, builderTool string) (*plansdk.Version, erro
144144
line := fileScanner.Text()
145145
if strings.Contains(line, "sourceCompatibility = ") {
146146
compilerSourceVersion := strings.TrimSpace(strings.Split(line, "=")[1])
147-
sourceVersion, err = plansdk.NewVersion(compilerSourceVersion)
147+
sourceVersion, err = analyzer.NewVersion(compilerSourceVersion)
148148
if err != nil {
149149
return nil, errors.WithMessage(err, "error parsing java version from gradle file")
150150
}

internal/initrec/recommenders/javascript/nodejs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"go.jetpack.io/devbox/internal/cuecfg"
1010
"go.jetpack.io/devbox/internal/fileutil"
11+
"go.jetpack.io/devbox/internal/initrec/analyzer"
1112
"go.jetpack.io/devbox/internal/initrec/recommenders"
12-
"go.jetpack.io/devbox/internal/planner/plansdk"
1313
)
1414

1515
type Recommender struct {
@@ -62,9 +62,9 @@ func (r *Recommender) nodePackage(project *nodeProject) string {
6262
return defaultNodeJSPkg
6363
}
6464

65-
func (r *Recommender) nodeVersion(project *nodeProject) *plansdk.Version {
65+
func (r *Recommender) nodeVersion(project *nodeProject) *analyzer.Version {
6666
if r != nil {
67-
if v, err := plansdk.NewVersion(project.Engines.Node); err == nil {
67+
if v, err := analyzer.NewVersion(project.Engines.Node); err == nil {
6868
return v
6969
}
7070
}

0 commit comments

Comments
 (0)