Skip to content

Commit

Permalink
Restore cli default cloud and allow opting into interactive selection (
Browse files Browse the repository at this point in the history
…#1991)

Summary: Restore cli default cloud and allow opting into interactive
selection

We've received feedback from users that is confusing to no longer have a
default cloud for the pixie cli. This change restores the previous
behavior and picks the alphabetically first option as the default (per
[CNCF
requirements](https://github.com/cncf/foundation/blob/42bc2197cce2f58b31eae5f5067f0fd04ab73482/website-guidelines.md)).
Users can pick from the available clouds through the new
`--interactive_cloud_select` flag.

Relevant Issues: N/A

Type of change: /kind cleanup

Test Plan: Verified the following scenarios
- [x] `px get viziers` uses default cloud
- [x] `px get --interactive_cloud_select viziers` lists the available
clouds and uses the selected valueq
```
$ ./px --interactive_cloud_select get viziers
Pixie CLI
✔ withpixie.ai:443
Failed to authenticate. Please retry `px auth login`.
```

Signed-off-by: Dom Del Nano <[email protected]>
  • Loading branch information
ddelnano authored Aug 26, 2024
1 parent 33244cd commit 33f0daf
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/pixie_cli/pkg/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ import (

var (
AvailableCloudAddrs = []string{
"getcosmic.ai:443",
"withpixie.ai:443",
}
// cloud addr is a required argument. Use empty string since Viper requires a default value.
defaultCloudAddr = ""
defaultCloudAddr = AvailableCloudAddrs[0]
)

func init() {
Expand All @@ -53,6 +53,9 @@ func init() {
RootCmd.PersistentFlags().StringP("cloud_addr", "a", defaultCloudAddr, "The address of Pixie Cloud")
viper.BindPFlag("cloud_addr", RootCmd.PersistentFlags().Lookup("cloud_addr"))

RootCmd.PersistentFlags().Bool("interactive_cloud_select", false, "Whether to interactively select the cloud address.")
viper.BindPFlag("interactive_cloud_select", RootCmd.PersistentFlags().Lookup("interactive_cloud_select"))

RootCmd.PersistentFlags().StringP("dev_cloud_namespace", "m", "", "The namespace of Pixie Cloud, if using a cluster local cloud.")
viper.BindPFlag("dev_cloud_namespace", RootCmd.PersistentFlags().Lookup("dev_cloud_namespace"))

Expand Down Expand Up @@ -210,9 +213,10 @@ func getCloudAddrIfRequired(cmd *cobra.Command) string {
if slices.Contains(cmdsCloudAddrNotReqd, cmd) || cmd.Short == "Help about any command" {
return defaultCloudAddr
}
interactiveCloudSelect := viper.GetBool("interactive_cloud_select")

cloudAddr := viper.GetString("cloud_addr")
if cloudAddr == "" {
if interactiveCloudSelect {
if !isatty.IsTerminal(os.Stdin.Fd()) {
utils.Errorf("No cloud address provided during run within non-interactive shell. Please set the cloud address using the `--cloud_addr` flag or `PX_CLOUD_ADDR` environment variable.")
os.Exit(1)
Expand Down

0 comments on commit 33f0daf

Please sign in to comment.