Revert change for interactive prompt to store cloud to pixie config file (#1964) (#1990)

Summary: Revert change for interactive prompt to store cloud to pixie
config file (#1964)

We've received feedback from users that is confusing to no longer have a
default cloud for the pixie cli. We will be restoring the previous
behavior in a follow up PR. With that new direction in mind, it no
longer makes sense to have the functionality added in #1964.

Relevant Issues: N/A

Type of change: /kind cleanup

Test Plan: None since this was a `git revert`

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

go.mod

@@ -45,7 +45,6 @@ require (
 	github.com/mattn/go-isatty v0.0.17
 	github.com/mattn/go-runewidth v0.0.9
 	github.com/mikefarah/yq/v4 v4.30.8
-	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nats-io/nats-server/v2 v2.10.4
 	github.com/nats-io/nats.go v1.31.0
 	github.com/olekukonko/tablewriter v0.0.5
@@ -215,6 +214,7 @@ require (
 	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect

src/pixie_cli/pkg/cmd/BUILD.bazel

@@ -23,7 +23,6 @@ go_library(
         "auth.go",
         "bindata.gen.go",
         "collect_logs.go",
-        "config.go",
         "create_bundle.go",
         "create_cloud_certs.go",
         "debug.go",
@@ -74,7 +73,6 @@ go_library(
         "@com_github_lestrrat_go_jwx//jwt",
         "@com_github_manifoldco_promptui//:promptui",
         "@com_github_mattn_go_isatty//:go-isatty",
-        "@com_github_mitchellh_mapstructure//:mapstructure",
         "@com_github_segmentio_analytics_go_v3//:analytics-go",
         "@com_github_sirupsen_logrus//:logrus",
         "@com_github_spf13_cobra//:cobra",

src/pixie_cli/pkg/cmd/config.go

@@ -72,7 +72,6 @@ func init() {
 	viper.BindPFlag("direct_vizier_key", RootCmd.PersistentFlags().Lookup("direct_vizier_key"))
 
 	RootCmd.AddCommand(VersionCmd)
-	RootCmd.AddCommand(ConfigCmd)
 	RootCmd.AddCommand(AuthCmd)
 	RootCmd.AddCommand(CollectLogsCmd)
 	RootCmd.AddCommand(CreateCloudCertsCmd)
@@ -202,8 +201,6 @@ var RootCmd = &cobra.Command{
 // Name a variable to store a slice of commands that don't require cloudAddr
 var cmdsCloudAddrNotReqd = []*cobra.Command{
 	CollectLogsCmd,
-	ConfigListCmd,
-	ConfigSetCmd,
 	VersionCmd,
 }
 
@@ -215,12 +212,6 @@ func getCloudAddrIfRequired(cmd *cobra.Command) string {
 	}
 
 	cloudAddr := viper.GetString("cloud_addr")
-	cfg := pxconfig.Cfg()
-	defaultCloudAddr = cfg.CloudAddr
-	if cloudAddr == "" && defaultCloudAddr != "" {
-		cloudAddr = defaultCloudAddr
-		viper.Set("cloud_addr", cloudAddr)
-	}
 	if cloudAddr == "" {
 		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.")
@@ -238,26 +229,6 @@ func getCloudAddrIfRequired(cmd *cobra.Command) string {
 
 			cloudAddr = selectedCloud
 			viper.Set("cloud_addr", cloudAddr)
-
-			defaultCloudPrompt := promptui.Select{
-				Label: "Set as default cloud address?",
-				Items: []string{"Yes", "No"},
-			}
-			_, storeDefault, err := defaultCloudPrompt.Run()
-			if err != nil {
-				utils.WithError(err).Fatal("Failed to select default cloud address")
-				os.Exit(1)
-			}
-
-			if storeDefault == "Yes" {
-				cfg.CloudAddr = cloudAddr
-				err := pxconfig.UpdateConfig(cfg)
-
-				if err != nil {
-					utils.WithError(err).Fatal("Failed to update config file with default cloud address")
-					os.Exit(1)
-				}
-			}
 		}
 	}
 	return cloudAddr

src/pixie_cli/pkg/cmd/root.go

@@ -21,7 +21,6 @@ package pxconfig
 import (
 	"encoding/json"
 	"os"
-	"reflect"
 	"sync"
 
 	"github.com/gofrs/uuid"
@@ -32,41 +31,14 @@ import (
 // ConfigInfo store the config about the CLI.
 type ConfigInfo struct {
 	// UniqueClientID is the ID assigned to this user on first startup when auth information is not know. This can be later associated with the UserID.
-	UniqueClientID     string `json:"uniqueClientID"`
-	ConfigInfoSettable `mapstructure:",squash"`
-}
-
-type ConfigInfoSettable struct {
-	CloudAddr string `json:"cloudAddr,omitempty"`
+	UniqueClientID string `json:"uniqueClientID"`
 }
 
 var (
 	config *ConfigInfo
 	once   sync.Once
 )
 
-func GetSettableConfigKeys() []string {
-	val := reflect.ValueOf(ConfigInfoSettable{})
-	keys := []string{}
-	for i := 0; i < val.NumField(); i++ {
-		keys = append(keys, val.Type().Field(i).Name)
-	}
-	return keys
-}
-
-func UpdateConfig(cfg *ConfigInfo) error {
-	configPath, err := utils.EnsureDefaultConfigFilePath()
-	if err != nil {
-		utils.WithError(err).Fatal("Failed to load/create config file path")
-	}
-	f, err := os.OpenFile(configPath, os.O_RDWR|os.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return json.NewEncoder(f).Encode(cfg)
-}
-
 func writeDefaultConfig(path string) (*ConfigInfo, error) {
 	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600)
 	if err != nil {