fix: make argocd login respect the context name

The argocd CLI login command does not respect the --argocd-context flag
to name the context and always uses the name of the server. This makes
it respect the flag and use the supplied context name. Removed check
against empty ctxName which is done higher up already.

Signed-off-by: Doug Goldstein <[email protected]>

Author: cardoe

cmd/argocd/commands/login.go

@@ -112,6 +112,8 @@ argocd login cd.argoproj.io --core`,
 				ServerName:           globalClientOpts.ServerName,
 			}
 
+			ctxName = globalClientOpts.Context
+
 			if ctxName == "" {
 				ctxName = server
 				if globalClientOpts.GRPCWebRootPath != "" {
@@ -167,9 +169,6 @@ argocd login cd.argoproj.io --core`,
 				AuthToken:    tokenString,
 				RefreshToken: refreshToken,
 			})
-			if ctxName == "" {
-				ctxName = server
-			}
 			localCfg.CurrentContext = ctxName
 			localCfg.UpsertContext(localconfig.ContextRef{
 				Name:   ctxName,