From 1dde10d5c34411599bb2bd07271e1c3fe882e0b8 Mon Sep 17 00:00:00 2001
From: Juan Fernandez <juan-fdz-hawa@users.noreply.github.com>
Date: Thu, 27 Jul 2023 15:08:40 -0400
Subject: [PATCH] Print inherited message if no queries found (#12998)

If the team has no queries, then fleetctl output should also show the number of inherited queries.
---
 cmd/fleetctl/get.go | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/cmd/fleetctl/get.go b/cmd/fleetctl/get.go
index 54083b927b..94ed9f06c0 100644
--- a/cmd/fleetctl/get.go
+++ b/cmd/fleetctl/get.go
@@ -18,7 +18,6 @@ import (
 	"gopkg.in/guregu/null.v3"
 
 	"github.com/fleetdm/fleet/v4/server/fleet"
-	"github.com/fleetdm/fleet/v4/server/ptr"
 	"github.com/fleetdm/fleet/v4/server/service"
 	"github.com/ghodss/yaml"
 	"github.com/olekukonko/tablewriter"
@@ -332,15 +331,23 @@ func queryToTableRow(query fleet.Query, teamName string) []string {
 	}
 }
 
-func numberInheritedQueries(client *service.Client, teamID *uint) (*int, error) {
+func printInheritedQueries(client *service.Client, teamID *uint) error {
 	if teamID != nil {
 		globalQueries, err := client.GetQueries(nil)
 		if err != nil {
-			return nil, fmt.Errorf("could not list global queries: %w", err)
+			return fmt.Errorf("could not list global queries: %w", err)
 		}
-		return ptr.Int(len(globalQueries)), nil
+		fmt.Printf("Not showing %d inherited queries. To see global queries, run this command without the `--team` flag.\n", len(globalQueries))
 	}
-	return nil, nil
+	return nil
+}
+
+func printNoQueriesFound(teamID *uint) {
+	scope := "global"
+	if teamID != nil {
+		scope = "team"
+	}
+	fmt.Printf("No %s queries found.\n", scope)
 }
 
 func getQueriesCommand() *cli.Command {
@@ -417,11 +424,10 @@ func getQueriesCommand() *cli.Command {
 				}
 
 				if len(queries) == 0 {
-					scope := "global"
-					if teamID != nil {
-						scope = "team"
+					printNoQueriesFound(teamID)
+					if err := printInheritedQueries(client, teamID); err != nil {
+						return err
 					}
-					fmt.Printf("No %s queries found.\n", scope)
 					return nil
 				}
 
@@ -452,14 +458,10 @@ func getQueriesCommand() *cli.Command {
 						rows = append(rows, queryToTableRow(query, teamName))
 					}
 
-					// Need to determine the number of inherited queries if we are viewing the
-					// queries for a team
-					nInheritedQueries, err := numberInheritedQueries(client, teamID)
-					if err != nil {
+					printQueryTable(c, columns, rows)
+					if err := printInheritedQueries(client, teamID); err != nil {
 						return err
 					}
-
-					printQueryTable(c, columns, rows, nInheritedQueries)
 				}
 				return nil
 			}
@@ -1075,16 +1077,12 @@ func getUserRolesCommand() *cli.Command {
 	}
 }
 
-func printQueryTable(c *cli.Context, columns []string, data [][]string, nInheritedQueries *int) {
+func printQueryTable(c *cli.Context, columns []string, data [][]string) {
 	table := defaultTable(c.App.Writer)
 	table.SetHeader(columns)
 	table.SetReflowDuringAutoWrap(false)
 	table.AppendBulk(data)
 	table.Render()
-
-	if nInheritedQueries != nil {
-		fmt.Printf("Not showing %d inherited queries. To see global queries, run this command without the `--team` flag.\n", *nInheritedQueries)
-	}
 }
 
 func printTable(c *cli.Context, columns []string, data [][]string) {