From 1768d591c2b594690c692bc8c25247ba3b2e7809 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:33:58 -0800
Subject: [PATCH 1/9] Add info to "not a terminal" error

---
 pkg/lib/prompt/prompt.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/lib/prompt/prompt.go b/pkg/lib/prompt/prompt.go
index 07885dcfb3..7cdbf3e7f4 100644
--- a/pkg/lib/prompt/prompt.go
+++ b/pkg/lib/prompt/prompt.go
@@ -70,6 +70,9 @@ func Prompt(opts *Options) string {
 		if errors.Message(err) == "interrupted" {
 			exit.Error(ErrorUserCtrlC())
 		}
+		if strings.Contains(errors.Message(err), "not a terminal") {
+			err = errors.Append(err, "\n\ncheck if you can pass flags into the command you are running to provide all required inputs and/or skip prompts (e.g. via `--yes`)")
+		}
 		exit.Error(err)
 	}
 

From a31103ebedc34ad5da42ead8b84f53808ea52ad4 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:40:28 -0800
Subject: [PATCH 2/9] Print newline on cluster-gcp up errors

---
 cli/cmd/cluster_gcp.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli/cmd/cluster_gcp.go b/cli/cmd/cluster_gcp.go
index 652ce85a0a..87b090505a 100644
--- a/cli/cmd/cluster_gcp.go
+++ b/cli/cmd/cluster_gcp.go
@@ -518,6 +518,7 @@ func createGKECluster(clusterConfig *clusterconfig.GCPConfig, gcpClient *gcp.Cli
 		Cluster: &gkeClusterConfig,
 	})
 	if err != nil {
+		fmt.Print("\n\n")
 		return err
 	}
 

From c8d555ff20981ea3032f0925f7928ce2762335a7 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:50:07 -0800
Subject: [PATCH 3/9] Catch no network error

---
 cli/cmd/cluster_gcp.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cli/cmd/cluster_gcp.go b/cli/cmd/cluster_gcp.go
index 87b090505a..f75a68c222 100644
--- a/cli/cmd/cluster_gcp.go
+++ b/cli/cmd/cluster_gcp.go
@@ -519,6 +519,9 @@ func createGKECluster(clusterConfig *clusterconfig.GCPConfig, gcpClient *gcp.Cli
 	})
 	if err != nil {
 		fmt.Print("\n\n")
+		if strings.Contains(errors.Message(err), "has no network named \"default\"") {
+			err = errors.Append(err, "\n\nyou can specify a different network be setting the `network` field in your cluster configuration file (see https://docs.cortex.dev)")
+		}
 		return err
 	}
 

From 5482b595e0864adc2b82b9d72326c9ef28d352bc Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 17:23:11 -0800
Subject: [PATCH 4/9] Improve GCP cluster up/down errors

---
 cli/cmd/cluster_gcp.go | 27 +++++++++++++++++++++------
 cli/cmd/errors.go      | 16 ++++++++++++++++
 pkg/lib/gcp/errors.go  |  9 ---------
 pkg/lib/gcp/gke.go     |  6 ------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/cli/cmd/cluster_gcp.go b/cli/cmd/cluster_gcp.go
index f75a68c222..67269bc541 100644
--- a/cli/cmd/cluster_gcp.go
+++ b/cli/cmd/cluster_gcp.go
@@ -141,7 +141,17 @@ var _clusterGCPUpCmd = &cobra.Command{
 			exit.Error(err)
 		}
 
