flatten agents list

Signed-off-by: Sahil Lakhwani <[email protected]>
fluxninja · Oct 19, 2023 · c3f9f60 · c3f9f60
1 parent fde28e2
commit c3f9f60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/cmd/aperturectl/cmd/cloud/agents.go b/cmd/aperturectl/cmd/cloud/agents.go
@@ -1,12 +1,8 @@
 package cloud
 
 import (
-	"context"
-	"fmt"
-
+	"github.com/fluxninja/aperture/v2/cmd/aperturectl/cmd/utils"
 	"github.com/spf13/cobra"
-
-	cmdv1 "github.com/fluxninja/aperture/v2/api/gen/proto/go/aperture/cmd/v1"
 )
 
 var agentGroup string
@@ -30,17 +26,6 @@ var agentsCmd = &cobra.Command{
 			return err
 		}
 
-		agents, err := client.ListAgents(context.Background(), &cmdv1.ListAgentsRequest{
-			AgentGroup: agentGroup,
-		})
-		if err != nil {
-			return err
-		}
-
-		for _, agent := range agents.Agents {
-			fmt.Println(agent)
-		}
-
-		return nil
+		return utils.ListAgents(client, agentGroup)
 	},
 }
diff --git a/pkg/agent-functions/agents/agents.go b/pkg/agent-functions/agents/agents.go
@@ -46,7 +46,7 @@ func (a Agents) ListFlowControlPoints() ([]transport.Result[*cmdv1.ListFlowContr
 	if err != nil {
 		return nil, err
 	}
-	return transport.SendRequests[cmdv1.ListFlowControlPointsAgentResponse](a.etcdTransport, agents["default"], &req)
+	return transport.SendRequests[cmdv1.ListFlowControlPointsAgentResponse](a.etcdTransport, flattenAgents(agents), &req)
 }
 
 // ListAutoScaleControlPoints lists auto-scale control points of all agents.
@@ -56,7 +56,7 @@ func (a Agents) ListAutoScaleControlPoints() ([]transport.Result[*cmdv1.ListAuto
 	if err != nil {
 		return nil, err
 	}
-	return transport.SendRequests[cmdv1.ListAutoScaleControlPointsAgentResponse](a.etcdTransport, agents["default"], &req)
+	return transport.SendRequests[cmdv1.ListAutoScaleControlPointsAgentResponse](a.etcdTransport, flattenAgents(agents), &req)
 }
 
 // ListDiscoveryEntities lists discovery entities.