feat: new action waiting progress

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/boumenot/gocover-cobertura v1.2.0
 	github.com/cheggaaa/pb/v3 v3.1.5
 	github.com/dustin/go-humanize v1.0.1
+	github.com/fatih/color v1.16.0
 	github.com/fatih/structs v1.1.0
 	github.com/goccy/go-yaml v1.11.3
 	github.com/golang/mock v1.6.0
@@ -24,7 +25,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.16.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect

internal/cmd/base/set_rdns.go

@@ -73,7 +73,7 @@ func (rc *SetRdnsCmd) Run(s state.State, cmd *cobra.Command, args []string) erro
 		return err
 	}
 
-	if err := s.ActionProgress(cmd, s, action); err != nil {
+	if err := s.WaitForActions(cmd, s, action); err != nil {
 		return err
 	}
 

internal/cmd/certificate/create.go

@@ -129,7 +129,7 @@ func createManaged(s state.State, cmd *cobra.Command) (*hcloud.Certificate, erro
 	if err != nil {
 		return nil, err
 	}
-	if err := s.ActionProgress(cmd, s, res.Action); err != nil {
+	if err := s.WaitForActions(cmd, s, res.Action); err != nil {
 		return nil, err
 	}
 	defer cmd.Printf("Certificate %d created\n", res.Certificate.ID)

internal/cmd/certificate/create_test.go

@@ -42,7 +42,7 @@ func TestCreateManaged(t *testing.T) {
 			Action: &hcloud.Action{ID: 321},
 		}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321})
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321})
 	fx.Client.CertificateClient.EXPECT().
 		GetByID(gomock.Any(), int64(123)).
 		Return(&hcloud.Certificate{
@@ -96,7 +96,7 @@ func TestCreateManagedJSON(t *testing.T) {
 			Action: &hcloud.Action{ID: 321},
 		}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321})
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321})
 	fx.Client.CertificateClient.EXPECT().
 		GetByID(gomock.Any(), int64(123)).
 		Return(&hcloud.Certificate{

internal/cmd/context/create.go

@@ -14,6 +14,7 @@ import (
 	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/cli/internal/state/config"
+	"github.com/hetznercloud/cli/internal/ui"
 )
 
 func newCreateCommand(s state.State) *cobra.Command {
@@ -30,7 +31,7 @@ func newCreateCommand(s state.State) *cobra.Command {
 
 func runCreate(s state.State, cmd *cobra.Command, args []string) error {
 	cfg := s.Config()
-	if !state.StdoutIsTerminal() {
+	if !ui.StdoutIsTerminal() {
 		return errors.New("context create is an interactive command")
 	}
 

internal/cmd/firewall/add_rule.go

@@ -110,7 +110,7 @@ var AddRuleCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.WaitForActions(cmd, s, actions); err != nil {
+		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
 

internal/cmd/firewall/apply_to_resource.go

@@ -81,7 +81,7 @@ var ApplyToResourceCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.WaitForActions(cmd, s, actions); err != nil {
+		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
 		cmd.Printf("Firewall %d applied\n", firewall.ID)

internal/cmd/firewall/create.go

@@ -82,7 +82,7 @@ var CreateCmd = base.CreateCmd{
 			return nil, nil, err
 		}
 
-		if err := s.WaitForActions(cmd, s, result.Actions); err != nil {
+		if err := s.WaitForActions(cmd, s, result.Actions...); err != nil {
 			return nil, nil, err
 		}
 

internal/cmd/firewall/delete_rule.go

@@ -118,7 +118,7 @@ var DeleteRuleCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.WaitForActions(cmd, s, actions); err != nil {
+		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
 		cmd.Printf("Firewall Rules for Firewall %d updated\n", firewall.ID)

internal/cmd/firewall/remove_from_resource.go

@@ -80,7 +80,7 @@ var RemoveFromResourceCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.WaitForActions(cmd, s, actions); err != nil {
+		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
 		cmd.Printf("Firewall %d applied\n", firewall.ID)

internal/cmd/firewall/replace_rules.go

@@ -93,7 +93,7 @@ var ReplaceRulesCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.WaitForActions(cmd, s, actions); err != nil {
+		if err := s.WaitForActions(cmd, s, actions...); err != nil {
 			return err
 		}
 		cmd.Printf("Firewall Rules for Firewall %d updated\n", firewall.ID)

internal/cmd/floatingip/assign.go

@@ -48,7 +48,7 @@ var AssignCmd = base.Cmd{
 			return err
 		}
 
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 

internal/cmd/floatingip/assign_test.go

@@ -28,7 +28,7 @@ func TestAssign(t *testing.T) {
 		Assign(gomock.Any(), &hcloud.FloatingIP{ID: 123}, &hcloud.Server{ID: 456}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"my-ip", "my-server"})

internal/cmd/floatingip/create.go

@@ -94,7 +94,7 @@ var CreateCmd = base.CreateCmd{
 		}
 
 		if result.Action != nil {
-			if err := s.ActionProgress(cmd, s, result.Action); err != nil {
+			if err := s.WaitForActions(cmd, s, result.Action); err != nil {
 				return nil, nil, err
 			}
 		}

internal/cmd/floatingip/create_test.go

@@ -116,14 +116,14 @@ func TestCreateProtection(t *testing.T) {
 				ID: 321,
 			},
 		}, nil, nil)
-	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321}).Return(nil)
+	fx.ActionWaiter.EXPECT().WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 321}).Return(nil)
 
 	fx.Client.FloatingIPClient.EXPECT().
 		ChangeProtection(gomock.Any(), floatingIp, hcloud.FloatingIPChangeProtectionOpts{
 			Delete: hcloud.Ptr(true),
 		}).
 		Return(&hcloud.Action{ID: 333}, nil, nil)
-	fx.ActionWaiter.EXPECT().ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 333}).Return(nil)
+	fx.ActionWaiter.EXPECT().WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 333}).Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"--name", "myFloatingIP", "--type", "ipv4", "--home-location", "fsn1", "--enable-protection", "delete"})
 

internal/cmd/floatingip/disable_protection_test.go

@@ -27,7 +27,7 @@ func TestDisableProtection(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"test", "delete"})