-		bucketName := clusterconfig.GCPBucketName(*accessConfig.ClusterName, *accessConfig.Project, *accessConfig.Zone)
+		gkeClusterName := fmt.Sprintf("projects/%s/locations/%s/clusters/%s", *clusterConfig.Project, *clusterConfig.Zone, clusterConfig.ClusterName)
+		bucketName := clusterconfig.GCPBucketName(clusterConfig.ClusterName, *clusterConfig.Project, *clusterConfig.Zone)
+
+		clusterExists, err := gcpClient.ClusterExists(gkeClusterName)
+		if err != nil {
+			exit.Error(err)
+		}
+		if clusterExists {
+			exit.Error(ErrorGCPClusterAlreadyExists(*accessConfig.ClusterName, *accessConfig.Zone, *accessConfig.Project))
+		}
+
 		err = gcpClient.CreateBucket(bucketName, gcp.ZoneToRegion(*accessConfig.Zone), true)
 		if err != nil {
 			exit.Error(err)
@@ -149,9 +159,6 @@ var _clusterGCPUpCmd = &cobra.Command{
 
 		err = createGKECluster(clusterConfig, gcpClient)
 		if err != nil {
-			if errors.GetKind(err) != gcp.ErrClusterAlreadyExists {
-				gcpClient.DeleteBucket(bucketName)
-			}
 			exit.Error(err)
 		}
 
@@ -161,7 +168,6 @@ var _clusterGCPUpCmd = &cobra.Command{
 			exit.Error(err)
 		}
 
-		gkeClusterName := fmt.Sprintf("projects/%s/locations/%s/clusters/%s", *clusterConfig.Project, *clusterConfig.Zone, clusterConfig.ClusterName)
 		operatorLoadBalancerIP, err := getGCPOperatorLoadBalancerIP(gkeClusterName, gcpClient)
 		if err != nil {
 			exit.Error(errors.Append(err, fmt.Sprintf("\n\nyou can attempt to resolve this issue and configure your cli environment by running `cortex cluster info --configure-env %s`", _flagClusterGCPUpEnv)))
@@ -238,6 +244,16 @@ var _clusterGCPDownCmd = &cobra.Command{
 		}
 
 		gkeClusterName := fmt.Sprintf("projects/%s/locations/%s/clusters/%s", *accessConfig.Project, *accessConfig.Zone, *accessConfig.ClusterName)
+		bucketName := clusterconfig.GCPBucketName(*accessConfig.ClusterName, *accessConfig.Project, *accessConfig.Zone)
+
+		clusterExists, err := gcpClient.ClusterExists(gkeClusterName)
+		if err != nil {
+			exit.Error(err)
+		}
+		if !clusterExists {
+			gcpClient.DeleteBucket(bucketName) // silently try to delete the bucket in case it got left behind
+			exit.Error(ErrorGCPClusterDoesntExist(*accessConfig.ClusterName, *accessConfig.Zone, *accessConfig.Project))
+		}
 
 		// updating CLI env is best-effort, so ignore errors
 		operatorLoadBalancerIP, _ := getGCPOperatorLoadBalancerIP(gkeClusterName, gcpClient)
@@ -248,7 +264,6 @@ var _clusterGCPDownCmd = &cobra.Command{
 			prompt.YesOrExit(fmt.Sprintf("your cluster named \"%s\" in %s (zone: %s) will be spun down and all apis will be deleted, are you sure you want to continue?", *accessConfig.ClusterName, *accessConfig.Project, *accessConfig.Zone), "", "")
 		}
 
-		bucketName := clusterconfig.GCPBucketName(*accessConfig.ClusterName, *accessConfig.Project, *accessConfig.Zone)
 		fmt.Printf("￮ deleting bucket %s ", bucketName)
 		err = gcpClient.DeleteBucket(bucketName)
 		if err != nil {
diff --git a/cli/cmd/errors.go b/cli/cmd/errors.go
index 6bb08f8fac..ec1e3dd31d 100644
--- a/cli/cmd/errors.go
+++ b/cli/cmd/errors.go
@@ -75,6 +75,8 @@ const (
 	ErrShellCompletionNotSupported             = "cli.shell_completion_not_supported"
 	ErrNoTerminalWidth                         = "cli.no_terminal_width"
 	ErrDeployFromTopLevelDir                   = "cli.deploy_from_top_level_dir"
+	ErrGCPClusterAlreadyExists                 = "cli.gcp_cluster_already_exists"
+	ErrGCPClusterDoesntExist                   = "cli.gcp_cluster_doesnt_exist"
 )
 
 func ErrorInvalidProvider(providerStr string) error {
@@ -332,3 +334,17 @@ func ErrorDeployFromTopLevelDir(genericDirName string, providerType types.Provid
 		Message: fmt.Sprintf("cannot deploy from your %s directory - when deploying your API, cortex sends all files in your project directory (i.e. the directory which contains cortex.yaml) to your cluster (see https://docs.cortex.dev/v/%s/); therefore it is recommended to create a subdirectory for your project files", genericDirName, consts.CortexVersionMinor),
 	})
 }
+
+func ErrorGCPClusterAlreadyExists(clusterName string, zone string, project string) error {
+	return errors.WithStack(&errors.Error{
+		Kind:    ErrGCPClusterAlreadyExists,
+		Message: fmt.Sprintf("there is already a cluster named \"%s\" in %s in the %s project", clusterName, zone, project),
+	})
+}
+
+func ErrorGCPClusterDoesntExist(clusterName string, zone string, project string) error {
+	return errors.WithStack(&errors.Error{
+		Kind:    ErrGCPClusterDoesntExist,
+		Message: fmt.Sprintf("there is no cluster named \"%s\" in %s in the %s project", clusterName, zone, project),
+	})
+}
diff --git a/pkg/lib/gcp/errors.go b/pkg/lib/gcp/errors.go
index 2c7aecd020..8d12bd8f79 100644
--- a/pkg/lib/gcp/errors.go
+++ b/pkg/lib/gcp/errors.go
@@ -30,8 +30,6 @@ const (
 	ErrInvalidGCSPath              = "gcp.invalid_gcs_path"
 	ErrCredentialsFileEnvVarNotSet = "gcp.credentials_file_env_var_not_set"
 	ErrProjectIDMismatch           = "gcp.project_id_mismatch"
-
-	ErrClusterAlreadyExists = "gcp.cluster_already_exists"
 )
 
 func IsGCPError(err error) bool {
@@ -81,10 +79,3 @@ func ErrorProjectIDMismatch(credsFileProject string, providedProject string, cre
 		Message: fmt.Sprintf("the \"%s\" project was specified in your configuration, but the credentials file at %s (specified via $GOOGLE_APPLICATION_CREDENTIALS) is connected the the project named \"%s\"", providedProject, credsFilePath, credsFileProject),
 	})
 }
-
-func ErrorClusterAlreadyExists(clusterName string) error {
-	return errors.WithStack(&errors.Error{
-		Kind:    ErrClusterAlreadyExists,
-		Message: fmt.Sprintf("cluster %s already exists", clusterName),
-	})
-}
diff --git a/pkg/lib/gcp/gke.go b/pkg/lib/gcp/gke.go
index 8ba8ecc4cd..fe26c12e03 100644
--- a/pkg/lib/gcp/gke.go
+++ b/pkg/lib/gcp/gke.go
@@ -19,7 +19,6 @@ package gcp
 import (
 	"context"
 	"encoding/base64"
-	"fmt"
 
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	containerpb "google.golang.org/genproto/googleapis/container/v1"
@@ -80,11 +79,6 @@ func (c *Client) CreateCluster(req *containerpb.CreateClusterRequest) (*containe
 	if err != nil {
 		return nil, err
 	}
-	if exists, err := c.ClusterExists(fmt.Sprintf("%s/clusters/%s", req.Parent, req.Cluster.Name)); err != nil {
-		return nil, err
-	} else if exists {
-		return nil, ErrorClusterAlreadyExists(req.Cluster.Name)
-	}
 	resp, err := gke.CreateCluster(context.Background(), req)
 	if err != nil {
 		return nil, errors.WithStack(err)

From 6674b8624c16d1add3c1ed97ae4eabcdd82f5cc0 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 20:24:42 -0800
Subject: [PATCH 5/9] Update model error wrapping

---
 pkg/types/spec/utils.go | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkg/types/spec/utils.go b/pkg/types/spec/utils.go
index e63bfd0504..273c5fda57 100644
--- a/pkg/types/spec/utils.go
+++ b/pkg/types/spec/utils.go
@@ -21,6 +21,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/cortexlabs/cortex/pkg/consts"
 	"github.com/cortexlabs/cortex/pkg/lib/aws"
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	"github.com/cortexlabs/cortex/pkg/lib/files"
@@ -162,12 +163,17 @@ func validateDirModels(
 
 	modelResources := make([]CuratedModelResource, len(modelNames))
 	for i, modelName := range modelNames {
+		modelNameWrapStr := modelName
+		if modelName == consts.SingleModelName {
+			modelNameWrapStr = ""
+		}
+
 		modelPrefix := filepath.Join(dirPrefix, modelName)
 		modelPrefix = s.EnsureSuffix(modelPrefix, "/")
 
 		modelStructureType := determineBaseModelStructure(modelDirPaths, modelPrefix)
 		if modelStructureType == userconfig.UnknownModelStructureType {
-			return nil, errors.Wrap(errorForPredictorType(modelPrefix, nil), modelName)
+			return nil, errors.Wrap(errorForPredictorType(modelPrefix, nil), modelNameWrapStr)
 		}
 
 		var versions []string
@@ -180,7 +186,7 @@ func validateDirModels(
 				for _, validator := range extraValidators {
 					err := validator(modelDirPaths, modelPrefix, pointer.String(versionedModelPrefix))
 					if err != nil {
-						return nil, errors.Wrap(err, modelName)
+						return nil, errors.Wrap(err, modelNameWrapStr)
 					}
 				}
 			}
@@ -188,14 +194,14 @@ func validateDirModels(
 			for _, validator := range extraValidators {
 				err := validator(modelDirPaths, modelPrefix, nil)
 				if err != nil {
-					return nil, errors.Wrap(err, modelName)
+					return nil, errors.Wrap(err, modelNameWrapStr)
 				}
 			}
 		}
 
 		intVersions, err := slices.StringToInt64(versions)
 		if err != nil {
-			return nil, errors.Wrap(err, modelName)
+			return nil, errors.Wrap(err, modelNameWrapStr)
 		}
 
 		fullModelPath := ""
@@ -236,6 +242,11 @@ func validateModels(
 
 	modelResources := make([]CuratedModelResource, len(models))
 	for i, model := range models {
+		modelNameWrapStr := model.Name
+		if model.Name == consts.SingleModelName {
+			modelNameWrapStr = ""
+		}
+
 		modelPath := s.EnsureSuffix(model.Path, "/")
 
 		s3Path := strings.HasPrefix(model.Path, "s3://")
@@ -244,41 +255,41 @@ func validateModels(
 		if s3Path {
 			awsClientForBucket, err := aws.NewFromClientS3Path(model.Path, awsClient)
 			if err != nil {
-				return nil, errors.Wrap(err, model.Name)
+				return nil, errors.Wrap(err, modelNameWrapStr)
 			}
 
 			bucket, modelPrefix, err = aws.SplitS3Path(model.Path)
 			if err != nil {
-				return nil, errors.Wrap(err, model.Name)
+				return nil, errors.Wrap(err, modelNameWrapStr)
 			}
 			modelPrefix = s.EnsureSuffix(modelPrefix, "/")
 
 			s3Objects, err := awsClientForBucket.ListS3PathDir(modelPath, false, nil)
 			if err != nil {
-				return nil, errors.Wrap(err, model.Name)
+				return nil, errors.Wrap(err, modelNameWrapStr)
 			}
 			modelPaths = aws.ConvertS3ObjectsToKeys(s3Objects...)
 		}
 		if gcsPath {
 			bucket, modelPrefix, err = gcp.SplitGCSPath(model.Path)
 			if err != nil {
-				return nil, errors.Wrap(err, model.Name)
+				return nil, errors.Wrap(err, modelNameWrapStr)
 			}
 			modelPrefix = s.EnsureSuffix(modelPrefix, "/")
 
 			gcsObjects, err := gcpClient.ListGCSPathDir(modelPath, nil)
 			if err != nil {
-				return nil, errors.Wrap(err, model.Name)
+				return nil, errors.Wrap(err, modelNameWrapStr)
 			}
 			modelPaths = gcp.ConvertGCSObjectsToKeys(gcsObjects...)
 		}
 		if len(modelPaths) == 0 {
-			return nil, errors.Wrap(errorForPredictorType(modelPrefix, modelPaths), model.Name)
+			return nil, errors.Wrap(errorForPredictorType(modelPrefix, modelPaths), modelNameWrapStr)
 		}
 
 		modelStructureType := determineBaseModelStructure(modelPaths, modelPrefix)
 		if modelStructureType == userconfig.UnknownModelStructureType {
-			return nil, errors.Wrap(ErrorInvalidPythonModelPath(modelPath, []string{}), model.Name)
+			return nil, errors.Wrap(ErrorInvalidPythonModelPath(modelPath, []string{}), modelNameWrapStr)
 		}
 
 		var versions []string
@@ -291,7 +302,7 @@ func validateModels(
 				for _, validator := range extraValidators {
 					err := validator(modelPaths, modelPrefix, pointer.String(versionedModelPrefix))
 					if err != nil {
-						return nil, errors.Wrap(err, model.Name)
+						return nil, errors.Wrap(err, modelNameWrapStr)
 					}
 				}
 			}
@@ -299,14 +310,14 @@ func validateModels(
 			for _, validator := range extraValidators {
 				err := validator(modelPaths, modelPrefix, nil)
 				if err != nil {
-					return nil, errors.Wrap(err, model.Name)
+					return nil, errors.Wrap(err, modelNameWrapStr)
 				}
 			}
 		}
 
 		intVersions, err := slices.StringToInt64(versions)
 		if err != nil {
-			return nil, errors.Wrap(err, model.Name)
+			return nil, errors.Wrap(err, modelNameWrapStr)
 		}
 
 		var signatureKey *string

From 0700a77afa0bdd14a596aac474bf3fce84774a96 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 20:48:07 -0800
Subject: [PATCH 6/9] Update s3.go

---
 pkg/lib/aws/s3.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/lib/aws/s3.go b/pkg/lib/aws/s3.go
index b86d99b26b..bb3df2df19 100644
--- a/pkg/lib/aws/s3.go
+++ b/pkg/lib/aws/s3.go
@@ -706,6 +706,10 @@ func (c *Client) DeleteS3Dir(bucket string, s3Dir string, continueIfFailure bool
 
 func (c *Client) DeleteS3Prefix(bucket string, prefix string, continueIfFailure bool) error {
 	err := c.S3BatchIterator(bucket, prefix, true, nil, func(objects []*s3.Object) (bool, error) {
+		if len(objects) == 0 {
+			return true, nil
+		}
+
 		deleteObjects := make([]*s3.ObjectIdentifier, len(objects))
 		for i, object := range objects {
 			deleteObjects[i] = &s3.ObjectIdentifier{Key: object.Key}

From f968835c17d23bf30db3d1aa28ea009a1c25bcb5 Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 21:34:50 -0800
Subject: [PATCH 7/9] Update kubeconfig output parsing

---
 Makefile             | 4 ++--
 manager/debug.sh     | 2 +-
 manager/debug_gcp.sh | 4 ++--
 manager/info.sh      | 2 +-
 manager/info_gcp.sh  | 4 ++--
 manager/install.sh   | 6 +++---
 manager/refresh.sh   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 4ee09ac207..fb7ca145ff 100644
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,9 @@ operator-local-dbg-gcp:
 
 # configure kubectl to point to the cluster specified in dev/config/cluster-[aws|gcp].yaml
 kubectl-aws:
-	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-aws.yaml) && eksctl utils write-kubeconfig --cluster="$$CORTEX_CLUSTER_NAME" --region="$$CORTEX_REGION" | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
+	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-aws.yaml) && eksctl utils write-kubeconfig --cluster="$$CORTEX_CLUSTER_NAME" --region="$$CORTEX_REGION" | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true)
 kubectl-gcp:
-	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-gcp.yaml) && gcloud container clusters get-credentials "$$CORTEX_CLUSTER_NAME" --zone "$$CORTEX_ZONE" --project "$$CORTEX_PROJECT" 2>&1 | grep -v "Fetching cluster" | grep -v "kubeconfig entry generated" || true
+	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-gcp.yaml) && gcloud container clusters get-credentials "$$CORTEX_CLUSTER_NAME" --project "$$CORTEX_PROJECT" --region "$$CORTEX_ZONE" 2> /dev/stdout 1> /dev/null | (grep -v "Fetching cluster" | grep -v "kubeconfig entry generated" || true)
 
 cluster-up-aws:
 	@$(MAKE) images-all-aws
diff --git a/manager/debug.sh b/manager/debug.sh
index 65ae6b86de..b35ae9aa22 100755
--- a/manager/debug.sh
+++ b/manager/debug.sh
@@ -26,7 +26,7 @@ if ! eksctl utils describe-stacks --cluster=$CORTEX_CLUSTER_NAME --region=$CORTE
   exit 1
 fi
 
-eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
+eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true)
 out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your aws iam user does not have access to this cluster; to grant access, see https://docs.cortex.dev/v/${CORTEX_VERSION_MINOR}/"; exit 1; fi
 
 echo -n "gathering cluster data"
diff --git a/manager/debug_gcp.sh b/manager/debug_gcp.sh
index 321d4a3c20..d3eefeb052 100755
--- a/manager/debug_gcp.sh
+++ b/manager/debug_gcp.sh
@@ -21,8 +21,8 @@ CORTEX_VERSION_MINOR=master
 debug_out_path="$1"
 mkdir -p "$(dirname "$debug_out_path")"
 
-gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS > /dev/null 2>&1
-gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE > /dev/null 2>&1 # write both stderr and stdout to dev/null
+gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS 2> /dev/stdout 1> /dev/null | (grep -v "Activated service account credentials" || true)
+gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE 2> /dev/stdout 1> /dev/null | (grep -v "Fetching cluster" | grep -v "kubeconfig entry generated" || true)
 out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your iam user does not have access to this cluster"; exit 1; fi
 
 echo -n "gathering cluster data"
diff --git a/manager/info.sh b/manager/info.sh
index d9faf3f6e9..4dd7a83139 100755
--- a/manager/info.sh
+++ b/manager/info.sh
@@ -31,7 +31,7 @@ if ! eksctl utils describe-stacks --cluster=$CORTEX_CLUSTER_NAME --region=$CORTE
   exit 1
 fi
 
-eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
+eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true)
 out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your aws iam user does not have access to this cluster; to grant access, see https://docs.cortex.dev/v/${CORTEX_VERSION_MINOR}/"; exit 1; fi
 
 operator_endpoint=$(get_operator_endpoint)
diff --git a/manager/info_gcp.sh b/manager/info_gcp.sh
index 2119cb9cbd..aa84b54254 100755
--- a/manager/info_gcp.sh
+++ b/manager/info_gcp.sh
@@ -26,8 +26,8 @@ function get_api_load_balancer_endpoint() {
   kubectl -n=istio-system get service ingressgateway-apis -o json | tr -d '[:space:]' | sed 's/.*{\"ip\":\"\(.*\)\".*/\1/'
 }
 
-gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS > /dev/null 2>&1
-gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE > /dev/null 2>&1 # write both stderr and stdout to dev/null
+gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS 2> /dev/stdout 1> /dev/null | (grep -v "Activated service account credentials" || true)
+gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE 2> /dev/stdout 1> /dev/null | (grep -v "Fetching cluster" | grep -v "kubeconfig entry generated" || true)
 out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your iam user does not have access to this cluster"; exit 1; fi
 
 operator_endpoint=$(get_operator_endpoint)
diff --git a/manager/install.sh b/manager/install.sh
index 3a1b379cc7..7abfca56b8 100755
--- a/manager/install.sh
+++ b/manager/install.sh
@@ -97,8 +97,8 @@ function cluster_up_aws() {
 }
 
 function cluster_up_gcp() {
-  gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS > /dev/null 2>&1
-  gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE > /dev/null 2>&1 # write both stderr and stdout to dev/null
+  gcloud auth activate-service-account --key-file $GOOGLE_APPLICATION_CREDENTIALS 2> /dev/stdout 1> /dev/null | (grep -v "Activated service account credentials" || true)
+  gcloud container clusters get-credentials $CORTEX_CLUSTER_NAME --project $CORTEX_GCP_PROJECT --region $CORTEX_GCP_ZONE 2> /dev/stdout 1> /dev/null | (grep -v "Fetching cluster" | grep -v "kubeconfig entry generated" || true)
 
   start_pre_download_images
 
@@ -248,7 +248,7 @@ function check_eks() {
 }
 
 function write_kubeconfig() {
-  eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
+  eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true)
   out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your aws iam user does not have access to this cluster; to grant access, see https://docs.cortex.dev/v/${CORTEX_VERSION_MINOR}/"; exit 1; fi
 }
 
diff --git a/manager/refresh.sh b/manager/refresh.sh
index 779696ffb5..da75db44fc 100755
--- a/manager/refresh.sh
+++ b/manager/refresh.sh
@@ -26,7 +26,7 @@ if ! eksctl utils describe-stacks --cluster=$CORTEX_CLUSTER_NAME --region=$CORTE
   exit 1
 fi
 
-eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
+eksctl utils write-kubeconfig --cluster=$CORTEX_CLUSTER_NAME --region=$CORTEX_REGION | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true)
 out=$(kubectl get pods 2>&1 || true); if [[ "$out" == *"must be logged in to the server"* ]]; then echo "error: your aws iam user does not have access to this cluster; to grant access, see https://docs.cortex.dev/v/${CORTEX_VERSION_MINOR}/"; exit 1; fi
 
 kubectl get -n=default configmap cluster-config -o yaml >> cluster_configmap.yaml

From de340b3e55a5ee53a0db0af7ac15e930e6638a6f Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 22:27:08 -0800
Subject: [PATCH 8/9] Don't print cluster version if env not specified

---
 cli/cmd/version.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cli/cmd/version.go b/cli/cmd/version.go
index edcdc7a60f..27ac0f9e57 100644
--- a/cli/cmd/version.go
+++ b/cli/cmd/version.go
@@ -39,9 +39,11 @@ var _versionCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		envName, err := getEnvFromFlag(_flagVersionEnv)
-		if err != nil {
+
+		if err != nil || envName == "" {
 			telemetry.Event("cli.version")
-			exit.Error(err)
+			fmt.Println("cli version: " + consts.CortexVersion)
+			return
 		}
 
 		env, err := ReadOrConfigureEnv(envName)

From 3f4d5a4582c21fa5e3ee0ffd39de0fe2fdc114ef Mon Sep 17 00:00:00 2001
From: David Eliahu <deliahu@users.noreply.github.com>
Date: Mon, 18 Jan 2021 22:32:28 -0800
Subject: [PATCH 9/9] Self review

---
 cli/cmd/cluster_gcp.go   | 2 +-
 pkg/lib/prompt/prompt.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/cmd/cluster_gcp.go b/cli/cmd/cluster_gcp.go
index 67269bc541..785dd9c421 100644
--- a/cli/cmd/cluster_gcp.go
+++ b/cli/cmd/cluster_gcp.go
@@ -149,7 +149,7 @@ var _clusterGCPUpCmd = &cobra.Command{
 			exit.Error(err)
 		}
 		if clusterExists {
-			exit.Error(ErrorGCPClusterAlreadyExists(*accessConfig.ClusterName, *accessConfig.Zone, *accessConfig.Project))
+			exit.Error(ErrorGCPClusterAlreadyExists(clusterConfig.ClusterName, *clusterConfig.Zone, *clusterConfig.Project))
 		}
 
 		err = gcpClient.CreateBucket(bucketName, gcp.ZoneToRegion(*accessConfig.Zone), true)
diff --git a/pkg/lib/prompt/prompt.go b/pkg/lib/prompt/prompt.go
index 7cdbf3e7f4..b811b51740 100644
--- a/pkg/lib/prompt/prompt.go
+++ b/pkg/lib/prompt/prompt.go
@@ -71,7 +71,7 @@ func Prompt(opts *Options) string {
 			exit.Error(ErrorUserCtrlC())
 		}
 		if strings.Contains(errors.Message(err), "not a terminal") {
-			err = errors.Append(err, "\n\ncheck if you can pass flags into the command you are running to provide all required inputs and/or skip prompts (e.g. via `--yes`)")
+			err = errors.Append(err, "\n\nyou may be able to pass flags into this command to provide all required inputs and/or skip prompts (e.g. via `--yes`)")
 		}
 		exit.Error(err)
 	}