Add status and list MPG subcommands (#4332)

Author: asib

internal/command/mpg/list.go

@@ -0,0 +1,88 @@
+package mpg
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/superfly/flyctl/gql"
+	"github.com/superfly/flyctl/iostreams"
+
+	"github.com/superfly/flyctl/internal/command"
+	"github.com/superfly/flyctl/internal/command/orgs"
+	"github.com/superfly/flyctl/internal/config"
+	"github.com/superfly/flyctl/internal/flag"
+	"github.com/superfly/flyctl/internal/flyutil"
+	"github.com/superfly/flyctl/internal/render"
+	"github.com/superfly/flyctl/internal/uiexutil"
+)
+
+func newList() *cobra.Command {
+	const (
+		long = `List MPG clusters owned by the specified organization.
+If no organization is specified, the user's personal organization is used.`
+		short = "List MPG clusters."
+		usage = "list"
+	)
+
+	cmd := command.New(usage, short, long, runList,
+		command.RequireSession,
+		command.RequireUiex,
+	)
+
+	cmd.Aliases = []string{"ls"}
+
+	flag.Add(cmd, flag.JSONOutput())
+	flag.Add(cmd, flag.Org())
+
+	return cmd
+}
+
+func runList(ctx context.Context) error {
+	cfg := config.FromContext(ctx)
+	out := iostreams.FromContext(ctx).Out
+
+	org, err := orgs.OrgFromFlagOrSelect(ctx)
+	if err != nil {
+		return err
+	}
+
+	uiexClient := uiexutil.ClientFromContext(ctx)
+	genqClient := flyutil.ClientFromContext(ctx).GenqClient()
+
+	// For ui-ex request we need the real org slug
+	var fullOrg *gql.GetOrganizationResponse
+	if fullOrg, err = gql.GetOrganization(ctx, genqClient, org.Slug); err != nil {
+		err = fmt.Errorf("failed fetching org: %w", err)
+		return err
+	}
+
+	clusters, err := uiexClient.ListManagedClusters(ctx, fullOrg.Organization.RawSlug)
+	if err != nil {
+		return fmt.Errorf("failed to list managed clusters for organization %s: %w", org.Slug, err)
+	}
+
+	if len(clusters.Data) == 0 {
+		fmt.Fprintf(out, "No managed postgres clusters found in organization %s\n", org.Slug)
+		return nil
+	}
+
+	if cfg.JSONOutput {
+		return render.JSON(out, clusters.Data)
+	}
+
+	rows := make([][]string, 0, len(clusters.Data))
+	for _, cluster := range clusters.Data {
+		rows = append(rows, []string{
+			cluster.Id,
+			cluster.Name,
+			cluster.Organization.Slug,
+			cluster.Region,
+			cluster.Status,
+			cluster.Plan,
+		})
+	}
+
+	return render.Table(out, "", rows, "ID", "Name", "Org", "Region", "Status", "Plan")
+}

internal/command/mpg/mpg.go

@@ -31,6 +31,8 @@ func New() *cobra.Command {
 		newProxy(),
 		newConnect(),
 		newAttach(),
+		newStatus(),
+		newList(),
 		newCreate(),
 	)
 

internal/command/mpg/proxy.go

@@ -37,7 +37,6 @@ func newProxy() (cmd *cobra.Command) {
 }
 
 func runProxy(ctx context.Context) (err error) {
-
 	localProxyPort := "16380"
 	cluster, params, password, err := getMpgProxyParams(ctx, localProxyPort)
 	if err != nil {

internal/command/mpg/status.go

@@ -0,0 +1,81 @@
+package mpg
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+
+	"github.com/spf13/cobra"
+	"github.com/superfly/flyctl/iostreams"
+
+	"github.com/superfly/flyctl/internal/command"
+	"github.com/superfly/flyctl/internal/config"
+	"github.com/superfly/flyctl/internal/flag"
+	"github.com/superfly/flyctl/internal/render"
+	"github.com/superfly/flyctl/internal/uiexutil"
+)
+
+func newStatus() *cobra.Command {
+	const (
+		long  = `Show status and details of a specific Managed Postgres cluster using its ID.`
+		short = "Show MPG cluster status."
+		usage = "status [CLUSTER_ID]"
+	)
+
+	cmd := command.New(usage, short, long, runStatus,
+		command.RequireSession,
+		command.RequireUiex,
+	)
+
+	cmd.Args = cobra.ExactArgs(1)
+
+	flag.Add(cmd, flag.JSONOutput())
+
+	return cmd
+}
+
+func runStatus(ctx context.Context) error {
+	cfg := config.FromContext(ctx)
+	out := iostreams.FromContext(ctx).Out
+	uiexClient := uiexutil.ClientFromContext(ctx)
+
+	clusterID := flag.FirstArg(ctx)
+	if clusterID == "" {
+		// Should not happen due to cobra.ExactArgs(1), but good practice
+		return fmt.Errorf("cluster ID argument is required")
+	}
+
+	// Fetch detailed cluster information by ID
+	clusterDetails, err := uiexClient.GetManagedClusterById(ctx, clusterID)
+	if err != nil {
+		return fmt.Errorf("failed retrieving details for cluster %s: %w", clusterID, err)
+	}
+
+	if cfg.JSONOutput {
+		return render.JSON(out, clusterDetails)
+	}
+
+	rows := [][]string{{
+		clusterDetails.Data.Id,
+		clusterDetails.Data.Name,
+		clusterDetails.Data.Organization.Slug,
+		clusterDetails.Data.Region,
+		clusterDetails.Data.Status,
+		strconv.Itoa(clusterDetails.Data.Disk),
+		strconv.Itoa(clusterDetails.Data.Replicas),
+		clusterDetails.Data.IpAssignments.Direct,
+	}}
+
+	cols := []string{
+		"ID",
+		"Name",
+		"Organization",
+		"Region",
+		"Status",
+		"Allocated Disk (GB)",
+		"Replicas",
+		"Direct IP",
+	}
+
+	return render.VerticalTable(out, "Cluster Status", rows, cols...)
+}

internal/uiex/managed_postgres.go

@@ -15,12 +15,15 @@ import (
 type ManagedClusterIpAssignments struct {
 	Direct string `json:"direct"`
 }
+
 type ManagedCluster struct {
 	Id            string                      `json:"id"`
 	Name          string                      `json:"name"`
 	Region        string                      `json:"region"`
 	Status        string                      `json:"status"`
 	Plan          string                      `json:"plan"`
+	Disk          int                         `json:"disk"`
+	Replicas      int                         `json:"replicas"`
 	Organization  fly.Organization            `json:"organization"`
 	IpAssignments ManagedClusterIpAssignments `json:"ip_assignments"`
 }