update error aggregation

Author: juanvallejo

pkg/cmd/cli/cli.go

@@ -169,7 +169,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 		{
 			Message: "Settings Commands:",
 			Commands: []*cobra.Command{
-				login.NewCmdLogout("logout", fullName+" logout", fullName+" login", f, in, out),
+				login.NewCmdLogout("logout", fullName+" logout", fullName+" login", f, in, out, errout),
 				cmd.NewCmdConfig(fullName, "config", out, errout),
 				cmd.NewCmdWhoAmI(cmd.WhoAmIRecommendedCommandName, fullName+" "+cmd.WhoAmIRecommendedCommandName, f, out),
 				cmd.NewCmdCompletion(fullName, f, out),

pkg/cmd/cli/cmd/login/logout.go

@@ -23,6 +23,7 @@ type LogoutOptions struct {
 	StartingKubeConfig *kclientcmdapi.Config
 	Config             *restclient.Config
 	Out                io.Writer
+	ErrOut             io.Writer
 
 	PathOptions *kclientcmd.PathOptions
 }
@@ -47,9 +48,10 @@ var (
 )
 
 // NewCmdLogout implements the OpenShift cli logout command
-func NewCmdLogout(name, fullName, ocLoginFullCommand string, f *osclientcmd.Factory, reader io.Reader, out io.Writer) *cobra.Command {
+func NewCmdLogout(name, fullName, ocLoginFullCommand string, f *osclientcmd.Factory, reader io.Reader, out, errOut io.Writer) *cobra.Command {
 	options := &LogoutOptions{
 		Out: out,
+		ErrOut: errOut,
 	}
 
 	cmds := &cobra.Command{
@@ -124,42 +126,38 @@ func (o LogoutOptions) RunLogout() error {
 		return err
 	}
 
-	if err := client.OAuthAccessTokens().Delete(token); err != nil {
-		errs := []error{}
-
-		configErr := o.deleteTokenFromConfig()
-		if configErr != nil {
-			errs = append(errs, configErr)
-		} else {
-			fmt.Printf("Successfully removed user token from local config.\n\n")
-		}
+	errs := []error{}
+	serverErr := client.OAuthAccessTokens().Delete(token)
+	if serverErr != nil {
+		errs = append(errs, serverErr)
+	}
 
-		// append error from server
+	if err := deleteTokenFromConfig(*o.StartingKubeConfig, o.PathOptions, token); err != nil {
 		errs = append(errs, err)
-		return kutilerrors.Flatten(kutilerrors.NewAggregate(errs))
+	} else if serverErr != nil {
+		// if token was not able to be deleted using api but was successfully removed
+		// from client config, print brief explanation that token was still removed locally
+		fmt.Fprintf(o.ErrOut, "%s\n\n", "An error ocurred deleting the token on the server. The token has been removed from your local configuration.")
 	}
 
-	if err := o.deleteTokenFromConfig(); err != nil {
-		return err
+	if len(errs) > 0 {
+		return kutilerrors.Flatten(kutilerrors.NewAggregate(errs))
 	}
 
 	fmt.Fprintf(o.Out, "Logged %q out on %q\n", userInfo.Name, o.Config.Host)
-
 	return nil
 }
 
-func (o LogoutOptions) deleteTokenFromConfig() error {
-	newConfig := *o.StartingKubeConfig
-
-	for key, value := range newConfig.AuthInfos {
-		if value.Token == o.Config.BearerToken {
+func deleteTokenFromConfig(config kclientcmdapi.Config, pathOptions *kclientcmd.PathOptions, bearerToken string) error {
+	for key, value := range config.AuthInfos {
+		if value.Token == bearerToken {
 			value.Token = ""
-			newConfig.AuthInfos[key] = value
+			config.AuthInfos[key] = value
 			// don't break, its possible that more than one user stanza has the same token.
 		}
 	}
 
-	if err := kclientcmd.ModifyConfig(o.PathOptions, newConfig, true); err != nil {
+	if err := kclientcmd.ModifyConfig(pathOptions, config, true); err != nil {
 		return err
 	}