MPG Extensions housekeeping (#4501)

* Remove PGVector option from managed Postgres cluster creation

* Rename PostGIS flag for cluster creation

Author: kylemclaren

internal/command/mpg/create.go

@@ -21,13 +21,12 @@ import (
 )
 
 type CreateClusterParams struct {
-	Name            string
-	OrgSlug         string
-	Region          string
-	Plan            string
-	VolumeSizeGB    int
-	PGVectorEnabled bool
-	PostGISEnabled  bool
+	Name           string
+	OrgSlug        string
+	Region         string
+	Plan           string
+	VolumeSizeGB   int
+	PostGISEnabled bool
 }
 
 // PlanDetails holds the details for each managed postgres plan.
@@ -89,12 +88,7 @@ func newCreate() *cobra.Command {
 			Default:     10,
 		},
 		flag.Bool{
-			Name:        "pgvector",
-			Description: "Enable PGVector for the Postgres cluster",
-			Default:     false,
-		},
-		flag.Bool{
-			Name:        "postgis",
+			Name:        "enable-postgis-support",
 			Description: "Enable PostGIS for the Postgres cluster",
 			Default:     false,
 		},
@@ -222,25 +216,23 @@ func runCreate(ctx context.Context) error {
 	}
 
 	params := &CreateClusterParams{
-		Name:            appName,
-		OrgSlug:         slug,
-		Region:          selectedRegion.Code,
-		Plan:            plan,
-		VolumeSizeGB:    flag.GetInt(ctx, "volume-size"),
-		PGVectorEnabled: flag.GetBool(ctx, "pgvector"),
-		PostGISEnabled:  flag.GetBool(ctx, "postgis"),
+		Name:           appName,
+		OrgSlug:        slug,
+		Region:         selectedRegion.Code,
+		Plan:           plan,
+		VolumeSizeGB:   flag.GetInt(ctx, "volume-size"),
+		PostGISEnabled: flag.GetBool(ctx, "enable-postgis-support"),
 	}
 
 	uiexClient := uiexutil.ClientFromContext(ctx)
 
 	input := uiex.CreateClusterInput{
-		Name:            params.Name,
-		Region:          params.Region,
-		Plan:            params.Plan,
-		OrgSlug:         params.OrgSlug,
-		Disk:            params.VolumeSizeGB,
-		PGVectorEnabled: params.PGVectorEnabled,
-		PostGISEnabled:  params.PostGISEnabled,
+		Name:           params.Name,
+		Region:         params.Region,
+		Plan:           params.Plan,
+		OrgSlug:        params.OrgSlug,
+		Disk:           params.VolumeSizeGB,
+		PostGISEnabled: params.PostGISEnabled,
 	}
 
 	response, err := uiexClient.CreateCluster(ctx, input)
@@ -296,7 +288,6 @@ func runCreate(ctx context.Context) error {
 	fmt.Fprintf(io.Out, "  Region: %s\n", params.Region)
 	fmt.Fprintf(io.Out, "  Plan: %s\n", params.Plan)
 	fmt.Fprintf(io.Out, "  Disk: %dGB\n", response.Data.Disk)
-	fmt.Fprintf(io.Out, "  PGVector: %t\n", response.Data.PGVectorEnabled)
 	fmt.Fprintf(io.Out, "  PostGIS: %t\n", response.Data.PostGISEnabled)
 	fmt.Fprintf(io.Out, "  Connection string: %s\n", connectionURI)
 

internal/command/mpg/mpg_test.go

@@ -573,26 +573,24 @@ func TestCreateCommand_Logic(t *testing.T) {
 
 			return uiex.CreateClusterResponse{
 				Data: struct {
-					Id              string                           `json:"id"`
-					Name            string                           `json:"name"`
-					Status          *string                          `json:"status"`
-					Plan            string                           `json:"plan"`
-					Environment     *string                          `json:"environment"`
-					Region          string                           `json:"region"`
-					Organization    fly.Organization                 `json:"organization"`
-					Replicas        int                              `json:"replicas"`
-					Disk            int                              `json:"disk"`
-					IpAssignments   uiex.ManagedClusterIpAssignments `json:"ip_assignments"`
-					PGVectorEnabled bool                             `json:"pgvector_enabled"`
-					PostGISEnabled  bool                             `json:"postgis_enabled"`
+					Id             string                           `json:"id"`
+					Name           string                           `json:"name"`
+					Status         *string                          `json:"status"`
+					Plan           string                           `json:"plan"`
+					Environment    *string                          `json:"environment"`
+					Region         string                           `json:"region"`
+					Organization   fly.Organization                 `json:"organization"`
+					Replicas       int                              `json:"replicas"`
+					Disk           int                              `json:"disk"`
+					IpAssignments  uiex.ManagedClusterIpAssignments `json:"ip_assignments"`
+					PostGISEnabled bool                             `json:"postgis_enabled"`
 				}{
-					Id:              expectedCluster.Id,
-					Name:            expectedCluster.Name,
-					Region:          expectedCluster.Region,
-					Plan:            expectedCluster.Plan,
-					Organization:    expectedCluster.Organization,
-					PGVectorEnabled: false,
-					PostGISEnabled:  false,
+					Id:             expectedCluster.Id,
+					Name:           expectedCluster.Name,
+					Region:         expectedCluster.Region,
+					Plan:           expectedCluster.Plan,
+					Organization:   expectedCluster.Organization,
+					PostGISEnabled: false,
 				},
 			}, nil
 		},

internal/uiex/managed_postgres.go

@@ -222,31 +222,29 @@ func (c *Client) CreateUser(ctx context.Context, id string, input CreateUserInpu
 }
 
 type CreateClusterInput struct {
-	Name            string `json:"name"`
-	Region          string `json:"region"`
-	Plan            string `json:"plan"`
-	OrgSlug         string `json:"org_slug"`
-	Disk            int    `json:"disk"`
-	PGVectorEnabled bool   `json:"pgvector_enabled"`
-	PostGISEnabled  bool   `json:"postgis_enabled"`
+	Name           string `json:"name"`
+	Region         string `json:"region"`
+	Plan           string `json:"plan"`
+	OrgSlug        string `json:"org_slug"`
+	Disk           int    `json:"disk"`
+	PostGISEnabled bool   `json:"postgis_enabled"`
 }
 
 type CreateClusterResponse struct {
 	Ok     bool           `json:"ok"`
 	Errors DetailedErrors `json:"errors"`
 	Data   struct {
-		Id              string                      `json:"id"`
-		Name            string                      `json:"name"`
-		Status          *string                     `json:"status"`
-		Plan            string                      `json:"plan"`
-		Environment     *string                     `json:"environment"`
-		Region          string                      `json:"region"`
-		Organization    fly.Organization            `json:"organization"`
-		Replicas        int                         `json:"replicas"`
-		Disk            int                         `json:"disk"`
-		IpAssignments   ManagedClusterIpAssignments `json:"ip_assignments"`
-		PGVectorEnabled bool                        `json:"pgvector_enabled"`
-		PostGISEnabled  bool                        `json:"postgis_enabled"`
+		Id             string                      `json:"id"`
+		Name           string                      `json:"name"`
+		Status         *string                     `json:"status"`
+		Plan           string                      `json:"plan"`
+		Environment    *string                     `json:"environment"`
+		Region         string                      `json:"region"`
+		Organization   fly.Organization            `json:"organization"`
+		Replicas       int                         `json:"replicas"`
+		Disk           int                         `json:"disk"`
+		IpAssignments  ManagedClusterIpAssignments `json:"ip_assignments"`
+		PostGISEnabled bool                        `json:"postgis_enabled"`
 	} `json:"data"`
 }