Skip to content

add username flag for token command #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
billiford wants to merge 2 commits into
base: v2.9
Choose a base branch
from
Open

add username flag for token command #351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5c122
add username flag for token command
Mar 14, 2024
8fc20db
Merge branch 'v2.9' into feat/add-username-flag
May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions cmd/kubectl_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Example:
type LoginInput struct {
server string
userID string
username string
clusterID string
authProvider string
caCerts string
Expand Down Expand Up @@ -107,6 +108,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",
Expand Down Expand Up @@ -171,6 +176,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)
Expand Down Expand Up @@ -365,9 +371,14 @@ func loginAndGenerateCred(input *LoginInput) (*config.ExecCredential, error) {

func basicAuth(input *LoginInput) (managementClient.Token, error) {
token := managementClient.Token{}
username, err := customPrompt("Enter username: ", true)
if err != nil {
return token, err

username := input.username
if username == "" {
var err error
username, err = customPrompt("Enter username:", true)
if err != nil {
return token, err
}
}

password, err := customPrompt("Enter password: ", false)
Expand Down