feat: add global profile selection and rename #27
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
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,109 @@ | ||
| package grw | ||
|
|
||
| import ( | ||
| "path/filepath" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| initcmd "github.com/open-cli-collective/google-cli/internal/cmd/init" | ||
| "github.com/open-cli-collective/google-cli/internal/cmd/setcred" | ||
| "github.com/open-cli-collective/google-cli/internal/credtest" | ||
| "github.com/open-cli-collective/google-cli/internal/keychain" | ||
| "github.com/open-cli-collective/google-cli/internal/rootutil" | ||
| ) | ||
|
|
||
| func selectorTestRoot() *cobra.Command { | ||
| var verbose, noColor bool | ||
| root := &cobra.Command{ | ||
| Use: "grw", | ||
| PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { | ||
| return rootutil.ApplyGlobalFlags(cmd, verbose, noColor) | ||
| }, | ||
| } | ||
| rootutil.AddGlobalFlags(root, &verbose, &noColor) | ||
| root.AddCommand(initcmd.NewCommand()) | ||
| root.AddCommand(setcred.NewCmd()) | ||
| return root | ||
| } | ||
|
|
||
| func TestProfileFlagInheritedByInitInBothFlagOrders(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| name string | ||
| args func(string) []string | ||
| }{ | ||
| {name: "before command", args: func(path string) []string { | ||
| return []string{"--profile", "work", "init", "--credentials-file", path} | ||
| }}, | ||
| {name: "after command", args: func(path string) []string { | ||
| return []string{"init", "--profile", "work", "--credentials-file", path} | ||
| }}, | ||
| } { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| credtest.Setup(t) | ||
| t.Setenv(keychain.CredentialRefEnvVar(), "") | ||
| root := selectorTestRoot() | ||
| root.SetArgs(tc.args(filepath.Join(t.TempDir(), "missing.json"))) | ||
| if err := root.Execute(); err == nil { | ||
| t.Fatal("init should fail for the intentionally missing client file") | ||
| } | ||
| if got, set := keychain.GetCredentialRefOverride(); !set || got != "google-readwrite/work" { | ||
| t.Fatalf("selector after init path = (%q, %v), want google-readwrite/work", got, set) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestProfileFlagInheritedBySetCredentialTargetsNamedProfile(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| name string | ||
| args []string | ||
| }{ | ||
| {name: "before command", args: []string{"--profile", "work", "set-credential", "--key", "oauth_token", "--stdin"}}, | ||
| {name: "after command", args: []string{"set-credential", "--profile", "work", "--key", "oauth_token", "--stdin"}}, | ||
| } { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| credtest.Setup(t) | ||
| t.Setenv(keychain.CredentialRefEnvVar(), "") | ||
| root := selectorTestRoot() | ||
| root.SetIn(strings.NewReader(`{"access_token":"profile-token","refresh_token":"refresh"}`)) | ||
| root.SetArgs(tc.args) | ||
| if err := root.Execute(); err != nil { | ||
| t.Fatalf("set-credential: %v", err) | ||
| } | ||
| st, err := keychain.OpenRef("google-readwrite/work") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| tok, err := st.Token() | ||
| _ = st.Close() | ||
| if err != nil || tok.AccessToken != "profile-token" { | ||
| t.Fatalf("named profile token = %+v, err=%v", tok, err) | ||
| } | ||
| assertNoTokenAtRef(t, "google-readwrite/default") | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestProfileAndSetCredentialRefAreMutuallyExclusive(t *testing.T) { | ||
| credtest.Setup(t) | ||
| root := selectorTestRoot() | ||
| root.SetIn(strings.NewReader(`{"access_token":"profile-token"}`)) | ||
| root.SetArgs([]string{"--profile", "work", "set-credential", "--ref", "google-readwrite/other", "--key", "oauth_token", "--stdin"}) | ||
| if err := root.Execute(); err == nil || !strings.Contains(err.Error(), "mutually exclusive") { | ||
| t.Fatalf("profile/local --ref conflict = %v, want mutual-exclusion error", err) | ||
| } | ||
| } | ||
|
|
||
| func assertNoTokenAtRef(t *testing.T, ref string) { | ||
| t.Helper() | ||
| st, err := keychain.OpenRef(ref) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer func() { _ = st.Close() }() | ||
| if has, err := st.HasToken(); err != nil || has { | ||
| t.Fatalf("%s token presence = (%v, %v), want (false, nil)", ref, has, err) | ||
| } | ||
| } |
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,13 @@ | ||
| package grw | ||
|
|
||
| import ( | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/open-cli-collective/google-cli/internal/config" | ||
| ) | ||
|
|
||
| func TestMain(m *testing.M) { | ||
| config.Register(Identity()) | ||
| os.Exit(m.Run()) | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The precedence description names a credential-reference environment override but never tells users which variable to set, leaving that documented selector unusable without source inspection. Document the concrete per-binary names, e.g.
GOOGLE_READONLY_CREDENTIAL_REFforgroandGOOGLE_READWRITE_CREDENTIAL_REFforgrw, alongside a short example.Reply inline to this comment.