From 178d49680e481f7e5f214e1beff5702dc3c7c3c8 Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 28 Sep 2020 12:47:27 -0400 Subject: [PATCH 1/3] Update cluster.go --- cli/cmd/cluster.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go index a30a5eb66b..319a23f61c 100644 --- a/cli/cmd/cluster.go +++ b/cli/cmd/cluster.go @@ -158,6 +158,8 @@ var _upCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, accessConfig) + clusterState, err := clusterstate.GetClusterState(awsClient, &accessConfig) if err != nil { exit.Error(err) @@ -294,8 +296,6 @@ var _upCmd = &cobra.Command{ exit.Error(errors.Append(err, fmt.Sprintf("unable to configure cli environment; you can attempt to resolve this issue and configure your CLI environment by running `cortex cluster info --env %s`", _flagClusterEnv))) } - cacheAWSCredentials(awsCreds, accessConfig) - fmt.Printf(console.Bold("\nan environment named \"%s\" has been configured for this cluster; append `--env %s` to cortex commands to connect to it (e.g. `cortex deploy --env %s`), or set it as your default with `cortex env default %s`\n"), _flagClusterEnv, _flagClusterEnv, _flagClusterEnv, _flagClusterEnv) }, } @@ -337,6 +337,8 @@ var _configureCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, *accessConfig) + clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig) if err != nil { exit.Error(err) @@ -364,8 +366,6 @@ var _configureCmd = &cobra.Command{ fmt.Println(helpStr) exit.Error(ErrorClusterConfigure(out + helpStr)) } - - cacheAWSCredentials(awsCreds, *accessConfig) }, } @@ -400,13 +400,13 @@ var _infoCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, *accessConfig) + if _flagClusterInfoDebug { cmdDebug(awsCreds, accessConfig) } else { cmdInfo(awsCreds, accessConfig, _flagClusterDisallowPrompt) } - - cacheAWSCredentials(awsCreds, *accessConfig) }, } From 6a630fd657d5f3424068b7efdffa7d041b7f59b6 Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 28 Sep 2020 12:55:03 -0400 Subject: [PATCH 2/3] Update cluster.go --- cli/cmd/cluster.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go index 319a23f61c..65225c381c 100644 --- a/cli/cmd/cluster.go +++ b/cli/cmd/cluster.go @@ -146,6 +146,8 @@ var _upCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, accessConfig) + clusterConfig, err := getInstallClusterConfig(awsCreds, _flagClusterEnv, _flagClusterDisallowPrompt) if err != nil { exit.Error(err) @@ -158,8 +160,6 @@ var _upCmd = &cobra.Command{ exit.Error(err) } - cacheAWSCredentials(awsCreds, accessConfig) - clusterState, err := clusterstate.GetClusterState(awsClient, &accessConfig) if err != nil { exit.Error(err) @@ -332,13 +332,13 @@ var _configureCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, *accessConfig) + awsClient, err := newAWSClient(*accessConfig.Region, awsCreds) if err != nil { exit.Error(err) } - cacheAWSCredentials(awsCreds, *accessConfig) - clusterState, err := clusterstate.GetClusterState(awsClient, accessConfig) if err != nil { exit.Error(err) From 0640d9e371e86edc46ba5a34ff3f4ffcddffcc83 Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 28 Sep 2020 12:57:21 -0400 Subject: [PATCH 3/3] Update cluster.go --- cli/cmd/cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go index 65225c381c..ccf562b54b 100644 --- a/cli/cmd/cluster.go +++ b/cli/cmd/cluster.go @@ -146,8 +146,6 @@ var _upCmd = &cobra.Command{ exit.Error(err) } - cacheAWSCredentials(awsCreds, accessConfig) - clusterConfig, err := getInstallClusterConfig(awsCreds, _flagClusterEnv, _flagClusterDisallowPrompt) if err != nil { exit.Error(err) @@ -160,6 +158,8 @@ var _upCmd = &cobra.Command{ exit.Error(err) } + cacheAWSCredentials(awsCreds, accessConfig) + clusterState, err := clusterstate.GetClusterState(awsClient, &accessConfig) if err != nil { exit.Error(err)