Use bearer token

Author: hupe1980

README.md

@@ -332,9 +332,10 @@ Usage:
   gotoaws eks get-token [flags]
 
 Flags:
-      --cluster string   arn or name of the cluster (required)
+      --cluster string   arn or name of the cluster
   -h, --help             help for get-token
       --role string      arn or name of the role
+      --token-only       Return only the token for use with Bearer token based tools
 
 Global Flags:
       --config string      config file (default "$HOME/.config/configstore/gotoaws.json")

cmd/eks/get_token.go

@@ -10,8 +10,9 @@ import (
 )
 
 type getTokenOptions struct {
-	cluster string
-	role    string
+	cluster   string
+	role      string
+	tokenOnly bool
 }
 
 func newGetTokenCmd() *cobra.Command {
@@ -43,21 +44,21 @@ func newGetTokenCmd() *cobra.Command {
 				}
 			}
 
-			out := gen.FormatJSON(*t)
+			if opts.tokenOnly {
+				fmt.Fprintln(os.Stdout, t.Token)
+			} else {
+				out := gen.FormatJSON(*t)
 
-			fmt.Fprintln(os.Stdout, out)
+				fmt.Fprintln(os.Stdout, out)
+			}
 
 			return nil
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.cluster, "cluster", "", "", "arn or name of the cluster (required)")
-
-	if err := cmd.MarkFlagRequired("cluster"); err != nil {
-		panic(err)
-	}
-
+	cmd.Flags().StringVarP(&opts.cluster, "cluster", "", "", "arn or name of the cluster")
 	cmd.Flags().StringVarP(&opts.role, "role", "", "", "arn or name of the role")
+	cmd.Flags().BoolVarP(&opts.tokenOnly, "token-only", "", false, "Return only the token for use with Bearer token based tools")
 
 	return cmd
 }

pkg/eks/kubeclient.go

@@ -20,14 +20,17 @@ type Kubeclient struct {
 }
 
 func NewKubeclient(cfg *config.Config, cluster *Cluster, role string) (*Kubeclient, error) {
-	execConfig := NewExecConfig(cfg, cluster.Name, role)
+	token, err := getToken(cfg, cluster.Name, role)
+	if err != nil {
+		return nil, err
+	}
 
 	config := &rest.Config{
-		Host: cluster.Endpoint,
+		Host:        cluster.Endpoint,
+		BearerToken: token.Token,
 		TLSClientConfig: rest.TLSClientConfig{
 			CAData: cluster.CAData,
 		},
-		ExecProvider: execConfig,
 	}
 
 	clientset, err := kubernetes.NewForConfig(config)

pkg/eks/token.go

@@ -131,3 +131,13 @@ func (t *tokenGen) FormatJSON(token Token) string {
 
 	return string(enc)
 }
+
+func getToken(cfg *config.Config, clusterName, role string) (*Token, error) {
+	gen := NewTokenGen(cfg)
+
+	if role != "" {
+		return gen.GetWithRole(clusterName, role)
+	}
+
+	return gen.Get(clusterName)
+}