Merge pull request superfly#1545 from superfly/fly-machine-checks

fly machine run/update hook into health checks if present
jlongtine · Jan 11, 2023 · f036e03 · f036e03
2 parents ebd92e6 + 247f21e
commit f036e03
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/internal/command/machine/run.go b/internal/command/machine/run.go
@@ -29,11 +29,13 @@ import (
 	mach "github.com/superfly/flyctl/internal/machine"
 	"github.com/superfly/flyctl/internal/prompt"
 	"github.com/superfly/flyctl/internal/state"
+	"github.com/superfly/flyctl/internal/watch"
 )
 
 var sharedFlags = flag.Set{
 	flag.App(),
 	flag.AppConfig(),
+	flag.Detach(),
 	flag.StringSlice{
 		Name:        "port",
 		Shorthand:   "p",
@@ -164,11 +166,12 @@ func newRun() *cobra.Command {
 
 func runMachineRun(ctx context.Context) error {
 	var (
-		appName = app.NameFromContext(ctx)
-		client  = client.FromContext(ctx).API()
-		io      = iostreams.FromContext(ctx)
-		err     error
-		app     *api.AppCompact
+		appName  = app.NameFromContext(ctx)
+		client   = client.FromContext(ctx).API()
+		io       = iostreams.FromContext(ctx)
+		colorize = io.ColorScheme()
+		err      error
+		app      *api.AppCompact
 	)
 
 	if appName == "" {
@@ -247,6 +250,15 @@ func runMachineRun(ctx context.Context) error {
 		return err
 	}
 
+	if !flag.GetDetach(ctx) {
+		fmt.Fprintln(io.Out, colorize.Green("==> "+"Monitoring health checks"))
+
+		if err := watch.MachinesChecks(ctx, []*api.Machine{machine}); err != nil {
+			return err
+		}
+		fmt.Fprintln(io.Out)
+	}
+
 	fmt.Fprintf(io.Out, "Machine started, you can connect via the following private ip\n")
 	fmt.Fprintf(io.Out, "  %s\n", privateIP)
 

diff --git a/internal/command/machine/update.go b/internal/command/machine/update.go
@@ -16,6 +16,7 @@ import (
 	"github.com/superfly/flyctl/internal/command/apps"
 	"github.com/superfly/flyctl/internal/flag"
 	mach "github.com/superfly/flyctl/internal/machine"
+	"github.com/superfly/flyctl/internal/watch"
 )
 
 func newUpdate() *cobra.Command {
@@ -50,9 +51,10 @@ func newUpdate() *cobra.Command {
 
 func runUpdate(ctx context.Context) (err error) {
 	var (
-		appName = app.NameFromContext(ctx)
-		io      = iostreams.FromContext(ctx)
-		client  = client.FromContext(ctx).API()
+		appName  = app.NameFromContext(ctx)
+		io       = iostreams.FromContext(ctx)
+		colorize = io.ColorScheme()
+		client   = client.FromContext(ctx).API()
 
 		machineID        = flag.FirstArg(ctx)
 		autoConfirm      = flag.GetBool(ctx, "yes")
@@ -124,6 +126,15 @@ func runUpdate(ctx context.Context) (err error) {
 		return err
 	}
 
+	if !flag.GetDetach(ctx) {
+		fmt.Fprintln(io.Out, colorize.Green("==> "+"Monitoring health checks"))
+
+		if err := watch.MachinesChecks(ctx, []*api.Machine{machine}); err != nil {
+			return err
+		}
+		fmt.Fprintln(io.Out)
+	}
+
 	fmt.Fprintf(io.Out, "\nMonitor machine status here:\nhttps://fly.io/apps/%s/machines/%s\n", app.Name, machine.ID)
 
 	return nil