Add mpg detach command for separating MPG and apps

This mirrors the `mpg attach` feature we added earlier.

Author: aezell

internal/command/launch/plan/postgres_test.go

@@ -115,6 +115,10 @@ func (m *mockUIEXClient) CreateAttachment(ctx context.Context, clusterId string,
 	return uiex.CreateAttachmentResponse{}, nil
 }
 
+func (m *mockUIEXClient) DeleteAttachment(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+	return uiex.DeleteAttachmentResponse{}, nil
+}
+
 func (m *mockUIEXClient) CreateBuild(ctx context.Context, in uiex.CreateBuildRequest) (*uiex.BuildResponse, error) {
 	return &uiex.BuildResponse{}, nil
 }

internal/command/mpg/detach.go

@@ -0,0 +1,91 @@
+package mpg
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/superfly/flyctl/internal/appconfig"
+	"github.com/superfly/flyctl/internal/command"
+	"github.com/superfly/flyctl/internal/flag"
+	"github.com/superfly/flyctl/internal/flyutil"
+	"github.com/superfly/flyctl/internal/uiexutil"
+	"github.com/superfly/flyctl/iostreams"
+)
+
+func newDetach() *cobra.Command {
+	const (
+		short = "Detach a managed Postgres cluster from an app"
+		long  = short + ". " +
+			`This command will remove the attachment record linking the app to the cluster.
+Note: This does NOT remove any secrets from the app. Use 'fly secrets unset' to remove secrets.`
+		usage = "detach <CLUSTER ID>"
+	)
+
+	cmd := command.New(usage, short, long, runDetach,
+		command.RequireSession,
+		command.RequireAppName,
+	)
+	cmd.Args = cobra.MaximumNArgs(1)
+
+	flag.Add(cmd,
+		flag.App(),
+		flag.AppConfig(),
+		flag.Yes(),
+	)
+
+	return cmd
+}
+
+func runDetach(ctx context.Context) error {
+	// Check token compatibility early
+	if err := validateMPGTokenCompatibility(ctx); err != nil {
+		return err
+	}
+
+	var (
+		clusterId = flag.FirstArg(ctx)
+		appName   = appconfig.NameFromContext(ctx)
+		client    = flyutil.ClientFromContext(ctx)
+		io        = iostreams.FromContext(ctx)
+	)
+
+	// Get app details to determine which org it belongs to
+	app, err := client.GetAppBasic(ctx, appName)
+	if err != nil {
+		return fmt.Errorf("failed retrieving app %s: %w", appName, err)
+	}
+
+	appOrgSlug := app.Organization.RawSlug
+	if appOrgSlug != "" && clusterId == "" {
+		fmt.Fprintf(io.Out, "Listing clusters in organization %s\n", appOrgSlug)
+	}
+
+	// Get cluster details
+	cluster, _, err := ClusterFromArgOrSelect(ctx, clusterId, appOrgSlug)
+	if err != nil {
+		return fmt.Errorf("failed retrieving cluster %s: %w", clusterId, err)
+	}
+
+	clusterOrgSlug := cluster.Organization.Slug
+
+	// Verify that the app and cluster are in the same organization
+	if appOrgSlug != clusterOrgSlug {
+		return fmt.Errorf("app %s is in organization %s, but cluster %s is in organization %s. They must be in the same organization",
+			appName, appOrgSlug, cluster.Id, clusterOrgSlug)
+	}
+
+	uiexClient := uiexutil.ClientFromContext(ctx)
+
+	// Delete the attachment record
+	_, err = uiexClient.DeleteAttachment(ctx, cluster.Id, appName)
+	if err != nil {
+		return fmt.Errorf("failed to detach: %w", err)
+	}
+
+	fmt.Fprintf(io.Out, "\nPostgres cluster %s has been detached from %s\n", cluster.Id, appName)
+	fmt.Fprintf(io.Out, "Note: This only removes the attachment record. Any secrets (like DATABASE_URL) are still set on the app.\n")
+	fmt.Fprintf(io.Out, "Use 'fly secrets unset DATABASE_URL -a %s' to remove the connection string.\n", appName)
+
+	return nil
+}

