refactor: make root command mockable

cmd/hcloud/main.go

@@ -34,7 +34,7 @@ func main() {
 
 	cliState.ReadEnv()
 	apiClient := hcapi2.NewClient(cliState.Client())
-	rootCommand := cli.NewRootCommand(cliState, apiClient)
+	rootCommand := cli.NewRootCommand(cliState, cliState.Context, apiClient, cliState, cliState)
 	if err := rootCommand.Execute(); err != nil {
 		log.Fatalln(err)
 	}

internal/cli/root.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	stdcontext "context"
 	"os"
 	"time"
 
@@ -30,7 +31,9 @@ import (
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewRootCommand(state *state.State, client hcapi2.Client) *cobra.Command {
+func NewRootCommand(
+	state *state.State, ctx stdcontext.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "hcloud",
 		Short:                 "Hetzner Cloud CLI",
@@ -41,26 +44,26 @@ func NewRootCommand(state *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		all.NewCommand(state, client),
-		floatingip.NewCommand(state, client),
-		image.NewCommand(state, client),
-		server.NewCommand(state, client),
-		sshkey.NewCommand(state, client),
-		version.NewCommand(state),
-		completion.NewCommand(state),
-		servertype.NewCommand(state, client),
+		all.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		floatingip.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		image.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		server.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		sshkey.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		version.NewCommand(),
+		completion.NewCommand(),
+		servertype.NewCommand(ctx, client, tokenEnsurer),
 		context.NewCommand(state),
-		datacenter.NewCommand(state, client),
-		location.NewCommand(state, client),
-		iso.NewCommand(state, client),
-		volume.NewCommand(state, client),
-		network.NewCommand(state, client),
-		loadbalancer.NewCommand(state, client),
-		loadbalancertype.NewCommand(state, client),
-		certificate.NewCommand(state, client),
-		firewall.NewCommand(state, client),
-		placementgroup.NewCommand(state, client),
-		primaryip.NewCommand(state, client),
+		datacenter.NewCommand(ctx, client, tokenEnsurer),
+		location.NewCommand(ctx, client, tokenEnsurer),
+		iso.NewCommand(ctx, client, tokenEnsurer),
+		volume.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		network.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		loadbalancer.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		loadbalancertype.NewCommand(ctx, client, tokenEnsurer),
+		certificate.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		firewall.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		placementgroup.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
+		primaryip.NewCommand(ctx, client, tokenEnsurer, actionWaiter),
 	)
 	cmd.PersistentFlags().Duration("poll-interval", 500*time.Millisecond, "Interval at which to poll information, for example action progress")
 	cmd.SetOut(os.Stdout)

internal/cmd/all/all.go

@@ -1,13 +1,17 @@
 package all
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "all",
 		Short:                 "Commands that apply to all resources",
@@ -16,7 +20,7 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		listCmd.CobraCommand(cli.Context, client, cli, cli),
+		listCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
 	)
 	return cmd
 }

internal/cmd/certificate/certificate.go

@@ -1,13 +1,17 @@
 package certificate
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "certificate",
 		Short:                 "Manage certificates",
@@ -16,13 +20,13 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		CreateCmd.CobraCommand(cli.Context, client, cli, cli),
-		UpdateCmd.CobraCommand(cli.Context, client, cli),
-		LabelCmds.AddCobraCommand(cli.Context, client, cli),
-		LabelCmds.RemoveCobraCommand(cli.Context, client, cli),
-		DeleteCmd.CobraCommand(cli.Context, client, cli, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		CreateCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		UpdateCmd.CobraCommand(ctx, client, tokenEnsurer),
+		LabelCmds.AddCobraCommand(ctx, client, tokenEnsurer),
+		LabelCmds.RemoveCobraCommand(ctx, client, tokenEnsurer),
+		DeleteCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
 	)
 
 	return cmd

internal/cmd/completion/completion.go

@@ -5,8 +5,6 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-
-	"github.com/hetznercloud/cli/internal/state"
 )
 
 // const (
@@ -31,7 +29,7 @@ import (
 // 	source <(hcloud completion zsh)`
 // )
 
-func NewCommand(cli *state.State) *cobra.Command {
+func NewCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "completion [FLAGS] SHELL",
 		Short: "Output shell completion code for the specified shell",

internal/cmd/datacenter/datacenter.go

@@ -2,12 +2,15 @@ package datacenter
 
 import (
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "datacenter",
 		Short:                 "Manage datacenters",
@@ -16,8 +19,8 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
 	)
 	return cmd
 }

internal/cmd/firewall/firewall.go

@@ -1,13 +1,17 @@
 package firewall
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "firewall",
 		Short:                 "Manage Firewalls",
@@ -16,18 +20,18 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
-		CreateCmd.CobraCommand(cli.Context, client, cli, cli),
-		UpdateCmd.CobraCommand(cli.Context, client, cli),
-		ReplaceRulesCmd.CobraCommand(cli.Context, client, cli, cli),
-		DeleteCmd.CobraCommand(cli.Context, client, cli, cli),
-		AddRuleCmd.CobraCommand(cli.Context, client, cli, cli),
-		DeleteRuleCmd.CobraCommand(cli.Context, client, cli, cli),
-		ApplyToResourceCmd.CobraCommand(cli.Context, client, cli, cli),
-		RemoveFromResourceCmd.CobraCommand(cli.Context, client, cli, cli),
-		LabelCmds.AddCobraCommand(cli.Context, client, cli),
-		LabelCmds.RemoveCobraCommand(cli.Context, client, cli),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
+		CreateCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		UpdateCmd.CobraCommand(ctx, client, tokenEnsurer),
+		ReplaceRulesCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DeleteCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		AddRuleCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DeleteRuleCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		ApplyToResourceCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		RemoveFromResourceCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		LabelCmds.AddCobraCommand(ctx, client, tokenEnsurer),
+		LabelCmds.RemoveCobraCommand(ctx, client, tokenEnsurer),
 	)
 	return cmd
 }

