From 3a693af61dc360929729ac45c4b30a56727342a3 Mon Sep 17 00:00:00 2001
From: Paul Lorenz <paul.lorenz@netfoundry.io>
Date: Mon, 20 Jul 2020 15:27:08 -0400
Subject: [PATCH] Let ziti-fabric list services,router, terminators do queries.
 Default to returning all results. Fixes GH-144

---
 doc/release-notes.md                   | 1 +
 ziti-fabric/subcmd/list_routers.go     | 8 +++++++-
 ziti-fabric/subcmd/list_services.go    | 8 +++++++-
 ziti-fabric/subcmd/list_terminators.go | 8 +++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes.md b/doc/release-notes.md
index 7d24a9f3a..ef6473a6e 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -5,6 +5,7 @@
 
 * Bug Fixes:
   * [#142](https://github.com/openziti/ziti/issues/142) - fix CLI ca create not defaulting identity roles
+  * [#144](https://github.com/openziti/ziti/issues/144) - ziti-fabric is only returning first 10 results for lists of services, routers and terminators
 
 
 # Release 0.15.1
diff --git a/ziti-fabric/subcmd/list_routers.go b/ziti-fabric/subcmd/list_routers.go
index 6a14a05c7..e6d082971 100644
--- a/ziti-fabric/subcmd/list_routers.go
+++ b/ziti-fabric/subcmd/list_routers.go
@@ -36,7 +36,13 @@ var listRouters = &cobra.Command{
 	Short: "List routers enrolled on the fabric",
 	Run: func(cmd *cobra.Command, args []string) {
 		if ch, err := listRoutersClient.Connect(); err == nil {
-			request := &mgmt_pb.ListRoutersRequest{}
+			query := "true limit none"
+			if len(args) > 0 {
+				query = args[0]
+			}
+			request := &mgmt_pb.ListRoutersRequest{
+				Query: query,
+			}
 			body, err := proto.Marshal(request)
 			if err != nil {
 				panic(err)
diff --git a/ziti-fabric/subcmd/list_services.go b/ziti-fabric/subcmd/list_services.go
index dc5660e90..e8d847cf0 100644
--- a/ziti-fabric/subcmd/list_services.go
+++ b/ziti-fabric/subcmd/list_services.go
@@ -36,7 +36,13 @@ var listServices = &cobra.Command{
 	Short: "Retrieve all service definitions",
 	Run: func(cmd *cobra.Command, args []string) {
 		if ch, err := listServicesClient.Connect(); err == nil {
-			request := &mgmt_pb.ListServicesRequest{}
+			query := "true limit none"
+			if len(args) > 0 {
+				query = args[0]
+			}
+			request := &mgmt_pb.ListServicesRequest{
+				Query: query,
+			}
 			body, err := proto.Marshal(request)
 			if err != nil {
 				panic(err)
diff --git a/ziti-fabric/subcmd/list_terminators.go b/ziti-fabric/subcmd/list_terminators.go
index 68b7b3545..9b65f0146 100644
--- a/ziti-fabric/subcmd/list_terminators.go
+++ b/ziti-fabric/subcmd/list_terminators.go
@@ -36,7 +36,13 @@ var listTerminators = &cobra.Command{
 	Short: "Retrieve terminator definitions",
 	Run: func(cmd *cobra.Command, args []string) {
 		if ch, err := listTerminatorsClient.Connect(); err == nil {
-			request := &mgmt_pb.ListTerminatorsRequest{}
+			query := "true limit none"
+			if len(args) > 0 {
+				query = args[0]
+			}
+			request := &mgmt_pb.ListTerminatorsRequest{
+				Query: query,
+			}
 			body, err := proto.Marshal(request)
 			if err != nil {
 				panic(err)