internal/command/mpg/mpg.go

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

internal/command/mpg/mpg_test.go

@@ -1538,6 +1538,81 @@ func TestFormatAttachedApps(t *testing.T) {
 	}
 }
 
+// Test DeleteAttachment functionality
+func TestDeleteAttachment(t *testing.T) {
+	ctx := setupTestContext()
+
+	clusterID := "test-cluster-123"
+
+	t.Run("successful attachment deletion", func(t *testing.T) {
+		mockUiex := &mock.UiexClient{
+			DeleteAttachmentFunc: func(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+				assert.Equal(t, clusterID, clusterId)
+				assert.Equal(t, "test-app", appName)
+				return uiex.DeleteAttachmentResponse{
+					Data: struct {
+						Message string `json:"message"`
+					}{
+						Message: "Attachment deleted successfully",
+					},
+				}, nil
+			},
+		}
+
+		ctx := uiexutil.NewContextWithClient(ctx, mockUiex)
+
+		response, err := mockUiex.DeleteAttachment(ctx, clusterID, "test-app")
+
+		require.NoError(t, err)
+		assert.Equal(t, "Attachment deleted successfully", response.Data.Message)
+	})
+
+	t.Run("error - attachment not found", func(t *testing.T) {
+		mockUiex := &mock.UiexClient{
+			DeleteAttachmentFunc: func(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+				return uiex.DeleteAttachmentResponse{}, fmt.Errorf("attachment not found for app '%s' on cluster %s", appName, clusterId)
+			},
+		}
+
+		ctx := uiexutil.NewContextWithClient(ctx, mockUiex)
+
+		_, err := mockUiex.DeleteAttachment(ctx, clusterID, "nonexistent-app")
+
+		assert.Error(t, err)
+		assert.Contains(t, err.Error(), "attachment not found")
+	})
+
+	t.Run("error - access denied", func(t *testing.T) {
+		mockUiex := &mock.UiexClient{
+			DeleteAttachmentFunc: func(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+				return uiex.DeleteAttachmentResponse{}, fmt.Errorf("access denied: you don't have permission to detach from cluster %s", clusterId)
+			},
+		}
+
+		ctx := uiexutil.NewContextWithClient(ctx, mockUiex)
+
+		_, err := mockUiex.DeleteAttachment(ctx, clusterID, "test-app")
+
+		assert.Error(t, err)
+		assert.Contains(t, err.Error(), "access denied")
+	})
+
+	t.Run("error - cluster not found", func(t *testing.T) {
+		mockUiex := &mock.UiexClient{
+			DeleteAttachmentFunc: func(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+				return uiex.DeleteAttachmentResponse{}, fmt.Errorf("cluster %s not found", clusterId)
+			},
+		}
+
+		ctx := uiexutil.NewContextWithClient(ctx, mockUiex)
+
+		_, err := mockUiex.DeleteAttachment(ctx, "nonexistent-cluster", "test-app")
+
+		assert.Error(t, err)
+		assert.Contains(t, err.Error(), "not found")
+	})
+}
+
 // Test the list command with attached apps
 func TestListCommand_WithAttachedApps(t *testing.T) {
 	ctx := setupTestContext()

internal/mock/uiex_client.go

@@ -32,6 +32,7 @@ type UiexClient struct {
 	CreateManagedClusterBackupFunc         func(ctx context.Context, clusterID string, input uiex.CreateManagedClusterBackupInput) (uiex.CreateManagedClusterBackupResponse, error)
 	RestoreManagedClusterBackupFunc        func(ctx context.Context, clusterID string, input uiex.RestoreManagedClusterBackupInput) (uiex.RestoreManagedClusterBackupResponse, error)
 	CreateAttachmentFunc                   func(ctx context.Context, clusterId string, input uiex.CreateAttachmentInput) (uiex.CreateAttachmentResponse, error)
+	DeleteAttachmentFunc                   func(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error)
 	CreateBuildFunc                        func(ctx context.Context, in uiex.CreateBuildRequest) (*uiex.BuildResponse, error)
 	FinishBuildFunc                        func(ctx context.Context, in uiex.FinishBuildRequest) (*uiex.BuildResponse, error)
 	EnsureDepotBuilderFunc                 func(ctx context.Context, in uiex.EnsureDepotBuilderRequest) (*uiex.EnsureDepotBuilderResponse, error)
@@ -245,3 +246,10 @@ func (m *UiexClient) CreateAttachment(ctx context.Context, clusterId string, inp
 	}
 	return uiex.CreateAttachmentResponse{}, nil
 }
+
+func (m *UiexClient) DeleteAttachment(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error) {
+	if m.DeleteAttachmentFunc != nil {
+		return m.DeleteAttachmentFunc(ctx, clusterId, appName)
+	}
+	return uiex.DeleteAttachmentResponse{}, nil
+}

internal/uiex/managed_postgres.go

@@ -944,3 +944,48 @@ func (c *Client) CreateAttachment(ctx context.Context, clusterId string, input C
 		return response, fmt.Errorf("failed to create attachment (status %d): %s", res.StatusCode, string(body))
 	}
 }
