From 4f5c1228c6466abadbfaaa53151e7dbbe4ca95d6 Mon Sep 17 00:00:00 2001 From: Billy Date: Thu, 14 Mar 2024 13:20:39 -0400 Subject: [PATCH] add username flag for token command --- cmd/kubectl_token.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cmd/kubectl_token.go b/cmd/kubectl_token.go index cda71f2f5..782857dc8 100644 --- a/cmd/kubectl_token.go +++ b/cmd/kubectl_token.go @@ -42,6 +42,7 @@ Example: type LoginInput struct { server string userID string + username string clusterID string authProvider string caCerts string @@ -97,6 +98,10 @@ func CredentialCommand() cli.Command { Name: "user", Usage: "user-id", }, + cli.StringFlag{ + Name: "username", + Usage: "Username for basic auth", + }, cli.StringFlag{ Name: "cluster", Usage: "cluster-id", @@ -161,6 +166,7 @@ func runCredential(ctx *cli.Context) error { authProvider: ctx.String("auth-provider"), caCerts: ctx.String("cacerts"), skipVerify: ctx.Bool("skip-verify"), + username: ctx.String("username"), } newCred, err := loginAndGenerateCred(input) @@ -342,9 +348,14 @@ func loginAndGenerateCred(input *LoginInput) (*config.ExecCredential, error) { func basicAuth(input *LoginInput, tlsConfig *tls.Config) (managementClient.Token, error) { token := managementClient.Token{} - username, err := customPrompt("username", true) - if err != nil { - return token, err + + username := input.username + if username == "" { + var err error + username, err = customPrompt("username", true) + if err != nil { + return token, err + } } password, err := customPrompt("password", false)