Skip to content

Commit 77e2710

Browse files
authored
Move several packages to internal/ (#365)
## Summary Moves most packages to `internal/`. There's still some other files I want to move/refactor, but this takes care of the bulk. The idea is to check this in quickly to minimize merge conflicts, and I can do the smaller refactors separately. ## How was it tested? `go test -v ./...`
1 parent d9569c3 commit 77e2710

File tree

166 files changed

+139
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+139
-139
lines changed

.goreleaser.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ builds:
77
binary: devbox
88
mod_timestamp: "{{ .CommitTimestamp }}" # For reproducible builds
99
ldflags:
10-
- -s -w -X go.jetpack.io/devbox/build.Version={{.Version}}
11-
- -s -w -X go.jetpack.io/devbox/build.Commit={{.Commit}}
12-
- -s -w -X go.jetpack.io/devbox/build.CommitDate={{.CommitDate}}
13-
- -s -w -X go.jetpack.io/devbox/build.SentryDSN={{ .Env.SENTRY_DSN }}
14-
- -s -w -X go.jetpack.io/devbox/build.TelemetryKey={{ .Env.TELEMETRY_KEY }}
10+
- -s -w -X go.jetpack.io/devbox/internal/build.Version={{.Version}}
11+
- -s -w -X go.jetpack.io/devbox/internal/build.Commit={{.Commit}}
12+
- -s -w -X go.jetpack.io/devbox/internal/build.CommitDate={{.CommitDate}}
13+
- -s -w -X go.jetpack.io/devbox/internal/build.SentryDSN={{ .Env.SENTRY_DSN }}
14+
- -s -w -X go.jetpack.io/devbox/internal/build.TelemetryKey={{ .Env.TELEMETRY_KEY }}
1515
env:
1616
- CGO_ENABLED=0
1717
- GO111MODULE=on

cmd/devbox/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package main
55

66
import (
7-
"go.jetpack.io/devbox/boxcli"
7+
"go.jetpack.io/devbox/internal/boxcli"
88
)
99

1010
func main() {

config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"unicode"
1313

1414
"github.com/pkg/errors"
15-
"go.jetpack.io/devbox/boxcli/usererr"
16-
"go.jetpack.io/devbox/cuecfg"
17-
"go.jetpack.io/devbox/debug"
18-
"go.jetpack.io/devbox/planner/plansdk"
15+
"go.jetpack.io/devbox/internal/boxcli/usererr"
16+
"go.jetpack.io/devbox/internal/cuecfg"
17+
"go.jetpack.io/devbox/internal/debug"
18+
"go.jetpack.io/devbox/internal/planner/plansdk"
1919
)
2020

2121
// Config defines a devbox environment as JSON.

devbox.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import (
1616
"github.com/fatih/color"
1717
"github.com/pkg/errors"
1818
"github.com/samber/lo"
19-
"go.jetpack.io/devbox/boxcli/featureflag"
20-
"go.jetpack.io/devbox/boxcli/generate"
21-
"go.jetpack.io/devbox/boxcli/usererr"
22-
"go.jetpack.io/devbox/cuecfg"
23-
"go.jetpack.io/devbox/debug"
24-
"go.jetpack.io/devbox/nix"
25-
"go.jetpack.io/devbox/pkgcfg"
26-
"go.jetpack.io/devbox/planner"
27-
"go.jetpack.io/devbox/planner/plansdk"
19+
"go.jetpack.io/devbox/internal/boxcli/featureflag"
20+
"go.jetpack.io/devbox/internal/boxcli/generate"
21+
"go.jetpack.io/devbox/internal/boxcli/usererr"
22+
"go.jetpack.io/devbox/internal/cuecfg"
23+
"go.jetpack.io/devbox/internal/debug"
24+
"go.jetpack.io/devbox/internal/nix"
25+
"go.jetpack.io/devbox/internal/pkgcfg"
26+
"go.jetpack.io/devbox/internal/planner"
27+
"go.jetpack.io/devbox/internal/planner/plansdk"
2828
"golang.org/x/exp/slices"
2929
)
3030

devbox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/bmatcuk/doublestar/v4"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
13-
"go.jetpack.io/devbox/planner/plansdk"
13+
"go.jetpack.io/devbox/internal/planner/plansdk"
1414
)
1515

1616
func TestDevbox(t *testing.T) {

generate.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
"text/template"
1414

1515
"github.com/pkg/errors"
16-
"go.jetpack.io/devbox/boxcli/featureflag"
17-
"go.jetpack.io/devbox/debug"
18-
"go.jetpack.io/devbox/pkgcfg"
19-
"go.jetpack.io/devbox/planner/plansdk"
16+
"go.jetpack.io/devbox/internal/boxcli/featureflag"
17+
"go.jetpack.io/devbox/internal/debug"
18+
"go.jetpack.io/devbox/internal/pkgcfg"
19+
"go.jetpack.io/devbox/internal/planner/plansdk"
2020
)
2121

22-
//go:embed tmpl/* tmpl/.*
22+
//go:embed internal/tmpl/* internal/tmpl/.*
2323
var tmplFS embed.FS
2424

2525
var shellFiles = []string{"development.nix", "shell.nix"}
@@ -61,7 +61,7 @@ func generateForShell(rootPath string, plan *plansdk.ShellPlan) error {
6161
}
6262

6363
func writeFromTemplate(path string, plan interface{}, tmplName string) error {
64-
embeddedPath := fmt.Sprintf("tmpl/%s.tmpl", tmplName)
64+
embeddedPath := fmt.Sprintf("internal/tmpl/%s.tmpl", tmplName)
6565

6666
// Should we clear the directory so we start "fresh"?
6767
outPath := filepath.Join(path, tmplName)

boxcli/add.go renamed to internal/boxcli/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111
"go.jetpack.io/devbox"
12-
"go.jetpack.io/devbox/nix"
12+
"go.jetpack.io/devbox/internal/nix"
1313
)
1414

1515
type addCmdFlags struct {

boxcli/args.go renamed to internal/boxcli/args.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"path/filepath"
88

99
"github.com/pkg/errors"
10-
"go.jetpack.io/devbox/boxcli/usererr"
10+
"go.jetpack.io/devbox/internal/boxcli/usererr"
1111
)
1212

1313
// Functions that help parse arguments
File renamed without changes.

boxcli/cloud.go renamed to internal/boxcli/cloud.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111
"go.jetpack.io/devbox"
12-
"go.jetpack.io/devbox/cloud"
12+
"go.jetpack.io/devbox/internal/cloud"
1313
)
1414

1515
type cloudShellCmdFlags struct {

0 commit comments

Comments
 (0)