Skip to content

Commit fbdbf01

Browse files
authored
[auth] Use new auth package (#1492)
## Summary Migrate to new auth package. The feature on devbox that used previous auth was not publicized and there's no data on S3 that we need to migrate. ## How was it tested? ```bash devbox auth login devbox auth whoami ```
1 parent bc92b10 commit fbdbf01

File tree

16 files changed

+252
-604
lines changed

16 files changed

+252
-604
lines changed

devbox.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ type Devbox interface {
3535
PrintEnv(ctx context.Context, includeHooks bool) (string, error)
3636
PrintEnvVars(ctx context.Context) ([]string, error)
3737
PrintGlobalList() error
38-
Pull(ctx context.Context, overwrite bool, path string) error
39-
Push(ctx context.Context, url string) error
38+
Pull(ctx context.Context, opts devopt.PullboxOpts) error
39+
Push(ctx context.Context, opts devopt.PullboxOpts) error
4040
// Remove removes Nix packages from the config so that it no longer exists in
4141
// the devbox environment.
4242
Remove(ctx context.Context, pkgs ...string) error

go.mod

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.21
55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.6
77
github.com/MakeNowJust/heredoc/v2 v2.0.1
8-
github.com/MicahParks/keyfunc/v2 v2.1.0
98
github.com/alessio/shellescape v1.4.1
109
github.com/aws/aws-sdk-go-v2 v1.18.0
1110
github.com/aws/aws-sdk-go-v2/config v1.18.25
@@ -22,21 +21,20 @@ require (
2221
github.com/fatih/color v1.15.0
2322
github.com/fsnotify/fsnotify v1.6.0
2423
github.com/getsentry/sentry-go v0.20.0
25-
github.com/golang-jwt/jwt/v5 v5.0.0
2624
github.com/google/go-cmp v0.5.9
2725
github.com/google/uuid v1.3.0
2826
github.com/hashicorp/go-envparse v0.1.0
29-
github.com/mattn/go-isatty v0.0.18
27+
github.com/mattn/go-isatty v0.0.19
3028
github.com/mholt/archiver/v4 v4.0.0-alpha.7
3129
github.com/pelletier/go-toml/v2 v2.0.7
32-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
30+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
3331
github.com/pkg/errors v0.9.1
34-
github.com/rogpeppe/go-internal v1.10.0
32+
github.com/rogpeppe/go-internal v1.11.0
3533
github.com/samber/lo v1.38.1
3634
github.com/segmentio/analytics-go v3.1.0+incompatible
37-
github.com/spf13/cobra v1.6.1
35+
github.com/spf13/cobra v1.7.0
3836
github.com/spf13/pflag v1.0.5
39-
github.com/stretchr/testify v1.8.2
37+
github.com/stretchr/testify v1.8.4
4038
github.com/wk8/go-ordered-map/v2 v2.1.8
4139
github.com/zealic/go2node v0.1.0
4240
golang.org/x/exp v0.0.0-20230807204917-050eac23e9de
@@ -47,15 +45,27 @@ require (
4745

4846
require (
4947
github.com/joho/godotenv v1.5.1
50-
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
48+
go.jetpack.io/pkg v0.0.0-20230915205515-567047de7b30
49+
golang.org/x/sync v0.1.0
5150
)
5251

5352
require (
5453
github.com/bahlo/generic-list-go v0.2.0 // indirect
5554
github.com/buger/jsonparser v1.1.1 // indirect
56-
github.com/kr/pretty v0.1.0 // indirect
55+
github.com/coreos/go-oidc/v3 v3.6.0 // indirect
56+
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
57+
github.com/golang/protobuf v1.5.3 // indirect
58+
github.com/gosimple/slug v1.13.1 // indirect
59+
github.com/gosimple/unidecode v1.0.1 // indirect
60+
github.com/kr/text v0.2.0 // indirect
5761
github.com/mailru/easyjson v0.7.7 // indirect
58-
golang.org/x/net v0.8.0 // indirect
62+
golang.org/x/crypto v0.13.0 // indirect
63+
golang.org/x/net v0.15.0 // indirect
64+
golang.org/x/oauth2 v0.12.0 // indirect
65+
golang.org/x/tools v0.6.0 // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/protobuf v1.31.0 // indirect
68+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
5969
)
6070

6171
require (
@@ -97,7 +107,7 @@ require (
97107
github.com/therootcompany/xz v1.0.1 // indirect
98108
github.com/ulikunitz/xz v0.5.11 // indirect
99109
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
100-
golang.org/x/sys v0.6.0 // indirect
101-
golang.org/x/term v0.6.0 // indirect
102-
golang.org/x/text v0.8.0 // indirect
110+
golang.org/x/sys v0.12.0 // indirect
111+
golang.org/x/term v0.12.0 // indirect
112+
golang.org/x/text v0.13.0 // indirect
103113
)

go.sum

Lines changed: 65 additions & 27 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)