Merge branch 'master' into alrs-cmd-err

api/resource_apps.go

@@ -3,7 +3,7 @@ package api
 func (client *Client) GetApps() ([]App, error) {
 	query := `
 		query {
-			apps(type: "container", first: 200) {
+			apps(type: "container", first: 400) {
 				nodes {
 					id
 					name

api/resource_monitoring.go

@@ -41,6 +41,7 @@ func (c *Client) GetAppStatus(appName string, showCompleted bool) (*AppStatus, e
 					canary
 					region
 					restarts
+					privateIP
 					checks {
 						status
 					}
@@ -81,6 +82,7 @@ func (c *Client) GetAllocationStatus(appName string, allocID string, logLimit in
 					canary
 					region
 					restarts
+					privateIP
 					checks {
 						status
 						output

api/resource_wireguard.go

@@ -0,0 +1,72 @@
+package api
+
+func (c *Client) GetWireGuardPeers(slug string) ([]*WireGuardPeer, error) {
+	req := c.NewRequest(`
+query($slug: String!) { 
+  organization(slug: $slug) { 
+    wireGuardPeers { 
+      nodes { 
+        id
+        name
+        pubkey
+        region
+        peerip
+      } 
+    }
+  } 
+}
+`)
+	req.Var("slug", slug)
+
+	data, err := c.Run(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return *data.Organization.WireGuardPeers.Nodes, nil
+}
+
+func (c *Client) CreateWireGuardPeer(org *Organization, region, name string) (*CreatedWireGuardPeer, error) {
+	req := c.NewRequest(`
+mutation($input: AddWireGuardPeerInput!) { 
+  addWireGuardPeer(input: $input) { 
+    pubkey
+    privkey
+    peerip
+    endpointip
+  } 
+}
+`)
+	req.Var("input", map[string]interface{}{
+		"organizationId": org.ID,
+		"region":         region,
+		"name":           name,
+	})
+
+	data, err := c.Run(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &data.AddWireGuardPeer, nil
+}
+
+func (c *Client) RemoveWireGuardPeer(org *Organization, name string) error {
+	req := c.NewRequest(`
+mutation($input: RemoveWireGuardPeerInput!) { 
+  removeWireGuardPeer(input: $input) { 
+    organization { 
+      id 
+    } 
+  }
+}
+`)
+	req.Var("input", map[string]interface{}{
+		"organizationId": org.ID,
+		"name":           name,
+	})
+
+	_, err := c.Run(req)
+
+	return err
+}

api/types.go

@@ -140,6 +140,20 @@ type Query struct {
 
 	CreateVolume CreateVolumePayload
 	DeleteVolume DeleteVolumePayload
+
+	AddWireGuardPeer CreatedWireGuardPeer
+
+	RemoveWireGuardPeer struct {
+		Organization Organization
+	}
+}
+
+// carries the privkey; this is the only time it can be retrieved
+type CreatedWireGuardPeer struct {
+	Pubkey     string
+	Privkey    string
+	Peerip     string
+	Endpointip string
 }
 
 type Definition map[string]interface{}
@@ -278,6 +292,14 @@ type Organization struct {
 			Node   *Domain
 		}
 	}
+
+	WireGuardPeers struct {
+		Nodes *[]*WireGuardPeer
+		Edges *[]*struct {
+			Cursor *string
+			Node   *WireGuardPeer
+		}
+	}
 }
 
 type OrganizationDetails struct {
@@ -576,6 +598,7 @@ type AllocationStatus struct {
 	WarningCheckCount  int
 	CriticalCheckCount int
 	Transitioning      bool
+	PrivateIP          string
 	RecentLogs         []LogEntry
 }
 
@@ -736,3 +759,11 @@ type ImportDnsWarning struct {
 	}
 	Message string
 }
+
+type WireGuardPeer struct {
+	ID     string
+	Pubkey string
+	Region string
+	Name   string
+	Peerip string
+}

builtinsupport/defaultbuiltins.go

@@ -40,7 +40,7 @@ CMD ["bundle", "exec", "rackup", "--host", "0.0.0.0", "-p", "8080"]
 		Details: `Uses Debian image from https://github.com/hayd/deno-docker.
 runs main.ts with --allow-net set and requires deps.ts for dependencies.
 Uses and exposes port 8080 internally.`,
-		Template: `FROM hayd/debian-deno:1.4.0
+		Template: `FROM hayd/debian-deno:{{.version}}
 ENV PORT=8080
 EXPOSE 8080
 WORKDIR /app
@@ -51,7 +51,8 @@ ADD . .
 RUN deno cache main.ts
 CMD ["run", {{range .perms}}"{{.}}",{{end}} "main.ts"]
 `,
-		Settings: []Setting{{"perms", []string{`--allow-net`}, "Array of command line settings to grant permissions, e.g. [\"--allow-net\",\"--allow-read\"] "}},
+		Settings: []Setting{{"perms", []string{`--allow-net`}, "Array of command line settings to grant permissions, e.g. [\"--allow-net\",\"--allow-read\"] "},
+			{"version", "1.5.4", "Version of Deno to use"}},
 	},
 	{Name: "go",
 		Description: "Go Builtin",

cmd/builtins.go

@@ -36,6 +36,11 @@ func runListBuiltins(commandContext *cmdctx.CmdContext) error {
 
 	sort.Slice(builtins, func(i, j int) bool { return builtins[i].Name < builtins[j].Name })
 
+	if commandContext.OutputJSON() {
+		commandContext.WriteJSON(builtins)
+		return nil
+	}
+
 	builtintable := helpers.MakeSimpleTable(commandContext.Out, []string{"Name", "Description", "Details"})
 
 	for _, builtin := range builtins {

cmd/dashboard.go

@@ -44,6 +44,6 @@ func runDashboardMetrics(ctx *cmdctx.CmdContext) error {
 }
 
 func runDashboardOpen(ctx *cmdctx.CmdContext, url string) error {
-	fmt.Println("Opening", docsURL)
-	return open.Run(docsURL)
+	fmt.Println("Opening", url)
+	return open.Run(url)
 }

cmd/deploy.go

@@ -20,7 +20,6 @@ import (
 	"github.com/superfly/flyctl/cmdctx"
 	"github.com/superfly/flyctl/docker"
 	"github.com/superfly/flyctl/docstrings"
-	"github.com/superfly/flyctl/flyname"
 	"github.com/superfly/flyctl/internal/builds"
 	"github.com/superfly/flyctl/internal/deployment"
 	"github.com/superfly/flyctl/terminal"
@@ -108,16 +107,6 @@ func runDeploy(commandContext *cmdctx.CmdContext) error {
 		}
 	}
 
-	appcheck, err := commandContext.Client.API().GetApp(commandContext.AppName)
-
-	if err != nil {
-		return err
-	}
-
-	if appcheck.Status == "suspended" {
-		return fmt.Errorf("app %s is currently suspended - resume it with "+flyname.Name()+" apps resume", commandContext.AppName)
-	}
-
 	var strategy = docker.DefaultDeploymentStrategy
 	if val, _ := commandContext.Config.GetString("strategy"); val != "" {
 		strategy, err = docker.ParseDeploymentStrategy(val)
@@ -128,28 +117,30 @@ func runDeploy(commandContext *cmdctx.CmdContext) error {
 
 	var image *docker.Image
 
-	configimageRef, _ := commandContext.Config.GetString("image")
-
-	var imageRef string
+	imageRef, _ := commandContext.Config.GetString("image")
 
-	if configimageRef != "" {
-		imageRef = configimageRef
-	} else if commandContext.AppConfig != nil &&
+	if imageRef == "" &&
+		commandContext.AppConfig != nil &&
 		commandContext.AppConfig.Build != nil &&
 		commandContext.AppConfig.Build.Image != "" {
 		imageRef = commandContext.AppConfig.Build.Image
 	}
 
 	if imageRef != "" {
 		// image specified, resolve it, tagging and pushing if docker+local
-
 		commandContext.Statusf("deploy", cmdctx.SINFO, "Deploying image: %s\n", imageRef)
 
-		img, err := op.ResolveImage(ctx, commandContext, imageRef)
+		img, err := op.ResolveImageLocally(ctx, commandContext, imageRef)
 		if err != nil {
 			return err
 		}
-		image = img
+		if img != nil {
+			image = img
+		} else {
+			image = &docker.Image{
+				Tag: imageRef,
+			}
+		}
 	} else {
 		// no image specified, build one
 		buildArgs := map[string]string{}
@@ -301,7 +292,7 @@ func runDeploy(commandContext *cmdctx.CmdContext) error {
 
 	commandContext.Status("deploy", cmdctx.SBEGIN, "Optimizing Image")
 
-	if err := op.OptimizeImage(*image); err != nil {
+	if err := op.OptimizeImage(image.Tag); err != nil {
 		return err
 	}
 	commandContext.Status("deploy", cmdctx.SDONE, "Done Optimizing Image")
@@ -312,7 +303,7 @@ func runDeploy(commandContext *cmdctx.CmdContext) error {
 		commandContext.Statusf("deploy", cmdctx.SDETAIL, "Deployment Strategy: %s", strategy)
 	}
 
-	release, err := op.Deploy(*image, strategy)
+	release, err := op.Deploy(image.Tag, strategy)
 	if err != nil {
 		return err
 	}
@@ -368,7 +359,6 @@ func watchDeployment(ctx context.Context, commandContext *cmdctx.CmdContext) err
 	}
 
 	monitor.DeploymentFailed = func(d *api.DeploymentStatus, failedAllocs []*api.AllocationStatus) error {
-
 		commandContext.Statusf("deploy", cmdctx.SDETAIL, "v%d %s - %s\n", d.Version, d.Status, d.Description)
 
 		if endmessage == "" && d.Status == "failed" {
@@ -390,7 +380,7 @@ func watchDeployment(ctx context.Context, commandContext *cmdctx.CmdContext) err
 				a := a
 				go func() {
 					defer wg.Done()
-					alloc, err := commandContext.Client.API().GetAllocationStatus(commandContext.AppName, a.ID, 20)
+					alloc, err := commandContext.Client.API().GetAllocationStatus(commandContext.AppName, a.ID, 30)
 					if err != nil {
 						commandContext.Status("deploy", cmdctx.SERROR, "Error fetching alloc", a.ID, err)
 						return
@@ -441,7 +431,6 @@ func watchDeployment(ctx context.Context, commandContext *cmdctx.CmdContext) err
 	}
 
 	monitor.DeploymentSucceeded = func(d *api.DeploymentStatus) error {
-
 		commandContext.Statusf("deploy", cmdctx.SDONE, "v%d deployed successfully\n", d.Version)
 		return nil
 	}