Skip to content

Commit d66f6ea

Browse files
authored
[refactor] Remove devbox interface (#1690)
## Summary Removes the devbox interface (`devbox.go` in root). I feel like it was making code harder to follow and not providing any value. Chatted with @loreto a few weeks ago about doing this. I was about to add a new function to interface and decided to remove instead. A possible follow up could be to remove `devopt.Opts` to avoid some ducplication. ## How was it tested? builds, CICD.
1 parent 34c5f35 commit d66f6ea

Some content is hidden

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

67 files changed

+87
-150
lines changed

.github/workflows/docker-image-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
- name: Build and push default
2121
uses: docker/build-push-action@v4
2222
with:
23-
context: ./internal/impl/generate/tmpl/
24-
file: ./internal/impl/generate/tmpl/DevboxImageDockerfile
23+
context: ./internal/devbox/generate/tmpl/
24+
file: ./internal/devbox/generate/tmpl/DevboxImageDockerfile
2525
push: true
2626
platforms: linux/amd64,linux/arm64
2727
tags: jetpackio/devbox:latest
2828
- name: Build and push root user
2929
uses: docker/build-push-action@v4
3030
with:
31-
context: ./internal/impl/generate/tmpl/
32-
file: ./internal/impl/generate/tmpl/DevboxImageDockerfileRootUser
31+
context: ./internal/devbox/generate/tmpl/
32+
file: ./internal/devbox/generate/tmpl/DevboxImageDockerfileRootUser
3333
push: true
3434
platforms: linux/amd64,linux/arm64
3535
tags: jetpackio/devbox-root-user:latest

devbox.go

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

internal/boxcli/add.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111

12-
"go.jetpack.io/devbox"
1312
"go.jetpack.io/devbox/internal/boxcli/usererr"
14-
"go.jetpack.io/devbox/internal/impl/devopt"
13+
"go.jetpack.io/devbox/internal/devbox"
14+
"go.jetpack.io/devbox/internal/devbox/devopt"
1515
"go.jetpack.io/devbox/internal/nix"
1616
)
1717

internal/boxcli/cloud.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"github.com/pkg/errors"
1111
"github.com/spf13/cobra"
1212

13-
"go.jetpack.io/devbox"
1413
"go.jetpack.io/devbox/internal/boxcli/usererr"
1514
"go.jetpack.io/devbox/internal/cloud"
15+
"go.jetpack.io/devbox/internal/devbox"
16+
"go.jetpack.io/devbox/internal/devbox/devopt"
1617
"go.jetpack.io/devbox/internal/envir"
17-
"go.jetpack.io/devbox/internal/impl/devopt"
1818
)
1919

2020
type cloudShellCmdFlags struct {

internal/boxcli/env.go

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

1515
// to be composed into xyzCmdFlags structs

internal/boxcli/envsec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package boxcli
66
import (
77
"github.com/pkg/errors"
88
"github.com/spf13/cobra"
9-
"go.jetpack.io/devbox"
109
"go.jetpack.io/devbox/internal/build"
11-
"go.jetpack.io/devbox/internal/impl/devopt"
10+
"go.jetpack.io/devbox/internal/devbox"
11+
"go.jetpack.io/devbox/internal/devbox/devopt"
1212
"go.jetpack.io/envsec/pkg/envsec"
1313
"go.jetpack.io/pkg/envvar"
1414
)

internal/boxcli/generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/pkg/errors"
88
"github.com/spf13/cobra"
99

10-
"go.jetpack.io/devbox"
1110
"go.jetpack.io/devbox/internal/cloud"
12-
"go.jetpack.io/devbox/internal/impl/devopt"
11+
"go.jetpack.io/devbox/internal/devbox"
12+
"go.jetpack.io/devbox/internal/devbox/devopt"
1313
)
1414

1515
type generateCmdFlags struct {

internal/boxcli/global.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111

12-
"go.jetpack.io/devbox"
13-
"go.jetpack.io/devbox/internal/impl/devopt"
12+
"go.jetpack.io/devbox/internal/devbox"
13+
"go.jetpack.io/devbox/internal/devbox/devopt"
1414
"go.jetpack.io/devbox/internal/ux"
1515
)
1616

internal/boxcli/info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111

12-
"go.jetpack.io/devbox"
13-
"go.jetpack.io/devbox/internal/impl/devopt"
12+
"go.jetpack.io/devbox/internal/devbox"
13+
"go.jetpack.io/devbox/internal/devbox/devopt"
1414
)
1515

1616
type infoCmdFlags struct {

internal/boxcli/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/pkg/errors"
88
"github.com/spf13/cobra"
99

10-
"go.jetpack.io/devbox"
10+
"go.jetpack.io/devbox/internal/devbox"
1111
)
1212

1313
func initCmd() *cobra.Command {

0 commit comments

Comments
 (0)