-
Notifications
You must be signed in to change notification settings - Fork 6
Added whoami #42
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.
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
Added whoami #42
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package authconfig | ||
|
|
||
| import ( | ||
| "crypto/sha256" | ||
| "errors" | ||
| "fmt" | ||
| "io/fs" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| // UserIdentity holds the cached identity resolved from the API key. | ||
| type UserIdentity struct { | ||
| CustomerID string `yaml:"customer_id"` // e.g. "user_123" or "team_456" | ||
| APIKeyHash string `yaml:"api_key_hash"` // SHA-256 of the API key for cache invalidation | ||
| } | ||
|
|
||
| // identityFileName is the file storing the cached user identity. | ||
| const identityFileName = "user_identity.yaml" | ||
|
|
||
| // LoadIdentity reads the cached user identity. Returns nil, nil if the file does not exist. | ||
| func LoadIdentity() (*UserIdentity, error) { | ||
| dir, err := Dir() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| data, err := os.ReadFile(filepath.Join(dir, identityFileName)) | ||
| if err != nil { | ||
| if errors.Is(err, fs.ErrNotExist) { | ||
| return nil, nil | ||
| } | ||
| return nil, err | ||
| } | ||
|
|
||
| var id UserIdentity | ||
| if err := yaml.Unmarshal(data, &id); err != nil { | ||
| return nil, err | ||
| } | ||
| return &id, nil | ||
| } | ||
|
|
||
| // SaveIdentity writes the user identity cache to disk. | ||
| func SaveIdentity(id *UserIdentity) error { | ||
| dir, err := Dir() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := os.MkdirAll(dir, 0o700); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| data, err := yaml.Marshal(id) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return os.WriteFile(filepath.Join(dir, identityFileName), data, 0o600) | ||
| } | ||
|
|
||
| // HashAPIKey returns the hex-encoded SHA-256 hash of an API key. | ||
| func HashAPIKey(apiKey string) string { | ||
| h := sha256.Sum256([]byte(apiKey)) | ||
| return fmt.Sprintf("%x", h) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package authconfig_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/duneanalytics/cli/authconfig" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestSaveAndLoadIdentity(t *testing.T) { | ||
| setupTempDir(t) | ||
|
|
||
| want := &authconfig.UserIdentity{ | ||
| CustomerID: "user_42", | ||
| APIKeyHash: authconfig.HashAPIKey("test-api-key"), | ||
| } | ||
| require.NoError(t, authconfig.SaveIdentity(want)) | ||
|
|
||
| got, err := authconfig.LoadIdentity() | ||
| require.NoError(t, err) | ||
| assert.Equal(t, want, got) | ||
| } | ||
|
|
||
| func TestLoadIdentityNonExistent(t *testing.T) { | ||
| setupTempDir(t) | ||
|
|
||
| id, err := authconfig.LoadIdentity() | ||
| assert.NoError(t, err) | ||
| assert.Nil(t, id) | ||
| } | ||
|
|
||
| func TestHashAPIKeyDeterministic(t *testing.T) { | ||
| h1 := authconfig.HashAPIKey("my-key") | ||
| h2 := authconfig.HashAPIKey("my-key") | ||
| assert.Equal(t, h1, h2) | ||
| assert.NotEqual(t, h1, authconfig.HashAPIKey("other-key")) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package whoami | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/duneanalytics/cli/cmdutil" | ||
| "github.com/duneanalytics/cli/output" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // NewWhoAmICmd returns the "whoami" command. | ||
| func NewWhoAmICmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "whoami", | ||
| Short: "Show the identity associated with the current API key", | ||
| Long: "Display the handle, customer ID, and API key ID of the currently\n" + | ||
| "configured API key. Useful for verifying which account is active.\n\n" + | ||
| "Examples:\n" + | ||
| " dune whoami\n" + | ||
| " dune whoami --output json", | ||
| RunE: runWhoAmI, | ||
| } | ||
|
|
||
| output.AddFormatFlag(cmd, "text") | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func runWhoAmI(cmd *cobra.Command, _ []string) error { | ||
| client := cmdutil.ClientFromCmd(cmd) | ||
|
|
||
| resp, err := client.WhoAmI() | ||
| if err != nil { | ||
| return fmt.Errorf("identifying API key: %w", err) | ||
| } | ||
|
|
||
| w := cmd.OutOrStdout() | ||
| switch output.FormatFromCmd(cmd) { | ||
| case output.FormatJSON: | ||
| return output.PrintJSON(w, resp) | ||
| default: | ||
| fmt.Fprintf(w, "Handle: %s\n", resp.Handle) | ||
| fmt.Fprintf(w, "Customer ID: %s\n", resp.CustomerID) | ||
| fmt.Fprintf(w, "API Key ID: %s\n", resp.APIKeyID) | ||
| return nil | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.