Skip to content

Display environment list output in json #1444

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.

Sign up for GitHub

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 3 commits into from
Oct 15, 2020
Merged

Display environment list output in json #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a2df3f
Display environment list output in json
vishalbollu Oct 14, 2020
70c77b2
Update cli.md
vishalbollu Oct 14, 2020
6a3196a
Merge branch 'master' into env-list-json-output
vishalbollu Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cli/cmd/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ package cmd

import (
"fmt"
"strings"

"github.com/cortexlabs/cortex/cli/types/cliconfig"
"github.com/cortexlabs/cortex/cli/types/flags"
"github.com/cortexlabs/cortex/pkg/lib/exit"
libjson "github.com/cortexlabs/cortex/pkg/lib/json"
"github.com/cortexlabs/cortex/pkg/lib/print"
"github.com/cortexlabs/cortex/pkg/lib/telemetry"
"github.com/cortexlabs/cortex/pkg/types"
Expand All @@ -45,6 +48,7 @@ func envInit() {
_envCmd.AddCommand(_envConfigureCmd)

_envListCmd.Flags().SortFlags = false
_envListCmd.Flags().VarP(&_flagOutput, "output", "o", fmt.Sprintf("output format: one of %s", strings.Join(flags.OutputTypeStrings(), "|")))
_envCmd.AddCommand(_envListCmd)

_envDefaultCmd.Flags().SortFlags = false
Expand Down Expand Up @@ -125,6 +129,15 @@ var _envListCmd = &cobra.Command{
exit.Error(err)
}

if _flagOutput == flags.JSONOutputType {
bytes, err := libjson.Marshal(cliConfig.Environments)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use MarshalIndent() here to make it look nicer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, for now -o json will not pretty print json.

if err != nil {
exit.Error(err)
}
fmt.Println(string(bytes))
return
}

defaultEnv := getDefaultEnv(_generalCommandType)

for i, env := range cliConfig.Environments {
Expand Down
17 changes: 10 additions & 7 deletions docs/miscellaneous/cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,14 @@ Usage:
cortex cluster configure [flags]

Flags:
-c, --config string path to a cluster configuration file
--aws-key string aws access key id
--aws-secret string aws secret access key
-e, --env string environment to update (default "aws")
-y, --yes skip prompts
-h, --help help for configure
-c, --config string path to a cluster configuration file
--aws-key string aws access key id
--aws-secret string aws secret access key
--cluster-aws-key string aws access key id to be used by the cluster
--cluster-aws-secret string aws secret access key to be used by the cluster
-e, --env string environment to update (default "aws")
-y, --yes skip prompts
-h, --help help for configure
```

### cluster export
Expand Down Expand Up @@ -213,7 +215,8 @@ Usage:
cortex env list [flags]

Flags:
-h, --help help for list
-o, --output string output format: one of pretty|json (default "pretty")
-h, --help help for list
```

### env default
Expand Down