Add JSON and YAML to several tsh commands #11681
Conversation
github-actions
bot
added
the
tsh
| @@ -252,13 +271,42 @@ func onDatabaseConfig(cf *CLIConf) error { | |||
| default: | |||
| return trace.BadParameter("unknown database protocol: %q", database) | |||
| } | |||
| switch cf.Format { | |||
|
|
|||
| format := strings.ToLower(cf.Format) | |||
There was a problem hiding this comment.
+1 for ignoring the case of the format. Do we have consistency with our other CLI tools in this regard? We may want to apply the same treatment e.g. for tctl, although preferably with a separate PR.
There was a problem hiding this comment.
@atburke Implementation looks good now apart from a few nitpicks, but this PR also needs test coverage. There are a couple of ways to test this I think, you can either setup auth/teleport process in tests, populate them with respective objects (apps, dbs, etc. - we should already be doing this somewhere here) and call respective onListXXX methods, or factor out json/yaml rendering logic into separate functions (like you already have showApps, showDatabases) and test them to make sure they return correct output based on the provided inputs.
tool/tsh/tsh.go
Outdated
| if apps == nil { | ||
| apps = []types.Application{} | ||
| } |
There was a problem hiding this comment.
Will Marshal panic is apps are nil?
There was a problem hiding this comment.
it won't panic, but it will serialize nil as null instead of [].
tool/tsh/tsh.go
Outdated
| if databases == nil { | ||
| databases = []types.Database{} | ||
| } |
There was a problem hiding this comment.
Will Marshal panic is databases are nil?
|
@r0mant Can you take another look at this? |
This PR adds support for JSON and YAML output to several tsh commands via the --format flag.
This change adds support for JSON and YAML output to several tsh commands via the --format flag.
This PR adds support for JSON and YAML output to several tsh commands via the
--formatflag.Commands with JSON/YAML
versionapp lsapp configdb lsdb envdb configplaylsclustersstatusenvrequest lsrequest showkube lskube sessionsmfa lsCommands without JSON/YAML
helpsshawsapp loginapp logoutproxy sshproxy dbproxy appdb logindb logoutdb connectjoinscploginlogoutrequest createrequest reviewkube loginkube execkube joinmfa addmfa rmResolves #6742.