internal/cmd/floatingip/enable_protection.go

@@ -45,7 +45,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 		return err
 	}
 
-	if err := s.ActionProgress(cmd, s, action); err != nil {
+	if err := s.WaitForActions(cmd, s, action); err != nil {
 		return err
 	}
 

internal/cmd/floatingip/enable_protection_test.go

@@ -27,7 +27,7 @@ func TestEnableProtection(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"test", "delete"})

internal/cmd/floatingip/set_rdns_test.go

@@ -31,7 +31,7 @@ func TestSetRDNS(t *testing.T) {
 		ChangeDNSPtr(gomock.Any(), floatingIP, floatingIP.IP, hcloud.Ptr("example.com")).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"--hostname", "example.com", "test"})

internal/cmd/floatingip/unassign.go

@@ -36,7 +36,7 @@ var UnassignCmd = base.Cmd{
 			return err
 		}
 
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 

internal/cmd/floatingip/unassign_test.go

@@ -25,7 +25,7 @@ func TestUnassign(t *testing.T) {
 		Unassign(gomock.Any(), &hcloud.FloatingIP{ID: 123}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"my-ip"})

internal/cmd/image/disable_protection_test.go

@@ -24,7 +24,7 @@ func TestDisableProtection(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "delete"})

internal/cmd/image/enable_protection.go

@@ -47,7 +47,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 		return err
 	}
 
-	if err := s.ActionProgress(cmd, s, action); err != nil {
+	if err := s.WaitForActions(cmd, s, action); err != nil {
 		return err
 	}
 

internal/cmd/image/enable_protection_test.go

@@ -24,7 +24,7 @@ func TestEnableProtection(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "delete"})

internal/cmd/loadbalancer/add_service.go

@@ -208,7 +208,7 @@ var AddServiceCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 		cmd.Printf("Service was added to Load Balancer %d\n", loadBalancer.ID)

internal/cmd/loadbalancer/add_service_test.go

@@ -35,7 +35,7 @@ func TestAddService(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--protocol", "http", "--listen-port", "80", "--destination-port", "8080"})
@@ -87,7 +87,7 @@ func TestAddServiceWithHealthCheck(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{

internal/cmd/loadbalancer/add_target.go

@@ -95,7 +95,7 @@ var AddTargetCmd = base.Cmd{
 			return fmt.Errorf("specify one of --server, --label-selector, or --ip")
 		}
 
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 		cmd.Printf("Target added to Load Balancer %d\n", loadBalancer.ID)

internal/cmd/loadbalancer/add_target_test.go

@@ -32,7 +32,7 @@ func TestAddTargetServer(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--server", "my-server"})
@@ -61,7 +61,7 @@ func TestAddTargetLabelSelector(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--label-selector", "my-label"})
@@ -89,7 +89,7 @@ func TestAddTargetIP(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--ip", "192.168.2.1"})

internal/cmd/loadbalancer/attach_to_network.go

@@ -61,7 +61,7 @@ var AttachToNetworkCmd = base.Cmd{
 			return err
 		}
 
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 

internal/cmd/loadbalancer/attach_to_network_test.go

@@ -30,7 +30,7 @@ func TestAttachToNetwork(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--network", "my-network"})

internal/cmd/loadbalancer/change_algorithm.go

@@ -46,7 +46,7 @@ var ChangeAlgorithmCmd = base.Cmd{
 		if err != nil {
 			return err
 		}
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 		cmd.Printf("Algorithm for Load Balancer %d was changed\n", loadBalancer.ID)

internal/cmd/loadbalancer/change_algorithm_test.go

@@ -27,7 +27,7 @@ func TestChangeAlgorithm(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "--algorithm-type", "least_connections"})

internal/cmd/loadbalancer/change_type.go

@@ -52,7 +52,7 @@ var ChangeTypeCmd = base.Cmd{
 			return err
 		}
 
-		if err := s.ActionProgress(cmd, s, action); err != nil {
+		if err := s.WaitForActions(cmd, s, action); err != nil {
 			return err
 		}
 

internal/cmd/loadbalancer/change_type_test.go

@@ -32,7 +32,7 @@ func TestChangeType(t *testing.T) {
 		}).
 		Return(&hcloud.Action{ID: 123}, nil, nil)
 	fx.ActionWaiter.EXPECT().
-		ActionProgress(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
+		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 123}).
 		Return(nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"123", "lb21"})

internal/cmd/loadbalancer/create.go

@@ -80,7 +80,7 @@ var CreateCmd = base.CreateCmd{
 			return nil, nil, err
 		}
 
-		if err := s.ActionProgress(cmd, s, result.Action); err != nil {
+		if err := s.WaitForActions(cmd, s, result.Action); err != nil {
 			return nil, nil, err
 		}
 		loadBalancer, _, err := s.Client().LoadBalancer().GetByID(s, result.LoadBalancer.ID)