From e7f570d6c61bad429188854166f97c3dae5f5904 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio <jaosorior@gmail.com>
Date: Tue, 14 Nov 2023 15:28:00 +0200
Subject: [PATCH] Print multiple projects in `auth login` subcommand (#1649)

Similar to PR https://github.com/stacklok/minder/pull/1648 this prints the projects into
multiple rows, now for the `auth login` subcommand. This created a function that is
re-used.
---
 cmd/cli/app/auth/auth_login.go  | 16 ++----------
 cmd/cli/app/auth/auth_whoami.go |  9 +------
 cmd/cli/app/auth/common.go      | 43 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 cmd/cli/app/auth/common.go

diff --git a/cmd/cli/app/auth/auth_login.go b/cmd/cli/app/auth/auth_login.go
index c3caeb71fc..5eb7677377 100644
--- a/cmd/cli/app/auth/auth_login.go
+++ b/cmd/cli/app/auth/auth_login.go
@@ -27,7 +27,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	"github.com/charmbracelet/bubbles/table"
@@ -222,26 +221,15 @@ func renderNewUser(cmd *cobra.Command, conn *grpc.ClientConn, newUser *pb.Create
 }
 
 func renderUserInfo(cmd *cobra.Command, conn *grpc.ClientConn, user *pb.GetUserResponse) {
-	projects := []string{}
-	for _, project := range user.Projects {
-		projects = append(projects, project.GetName())
-	}
-
 	minderSrvKey := "Minder Server"
-	projectKey := "Project Name"
-	if len(projects) > 1 {
-		projectKey += "s"
-	}
-
 	rows := []table.Row{
-		{
-			projectKey, strings.Join(projects, ", "),
-		},
 		{
 			minderSrvKey, conn.Target(),
 		},
 	}
 
+	rows = append(rows, getProjectTableRows(user.Projects)...)
+
 	renderUserToTable(cmd, rows)
 }
 
diff --git a/cmd/cli/app/auth/auth_whoami.go b/cmd/cli/app/auth/auth_whoami.go
index 547db6195e..14967257e5 100644
--- a/cmd/cli/app/auth/auth_whoami.go
+++ b/cmd/cli/app/auth/auth_whoami.go
@@ -81,14 +81,7 @@ func renderUserInfoWhoami(cmd *cobra.Command, conn *grpc.ClientConn, user *pb.Ge
 		},
 	}
 
-	projectKey := "Project"
-	for idx, project := range user.Projects {
-		if len(user.Projects) > 1 {
-			projectKey = fmt.Sprintf("Project #%d", idx+1)
-		}
-		projectVal := fmt.Sprintf("%s / %s", project.GetName(), project.GetProjectId())
-		rows = append(rows, table.Row{projectKey, projectVal})
-	}
+	rows = append(rows, getProjectTableRows(user.Projects)...)
 
 	renderUserToTable(cmd, rows)
 }
diff --git a/cmd/cli/app/auth/common.go b/cmd/cli/app/auth/common.go
new file mode 100644
index 0000000000..12dbc9cb28
--- /dev/null
+++ b/cmd/cli/app/auth/common.go
@@ -0,0 +1,43 @@
+//
+// Copyright 2023 Stacklok, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// NOTE: This file is for stubbing out client code for proof of concept
+// purposes. It will / should be removed in the future.
+// Until then, it is not covered by unit tests and should not be used
+// It does make a good example of how to use the generated client code
+// for others to use as a reference.
+
+package auth
+
+import (
+	"fmt"
+
+	"github.com/charmbracelet/bubbles/table"
+
+	minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
+)
+
+func getProjectTableRows(projects []*minderv1.Project) []table.Row {
+	rows := []table.Row{}
+	projectKey := "Project"
+	for idx, project := range projects {
+		if len(projects) > 1 {
+			projectKey = fmt.Sprintf("Project #%d", idx+1)
+		}
+		projectVal := fmt.Sprintf("%s / %s", project.GetName(), project.GetProjectId())
+		rows = append(rows, table.Row{projectKey, projectVal})
+	}
+	return rows
+}