Skip to content

[refactor] Remove devbox interface #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 21, 2023
Merged

[refactor] Remove devbox interface #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b70e7
[refactor] Remove devbox interface
mikeland73 Dec 21, 2023
49f8580
Some missing fixes
mikeland73 Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker-image-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:
- name: Build and push default
uses: docker/build-push-action@v4
with:
context: ./internal/impl/generate/tmpl/
file: ./internal/impl/generate/tmpl/DevboxImageDockerfile
context: ./internal/devbox/generate/tmpl/
file: ./internal/devbox/generate/tmpl/DevboxImageDockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: jetpackio/devbox:latest
- name: Build and push root user
uses: docker/build-push-action@v4
with:
context: ./internal/impl/generate/tmpl/
file: ./internal/impl/generate/tmpl/DevboxImageDockerfileRootUser
context: ./internal/devbox/generate/tmpl/
file: ./internal/devbox/generate/tmpl/DevboxImageDockerfileRootUser
push: true
platforms: linux/amd64,linux/arm64
tags: jetpackio/devbox-root-user:latest
67 changes: 0 additions & 67 deletions devbox.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions internal/boxcli/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/nix"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/cloud"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/envir"
"go.jetpack.io/devbox/internal/impl/devopt"
)

type cloudShellCmdFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/boxcli/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/joho/godotenv"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

// to be composed into xyzCmdFlags structs
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/envsec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package boxcli
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/build"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/envsec/pkg/envsec"
"go.jetpack.io/pkg/envvar"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/cloud"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type generateCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/global.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/ux"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type infoCmdFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/boxcli/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/devbox"
)

func initCmd() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

func installCmd() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/integrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/spf13/cobra"
"github.com/zealic/go2node"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/debug"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type integrateCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/midcobra/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/featureflag"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/envir"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/telemetry"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/boxcli/multi/multi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"io/fs"
"path/filepath"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/debug"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/devconfig"
"go.jetpack.io/devbox/internal/impl/devopt"
)

func Open(opts *devopt.Opts) ([]devbox.Devbox, error) {
func Open(opts *devopt.Opts) ([]*devbox.Devbox, error) {
defer debug.FunctionTimer().End()

var boxes []devbox.Devbox
var boxes []*devbox.Devbox
err := filepath.WalkDir(
".",
func(path string, dirEntry fs.DirEntry, err error) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/goutil"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/pullbox/s3"
"go.jetpack.io/pkg/auth"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/spf13/cobra"
"go.jetpack.io/pkg/auth"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/goutil"
"go.jetpack.io/devbox/internal/impl/devopt"
)

type pushCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/rm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package boxcli
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type removeCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/debug"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/redact"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package boxcli
import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type servicesCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/envir"
"go.jetpack.io/devbox/internal/impl/devopt"
)

type shellCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/shellenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"

"github.com/spf13/cobra"
"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type shellEnvCmdFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/boxcli/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"go.jetpack.io/devbox"
"go.jetpack.io/devbox/internal/boxcli/multi"
"go.jetpack.io/devbox/internal/boxcli/usererr"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/devbox"
"go.jetpack.io/devbox/internal/devbox/devopt"
)

type updateCmdFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/conf/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// Use of this source code is governed by the license in the LICENSE file.

// Package conf is future home of the config (devbox.json) management code.
// it will merge exiting plugin and impl/config.go code.
// it will merge exiting plugin and devbox/config.go code.
package conf
14 changes: 9 additions & 5 deletions internal/impl/devbox.go → internal/devbox/devbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 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 impl creates isolated development environments.
package impl
// Package devbox creates isolated development environments.
package devbox

import (
"bytes"
Expand All @@ -24,10 +24,10 @@ import (
"github.com/pkg/errors"
"github.com/samber/lo"
"go.jetpack.io/devbox/internal/cachehash"
"go.jetpack.io/devbox/internal/devbox/envpath"
"go.jetpack.io/devbox/internal/devbox/generate"
"go.jetpack.io/devbox/internal/devpkg"
"go.jetpack.io/devbox/internal/devpkg/pkgtype"
"go.jetpack.io/devbox/internal/impl/envpath"
"go.jetpack.io/devbox/internal/impl/generate"
"go.jetpack.io/devbox/internal/searcher"
"go.jetpack.io/devbox/internal/shellgen"
"go.jetpack.io/devbox/internal/telemetry"
Expand All @@ -36,10 +36,10 @@ import (
"go.jetpack.io/devbox/internal/cmdutil"
"go.jetpack.io/devbox/internal/conf"
"go.jetpack.io/devbox/internal/debug"
"go.jetpack.io/devbox/internal/devbox/devopt"
"go.jetpack.io/devbox/internal/devconfig"
"go.jetpack.io/devbox/internal/envir"
"go.jetpack.io/devbox/internal/fileutil"
"go.jetpack.io/devbox/internal/impl/devopt"
"go.jetpack.io/devbox/internal/lock"
"go.jetpack.io/devbox/internal/nix"
"go.jetpack.io/devbox/internal/plugin"
Expand Down Expand Up @@ -74,6 +74,10 @@ type Devbox struct {

var legacyPackagesWarningHasBeenShown = false

func InitConfig(dir string, writer io.Writer) (bool, error) {
return devconfig.Init(dir, writer)
}

func Open(opts *devopt.Opts) (*Devbox, error) {
projectDir, err := findProjectDir(opts.Dir)
if err != nil {
Expand Down
Loading