Update unexpected cluster state error messages

deliahu · deliahu · commit c74796163fd1 · 2020-05-18T17:34:08.000-07:00
diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go
@@ -127,7 +127,7 @@ var _upCmd = &cobra.Command{
 		clusterState, err := clusterstate.GetClusterState(awsClient, &accessConfig)
 		if err != nil {
 			if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {
-				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", clusterConfig.ClusterName, *clusterConfig.Region, getCloudFormationURL(*clusterConfig.Region, clusterConfig.ClusterName)))
+				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", clusterConfig.ClusterName, *clusterConfig.Region, getCloudFormationURL(*clusterConfig.Region, clusterConfig.ClusterName)))
 			}
 			exit.Error(err)
 		}
@@ -204,7 +204,7 @@ var _configureCmd = &cobra.Command{
 		clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)
 		if err != nil {
 			if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {
-				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
+				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
 			}
 			exit.Error(err)
 		}
@@ -297,7 +297,7 @@ var _downCmd = &cobra.Command{
 		clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)
 		if err != nil {
 			if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {
-				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please delete the cloudformation stacks manually in your AWS console %s", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
+				fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please delete the cloudformation stacks manually in your AWS console (%s)", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
 			}
 			exit.Error(err)
 		}
@@ -415,7 +415,7 @@ func printInfoClusterState(awsClient *aws.Client, accessConfig *clusterconfig.Ac
 	clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)
 	if err != nil {
 		if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {
-			fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
+			fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", *accessConfig.ClusterName, *accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
 		}
 		return err
 	}
diff --git a/cli/cmd/errors.go b/cli/cmd/errors.go
@@ -289,7 +289,7 @@ func ErrorClusterAlreadyDeleted(clusterName string, region string) error {
 func ErrorFailedClusterStatus(status clusterstate.Status, clusterName string, region string) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrFailedClusterStatus,
-		Message: fmt.Sprintf("cluster \"%s\" in %s encountered an unexpected status %s, please try to delete the cluster with `cortex cluster down` or delete the cloudformation stacks manually in your AWS console %s", clusterName, region, string(status), getCloudFormationURL(clusterName, region)),
+		Message: fmt.Sprintf("cluster \"%s\" in %s encountered an unexpected status %s; please try to delete the cluster with `cortex cluster down`, or delete the cloudformation stacks manually in your AWS console (%s)", clusterName, region, string(status), getCloudFormationURL(clusterName, region)),
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ var _upCmd = &cobra.Command{`
`127`	`127`	`clusterState, err := clusterstate.GetClusterState(awsClient, &accessConfig)`
`128`	`128`	`if err != nil {`
`129`	`129`	`if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {`
`130`		- fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", clusterConfig.ClusterName, clusterConfig.Region, getCloudFormationURL(clusterConfig.Region, clusterConfig.ClusterName)))
	`130`	+ fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", clusterConfig.ClusterName, clusterConfig.Region, getCloudFormationURL(clusterConfig.Region, clusterConfig.ClusterName)))
`131`	`131`	`}`
`132`	`132`	`exit.Error(err)`
`133`	`133`	`}`
`@@ -204,7 +204,7 @@ var _configureCmd = &cobra.Command{`
`204`	`204`	`clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)`
`205`	`205`	`if err != nil {`
`206`	`206`	`if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {`
`207`		- fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
	`207`	+ fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
`208`	`208`	`}`
`209`	`209`	`exit.Error(err)`
`210`	`210`	`}`
`@@ -297,7 +297,7 @@ var _downCmd = &cobra.Command{`
`297`	`297`	`clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)`
`298`	`298`	`if err != nil {`
`299`	`299`	`if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {`
`300`		`- fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please delete the cloudformation stacks manually in your AWS console %s", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))`
	`300`	`+ fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please delete the cloudformation stacks manually in your AWS console (%s)", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))`
`301`	`301`	`}`
`302`	`302`	`exit.Error(err)`
`303`	`303`	`}`
`@@ -415,7 +415,7 @@ func printInfoClusterState(awsClient aws.Client, accessConfig clusterconfig.Ac`
`415`	`415`	`clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig)`
`416`	`416`	`if err != nil {`
`417`	`417`	`if errors.GetKind(err) == clusterstate.ErrUnexpectedCloudFormationStatus {`
`418`		- fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state, please run `cortex cluster down` to delete the cluster or delete the cloudformation stacks manually in your AWS console %s", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
	`418`	+ fmt.Println(fmt.Sprintf("cluster named \"%s\" in %s is in an unexpected state; please run `cortex cluster down` to delete the cluster, or delete the cloudformation stacks manually in your AWS console (%s)", accessConfig.ClusterName, accessConfig.Region, getCloudFormationURLWithAccessConfig(accessConfig)))
`419`	`419`	`}`
`420`	`420`	`return err`
`421`	`421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func ErrorClusterAlreadyDeleted(clusterName string, region string) error {`
`289`	`289`	`func ErrorFailedClusterStatus(status clusterstate.Status, clusterName string, region string) error {`
`290`	`290`	`return errors.WithStack(&errors.Error{`
`291`	`291`	`Kind: ErrFailedClusterStatus,`
`292`		- Message: fmt.Sprintf("cluster \"%s\" in %s encountered an unexpected status %s, please try to delete the cluster with `cortex cluster down` or delete the cloudformation stacks manually in your AWS console %s", clusterName, region, string(status), getCloudFormationURL(clusterName, region)),
	`292`	+ Message: fmt.Sprintf("cluster \"%s\" in %s encountered an unexpected status %s; please try to delete the cluster with `cortex cluster down`, or delete the cloudformation stacks manually in your AWS console (%s)", clusterName, region, string(status), getCloudFormationURL(clusterName, region)),
`293`	`293`	`})`
`294`	`294`	`}`
`295`	`295`