Add support for managing app-scoped egress IPs (#199)

Author: PeterCxy

resource_ip_addresses.go

@@ -151,6 +151,7 @@ func (c *Client) GetEgressIPAddresses(ctx context.Context, appName string) (map[
 								ip
 								version
 								region
+								updatedAt
 							}
 						}
 					}
@@ -227,3 +228,86 @@ func (c *Client) ReleaseIPAddress(ctx context.Context, appName string, ip string
 
 	return nil
 }
+
+func (c *Client) GetAppScopedEgressIPAddresses(ctx context.Context, appName string) (map[string][]EgressIPAddress, error) {
+	query := `
+		query ($appName: String!) {
+			app(name: $appName) {
+				egressIpAddresses {
+					nodes {
+						id
+						ip
+						version
+						region
+						updatedAt
+					}
+				}
+			}
+		}
+	`
+
+	req := c.NewRequest(query)
+	ctx = ctxWithAction(ctx, "get_app_scoped_egress_ip_addresses")
+	req.Var("appName", appName)
+
+	data, err := c.RunWithContext(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	ret := make(map[string][]EgressIPAddress)
+	for _, ip := range data.App.EgressIpAddresses.Nodes {
+		if _, ok := ret[ip.Region]; !ok {
+			ret[ip.Region] = make([]EgressIPAddress, 0)
+		}
+
+		ret[ip.Region] = append(ret[ip.Region], *ip)
+	}
+
+	return ret, nil
+}
+
+func (c *Client) AllocateAppScopedEgressIPAddress(ctx context.Context, appName string, region string) (net.IP, net.IP, error) {
+	query := `
+		mutation($input: AllocateEgressIPAddressInput!) {
+			allocateEgressIpAddress(input: $input) {
+				v4,
+				v6
+			}
+		}
+	`
+
+	req := c.NewRequest(query)
+	ctx = ctxWithAction(ctx, "allocate_app_scoped_egress_ip_address")
+	req.Var("input", AllocateEgressIPAddressInput{AppID: appName, Region: region})
+
+	data, err := c.RunWithContext(ctx, req)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return net.ParseIP(data.AllocateEgressIPAddress.V4), net.ParseIP(data.AllocateEgressIPAddress.V6), nil
+}
+
+func (c *Client) ReleaseAppScopedEgressIPAddress(ctx context.Context, appName, ip string) error {
+	query := `
+		mutation($input: ReleaseEgressIPAddressInput!) {
+			releaseEgressIpAddress(input: $input) {
+				v4
+				v6
+				clientMutationId
+			}
+		}
+	`
+
+	req := c.NewRequest(query)
+	ctx = ctxWithAction(ctx, "release_app_scoped_egress_ip_address")
+	req.Var("input", ReleaseEgressIPAddressInput{AppID: appName, IP: ip})
+
+	_, err := c.RunWithContext(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

schema.graphql

@@ -514,7 +514,12 @@ input AllocateEgressIPAddressInput {
   """
   ID of the machine
   """
-  machineId: ID!
+  machineId: ID
+
+  """
+  If set, allocate an app-scoped egress IP (instead of machine-scoped) in the region
+  """
+  region: String
 }
 
 """
@@ -865,6 +870,27 @@ type App implements Node {
   Find a deployment by id, defaults to latest
   """
   deploymentStatus(evaluationId: String, id: ID): DeploymentStatus
+  egressIpAddresses(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+  ): EgressIPAddressConnection!
 
   """
   Check if this app has a configured deployment source
@@ -3435,6 +3461,7 @@ input CreateUserSignupInput {
   clientMutationId: String
 
   """
+
   """
   path: [String!]
 
@@ -4323,6 +4350,8 @@ type DummyWireGuardPeerPayload {
 }
 
 type EgressIPAddress implements Node {
+  createdAt: ISO8601DateTime!
+
   """
   ID of the object.
   """
@@ -8374,10 +8403,15 @@ input ReleaseEgressIPAddressInput {
   """
   clientMutationId: String
 
+  """
+  The IP address to release (in the case of app-scoped egress IPs)
+  """
+  ip: String
+
   """
   The ID of the machine
   """
-  machineId: ID!
+  machineId: ID
 }
 
 """

types.go

@@ -245,6 +245,9 @@ type App struct {
 	IPAddresses struct {
 		Nodes []IPAddress
 	}
+	EgressIpAddresses struct {
+		Nodes []*EgressIPAddress
+	}
 	SharedIPAddress string
 	CNAMETarget     string
 	IPAddress       *IPAddress
@@ -482,10 +485,11 @@ type IPAddress struct {
 }
 
 type EgressIPAddress struct {
-	ID      string
-	IP      string
-	Version int
-	Region  string
+	ID        string
+	IP        string
+	Version   int
+	Region    string
+	UpdatedAt time.Time
 }
 
 type VMSize struct {
@@ -698,11 +702,17 @@ type AllocateIPAddressInput struct {
 type AllocateEgressIPAddressInput struct {
 	AppID     string `json:"appId"`
 	MachineID string `json:"machineId"`
+	// If set, allocates an app-scoped egress IP in the region
+	// Note that region cannot be set simultaneously with machine ID
+	Region string `json:"region"`
 }
 
 type ReleaseEgressIPAddressInput struct {
 	AppID     string `json:"appId"`
 	MachineID string `json:"machineId"`
+	// If set, releases the specified app-scoped egress IP
+	// Note that this cannot be set simultaneously with machine ID
+	IP string `json:"ip"`
 }
 
 type ReleaseIPAddressInput struct {