guess aws cluster id based on cluster name

internal/kubernetes/config.go

@@ -329,7 +329,7 @@ func (conf *OutOfClusterConfig) CreateRawConfigFromCluster() (*api.Config, error
 			return nil, err
 		}
 
-		tok, err := awsAuth.GetBearerToken(conf.getTokenCache, conf.setTokenCache)
+		tok, err := awsAuth.GetBearerToken(conf.getTokenCache, conf.setTokenCache, cluster.Name)
 
 		if err != nil {
 			return nil, err

internal/models/integrations/aws.go

@@ -104,6 +104,7 @@ func (a *AWSIntegration) PopulateAWSArn() error {
 func (a *AWSIntegration) GetBearerToken(
 	getTokenCache GetTokenCacheFunc,
 	setTokenCache SetTokenCacheFunc,
+	clusterID string,
 ) (string, error) {
 	cache, err := getTokenCache()
 
@@ -126,9 +127,15 @@ func (a *AWSIntegration) GetBearerToken(
 		return "", err
 	}
 
+	clusterIDGuess := string(a.AWSClusterID)
+
+	if clusterIDGuess == "" {
+		clusterIDGuess = clusterID
+	}
+
 	tok, err := generator.GetWithOptions(&token.GetTokenOptions{
 		Session:   sess,
-		ClusterID: string(a.AWSClusterID),
+		ClusterID: clusterID,
 	})
 
 	if err != nil {