a bunch of refactors on app list implementation

cmd/client/cmd/app.go

@@ -161,7 +161,6 @@ var appListCmd = &cobra.Command{
 }
 
 func appList(cmd *cobra.Command, args []string) {
-
 	conn, err := connection.New(cfgFile)
 	if err != nil {
 		client.PrintErrorAndExit("Error connecting to server: %v", err)
@@ -171,12 +170,11 @@ func appList(cmd *cobra.Command, args []string) {
 	cli := appb.NewAppClient(conn)
 	resp, err := cli.List(context.Background(), &appb.Empty{})
 	if err != nil {
-		fmt.Fprintln(os.Stderr, client.GetErrorMsg(err))
-		return
+		client.PrintErrorAndExit("Error listing apps: %v", err)
 	}
 
 	if len(resp.Apps) == 0 {
-		fmt.Println("You do not have to any app")
+		fmt.Println("You don't have any app")
 		return
 	}
 	// rendering app list in a table view
@@ -186,11 +184,12 @@ func appList(cmd *cobra.Command, args []string) {
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
 	table.SetRowSeparator("-")
 	table.SetAutoWrapText(false)
-	for _, t := range resp.Apps {
-		if t.Urls == "" {
-			t.Urls = "n/a"
+	for _, a := range resp.Apps {
+		urls := strings.Join(a.Urls, ",")
+		if urls == "" {
+			urls = "n/a"
 		}
-		r := []string{t.Team, t.App, t.Urls}
+		r := []string{a.Team, a.Name, urls}
 		table.Append(r)
 	}
 	table.Render()
@@ -455,8 +454,6 @@ func init() {
 	// App logs
 	appLogsCmd.Flags().Int64("lines", 10, "number of lines")
 	appLogsCmd.Flags().Bool("follow", false, "follow logs")
-	// App list
-	appListCmd.Flags().Bool("show-apps", false, "Show team's app(s)")
 }
 
 func appLogs(cmd *cobra.Command, args []string) {

cmd/client/cmd/teresaclient.go

@@ -59,8 +59,8 @@ func NewTeresa() TeresaClient {
 
 	tc := TeresaClient{teresa: apiclient.Default}
 	log.Debugf(`Setting new teresa client. server: %s, api suffix: %s`, cluster.Server, suffix)
-	ts, err := ParseServerURL(cluster.Server)
 
+	ts, err := ParseServerURL(cluster.Server)
 	if err != nil {
 		log.Fatal(err)
 	}

pkg/protobuf/app/app.proto

@@ -36,11 +36,11 @@ message CreateRequest {
 }
 
 message ListResponse {
-    
+
     message App {
         string team = 1;
-        string app  = 2;
-        string urls  = 3;    
+        string name  = 2;
+        repeated string urls  = 3;
     }
     repeated App apps = 1;
 

pkg/server/app/app.go

@@ -26,7 +26,7 @@ type Operations interface {
 	HasPermission(user *storage.User, appName string) bool
 	SetEnv(user *storage.User, appName string, evs []*EnvVar) error
 	UnsetEnv(user *storage.User, appName string, evs []string) error
-	List(user *storage.User) ([]*List, error)
+	List(user *storage.User) ([]*AppListItem, error)
 }
 
 type K8sOperations interface {
@@ -48,7 +48,7 @@ type K8sOperations interface {
 	DeleteDeployEnvVars(namespace, name string, evNames []string) error
 	CreateOrUpdateDeployEnvVars(namespace, name string, evs []*EnvVar) error
 	DeleteNamespace(namespace string) error
-	ListNamespaceByLabel(label string) ([]string, error)
+	NamespaceListByLabel(label, value string) ([]string, error)
 }
 
 type AppOperations struct {
@@ -337,31 +337,30 @@ func checkForProtectedEnvVars(evsNames []string) error {
 	return nil
 }
 
-func (ops *AppOperations) List(user *storage.User) ([]*List, error) {
+func (ops *AppOperations) List(user *storage.User) ([]*AppListItem, error) {
 	teams, err := ops.tops.ListByUser(user.Email)
 	if err != nil {
 		return nil, err
 	}
-	result := make([]*List, 0)
+	items := make([]*AppListItem, 0)
 	for _, team := range teams {
-		appNames, err := ops.kops.ListNamespaceByLabel(team.Name)
+		apps, err := ops.kops.NamespaceListByLabel(TeresaTeamLabel, team.Name)
 		if err != nil {
 			return nil, err
 		}
-		for _, app := range appNames {
-			appAdd, err := ops.kops.AddressList(app)
+		for _, a := range apps {
+			addrs, err := ops.kops.AddressList(a)
 			if err != nil {
 				return nil, err
 			}
-			list := &List{
+			items = append(items, &AppListItem{
 				Team:      team.Name,
-				Addresses: appAdd,
-				Name:      string(app),
-			}
-			result = append(result, list)
+				Name:      a,
+				Addresses: addrs,
+			})
 		}
 	}
-	return result, nil
+	return items, nil
 }
 
 func NewOperations(tops team.Operations, kops K8sOperations, st st.Storage) Operations {

pkg/server/app/app_test.go

@@ -20,8 +20,7 @@ import (
 )
 
 type fakeK8sOperations struct {
-	Namespaces  map[string]struct{}
-	ErrNotFound error
+	Namespaces map[string]struct{}
 }
 
 type errK8sOperations struct {
@@ -130,8 +129,12 @@ func (f *fakeK8sOperations) DeleteNamespace(namespace string) error {
 	return nil
 }
 
-func (*fakeK8sOperations) ListNamespaceByLabel(label string) ([]string, error) {
-	return nil, nil
+func (f *fakeK8sOperations) NamespaceListByLabel(label, value string) ([]string, error) {
+	ns := make([]string, 0)
+	for s, _ := range f.Namespaces {
+		ns = append(ns, s)
+	}
+	return ns, nil
 }
 
 func (e *errK8sOperations) CreateNamespace(app *App, user string) error {
@@ -207,7 +210,7 @@ func (e *errK8sOperations) DeleteNamespace(namespace string) error {
 	return e.DeleteNamespaceErr
 }
 
-func (e *errK8sOperations) ListNamespaceByLabel(label string) ([]string, error) {
+func (e *errK8sOperations) NamespaceListByLabel(label, value string) ([]string, error) {
 	return nil, e.Err
 }
 
@@ -529,27 +532,35 @@ func TestAppOperationsInfoErrNotFound(t *testing.T) {
 
 func TestAppOperationsList(t *testing.T) {
 	tops := team.NewFakeOperations()
-	ops := NewOperations(tops, &fakeK8sOperations{}, nil)
+	appName := "teresa"
 	teamName := "luizalabs"
+
 	user := &storage.User{Email: "teresa@luizalabs.com"}
-	app := &App{Name: "teresa", Team: teamName}
-	tops.(*team.FakeOperations).Storage[app.Name] = &storage.Team{
+	fk8s := &fakeK8sOperations{Namespaces: map[string]struct{}{appName: struct{}{}}}
+
+	ops := NewOperations(tops, fk8s, nil)
+	tops.(*team.FakeOperations).Storage[appName] = &storage.Team{
 		Name:  teamName,
 		Users: []storage.User{*user},
 	}
 
-	list, err := ops.List(user)
+	apps, err := ops.List(user)
 	if err != nil {
-		t.Fatal("error getting app list: ", err)
+		t.Fatal("error getting app list:", err)
 	}
 
-	for _, a := range list {
+	if len(apps) == 0 {
+		t.Fatal("expected at least one app")
+	}
+	for _, a := range apps {
+		if a.Name != appName {
+			t.Errorf("expected %s, got %s", appName, a.Name)
+		}
 		if a.Team != teamName {
 			t.Errorf("expected %s, got %s", teamName, a.Team)
 		}
-
 		if len(a.Addresses) != 1 { // see fakeK8sOperations.AddressList
-			t.Errorf("expected 2, got %d", len(a.Addresses))
+			t.Errorf("expected 1 address, got %d", len(a.Addresses))
 		}
 	}
 }