internal/cmd/floatingip/floatingip.go

@@ -1,13 +1,17 @@
 package floatingip
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "floating-ip",
 		Short:                 "Manage Floating IPs",
@@ -16,18 +20,18 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		UpdateCmd.CobraCommand(cli.Context, client, cli),
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		CreateCmd.CobraCommand(cli.Context, client, cli, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
-		AssignCmd.CobraCommand(cli.Context, client, cli, cli),
-		UnassignCmd.CobraCommand(cli.Context, client, cli, cli),
-		DeleteCmd.CobraCommand(cli.Context, client, cli, cli),
-		EnableProtectionCmd.CobraCommand(cli.Context, client, cli, cli),
-		DisableProtectionCmd.CobraCommand(cli.Context, client, cli, cli),
-		LabelCmds.AddCobraCommand(cli.Context, client, cli),
-		LabelCmds.RemoveCobraCommand(cli.Context, client, cli),
-		SetRDNSCmd.CobraCommand(cli.Context, client, cli, cli),
+		UpdateCmd.CobraCommand(ctx, client, tokenEnsurer),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		CreateCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
+		AssignCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		UnassignCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DeleteCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		EnableProtectionCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DisableProtectionCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		LabelCmds.AddCobraCommand(ctx, client, tokenEnsurer),
+		LabelCmds.RemoveCobraCommand(ctx, client, tokenEnsurer),
+		SetRDNSCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
 	)
 	return cmd
 }

internal/cmd/image/image.go

@@ -1,13 +1,17 @@
 package image
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer, actionWaiter state.ActionWaiter,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "image",
 		Short:                 "Manage images",
@@ -16,14 +20,14 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		DeleteCmd.CobraCommand(cli.Context, client, cli, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
-		UpdateCmd.CobraCommand(cli.Context, client, cli),
-		EnableProtectionCmd.CobraCommand(cli.Context, client, cli, cli),
-		DisableProtectionCmd.CobraCommand(cli.Context, client, cli, cli),
-		LabelCmds.AddCobraCommand(cli.Context, client, cli),
-		LabelCmds.RemoveCobraCommand(cli.Context, client, cli),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		DeleteCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
+		UpdateCmd.CobraCommand(ctx, client, tokenEnsurer),
+		EnableProtectionCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		DisableProtectionCmd.CobraCommand(ctx, client, tokenEnsurer, actionWaiter),
+		LabelCmds.AddCobraCommand(ctx, client, tokenEnsurer),
+		LabelCmds.RemoveCobraCommand(ctx, client, tokenEnsurer),
 	)
 	return cmd
 }

internal/cmd/iso/iso.go

@@ -2,12 +2,15 @@ package iso
 
 import (
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
-func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
+func NewCommand(
+	ctx context.Context, client hcapi2.Client, tokenEnsurer state.TokenEnsurer,
+) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "iso",
 		Short:                 "Manage ISOs",
@@ -16,8 +19,8 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		ListCmd.CobraCommand(cli.Context, client, cli),
-		DescribeCmd.CobraCommand(cli.Context, client, cli),
+		ListCmd.CobraCommand(ctx, client, tokenEnsurer),
+		DescribeCmd.CobraCommand(ctx, client, tokenEnsurer),
 	)
 	return cmd
 }