kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix use of the sanitized method type for the login command. (#16105)

Browse Source 
When an auth method was not supplied and the OIDC type was given
in lower case, the CLI was not matching the default method due to
casing and responded with a confusing user message.

This change fixes the above problem, along with making use of the
santized type easier.
This commit is contained in:
James Rasell
2023-02-09 15:23:54 +01:00
committed by GitHub
parent 8d6d68060a
commit 70101aefd0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
command/login.go
View File

@@ -106,16 +106,16 @@ func (l *LoginCommand) Run(args []string) int {
// Auth method types are particular with their naming, so ensure we forgive
// any case mistakes here from the user.
sanitizedMethodType := strings.ToUpper(l.authMethodType)
l.authMethodType = strings.ToUpper(l.authMethodType)
// Ensure we sanitize the method type so we do not pedantically return an
// error when the caller uses "oidc" rather than "OIDC". The flag default
// means an empty type is only possible is the caller specifies this
// explicitly.
switch sanitizedMethodType {
switch l.authMethodType {
case api.ACLAuthMethodTypeOIDC:
default:
l.Ui.Error(fmt.Sprintf("Unsupported authentication type %q", sanitizedMethodType))
l.Ui.Error(fmt.Sprintf("Unsupported authentication type %q", l.authMethodType))
return 1
}
@@ -164,11 +164,11 @@ func (l *LoginCommand) Run(args []string) int {
// reusable and generic handling of errors and outputs.
var authFn func(context.Context, *api.Client) (*api.ACLToken, error)
switch sanitizedMethodType {
switch l.authMethodType {
case api.ACLAuthMethodTypeOIDC:
authFn = l.loginOIDC
default:
l.Ui.Error(fmt.Sprintf("Unsupported authentication type %q", sanitizedMethodType))
l.Ui.Error(fmt.Sprintf("Unsupported authentication type %q", l.authMethodType))
return 1
}
@@ -191,7 +191,7 @@ func (l *LoginCommand) Run(args []string) int {
return 0
}
l.Ui.Output(fmt.Sprintf("Successfully logged in via %s and %s\n", sanitizedMethodType, l.authMethodName))
l.Ui.Output(fmt.Sprintf("Successfully logged in via %s and %s\n", l.authMethodType, l.authMethodName))
outputACLToken(l.Ui, token)
return 0
}