Merge d9560ff into 154fb98

Author: kzys

gql/generated.go

@@ -140,6 +140,8 @@ fragment OrganizationData on Organization {
 	paidPlan
 	addOnSsoLink
 	provisionsBetaExtensions
+	name
+	billable
 }
 
 fragment AppData on App {

gql/genqclient.graphql

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/samber/lo"
-	fly "github.com/superfly/fly-go"
 	"github.com/superfly/flyctl/internal/command/launch/plan"
 	"github.com/superfly/flyctl/internal/command/mpg"
 	"github.com/superfly/flyctl/internal/command/redis"
@@ -54,17 +53,17 @@ func describeSupabasePostgresPlan(p *plan.SupabasePostgresPlan, launchPlan *plan
 	return fmt.Sprintf("(Supabase) %s in %s", p.GetDbName(launchPlan), p.GetRegion(launchPlan)), nil
 }
 
-func describeRedisPlan(ctx context.Context, p plan.RedisPlan, org *fly.Organization) (string, error) {
+func describeRedisPlan(ctx context.Context, p plan.RedisPlan) (string, error) {
 
 	switch provider := p.Provider().(type) {
 	case *plan.UpstashRedisPlan:
-		return describeUpstashRedisPlan(ctx, provider, org)
+		return describeUpstashRedisPlan(ctx, provider)
 	}
 	return descriptionNone, nil
 }
 
-func describeUpstashRedisPlan(ctx context.Context, p *plan.UpstashRedisPlan, org *fly.Organization) (string, error) {
-	plan, err := redis.DeterminePlan(ctx, org)
+func describeUpstashRedisPlan(ctx context.Context, p *plan.UpstashRedisPlan) (string, error) {
+	plan, err := redis.DeterminePlan(ctx)
 	if err != nil {
 		return "<plan not found, this is an error>", fmt.Errorf("redis plan not found: %w", err)
 	}

internal/command/launch/describe_plan.go

@@ -40,11 +40,11 @@ func (state *launchState) Launch(ctx context.Context) error {
 		return err
 	}
 
-	org, err := state.Org(ctx)
+	org, err := state.orgCompact(ctx)
 	if err != nil {
 		return err
 	}
-	if !planValidateHighAvailability(ctx, state.Plan, org, !state.warnedNoCcHa) {
+	if !planValidateHighAvailability(ctx, state.Plan, org.Billable, !state.warnedNoCcHa) {
 		state.Plan.HighAvailability = false
 		state.warnedNoCcHa = true
 	}
@@ -338,12 +338,13 @@ func (state *launchState) updateConfig(ctx context.Context) {
 // createApp creates the fly.io app for the plan
 func (state *launchState) createApp(ctx context.Context) (flapsutil.FlapsClient, *fly.App, error) {
 	apiClient := flyutil.ClientFromContext(ctx)
-	org, err := state.Org(ctx)
+
+	org, err := state.orgCompact(ctx)
 	if err != nil {
 		return nil, nil, err
 	}
 	app, err := apiClient.CreateApp(ctx, fly.CreateAppInput{
-		OrganizationID:  org.ID,
+		OrganizationID:  org.Id,
 		Name:            state.Plan.AppName,
 		PreferredRegion: &state.Plan.RegionCode,
 		Machines:        true,

internal/command/launch/launch.go

@@ -220,7 +220,7 @@ func buildManifest(ctx context.Context, parentConfig *appconfig.Config, recovera
 		warnedNoCcHa:     false,
 	}
 
-	if planValidateHighAvailability(ctx, lp, org, true) {
+	if planValidateHighAvailability(ctx, lp, org.Billable, true) {
 		buildCache.warnedNoCcHa = true
 	}
 
@@ -799,8 +799,8 @@ func determineCompute(ctx context.Context, config *appconfig.Config, srcInfo *sc
 	return []*appconfig.Compute{guestToCompute(guest)}, reason, nil
 }
 
-func planValidateHighAvailability(ctx context.Context, p *plan.LaunchPlan, org *fly.Organization, print bool) bool {
-	if !org.Billable && p.HighAvailability {
+func planValidateHighAvailability(ctx context.Context, p *plan.LaunchPlan, billable, print bool) bool {
+	if !billable && p.HighAvailability {
 		if print {
 			fmt.Fprintln(iostreams.FromContext(ctx).ErrOut, "Warning: This organization has no payment method, turning off high availability")
 		}

internal/command/launch/plan_builder.go

@@ -56,6 +56,15 @@ func cacheGrab[T any](cache map[string]interface{}, key string, cb func() (T, er
 	return val, nil
 }
 
+func (state *launchState) orgCompact(ctx context.Context) (*gql.GetOrganizationOrganization, error) {
+	client := flyutil.ClientFromContext(ctx).GenqClient()
+	res, err := gql.GetOrganization(ctx, client, state.Plan.OrgSlug)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get org %q for state: %w", state.Plan.OrgSlug, err)
+	}
+	return &res.Organization, nil
+}
+
 func (state *launchState) Org(ctx context.Context) (*fly.Organization, error) {
 	apiClient := flyutil.ClientFromContext(ctx)
 	return cacheGrab(state.cache, "org,"+state.Plan.OrgSlug, func() (*fly.Organization, error) {
@@ -103,7 +112,7 @@ func (state *launchState) PlanSummary(ctx context.Context) (string, error) {
 		guestStr += fmt.Sprintf(", %d more", len(state.appConfig.Compute)-1)
 	}
 
-	org, err := state.Org(ctx)
+	org, err := state.orgCompact(ctx)
 	if err != nil {
 		return "", err
 	}
@@ -118,7 +127,7 @@ func (state *launchState) PlanSummary(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	redisStr, err := describeRedisPlan(ctx, state.Plan.Redis, org)
+	redisStr, err := describeRedisPlan(ctx, state.Plan.Redis)
 	if err != nil {
 		return "", err
 	}
@@ -183,7 +192,7 @@ func (state *launchState) validateExtensions(ctx context.Context) error {
 	io := iostreams.FromContext(ctx)
 	noConfirm := !io.IsInteractive() || flag.GetBool(ctx, "now")
 
-	org, err := state.Org(ctx)
+	org, err := state.orgCompact(ctx)
 	if err != nil {
 		return err
 	}

internal/command/launch/state.go

@@ -97,7 +97,7 @@ func (state *launchState) EditInWebUi(ctx context.Context) error {
 				region = r
 			}
 
-			org, err := state.Org(ctx)
+			org, err := state.orgCompact(ctx)
 			if err != nil {
 				return fmt.Errorf("failed to get organization: %w", err)
 			}

internal/command/launch/webui.go

@@ -146,7 +146,7 @@ func Create(ctx context.Context, org *fly.Organization, name string, region *fly
 		}
 	}
 
-	plan, err := DeterminePlan(ctx, org)
+	plan, err := DeterminePlan(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -216,7 +216,7 @@ func ProvisionDatabase(ctx context.Context, org *fly.Organization, config RedisC
 	return &response.CreateAddOn.AddOn, nil
 }
 
-func DeterminePlan(ctx context.Context, org *fly.Organization) (*gql.ListAddOnPlansAddOnPlansAddOnPlanConnectionNodesAddOnPlan, error) {
+func DeterminePlan(ctx context.Context) (*gql.ListAddOnPlansAddOnPlansAddOnPlanConnectionNodesAddOnPlan, error) {
 	client := flyutil.ClientFromContext(ctx)
 
 	planId := redisPlanPayAsYouGo