return config err if any

Author: juanvallejo

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

@@ -12,7 +12,6 @@ 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"
@@ -125,26 +124,21 @@ func (o LogoutOptions) RunLogout() error {
 		return err
 	}
 
-	errs := []error{}
 	serverErr := client.OAuthAccessTokens().Delete(token)
-	errs = append(errs, serverErr)
-
-	if configErr := deleteTokenFromConfig(*o.StartingKubeConfig, o.PathOptions, token); configErr != nil {
-		errs = append(errs, configErr)
-	} else if serverErr != nil {
-		// if token was not able to be deleted using api but was successfully removed
-		// from client config, log brief explanation that token was still removed locally
-		glog.V(1).Infof("%s\n\n", "An error ocurred deleting the token on the server. The token has been removed from your local configuration.")
+	if serverErr != nil {
+		glog.V(1).Infof("%v\n", serverErr)
 	}
 
-	err = kutilerrors.Flatten(kutilerrors.NewAggregate(errs))
-	if err != nil {
-		glog.V(1).Infof("%v\n", err)
-	}
+	configErr := deleteTokenFromConfig(*o.StartingKubeConfig, o.PathOptions, token)
+	if configErr == nil {
+		glog.V(1).Infof("Removed token from your local configuration.\n\n")
 
-	fmt.Fprintf(o.Out, "Logged %q out on %q\n", userInfo.Name, o.Config.Host)
+		// return successful message to user, even if serverErr != nil, as long as
+		// removing the token from the client config did not result in an error
+		fmt.Fprintf(o.Out, "Logged %q out on %q\n", userInfo.Name, o.Config.Host)
+	}
 
-	return nil
+	return configErr
 }
 
 func deleteTokenFromConfig(config kclientcmdapi.Config, pathOptions *kclientcmd.PathOptions, bearerToken string) error {