Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internal/command/extensions/extensions.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/superfly/flyctl/internal/command/extensions/arcjet"
"github.com/superfly/flyctl/internal/command/extensions/kubernetes"
sentry_ext "github.com/superfly/flyctl/internal/command/extensions/sentry"
"github.com/superfly/flyctl/internal/command/extensions/supabase"
"github.com/superfly/flyctl/internal/command/extensions/tigris"
"github.com/superfly/flyctl/internal/command/extensions/vector"
"github.com/superfly/flyctl/internal/command/extensions/wafris"
Expand All @@ -26,7 +25,6 @@ func New() (cmd *cobra.Command) {

cmd.AddCommand(
sentry_ext.New(),
supabase.New(),
tigris.New(),
kubernetes.New(),
vector.New(),
Expand Down
48 changes: 0 additions & 48 deletions internal/command/extensions/supabase/dashboard.go

This file was deleted.

79 changes: 0 additions & 79 deletions internal/command/extensions/supabase/destroy.go

This file was deleted.

74 changes: 0 additions & 74 deletions internal/command/extensions/supabase/list.go

This file was deleted.

38 changes: 0 additions & 38 deletions internal/command/extensions/supabase/status.go

This file was deleted.

19 changes: 0 additions & 19 deletions internal/command/extensions/supabase/supabase.go

This file was deleted.

2 changes: 1 addition & 1 deletion internal/command/launch/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ func run(ctx context.Context) (err error) {
status.VM.ProcessN = len(vm.Processes)
}

status.HasPostgres = launchManifest.Plan.Postgres.FlyPostgres != nil || launchManifest.Plan.Postgres.SupabasePostgres != nil || launchManifest.Plan.Postgres.ManagedPostgres != nil
status.HasPostgres = launchManifest.Plan.Postgres.FlyPostgres != nil || launchManifest.Plan.Postgres.ManagedPostgres != nil
status.HasRedis = launchManifest.Plan.Redis.UpstashRedis != nil
status.HasSentry = launchManifest.Plan.Sentry

Expand Down
7 changes: 0 additions & 7 deletions internal/command/launch/describe_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ func describePostgresPlan(launchPlan *plan.LaunchPlan) (string, error) {
switch provider := launchPlan.Postgres.Provider().(type) {
case *plan.FlyPostgresPlan:
return describeFlyPostgresPlan(provider)
case *plan.SupabasePostgresPlan:
return describeSupabasePostgresPlan(provider, launchPlan)
case *plan.ManagedPostgresPlan:
return describeManagedPostgresPlan(provider, launchPlan)
}
Expand Down Expand Up @@ -49,11 +47,6 @@ func describeFlyPostgresPlan(p *plan.FlyPostgresPlan) (string, error) {
return strings.Join(info, ", "), nil
}

func describeSupabasePostgresPlan(p *plan.SupabasePostgresPlan, launchPlan *plan.LaunchPlan) (string, error) {

return fmt.Sprintf("(Supabase) %s in %s", p.GetDbName(launchPlan), p.GetRegion(launchPlan)), nil
}

func describeRedisPlan(ctx context.Context, p plan.RedisPlan) (string, error) {

switch provider := p.Provider().(type) {
Expand Down
4 changes: 0 additions & 4 deletions internal/command/launch/launch_databases.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ func (state *launchState) createDatabases(ctx context.Context) error {
}
}

if state.Plan.Postgres.SupabasePostgres != nil && (planStep == "" || planStep == "postgres") {
fmt.Fprintf(iostreams.FromContext(ctx).ErrOut, "Supabase Postgres is no longer supported.\n")
}

if state.Plan.Redis.UpstashRedis != nil && (planStep == "" || planStep == "redis") {
err := state.createUpstashRedis(ctx)
if err != nil {
Expand Down
29 changes: 2 additions & 27 deletions internal/command/launch/plan/postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ import (
)

type PostgresPlan struct {
FlyPostgres *FlyPostgresPlan `json:"fly_postgres"`
SupabasePostgres *SupabasePostgresPlan `json:"supabase_postgres"`
ManagedPostgres *ManagedPostgresPlan `json:"managed_postgres"`
FlyPostgres *FlyPostgresPlan `json:"fly_postgres"`
ManagedPostgres *ManagedPostgresPlan `json:"managed_postgres"`
}

func (p *PostgresPlan) Provider() any {
Expand All @@ -25,9 +24,6 @@ func (p *PostgresPlan) Provider() any {
if p.FlyPostgres != nil {
return p.FlyPostgres
}
if p.SupabasePostgres != nil {
return p.SupabasePostgres
}
if p.ManagedPostgres != nil {
return p.ManagedPostgres
}
Expand Down Expand Up @@ -249,27 +245,6 @@ func (p *FlyPostgresPlan) Guest() *fly.MachineGuest {
return &guest
}

type SupabasePostgresPlan struct {
DbName string `json:"db_name"`
Region string `json:"region"`
}

func (p *SupabasePostgresPlan) GetDbName(plan *LaunchPlan) string {
if p.DbName == "" {
return plan.AppName + "-db"
}

return p.DbName
}

func (p *SupabasePostgresPlan) GetRegion(plan *LaunchPlan) string {
if p.Region == "" {
return plan.RegionCode
}

return p.Region
}

type ManagedPostgresPlan struct {
DbName string `json:"db_name"`
Region string `json:"region"`
Expand Down
Loading
Loading