Skip to content

Commit 4e95590

Browse files
mikeland73mikeland73
authored
[auth] Improve whoami (#1693)
## Summary TSIA ## How was it tested?
1 parent a0fa00a commit 4e95590

File tree

5 files changed

+29
-30
lines changed

5 files changed

+29
-30
lines changed

‎.github/workflows/cli-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- uses: actions/checkout@v3
74-
- uses: crate-ci/typos@v1.13.16
74+
- uses: crate-ci/typos@v1.16.26
7575

7676
golangci-lint:
7777
needs: build-devbox

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ require (
3939
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
4040
github.com/wk8/go-ordered-map/v2 v2.1.8
4141
github.com/zealic/go2node v0.1.0
42-
go.jetpack.io/envsec v0.0.13
43-
go.jetpack.io/pkg v0.0.0-20231220195442-0c2f1e897695
44-
golang.org/x/exp v0.0.0-20231219180239-dc181d75b848
42+
go.jetpack.io/envsec v0.0.14-0.20231223002340-852b37835912
43+
go.jetpack.io/pkg v0.0.0-20231222235844-de2c9c35ba7c
44+
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
4545
golang.org/x/mod v0.14.0
4646
golang.org/x/sync v0.5.0
4747
golang.org/x/tools v0.16.0
@@ -50,7 +50,7 @@ require (
5050
)
5151

5252
require (
53-
connectrpc.com/connect v1.13.0 // indirect
53+
connectrpc.com/connect v1.14.0 // indirect
5454
github.com/InVisionApp/go-health/v2 v2.1.3 // indirect
5555
github.com/InVisionApp/go-logger v1.0.1 // indirect
5656
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
@@ -126,5 +126,5 @@ require (
126126
golang.org/x/term v0.15.0 // indirect
127127
golang.org/x/text v0.14.0 // indirect
128128
google.golang.org/appengine v1.6.8 // indirect
129-
google.golang.org/protobuf v1.31.0 // indirect
129+
google.golang.org/protobuf v1.32.0 // indirect
130130
)

‎go.sum

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
1616
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
1717
connectrpc.com/connect v1.13.0 h1:lGs5maZZzWOOD+PFFiOt5OncKmMsk9ZdPwpy5jcmaYg=
1818
connectrpc.com/connect v1.13.0/go.mod h1:uHAFHtYgeSZJxXrkN1IunDpKghnTXhYbVh0wW4StPW0=
19+
connectrpc.com/connect v1.14.0 h1:PDS+J7uoz5Oui2VEOMcfz6Qft7opQM9hPiKvtGC01pA=
20+
connectrpc.com/connect v1.14.0/go.mod h1:uoAq5bmhhn43TwhaKdGKN/bZcGtzPW1v+ngDTn5u+8s=
1921
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
2022
github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
2123
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
@@ -377,10 +379,14 @@ go.jetpack.io/envsec v0.0.12-0.20231220042802-d784a6c23f33 h1:E7PQw+0KO7LmtT2ANO
377379
go.jetpack.io/envsec v0.0.12-0.20231220042802-d784a6c23f33/go.mod h1:bR8d9A7SnjABK0uvjJLRedJdFRiPOWkDoo+W374z6X4=
378380
go.jetpack.io/envsec v0.0.13 h1:ZtA747aKU/cjDOMwaiqybKu5HG9dly8/T0p4bxLEvK0=
379381
go.jetpack.io/envsec v0.0.13/go.mod h1:K+gqk7llRfXcGF4zB4WHu6m1/DocSthk4Fh6Dx71doc=
382+
go.jetpack.io/envsec v0.0.14-0.20231223002340-852b37835912 h1:tnth22wvh4nUTED5hZUch7W3NvGGbGqChopkJBXf06A=
383+
go.jetpack.io/envsec v0.0.14-0.20231223002340-852b37835912/go.mod h1:oQ/a382loMMnuypIIaWTLbbVt0xiRO86r79LeAcoDqg=
380384
go.jetpack.io/pkg v0.0.0-20231220014237-68ef53318b2e h1:XYnuIOYcIStIb2WG6krxtln5YlzY66+QdQU78jMAgmI=
381385
go.jetpack.io/pkg v0.0.0-20231220014237-68ef53318b2e/go.mod h1:3bunF5jJUIXf8vWXvu4PHWfHuDj3hgzOyhTXeoBH8Dk=
382386
go.jetpack.io/pkg v0.0.0-20231220195442-0c2f1e897695 h1:ttpYfHeXn9towh6MGjGbd9y+dbSvWYfu/WYoW4kRrlM=
383387
go.jetpack.io/pkg v0.0.0-20231220195442-0c2f1e897695/go.mod h1:3bunF5jJUIXf8vWXvu4PHWfHuDj3hgzOyhTXeoBH8Dk=
388+
go.jetpack.io/pkg v0.0.0-20231222235844-de2c9c35ba7c h1:pVMgrsVoMLRui62Ga0BBaX4ExJzlvr6B+GpFyYxqusg=
389+
go.jetpack.io/pkg v0.0.0-20231222235844-de2c9c35ba7c/go.mod h1:3bunF5jJUIXf8vWXvu4PHWfHuDj3hgzOyhTXeoBH8Dk=
384390
go.jetpack.io/typeid v1.0.0 h1:8gQ+iYGdyiQ0Pr40ydSB/PzMOIwlXX5DTojp1CBeSPQ=
385391
go.jetpack.io/typeid v1.0.0/go.mod h1:+UPEaECUgFxgAjFPn5Yf9eO/3ft/3xZ98Eahv9JW/GQ=
386392
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -407,6 +413,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
407413
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
408414
golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE=
409415
golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
416+
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
417+
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
410418
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
411419
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
412420
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -581,6 +589,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
581589
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
582590
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
583591
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
592+
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
593+
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
584594
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
585595
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
586596
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎internal/boxcli/auth.go

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ package boxcli
66
import (
77
"context"
88
"fmt"
9+
"os"
910

1011
"github.com/spf13/cobra"
11-
"go.jetpack.io/devbox/internal/boxcli/usererr"
1212
"go.jetpack.io/devbox/internal/build"
13+
"go.jetpack.io/devbox/internal/integrations/envsec"
1314
"go.jetpack.io/pkg/auth"
1415
"go.jetpack.io/pkg/auth/session"
1516
)
@@ -44,7 +45,7 @@ func loginCmd() *cobra.Command {
4445
if err != nil {
4546
return err
4647
}
47-
fmt.Fprintf(cmd.ErrOrStderr(), "Logged in as : %s\n", t.IDClaims().Email)
48+
fmt.Fprintf(cmd.ErrOrStderr(), "Logged in as: %s\n", t.IDClaims().Email)
4849
return nil
4950
},
5051
}
@@ -79,30 +80,12 @@ func whoAmICmd() *cobra.Command {
7980
Short: "Show the current user",
8081
Args: cobra.ExactArgs(0),
8182
RunE: func(cmd *cobra.Command, args []string) error {
82-
tok, err := genSession(cmd.Context())
83+
wd, err := os.Getwd()
8384
if err != nil {
8485
return err
85-
} else if tok == nil {
86-
return usererr.New("not logged in")
8786
}
88-
idClaims := tok.IDClaims()
89-
90-
fmt.Fprintf(cmd.OutOrStdout(), "Logged in\n")
91-
fmt.Fprintf(cmd.OutOrStdout(), "User ID: %s\n", idClaims.Subject)
92-
93-
if idClaims.OrgID != "" {
94-
fmt.Fprintf(cmd.OutOrStdout(), "Org ID: %s\n", idClaims.OrgID)
95-
}
96-
97-
if idClaims.Email != "" {
98-
fmt.Fprintf(cmd.OutOrStdout(), "Email: %s\n", idClaims.Email)
99-
}
100-
101-
if idClaims.Name != "" {
102-
fmt.Fprintf(cmd.OutOrStdout(), "Name: %s\n", idClaims.Name)
103-
}
104-
105-
return nil
87+
return envsec.DefaultEnvsec(cmd.ErrOrStderr(), wd).
88+
WhoAmI(cmd.Context(), cmd.OutOrStdout(), false)
10689
},
10790
}
10891

‎typos.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@
22
AKE = "AKE"
33

44
[files]
5-
extend-exclude=["*.svg", "**/testdata/**", "internal/cachehash/hash_test.go", "internal/devpkg/package_test.go"]
5+
extend-exclude=[
6+
"go.mod",
7+
"*.svg",
8+
"**/testdata/**",
9+
"internal/cachehash/hash_test.go",
10+
"internal/devpkg/package_test.go",
11+
]

0 commit comments

Comments
 (0)