basic allocate and release of shared ips

superfly · Dec 7, 2022 · b078cd2 · b078cd2
1 parent 74443a0
commit b078cd2
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 18 deletions.
diff --git a/api/resource_ip_addresses.go b/api/resource_ip_addresses.go
@@ -1,6 +1,10 @@
 package api
 
-import "context"
+import (
+	"context"
+	"net"
+	"time"
+)
 
 func (c *Client) GetIPAddresses(ctx context.Context, appName string) ([]IPAddress, error) {
 	query := `
@@ -15,6 +19,7 @@ func (c *Client) GetIPAddresses(ctx context.Context, appName string) ([]IPAddres
 						createdAt
 					}
 				}
+				sharedIpAddress
 			}
 		}
 	`
@@ -27,7 +32,20 @@ func (c *Client) GetIPAddresses(ctx context.Context, appName string) ([]IPAddres
 		return nil, err
 	}
 
-	return data.App.IPAddresses.Nodes, nil
+	ips := data.App.IPAddresses.Nodes
+
+	// ugly hack
+	if data.App.SharedIPAddress != "" {
+		ips = append(ips, IPAddress{
+			ID:        "",
+			Address:   data.App.SharedIPAddress,
+			Type:      "shared_v4",
+			Region:    "",
+			CreatedAt: time.Time{},
+		})
+	}
+
+	return ips, nil
 }
 
 func (c *Client) FindIPAddress(ctx context.Context, appName string, address string) (*IPAddress, error) {
@@ -85,7 +103,30 @@ func (c *Client) AllocateIPAddress(ctx context.Context, appName string, addrType
 	return &data.AllocateIPAddress.IPAddress, nil
 }
 
-func (c *Client) ReleaseIPAddress(ctx context.Context, id string) error {
+func (c *Client) AllocateSharedIPAddress(ctx context.Context, appName string) (net.IP, error) {
+	query := `
+		mutation($input: AllocateIPAddressInput!) {
+			allocateIpAddress(input: $input) {
+				app {
+					sharedIpAddress
+				}
+			}
+		}
+	`
+
+	req := c.NewRequest(query)
+
+	req.Var("input", AllocateIPAddressInput{AppID: appName, Type: "shared_v4"})
+
+	data, err := c.RunWithContext(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return net.ParseIP(data.AllocateIPAddress.App.SharedIPAddress), nil
+}
+
+func (c *Client) ReleaseIPAddress(ctx context.Context, appName string, ip string) error {
 	query := `
 		mutation($input: ReleaseIPAddressInput!) {
 			releaseIpAddress(input: $input) {
@@ -96,7 +137,7 @@ func (c *Client) ReleaseIPAddress(ctx context.Context, id string) error {
 
 	req := c.NewRequest(query)
 
-	req.Var("input", ReleaseIPAddressInput{IPAddressID: id})
+	req.Var("input", ReleaseIPAddressInput{AppID: &appName, IP: &ip})
 
 	_, err := c.RunWithContext(ctx, req)
 	if err != nil {

diff --git a/api/types.go b/api/types.go
@@ -299,8 +299,9 @@ type App struct {
 	IPAddresses struct {
 		Nodes []IPAddress
 	}
-	IPAddress *IPAddress
-	Builds    struct {
+	SharedIPAddress string
+	IPAddress       *IPAddress
+	Builds          struct {
 		Nodes []Build
 	}
 	SourceBuilds struct {
@@ -885,7 +886,9 @@ type AllocateIPAddressInput struct {
 }
 
 type ReleaseIPAddressInput struct {
-	IPAddressID string `json:"ipAddressId"`
+	AppID       *string `json:"appId"`
+	IPAddressID *string `json:"ipAddressId"`
+	IP          *string `json:"ip"`
 }
 
 type ScaleAppInput struct {

diff --git a/cmd/certificates.go b/cmd/certificates.go
@@ -169,7 +169,7 @@ func reportNextStepCert(cmdCtx *cmdctx.CmdContext, hostname string, cert *api.Ap
 
 	// Extract the v4 and v6 addresses we have allocated
 	for _, x := range ips {
-		if x.Type == "v4" {
+		if x.Type == "v4" || x.Type == "shared_v4" {
 			ipV4 = x
 		} else if x.Type == "v6" {
 			ipV6 = x

diff --git a/internal/command/ips/allocate.go b/internal/command/ips/allocate.go
@@ -23,6 +23,11 @@ func newAllocatev4() *cobra.Command {
 	)
 
 	flag.Add(cmd,
+		flag.Bool{
+			Name:        "shared",
+			Description: "Allocates a shared IPv4",
+			Default:     false,
+		},
 		flag.App(),
 		flag.AppConfig(),
 		flag.Region(),
@@ -55,7 +60,11 @@ func newAllocatev6() *cobra.Command {
 }
 
 func runAllocateIPAddressV4(ctx context.Context) error {
-	return runAllocateIPAddress(ctx, "v4")
+	addrType := "v4"
+	if flag.GetBool(ctx, "shared") {
+		addrType = "shared_v4"
+	}
+	return runAllocateIPAddress(ctx, addrType)
 }
 
 func runAllocateIPAddressV6(ctx context.Context) error {
@@ -70,6 +79,18 @@ func runAllocateIPAddress(ctx context.Context, addrType string) error {
 	client := client.FromContext(ctx).API()
 
 	appName := app.NameFromContext(ctx)
+
+	if addrType == "shared_v4" {
+		ip, err := client.AllocateSharedIPAddress(ctx, appName)
+		if err != nil {
+			return err
+		}
+
+		renderSharedTable(ctx, ip)
+
+		return nil
+	}
+
 	region := flag.GetRegion(ctx)
 
 	ipAddress, err := client.AllocateIPAddress(ctx, appName, addrType, region)

diff --git a/internal/command/ips/release.go b/internal/command/ips/release.go
@@ -42,16 +42,11 @@ func runReleaseIPAddress(ctx context.Context) error {
 		return fmt.Errorf("Invalid IP address: '%s'", address)
 	}
 
-	ipAddress, err := client.FindIPAddress(ctx, appName, address)
-	if err != nil {
+	if err := client.ReleaseIPAddress(ctx, appName, address); err != nil {
 		return err
 	}
 
-	if err := client.ReleaseIPAddress(ctx, ipAddress.ID); err != nil {
-		return err
-	}
-
-	fmt.Printf("Released %s from %s\n", ipAddress.Address, appName)
+	fmt.Printf("Released %s from %s\n", address, appName)
 
 	return nil
 }
diff --git a/internal/command/ips/render.go b/internal/command/ips/render.go
@@ -2,6 +2,7 @@ package ips
 
 import (
 	"context"
+	"net"
 	"strings"
 
 	"github.com/superfly/flyctl/api"
@@ -21,7 +22,11 @@ func renderListTable(ctx context.Context, ipAddresses []api.IPAddress) {
 			ipType = "public"
 		}
 
-		rows = append(rows, []string{ipAddr.Type, ipAddr.Address, ipType, ipAddr.Region, presenters.FormatRelativeTime(ipAddr.CreatedAt)})
+		if ipAddr.Type == "shared_v4" {
+			rows = append(rows, []string{"v4", ipAddr.Address, "public (shared)", ipAddr.Region, ""})
+		} else {
+			rows = append(rows, []string{ipAddr.Type, ipAddr.Address, ipType, ipAddr.Region, presenters.FormatRelativeTime(ipAddr.CreatedAt)})
+		}
 	}
 
 	out := iostreams.FromContext(ctx).Out
@@ -49,3 +54,12 @@ func renderPrivateTable(ctx context.Context, allocations []*api.AllocationStatus
 	out := iostreams.FromContext(ctx).Out
 	render.Table(out, "", rows, "ID", "Region", "IP")
 }
+
+func renderSharedTable(ctx context.Context, ip net.IP) {
+	rows := make([][]string, 0, 1)
+
+	rows = append(rows, []string{"v4", ip.String(), "shared", "global"})
+
+	out := iostreams.FromContext(ctx).Out
+	render.Table(out, "", rows, "Version", "IP", "Type", "Region")
+}
diff --git a/internal/command/machine/launch.go b/internal/command/machine/launch.go
@@ -470,7 +470,7 @@ func setupHttpService(ctx context.Context, appConfig *app.Config, srcInfo *scann
 			if err != nil {
 				return
 			}
-			_, err = client.AllocateIPAddress(ctx, appConfig.AppName, "v4", "")
+			_, err = client.AllocateIPAddress(ctx, appConfig.AppName, "shared_v4", "")
 
 			if err != nil {
 				return err