less graphql on launch/deploy (#4656)

Author: lillianberryfly

agent/remote.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/pkg/errors"
-	"github.com/superfly/fly-go"
+	"github.com/superfly/fly-go/flaps"
 	"github.com/superfly/flyctl/internal/flyutil"
 	"github.com/superfly/flyctl/iostreams"
 )
 
-func BringUpAgent(ctx context.Context, client flyutil.Client, app *fly.AppCompact, network string, quiet bool) (*Client, Dialer, error) {
+func BringUpAgent(ctx context.Context, client flyutil.Client, app *flaps.App, quiet bool) (*Client, Dialer, error) {
 	io := iostreams.FromContext(ctx)
 
 	agentclient, err := Establish(ctx, client)
@@ -21,7 +21,7 @@ func BringUpAgent(ctx context.Context, client flyutil.Client, app *fly.AppCompac
 		return nil, nil, errors.Wrap(err, "can't establish agent")
 	}
 
-	dialer, err := agentclient.Dialer(ctx, slug, network)
+	dialer, err := agentclient.Dialer(ctx, slug, app.Network)
 	if err != nil {
 		captureError(ctx, err, "agent-remote", slug, name)
 		return nil, nil, fmt.Errorf("ssh: can't build tunnel for %s: %s\n", slug, err)
@@ -30,7 +30,7 @@ func BringUpAgent(ctx context.Context, client flyutil.Client, app *fly.AppCompac
 	if !quiet {
 		io.StartProgressIndicatorMsg("Connecting to tunnel")
 	}
-	if err := agentclient.WaitForTunnel(ctx, slug, network); err != nil {
+	if err := agentclient.WaitForTunnel(ctx, slug, app.Network); err != nil {
 		captureError(ctx, err, "agent-remote", slug, name)
 		return nil, nil, errors.Wrapf(err, "tunnel unavailable")
 	}

agent/server/server.go

@@ -21,6 +21,8 @@ import (
 	"github.com/superfly/flyctl/internal/flyutil"
 	"github.com/superfly/flyctl/internal/metrics/synthetics"
 	"github.com/superfly/flyctl/internal/sentry"
+	"github.com/superfly/flyctl/internal/uiex"
+	"github.com/superfly/flyctl/internal/uiexutil"
 	"github.com/superfly/flyctl/internal/wireguard"
 	"github.com/superfly/flyctl/wg"
 	"golang.org/x/sync/errgroup"
@@ -227,11 +229,16 @@ func (s *server) checkForConfigChange() (err error) {
 	return
 }
 
-func (s *server) buildTunnel(ctx context.Context, org *fly.Organization, reestablish bool, network string, client flyutil.Client) (tunnel *wg.Tunnel, err error) {
+func (s *server) buildTunnel(ctx context.Context, org *uiex.Organization, reestablish bool, network string, client flyutil.Client) (tunnel *wg.Tunnel, err error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	tk := tunnelKey{orgSlug: org.Slug, networkName: network}
+	// todo: handle this correctly everywhere
+	if network == "default" {
+		network = ""
+	}
+
+	tk := tunnelKey{orgSlug: org.RawSlug, networkName: network}
 
 	// not checking the region is intentional, it's static during the lifetime of the agent
 	if tunnel = s.tunnels[tk]; tunnel != nil && !reestablish {
@@ -308,6 +315,14 @@ func (s *server) tunnelFor(slug, network string) *wg.Tunnel {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	// todo: handle this correctly everywhere
+	if slug == "personal" {
+		panic("personal slug should not be found here")
+	}
+	if network == "default" {
+		network = ""
+	}
+
 	tk := tunnelKey{orgSlug: slug, networkName: network}
 
 	return s.tunnels[tk]
@@ -406,6 +421,17 @@ func (s *server) GetClient(ctx context.Context) flyutil.Client {
 	return flyutil.NewClientFromOptions(ctx, fly.ClientOptions{Tokens: s.tokens})
 }
 
+func (s *server) GetUiExClient(ctx context.Context) uiexutil.Client {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	client, err := uiexutil.NewClientWithOptions(ctx, uiex.NewClientOpts{Tokens: s.tokens})
+	if err != nil {
+		s.Logger.Fatal(err)
+	}
+	return client
+}
+
 // UpdateTokensFromClient replaces the server's tokens with those from the
 // client if the new ones seem better. Specifically, if the agent was started
 // with `FLY_API_TOKEN`, but a later client is using tokens form a config file.

agent/server/session.go

@@ -28,6 +28,8 @@ import (
 	"github.com/superfly/flyctl/internal/buildinfo"
 	"github.com/superfly/flyctl/internal/config"
 	"github.com/superfly/flyctl/internal/flyutil"
+	"github.com/superfly/flyctl/internal/uiex"
+	"github.com/superfly/flyctl/internal/uiexutil"
 )
 
 type id uint64
@@ -200,14 +202,14 @@ func (s *session) reestablish(ctx context.Context, args ...string) {
 
 var errNoSuchOrg = errors.New("no such organization")
 
-func (s *session) fetchOrg(ctx context.Context, slug string) (*fly.Organization, error) {
-	orgs, err := s.getClient(ctx).GetOrganizations(ctx)
+func (s *session) fetchOrg(ctx context.Context, slug string) (*uiex.Organization, error) {
+	orgs, err := s.getUiExClient(ctx).ListOrganizations(ctx, false)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, org := range orgs {
-		if org.Slug == slug {
+		if org.RawSlug == slug {
 			no := org // copy
 			return &no, nil
 		}
@@ -587,6 +589,18 @@ func (s *session) getClient(ctx context.Context) flyutil.Client {
 	return flyutil.NewClientFromOptions(ctx, fly.ClientOptions{Tokens: s.tokens})
 }
 
+func (s *session) getUiExClient(ctx context.Context) uiexutil.Client {
+	if s.tokens == nil {
+		return s.srv.GetUiExClient(ctx)
+	}
+
+	client, err := uiexutil.NewClientWithOptions(ctx, uiex.NewClientOpts{Tokens: s.tokens})
+	if err != nil {
+		s.logger.Fatal(err)
+	}
+	return client
+}
+
 func (s *session) error(err error) bool {
 	return s.reply("err", err.Error())
 }

flypg/cmd.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	fly "github.com/superfly/fly-go"
+	"github.com/superfly/fly-go/flaps"
 	"github.com/superfly/flyctl/agent"
 	"github.com/superfly/flyctl/internal/command/ssh"
 	"github.com/superfly/flyctl/internal/flag"
@@ -27,14 +27,20 @@ type commandResponse struct {
 
 type Command struct {
 	ctx    context.Context
-	app    *fly.AppCompact
+	app    *flaps.App
 	dialer agent.Dialer
 	io     *iostreams.IOStreams
+	orgID  string
 }
 
-func NewCommand(ctx context.Context, app *fly.AppCompact) (*Command, error) {
+func NewCommand(ctx context.Context, app *flaps.App) (*Command, error) {
 	client := flyutil.ClientFromContext(ctx)
 
+	org, err := client.GetOrganizationByApp(ctx, app.Name)
+	if err != nil {
+		return nil, fmt.Errorf("error getting organization: %w", err)
+	}
+
 	agentclient, err := agent.Establish(ctx, client)
 	if err != nil {
 		return nil, fmt.Errorf("error establishing agent: %w", err)
@@ -48,6 +54,7 @@ func NewCommand(ctx context.Context, app *fly.AppCompact) (*Command, error) {
 	return &Command{
 		ctx:    ctx,
 		app:    app,
+		orgID:  org.ID,
 		dialer: dialer,
 		io:     iostreams.FromContext(ctx),
 	}, nil
@@ -63,7 +70,7 @@ func (pc *Command) UpdateSettings(ctx context.Context, leaderIp string, config m
 	subCmd := fmt.Sprintf("update --patch '%s'", string(configBytes))
 	cmd := fmt.Sprintf("stolonctl-run %s", encodeCommand(subCmd))
 
-	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIp, cmd, ssh.DefaultSshUsername)
+	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIp, cmd, ssh.DefaultSshUsername, pc.orgID)
 	if err != nil {
 		return err
 	}
@@ -84,7 +91,7 @@ func (pc *Command) UnregisterMember(ctx context.Context, leaderIP string, standb
 	payload := encodeCommand(standbyNodeName)
 	cmd := fmt.Sprintf("pg_unregister %s", payload)
 
-	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIP, cmd, ssh.DefaultSshUsername)
+	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIP, cmd, ssh.DefaultSshUsername, pc.orgID)
 	if err != nil {
 		return err
 	}
@@ -110,7 +117,7 @@ func (pc *Command) ListEvents(ctx context.Context, leaderIP string, flagsName []
 		cmd += fmt.Sprintf("--%s %s ", flagName, flag.GetString(ctx, flagName))
 	}
 
-	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIP, cmd, ssh.DefaultSshUsername)
+	resp, err := ssh.RunSSHCommand(ctx, pc.app, pc.dialer, leaderIP, cmd, ssh.DefaultSshUsername, pc.orgID)
 	if err != nil {
 		return err
 	}

flypg/launcher.go

@@ -15,6 +15,7 @@ import (
 	"github.com/superfly/flyctl/internal/flapsutil"
 	"github.com/superfly/flyctl/internal/flyutil"
 	mach "github.com/superfly/flyctl/internal/machine"
+	"github.com/superfly/flyctl/internal/uiex"
 	"github.com/superfly/flyctl/internal/watch"
 
 	"github.com/superfly/fly-go/flaps"
@@ -38,15 +39,16 @@ const (
 )
 
 type Launcher struct {
-	client flyutil.Client
+	client      flyutil.Client
+	flapsClient flapsutil.FlapsClient
 }
 
 type CreateClusterInput struct {
 	AppName            string
 	ConsulURL          string
 	ImageRef           string
 	InitialClusterSize int
-	Organization       *fly.Organization
+	Organization       *uiex.Organization
 	Password           string
 	Region             string
 	VolumeSize         *int
@@ -66,9 +68,10 @@ type CreateClusterInput struct {
 	RestoreTargetInclusive    bool
 }
 
-func NewLauncher(client flyutil.Client) *Launcher {
+func NewLauncher(client flyutil.Client, flapsClient flapsutil.FlapsClient) *Launcher {
 	return &Launcher{
-		client: client,
+		client:      client,
+		flapsClient: flapsClient,
 	}
 }
 
@@ -91,10 +94,17 @@ func (l *Launcher) LaunchMachinesPostgres(ctx context.Context, config *CreateClu
 		config.Autostart = true
 	}
 
-	app, err := l.createApp(ctx, config)
+	fmt.Println("Creating app...")
+
+	app, err := l.flapsClient.CreateApp(ctx, flaps.CreateAppRequest{
+		Name:      config.AppName,
+		Org:       config.Organization.RawSlug,
+		AppRoleID: "postgres_cluster",
+	})
 	if err != nil {
 		return err
 	}
+
 	// In case the user hasn't specified a name, use the app name generated by the API
 	config.AppName = app.Name
 
@@ -112,10 +122,13 @@ func (l *Launcher) LaunchMachinesPostgres(ctx context.Context, config *CreateClu
 		config.ImageRef = imageRef
 	}
 
-	var addr *fly.IPAddress
+	var addr *flaps.IPAssignment
 
 	if config.Manager == ReplicationManager {
-		addr, err = l.client.AllocateIPAddress(ctx, config.AppName, "private_v6", config.Region, config.Organization, "")
+		addr, err = l.flapsClient.AssignIP(ctx, config.AppName, flaps.AssignIPRequest{
+			Type:         "private_v6",
+			Organization: config.Organization.RawSlug,
+		})
 		if err != nil {
 			return err
 		}
@@ -130,8 +143,8 @@ func (l *Launcher) LaunchMachinesPostgres(ctx context.Context, config *CreateClu
 	}
 
 	flapsClient, err := flapsutil.NewClientWithOptions(ctx, flaps.NewClientOpts{
-		AppCompact: app,
-		AppName:    app.Name,
+		AppData: app,
+		AppName: app.Name,
 	})
 	if err != nil {
 		return err
@@ -297,7 +310,7 @@ func (l *Launcher) LaunchMachinesPostgres(ctx context.Context, config *CreateClu
 	fmt.Fprintf(io.Out, "  Password:    %s\n", secrets["OPERATOR_PASSWORD"])
 	fmt.Fprintf(io.Out, "  Hostname:    %s.internal\n", config.AppName)
 	if addr != nil {
-		fmt.Fprintf(io.Out, "  Flycast:     %s\n", addr.Address)
+		fmt.Fprintf(io.Out, "  Flycast:     %s\n", addr.IP)
 	}
 	fmt.Fprintf(io.Out, "  Proxy port:  5432\n")
 	fmt.Fprintf(io.Out, "  Postgres port:  5433\n")
@@ -391,41 +404,6 @@ func (l *Launcher) getPostgresConfig(config *CreateClusterInput) *fly.MachineCon
 	return &machineConfig
 }
 
-func (l *Launcher) createApp(ctx context.Context, config *CreateClusterInput) (*fly.AppCompact, error) {
-	fmt.Println("Creating app...")
-	appInput := fly.CreateAppInput{
-		OrganizationID:  config.Organization.ID,
-		Name:            config.AppName,
-		PreferredRegion: &config.Region,
-		AppRoleID:       "postgres_cluster",
-	}
-
-	app, err := l.client.CreateApp(ctx, appInput)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := flapsutil.NewClientWithOptions(ctx, flaps.NewClientOpts{AppName: app.Name})
-	if err != nil {
-		return nil, err
-	} else if err := f.WaitForApp(ctx, app.Name); err != nil {
-		return nil, err
-	}
-
-	return &fly.AppCompact{
-		ID:       app.ID,
-		Name:     app.Name,
-		Status:   app.Status,
-		Deployed: app.Deployed,
-		Hostname: app.Hostname,
-		AppURL:   app.AppURL,
-		Organization: &fly.OrganizationBasic{
-			ID:   app.Organization.ID,
-			Slug: app.Organization.Slug,
-		},
-	}, nil
-}
-
 func (l *Launcher) setSecrets(ctx context.Context, config *CreateClusterInput) (map[string]string, error) {
 	flapsClient := flapsutil.ClientFromContext(ctx)
 	if flapsClient == nil {
@@ -475,7 +453,7 @@ func (l *Launcher) setSecrets(ctx context.Context, config *CreateClusterInput) (
 		validHours := 876600
 
 		app := fly.App{Name: config.AppName}
-		cert, err := l.client.IssueSSHCertificate(ctx, config.Organization, []string{"root", "fly", "postgres"}, []string{app.Name}, &validHours, pub)
+		cert, err := l.client.IssueSSHCertificate(ctx, config.Organization.ID, []string{"root", "fly", "postgres"}, []string{app.Name}, &validHours, pub)
 		if err != nil {
 			return nil, err
 		}

flypg/tigris.go

@@ -32,7 +32,7 @@ func CreateTigrisBucket(ctx context.Context, config *CreateClusterInput) error {
 	name := config.AppName + "-postgres"
 	params := extensions_core.ExtensionParams{
 		AppName:      config.AppName,
-		Organization: config.Organization,
+		OrgSlug:      config.Organization.RawSlug,
 		Provider:     "tigris",
 		OverrideName: &name,
 	}

go.mod

@@ -74,7 +74,7 @@ require (
 	github.com/spf13/pflag v1.0.9
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.11.1
-	github.com/superfly/fly-go v0.1.66
+	github.com/superfly/fly-go v0.1.67
 	github.com/superfly/graphql v0.2.6
 	github.com/superfly/lfsc-go v0.1.1
 	github.com/superfly/macaroon v0.3.0

go.sum

@@ -635,8 +635,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/superfly/fly-go v0.1.66 h1:3Kw2fF7y14UXgZ1uhNwSgDICI7JSiufqqC5++60wiu0=
-github.com/superfly/fly-go v0.1.66/go.mod h1:wpq4XNor10w9KurA15CBYRnhtT2mnemAXYHuqkhp2vI=
+github.com/superfly/fly-go v0.1.67 h1:MM2hSPsUenjUgod2/q2xfJg5idNYwCoI5/BWxLTRJys=
+github.com/superfly/fly-go v0.1.67/go.mod h1:2gCFoNR3iUELADGTJtbBoviMa2jlh2vlPK3cKUajOp8=
 github.com/superfly/graphql v0.2.6 h1:zppbodNerWecoXEdjkhrqaNaSjGqobhXNlViHFuZzb4=
 github.com/superfly/graphql v0.2.6/go.mod h1:CVfDl31srm8HnJ9udwLu6hFNUW/P6GUM2dKcG1YQ8jc=
 github.com/superfly/lfsc-go v0.1.1 h1:dGjLgt81D09cG+aR9lJZIdmonjZSR5zYCi7s54+ZU2Q=