From 1f5c1827826c84a9e85656692dc7ef26ebdcc5a9 Mon Sep 17 00:00:00 2001 From: RobiNino Date: Tue, 1 Oct 2024 14:22:02 +0300 Subject: [PATCH] Remove Api Key suggestion from config command --- common/commands/config.go | 8 ++++---- utils/ioutils/ioutils.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/commands/config.go b/common/commands/config.go index d771fc865..d542593d0 100644 --- a/common/commands/config.go +++ b/common/commands/config.go @@ -36,7 +36,7 @@ type AuthenticationMethod string const ( AccessToken AuthenticationMethod = "Access Token" - BasicAuth AuthenticationMethod = "Username and Password / API Key" + BasicAuth AuthenticationMethod = "Username and Password / Reference token" MTLS AuthenticationMethod = "Mutual TLS" WebLogin AuthenticationMethod = "Web Login" ) @@ -375,10 +375,10 @@ func (cc *ConfigCommand) promptAuthMethods() (selectedMethod AuthenticationMetho var selected string authMethods := []AuthenticationMethod{ - BasicAuth, AccessToken, - MTLS, WebLogin, + BasicAuth, + MTLS, } var selectableItems []ioutils.PromptItem for _, curMethod := range authMethods { @@ -820,7 +820,7 @@ func assertSingleAuthMethod(details *config.ServerDetails) error { details.AccessToken != "" && details.ArtifactoryRefreshToken == "", details.SshKeyPath != ""} if coreutils.SumTrueValues(authMethods) > 1 { - return errorutils.CheckErrorf("Only one authentication method is allowed: Username + Password/API key, RSA Token (SSH) or Access Token") + return errorutils.CheckErrorf("Only one authentication method is allowed: Username + Password/Reference Token, RSA Token (SSH) or Access Token") } return nil } diff --git a/utils/ioutils/ioutils.go b/utils/ioutils/ioutils.go index c624eb5a7..c410c4d25 100644 --- a/utils/ioutils/ioutils.go +++ b/utils/ioutils/ioutils.go @@ -40,7 +40,7 @@ func ReadCredentialsFromConsole(details, savedDetails coreutils.Credentials, dis } func ScanJFrogPasswordFromConsole() (string, error) { - return ScanPasswordFromConsole("JFrog password or API key: ") + return ScanPasswordFromConsole("JFrog password or Reference Token: ") } func ScanPasswordFromConsole(message string) (string, error) {