Skip to content

Commit c703d13

Browse files
authored
[easy][deps] Update pkg, use new DEVBOX_API_TOKEN name (#2025)
## Summary TSIA ## How was it tested?
1 parent c282015 commit c703d13

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ require (
2323
github.com/getsentry/sentry-go v0.27.0
2424
github.com/google/go-cmp v0.6.0
2525
github.com/google/uuid v1.6.0
26-
github.com/gosimple/slug v1.14.0
2726
github.com/hashicorp/go-envparse v0.1.0
2827
github.com/joho/godotenv v1.5.1
2928
github.com/mattn/go-isatty v0.0.20
@@ -40,9 +39,9 @@ require (
4039
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
4140
github.com/wk8/go-ordered-map/v2 v2.1.8
4241
github.com/zealic/go2node v0.1.0
42+
go.jetify.com/typeid v1.1.0
4343
go.jetpack.io/envsec v0.0.16-0.20240329013200-4174c0acdb00
44-
go.jetpack.io/pkg v0.0.0-20240415190428-d17de207b432
45-
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2
44+
go.jetpack.io/pkg v0.0.0-20240425160511-7b1b3c860422
4645
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
4746
golang.org/x/mod v0.16.0
4847
golang.org/x/oauth2 v0.19.0
@@ -94,6 +93,7 @@ require (
9493
github.com/google/go-github/v53 v53.2.0 // indirect
9594
github.com/google/go-querystring v1.1.0 // indirect
9695
github.com/google/renameio/v2 v2.0.0 // indirect
96+
github.com/gosimple/slug v1.14.0 // indirect
9797
github.com/gosimple/unidecode v1.0.1 // indirect
9898
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9999
github.com/h2non/filetype v1.1.3 // indirect
@@ -124,6 +124,7 @@ require (
124124
github.com/therootcompany/xz v1.0.1 // indirect
125125
github.com/ulikunitz/xz v0.5.12 // indirect
126126
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
127+
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2 // indirect
127128
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
128129
golang.org/x/crypto v0.22.0 // indirect
129130
golang.org/x/sys v0.19.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,12 +358,12 @@ github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBU
358358
github.com/zaffka/mongodb-boltdb-mock v0.0.0-20221014194232-b4bb03fbe3a0/go.mod h1:GsDD1qsG+86MeeCG7ndi6Ei3iGthKL3wQ7PTFigDfNY=
359359
github.com/zealic/go2node v0.1.0 h1:ofxpve08cmLJBwFdI0lPCk9jfwGWOSD+s6216x0oAaA=
360360
github.com/zealic/go2node v0.1.0/go.mod h1:GrkFr+HctXwP7vzcU9RsgtAeJjTQ6Ud0IPCQAqpTfBg=
361+
go.jetify.com/typeid v1.1.0 h1:eRW/BBYx1Kh3DiOKBLaAHbwomxK4jm4/tWuNshN5wXY=
362+
go.jetify.com/typeid v1.1.0/go.mod h1:68KXnMPJvJi4Pf2vUhr1QtWo5LfXzMwbUdLfwPlO4jI=
361363
go.jetpack.io/envsec v0.0.16-0.20240329013200-4174c0acdb00 h1:Kb+OlWOntAq+1nF+01ntqnQEqSJkFmLLS0RX5sl5zak=
362364
go.jetpack.io/envsec v0.0.16-0.20240329013200-4174c0acdb00/go.mod h1:dVG2n8fBAGpQczW8yk/6wuXb9uEhzaJF7wGXkGLRRCU=
363-
go.jetpack.io/pkg v0.0.0-20240415163115-0f42b5c54fe1 h1:qLatba17X9hZ0+3m+9FzDu48cQBhCZjDHWJDctPGYp4=
364-
go.jetpack.io/pkg v0.0.0-20240415163115-0f42b5c54fe1/go.mod h1:JfVScypw14E4GR2TA2Nv29JqalRtgv2C9QjeQcNS4UM=
365-
go.jetpack.io/pkg v0.0.0-20240415190428-d17de207b432 h1:5B9uUxqzwDLUi+m/SVawTMszOmCK6KnUWb4yiCZJumg=
366-
go.jetpack.io/pkg v0.0.0-20240415190428-d17de207b432/go.mod h1:JfVScypw14E4GR2TA2Nv29JqalRtgv2C9QjeQcNS4UM=
365+
go.jetpack.io/pkg v0.0.0-20240425160511-7b1b3c860422 h1:nycOky7HqHwm7yyRy8nM1vnehkPmpSQEjdVSp9oz0to=
366+
go.jetpack.io/pkg v0.0.0-20240425160511-7b1b3c860422/go.mod h1:+uFriYKQtj7KHG5g+n6EKspEBg4zlwvq7Z/YOmatjQU=
367367
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2 h1:w9uWg8BAim374iWzxEuDhf6MJ/cMQVR/0xi/L3DgfT0=
368368
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2/go.mod h1:zqBUNjE3NxAL8wRYW2LcOpH5LxCvTqthm9YSuuu1ic4=
369369
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

internal/devbox/providers/identity/identity.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"context"
55
"os"
66

7+
"go.jetify.com/typeid"
78
"go.jetpack.io/devbox/internal/build"
89
"go.jetpack.io/pkg/api"
910
"go.jetpack.io/pkg/auth"
1011
"go.jetpack.io/pkg/auth/session"
1112
"go.jetpack.io/pkg/ids"
12-
"go.jetpack.io/typeid"
1313
"golang.org/x/oauth2"
1414
)
1515

@@ -71,18 +71,18 @@ func (p *Provider) AuthClient() (*auth.Client, error) {
7171
func (p *Provider) getAccessTokenFromAPIToken(
7272
ctx context.Context,
7373
) (*session.Token, error) {
74-
pat := os.Getenv("DEVBOX_ACCESS_TOKEN")
75-
if pat == "" {
74+
apiTokenRaw := os.Getenv("DEVBOX_API_TOKEN")
75+
if apiTokenRaw == "" {
7676
return nil, nil
7777
}
7878

79-
patID, err := typeid.Parse[ids.PersonalAccessToken](pat)
79+
apiToken, err := typeid.Parse[ids.APIToken](apiTokenRaw)
8080
if err != nil {
8181
return nil, err
8282
}
8383

8484
apiClient := api.NewClient(ctx, build.JetpackAPIHost(), &session.Token{})
85-
response, err := apiClient.GetAccessToken(ctx, patID)
85+
response, err := apiClient.GetAccessToken(ctx, apiToken)
8686
if err != nil {
8787
return nil, err
8888
}

0 commit comments

Comments
 (0)