update project errors and short project output

Author: juanvallejo

pkg/cmd/cli/cmd/projects.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	// kapi "k8s.io/kubernetes/pkg/api"
-	kapierrors "k8s.io/kubernetes/pkg/api/errors"
+	// kapierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	kubecmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"
@@ -14,7 +14,7 @@ import (
 	"github.com/openshift/origin/pkg/client"
 	cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
-	"github.com/openshift/origin/pkg/project/api"
+	// "github.com/openshift/origin/pkg/project/api"
 
 	"github.com/spf13/cobra"
 )
@@ -65,6 +65,8 @@ func NewCmdProjects(fullName string, f *clientcmd.Factory, out io.Writer) *cobra
 			}
 		},
 	}
+
+	cmd.Flags().BoolVarP(&options.DisplayShort, "short", "q", false, "If true, display only the project names")
 	return cmd
 }
 
@@ -94,9 +96,6 @@ func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, out io.W
 
 	return nil
 }
-func (o ProjectsOptions) Validate() error {
-	return nil
-}
 
 // RunProjects lists all projects a user belongs to
 func (o ProjectsOptions) RunProjects() error {
@@ -108,29 +107,17 @@ func (o ProjectsOptions) RunProjects() error {
 	currentProject := currentContext.Namespace
 
 	var currentProjectExists bool = false
+	var currentProjectErr error = nil
 
 	client, err := o.ClientFn()
 	if err != nil {
 		return err
 	}
 
 	if len(currentProject) > 0 {
-		if o.DisplayShort {
-			fmt.Fprintln(out, currentProject)
-			return nil
-		}
-
-		if _, err := client.Projects().Get(currentProject); err != nil {
-			if kapierrors.IsNotFound(err) {
-				fmt.Printf("the project %q specified in your config does not exist.", currentProject)
-			}
-			if clientcmd.IsForbidden(err) {
-				fmt.Printf("you do not have rights to view project %q.", currentProject)
-			}
-			return err
+		if _, currentProjectErr := client.Projects().Get(currentProject); currentProjectErr == nil {
+			currentProjectExists = true
 		}
-
-		currentProjectExists = true
 	}
 
 	defaultContextName := cliconfig.GetContextNickname(currentContext.Namespace, currentContext.Cluster, currentContext.AuthInfo)
@@ -142,35 +129,49 @@ func (o ProjectsOptions) RunProjects() error {
 		switch len(projects) {
 		case 0:
 			msg += "You are not a member of any projects. You can request a project to be created with the 'new-project' command."
-		case 1:
-			msg += fmt.Sprintf("You have one project on this server: %s", api.DisplayNameAndNameForProject(&projects[0]))
 		default:
-			msg += "You have access to the following projects and can switch between them with 'oc project <projectname>':\n"
+			asterisk := ""
+			count := 0
+			if !o.DisplayShort {
+				msg += "You have access to the following projects and can switch between them with 'oc project <projectname>':\n"
+				asterisk = "* "
+			}
 			for _, project := range projects {
+				count = count + 1
 				displayName := project.Annotations["openshift.io/display-name"]
+				linebreak := "\n"
 				if len(displayName) == 0 {
 					displayName = project.Annotations["displayName"]
 				}
 
 				current = ""
-				if currentProjectExists && currentProject == project.Name {
+				if currentProjectExists && currentProject == project.Name && !o.DisplayShort {
 					current = " (current)"
 				}
-				if len(displayName) > 0 && displayName != project.Name {
+				if len(displayName) > 0 && displayName != project.Name && !o.DisplayShort {
 					msg += fmt.Sprintf("\n* %s (%s)%s", displayName, project.Name, current)
 				} else {
-					msg += fmt.Sprintf("\n* %s%s", project.Name, current)
+					if o.DisplayShort && count == 1 {
+						linebreak = ""
+					}
+					msg += fmt.Sprintf(linebreak+asterisk+"%s%s", project.Name, current)
 				}
 			}
 		}
 		fmt.Println(msg)
 
-		if len(projects) > 0 {
+		if len(projects) > 0 && !o.DisplayShort {
+			if !currentProjectExists {
+				if clientcmd.IsForbidden(currentProjectErr) {
+					fmt.Printf("you do not have rights to view project %q. Please switch to an existing one.", currentProject)
+				}
+				return currentProjectErr
+			}
+
 			// if they specified a project name and got a generated context, then only show the information they care about.  They won't recognize
 			// a context name they didn't choose
 			if config.CurrentContext == defaultContextName {
 				fmt.Fprintf(out, "\nUsing project %q on server %q.\n", currentProject, clientCfg.Host)
-
 			} else {
 				fmt.Fprintf(out, "\nUsing project %q from context named %q on server %q.\n", currentProject, config.CurrentContext, clientCfg.Host)
 			}