Fix for login command with not all flags; Added automatic context swi…

…tch after login execution and credential update Signed-off-by: Patrick Eschenbach <patrickeschenbach96@gmail.com>
goharbor · Dec 23, 2024 · b9d3754 · b9d3754
1 parent 49f1d5b
commit b9d3754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/harbor/root/login.go b/cmd/harbor/root/login.go
@@ -88,7 +88,7 @@ func LoginCommand() *cobra.Command {
 				} else {
 					err = createLoginView(&loginView)
 				}
-			} else if currentCredentialName != "" {
+			} else if currentCredentialName != "" && loginView.Name == "" && loginView.Server == "" && loginView.Username == "" && loginView.Password == "" {
 				var resolvedLoginView login.LoginView
 				creds := config.Credentials
 				key, err := utils.GetEncryptionKey()

diff --git a/pkg/utils/config.go b/pkg/utils/config.go
@@ -485,6 +485,7 @@ func UpdateCredentialsInConfigFile(updatedCredential Credential, configPath stri
 	for i, cred := range c.Credentials {
 		if cred.Name == updatedCredential.Name {
 			c.Credentials[i] = updatedCredential
+			c.CurrentCredentialName = updatedCredential.Name
 			updated = true
 			break
 		}
@@ -501,6 +502,7 @@ func UpdateCredentialsInConfigFile(updatedCredential Credential, configPath stri
 		log.Fatalf("failed to write updated config file: %v", err)
 	}
 
-	log.Infof("Updated credential '%s' in config file at %s", updatedCredential.Name, configPath)
+	log.Infof("Updated credential '%s' in config file at %s.", updatedCredential.Name, configPath)
+	log.Infof("Switched to context '%s'", updatedCredential.Name)
 	return nil
 }