+
+type DeleteAttachmentResponse struct {
+	Data struct {
+		Message string `json:"message"`
+	} `json:"data"`
+}
+
+// DeleteAttachment removes a ManagedServiceAttachment record linking an app to a managed Postgres cluster
+func (c *Client) DeleteAttachment(ctx context.Context, clusterId string, appName string) (DeleteAttachmentResponse, error) {
+	var response DeleteAttachmentResponse
+	cfg := config.FromContext(ctx)
+	url := fmt.Sprintf("%s/api/v1/postgres/%s/attachments/%s", c.baseUrl, clusterId, appName)
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, url, nil)
+	if err != nil {
+		return response, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	req.Header.Add("Authorization", "Bearer "+cfg.Tokens.GraphQL())
+
+	res, err := c.httpClient.Do(req)
+	if err != nil {
+		return response, err
+	}
+	defer res.Body.Close()
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return response, fmt.Errorf("failed to read response body: %w", err)
+	}
+
+	switch res.StatusCode {
+	case http.StatusOK:
+		if err = json.Unmarshal(body, &response); err != nil {
+			return response, fmt.Errorf("failed to decode response: %w", err)
+		}
+		return response, nil
+	case http.StatusNotFound:
+		return response, fmt.Errorf("attachment not found for app '%s' on cluster %s", appName, clusterId)
+	case http.StatusForbidden:
+		return response, fmt.Errorf("access denied: you don't have permission to detach from cluster %s", clusterId)
+	default:
+		return response, fmt.Errorf("failed to delete attachment (status %d): %s", res.StatusCode, string(body))
+	}
+}

internal/uiexutil/client.go

@@ -31,6 +31,7 @@ type Client interface {
 	CreateManagedClusterBackup(ctx context.Context, clusterID string, input uiex.CreateManagedClusterBackupInput) (uiex.CreateManagedClusterBackupResponse, error)
 	RestoreManagedClusterBackup(ctx context.Context, clusterID string, input uiex.RestoreManagedClusterBackupInput) (uiex.RestoreManagedClusterBackupResponse, error)
 	CreateAttachment(ctx context.Context, clusterId string, input uiex.CreateAttachmentInput) (uiex.CreateAttachmentResponse, error)
+	DeleteAttachment(ctx context.Context, clusterId string, appName string) (uiex.DeleteAttachmentResponse, error)
 
 	// Builders
 	CreateBuild(ctx context.Context, in uiex.CreateBuildRequest) (*uiex.BuildResponse, error)