-
Notifications
You must be signed in to change notification settings - Fork 12
feat(REL-12752): adding TTY detection for auto-JSON output #660
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
Open
nieblara
wants to merge
5
commits into
main
Choose a base branch
from
REL-12752-tty-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+426
−12
Open
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
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
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 |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import ( | |
| "github.com/google/uuid" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| "golang.org/x/term" | ||
|
|
||
| cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics" | ||
| "github.com/launchdarkly/ldcli/cmd/cliflags" | ||
|
|
@@ -81,13 +82,40 @@ func init() { | |
| cobra.AddTemplateFunc("HasOptionalFlags", HasOptionalFlags) | ||
| } | ||
|
|
||
| // forceTTYDefaultOutput is true when FORCE_TTY or LD_FORCE_TTY is non-empty, so the default | ||
| // --output is plaintext even if stdout is not a TTY (similar to NO_COLOR). Explicit --output, | ||
| // --json, LD_OUTPUT, and config file values still take precedence via Viper/Cobra after parse. | ||
| // | ||
| // getenv, if non-nil, is used only for those two keys (tests can inject without mutating | ||
| // process environment). If nil, os.Getenv is used. | ||
| func forceTTYDefaultOutput(getenv func(string) string) bool { | ||
| lookup := getenv | ||
| if lookup == nil { | ||
| lookup = os.Getenv | ||
ari-launchdarkly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return lookup("FORCE_TTY") != "" || lookup("LD_FORCE_TTY") != "" | ||
| } | ||
|
|
||
| // NewRootCommand constructs the ldcli root command tree. | ||
| // | ||
| // isTerminal must be non-nil; it should reflect whether stdout is a TTY (see Execute). When it | ||
| // returns false, the default --output is json unless forceTTYDefaultOutput applies. | ||
| // | ||
| // getenv is optional: when non-nil, it is used to read FORCE_TTY and LD_FORCE_TTY only; when | ||
| // nil, os.Getenv is used. Viper still reads LD_OUTPUT and other LD_ vars from the real | ||
| // environment. | ||
| func NewRootCommand( | ||
| configService config.Service, | ||
| analyticsTrackerFn analytics.TrackerFn, | ||
| clients APIClients, | ||
| version string, | ||
| useConfigFile bool, | ||
| isTerminal func() bool, | ||
| getenv func(string) string, | ||
| ) (*RootCmd, error) { | ||
| if isTerminal == nil { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When would this be |
||
| return nil, errors.New("NewRootCommand: isTerminal must not be nil") | ||
| } | ||
| cmd := &cobra.Command{ | ||
| Use: "ldcli", | ||
| Short: "LaunchDarkly CLI", | ||
|
|
@@ -188,10 +216,17 @@ func NewRootCommand( | |
| return nil, err | ||
| } | ||
|
|
||
| // When stdout is not a TTY (e.g. piped, CI, agent), default to JSON unless FORCE_TTY or | ||
| // LD_FORCE_TTY is set (any non-empty value), like NO_COLOR. | ||
| defaultOutput := "plaintext" | ||
| if !forceTTYDefaultOutput(getenv) && !isTerminal() { | ||
| defaultOutput = "json" | ||
| } | ||
|
|
||
| cmd.PersistentFlags().StringP( | ||
| cliflags.OutputFlag, | ||
| "o", | ||
| "plaintext", | ||
| defaultOutput, | ||
| cliflags.OutputFlagDescription, | ||
| ) | ||
| err = viper.BindPFlag(cliflags.OutputFlag, cmd.PersistentFlags().Lookup(cliflags.OutputFlag)) | ||
|
|
@@ -252,6 +287,8 @@ func Execute(version string) { | |
| clients, | ||
| version, | ||
| true, | ||
| func() bool { return term.IsTerminal(int(os.Stdout.Fd())) }, | ||
| nil, | ||
| ) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
|
|
||
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.
how do we communicate a breaking change like this? Should we have a deprecation warning associated with current usages? How do we want to communicate this change to users that might be actively using the CLI and have expectations mismatch reality.