Merge pull request #51 from slntopp/access

Access
slntopp · Jan 11, 2023 · af82efe · af82efe
2 parents 561c507 + 73156e6
commit af82efe
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/cmd/account/main.go b/cmd/account/main.go
@@ -72,15 +72,26 @@ func PrintAccount(acc *pb.Account) {
 func PrintAccountsPool(pool []*pb.Account) {
 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
-	t.AppendHeader(table.Row{"UUID", "Title", "Balance NCU"})
+	t.AppendHeader(table.Row{"UUID", "Title", "Balance NCU", "Access", "Role", "Namespace"})
 
 	rows := make([]table.Row, len(pool))
 	for i, acc := range pool {
 		balance := "-"
 		if acc.Balance != nil {
 			balance = fmt.Sprintf("%.2f", *acc.Balance)
 		}
-		rows[i] = table.Row{acc.Uuid, acc.Title, balance}
+		a, r, n := "READ", "-", "-"
+		if acc.Access != nil {
+			a = acc.Access.Level.Enum().String()
+			r = acc.Access.Role
+			if r == "" {
+				r = "-"
+			}
+			if acc.Access.Namespace != nil {
+				n = *acc.Access.Namespace
+			}
+		}
+		rows[i] = table.Row{acc.Uuid, acc.Title, balance, a, r, n}
 	}
 	t.AppendRows(rows)
 

diff --git a/cmd/namespace/main.go b/cmd/namespace/main.go
@@ -64,11 +64,16 @@ func MakeNamespacesServiceClientOrFail() (context.Context, regpb.NamespacesServi
 func PrintNamespacesPool(pool []*pb.Namespace) {
 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
-	t.AppendHeader(table.Row{"UUID", "Title"})
+	t.AppendHeader(table.Row{"UUID", "Title", "Access", "Role"})
 
 	rows := make([]table.Row, len(pool))
-	for i, acc := range pool {
-		rows[i] = table.Row{acc.Uuid, acc.Title}
+	for i, ns := range pool {
+		a, r := "READ", "-"
+		if ns.Access != nil {
+			a = ns.Access.Level.Enum().String()
+			r = ns.Access.Role
+		}
+		rows[i] = table.Row{ns.Uuid, ns.Title, a, r}
 	}
 	t.AppendRows(rows)
 

diff --git a/cmd/services/main.go b/cmd/services/main.go
@@ -99,11 +99,19 @@ func PrintService(s *pb.Service) error {
 func PrintServicesPool(pool []*pb.Service) {
 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
-	t.AppendHeader(table.Row{"UUID", "Title", "Status"})
+	t.AppendHeader(table.Row{"UUID", "Title", "Status", "Access", "Role", "Namespace"})
 
 	rows := make([]table.Row, len(pool))
 	for i, s := range pool {
-		rows[i] = table.Row{s.GetUuid(), s.GetTitle(), s.GetStatus()}
+		a, r, n := "READ", "-", "-"
+		if s.Access != nil {
+			a = s.Access.Level.Enum().String()
+			r = s.Access.Role
+			if s.Access.Namespace != nil {
+				n = *s.Access.Namespace
+			}
+		}
+		rows[i] = table.Row{s.GetUuid(), s.GetTitle(), s.GetStatus(), a, r, n}
 	}
 	t.AppendRows(rows)