remove token from config on error / success from api req

Author: juanvallejo

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

@@ -11,6 +11,7 @@ import (
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	kutilerrors "k8s.io/kubernetes/pkg/util/errors"
 
 	"github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/cli/config"
@@ -123,19 +124,22 @@ func (o LogoutOptions) RunLogout() error {
 		return err
 	}
 
-	// attempt to always delete token from local config
-	// before deleting using api.
-	tokenDeleted, err := o.deleteTokenFromConfig()
-	if err != nil {
-		return err
-	}
-
 	if err := client.OAuthAccessTokens().Delete(token); err != nil {
-		// print successful removal of token from local
-		// config before printing error from server.
-		if tokenDeleted {
+		errs := []error{}
+
+		configErr := o.deleteTokenFromConfig()
+		if configErr != nil {
+			errs = append(errs, configErr)
+		} else {
 			fmt.Printf("Successfully removed user token from local config.\n\n")
 		}
+
+		// append error from server
+		errs = append(errs, err)
+		return kutilerrors.Flatten(kutilerrors.NewAggregate(errs))
+	}
+
+	if err := o.deleteTokenFromConfig(); err != nil {
 		return err
 	}
 
@@ -144,22 +148,20 @@ func (o LogoutOptions) RunLogout() error {
 	return nil
 }
 
-func (o LogoutOptions) deleteTokenFromConfig() (bool, error) {
+func (o LogoutOptions) deleteTokenFromConfig() error {
 	newConfig := *o.StartingKubeConfig
-	tokenDeleted := false
 
 	for key, value := range newConfig.AuthInfos {
 		if value.Token == o.Config.BearerToken {
 			value.Token = ""
 			newConfig.AuthInfos[key] = value
-			tokenDeleted = true
 			// 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 {
-		return tokenDeleted, err
+		return err
 	}
 
-	return tokenDeleted, nil
+	return nil
 }