Show action progress and check status everywhere (#104)

thcyron · nikolak · commit 9d5ba516fb84 · 2018-04-05T08:25:39.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## master
 
+* Show progress for every action
 * Show datacenter in `server list` and `server describe`
 
 ## v1.3.1
diff --git a/cli.go b/cli.go
@@ -127,7 +127,7 @@ func (c *CLI) Terminal() bool {
 }
 
 func (c *CLI) ActionProgress(ctx context.Context, action *hcloud.Action) error {
-	errCh, progressCh := waitAction(ctx, c.Client(), action)
+	progressCh, errCh := c.Client().Action.WatchProgress(ctx, action)
 
 	if c.Terminal() {
 		progress := uiprogress.New()
diff --git a/floatingip_assign.go b/floatingip_assign.go
@@ -43,10 +43,11 @@ func runFloatingIPAssign(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Floating IP %d assigned to server %s\n", floatingIP.ID, server.Name)
 	return nil
 }
diff --git a/floatingip_unassign.go b/floatingip_unassign.go
@@ -33,10 +33,11 @@ func runFloatingIPUnassign(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Floating IP %d unassigned\n", floatingIP.ID)
 	return nil
 }
diff --git a/server_disable_backup.go b/server_disable_backup.go
@@ -33,10 +33,11 @@ func runServerDisableBackup(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Backup disabled for server %s\n", server.Name)
 	return nil
 }
diff --git a/server_disable_rescue.go b/server_disable_rescue.go
@@ -33,10 +33,11 @@ func runServerDisableRescue(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Rescue disabled for server %s\n", server.Name)
 	return nil
 }
diff --git a/server_enable_backup.go b/server_enable_backup.go
@@ -40,10 +40,11 @@ func runServerEnableBackup(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Backup enabled for server %s\n", server.Name)
 	return nil
 }
diff --git a/server_enable_rescue.go b/server_enable_rescue.go
@@ -61,10 +61,11 @@ func runServerEnableRescue(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), result.Action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, result.Action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Rescue enabled for server %s with root password: %s\n", server.Name, result.RootPassword)
 	return nil
 }
diff --git a/server_poweroff.go b/server_poweroff.go
@@ -33,10 +33,11 @@ func runServerPoweroff(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s stopped\n", server.Name)
 	return nil
 }
diff --git a/server_poweron.go b/server_poweron.go
@@ -33,10 +33,11 @@ func runServerPoweron(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s started\n", server.Name)
 	return nil
 }
diff --git a/server_reboot.go b/server_reboot.go
@@ -33,10 +33,11 @@ func runServerReboot(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s rebooted\n", server.Name)
 	return nil
 }
diff --git a/server_rebuild.go b/server_rebuild.go
@@ -53,10 +53,11 @@ func runServerRebuild(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s rebuilt with image %s\n", server.Name, imageIDOrName)
 	return nil
 }
diff --git a/server_reset.go b/server_reset.go
@@ -33,10 +33,11 @@ func runServerReset(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s reset\n", server.Name)
 	return nil
 }
diff --git a/server_reset_password.go b/server_reset_password.go
@@ -33,10 +33,11 @@ func runServerResetPassword(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), result.Action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, result.Action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Password of server %s reset to: %s\n", server.Name, result.RootPassword)
 	return nil
 }
diff --git a/server_shutdown.go b/server_shutdown.go
@@ -33,10 +33,11 @@ func runServerShutdown(cli *CLI, cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	errCh, _ := waitAction(cli.Context, cli.Client(), action)
-	if err := <-errCh; err != nil {
+
+	if err := cli.ActionProgress(cli.Context, action); err != nil {
 		return err
 	}
+
 	fmt.Printf("Server %s shut down\n", server.Name)
 	return nil
 }
diff --git a/util.go b/util.go
@@ -1,10 +1,8 @@
 package cli
 
 import (
-	"context"
 	"time"
 
-	"github.com/hetznercloud/hcloud-go/hcloud"
 	"github.com/spf13/cobra"
 )
 
@@ -26,58 +24,6 @@ func datetime(t time.Time) string {
 	return t.Local().Format(time.UnixDate)
 }
 
-func waitAction(ctx context.Context, client *hcloud.Client, action *hcloud.Action) (<-chan error, <-chan int) {
-	errCh := make(chan error, 1)
-	progressCh := make(chan int)
-
-	go func() {
-		defer close(errCh)
-		defer close(progressCh)
-
-		ticker := time.NewTicker(100 * time.Millisecond)
-
-		sendProgress := func(p int) {
-			select {
-			case progressCh <- p:
-				break
-			default:
-				break
-			}
-		}
-
-		for {
-			select {
-			case <-ctx.Done():
-				errCh <- ctx.Err()
-				return
-			case <-ticker.C:
-				break
-			}
-
-			action, _, err := client.Action.GetByID(ctx, action.ID)
-			if err != nil {
-				errCh <- ctx.Err()
-				return
-			}
-
-			switch action.Status {
-			case hcloud.ActionStatusRunning:
-				sendProgress(action.Progress)
-				break
-			case hcloud.ActionStatusSuccess:
-				sendProgress(100)
-				errCh <- nil
-				return
-			case hcloud.ActionStatusError:
-				errCh <- action.Error()
-				return
-			}
-		}
-	}()
-
-	return errCh, progressCh
-}
-
 func chainRunE(fns ...func(cmd *cobra.Command, args []string) error) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		for _, fn := range fns {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (c *CLI) Terminal() bool {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func (c CLI) ActionProgress(ctx context.Context, action hcloud.Action) error {`
`130`		`- errCh, progressCh := waitAction(ctx, c.Client(), action)`
	`130`	`+ progressCh, errCh := c.Client().Action.WatchProgress(ctx, action)`
`131`	`131`
`132`	`132`	`if c.Terminal() {`
`133`	`133`	`progress := uiprogress.New()`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,11 @@ func runFloatingIPAssign(cli CLI, cmd cobra.Command, args []string) error {`
`43`	`43`	`if err != nil {`
`44`	`44`	`return err`
`45`	`45`	`}`
`46`		`- errCh, _ := waitAction(cli.Context, cli.Client(), action)`
`47`		`- if err := <-errCh; err != nil {`
	`46`	`+`
	`47`	`+ if err := cli.ActionProgress(cli.Context, action); err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`
	`50`	`+`
`50`	`51`	`fmt.Printf("Floating IP %d assigned to server %s\n", floatingIP.ID, server.Name)`
`51`	`52`	`return nil`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@ func runFloatingIPUnassign(cli CLI, cmd cobra.Command, args []string) error {`
`33`	`33`	`if err != nil {`
`34`	`34`	`return err`
`35`	`35`	`}`
`36`		`- errCh, _ := waitAction(cli.Context, cli.Client(), action)`
`37`		`- if err := <-errCh; err != nil {`
	`36`	`+`
	`37`	`+ if err := cli.ActionProgress(cli.Context, action); err != nil {`
`38`	`38`	`return err`
`39`	`39`	`}`
	`40`	`+`
`40`	`41`	`fmt.Printf("Floating IP %d unassigned\n", floatingIP.ID)`
`41`	`42`	`return nil`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@ func runServerDisableBackup(cli CLI, cmd cobra.Command, args []string) error {`
`33`	`33`	`if err != nil {`
`34`	`34`	`return err`
`35`	`35`	`}`
`36`		`- errCh, _ := waitAction(cli.Context, cli.Client(), action)`
`37`		`- if err := <-errCh; err != nil {`
	`36`	`+`
	`37`	`+ if err := cli.ActionProgress(cli.Context, action); err != nil {`
`38`	`38`	`return err`
`39`	`39`	`}`
	`40`	`+`
`40`	`41`	`fmt.Printf("Backup disabled for server %s\n", server.Name)`
`41`	`42`	`return nil`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,11 @@ func runServerEnableBackup(cli CLI, cmd cobra.Command, args []string) error {`
`40`	`40`	`if err != nil {`
`41`	`41`	`return err`
`42`	`42`	`}`
`43`		`- errCh, _ := waitAction(cli.Context, cli.Client(), action)`
`44`		`- if err := <-errCh; err != nil {`
	`43`	`+`
	`44`	`+ if err := cli.ActionProgress(cli.Context, action); err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
	`47`	`+`
`47`	`48`	`fmt.Printf("Backup enabled for server %s\n", server.Name)`
`48`	`49`	`return nil`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,11 @@ func runServerEnableRescue(cli CLI, cmd cobra.Command, args []string) error {`
`61`	`61`	`if err != nil {`
`62`	`62`	`return err`
`63`	`63`	`}`
`64`		`- errCh, _ := waitAction(cli.Context, cli.Client(), result.Action)`
`65`		`- if err := <-errCh; err != nil {`
	`64`	`+`
	`65`	`+ if err := cli.ActionProgress(cli.Context, result.Action); err != nil {`
`66`	`66`	`return err`
`67`	`67`	`}`
	`68`	`+`
`68`	`69`	`fmt.Printf("Rescue enabled for server %s with root password: %s\n", server.Name, result.RootPassword)`
`69`	`70`	`return nil`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@ func runServerPoweroff(cli CLI, cmd cobra.Command, args []string) error {`
`33`	`33`	`if err != nil {`
`34`	`34`	`return err`
`35`	`35`	`}`
`36`		`- errCh, _ := waitAction(cli.Context, cli.Client(), action)`
`37`		`- if err := <-errCh; err != nil {`
	`36`	`+`
	`37`	`+ if err := cli.ActionProgress(cli.Context, action); err != nil {`
`38`	`38`	`return err`
`39`	`39`	`}`
	`40`	`+`
`40`	`41`	`fmt.Printf("Server %s stopped\n", server.Name)`
`41`	`42`	`return nil`
`42`	`43`	`}`