test: make state config mockable

cmd/hcloud/main.go

@@ -5,7 +5,28 @@ import (
 	"os"
 
 	"github.com/hetznercloud/cli/internal/cli"
+	"github.com/hetznercloud/cli/internal/cmd/all"
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
+	"github.com/hetznercloud/cli/internal/cmd/completion"
+	"github.com/hetznercloud/cli/internal/cmd/context"
+	"github.com/hetznercloud/cli/internal/cmd/datacenter"
+	"github.com/hetznercloud/cli/internal/cmd/firewall"
+	"github.com/hetznercloud/cli/internal/cmd/floatingip"
+	"github.com/hetznercloud/cli/internal/cmd/image"
+	"github.com/hetznercloud/cli/internal/cmd/iso"
+	"github.com/hetznercloud/cli/internal/cmd/loadbalancer"
+	"github.com/hetznercloud/cli/internal/cmd/loadbalancertype"
+	"github.com/hetznercloud/cli/internal/cmd/location"
+	"github.com/hetznercloud/cli/internal/cmd/network"
+	"github.com/hetznercloud/cli/internal/cmd/placementgroup"
+	"github.com/hetznercloud/cli/internal/cmd/primaryip"
+	"github.com/hetznercloud/cli/internal/cmd/server"
+	"github.com/hetznercloud/cli/internal/cmd/servertype"
+	"github.com/hetznercloud/cli/internal/cmd/sshkey"
+	"github.com/hetznercloud/cli/internal/cmd/version"
+	"github.com/hetznercloud/cli/internal/cmd/volume"
 	"github.com/hetznercloud/cli/internal/state"
+	"github.com/hetznercloud/cli/internal/state/config"
 )
 
 func init() {
@@ -17,10 +38,10 @@ func init() {
 func main() {
 	configPath := os.Getenv("HCLOUD_CONFIG")
 	if configPath == "" {
-		configPath = state.DefaultConfigPath()
+		configPath = config.DefaultConfigPath()
 	}
 
-	cfg, err := state.ReadConfig(configPath)
+	cfg, err := config.ReadConfig(configPath)
 	if err != nil {
 		log.Fatalf("unable to read config file %q: %s\n", configPath, err)
 	}
@@ -31,6 +52,29 @@ func main() {
 	}
 
 	rootCommand := cli.NewRootCommand(s)
+	rootCommand.AddCommand(
+		all.NewCommand(s),
+		floatingip.NewCommand(s),
+		image.NewCommand(s),
+		server.NewCommand(s),
+		sshkey.NewCommand(s),
+		version.NewCommand(s),
+		completion.NewCommand(s),
+		servertype.NewCommand(s),
+		context.NewCommand(s),
+		datacenter.NewCommand(s),
+		location.NewCommand(s),
+		iso.NewCommand(s),
+		volume.NewCommand(s),
+		network.NewCommand(s),
+		loadbalancer.NewCommand(s),
+		loadbalancertype.NewCommand(s),
+		certificate.NewCommand(s),
+		firewall.NewCommand(s),
+		placementgroup.NewCommand(s),
+		primaryip.NewCommand(s),
+	)
+
 	if err := rootCommand.Execute(); err != nil {
 		log.Fatalln(err)
 	}

internal/cli/root.go

@@ -6,26 +6,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/hetznercloud/cli/internal/cmd/all"
-	"github.com/hetznercloud/cli/internal/cmd/certificate"
-	"github.com/hetznercloud/cli/internal/cmd/completion"
-	"github.com/hetznercloud/cli/internal/cmd/context"
-	"github.com/hetznercloud/cli/internal/cmd/datacenter"
-	"github.com/hetznercloud/cli/internal/cmd/firewall"
-	"github.com/hetznercloud/cli/internal/cmd/floatingip"
-	"github.com/hetznercloud/cli/internal/cmd/image"
-	"github.com/hetznercloud/cli/internal/cmd/iso"
-	"github.com/hetznercloud/cli/internal/cmd/loadbalancer"
-	"github.com/hetznercloud/cli/internal/cmd/loadbalancertype"
-	"github.com/hetznercloud/cli/internal/cmd/location"
-	"github.com/hetznercloud/cli/internal/cmd/network"
-	"github.com/hetznercloud/cli/internal/cmd/placementgroup"
-	"github.com/hetznercloud/cli/internal/cmd/primaryip"
-	"github.com/hetznercloud/cli/internal/cmd/server"
-	"github.com/hetznercloud/cli/internal/cmd/servertype"
-	"github.com/hetznercloud/cli/internal/cmd/sshkey"
-	"github.com/hetznercloud/cli/internal/cmd/version"
-	"github.com/hetznercloud/cli/internal/cmd/volume"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -40,28 +20,6 @@ func NewRootCommand(s state.State) *cobra.Command {
 		SilenceErrors:         true,
 		DisableFlagsInUseLine: true,
 	}
-	cmd.AddCommand(
-		all.NewCommand(s),
-		floatingip.NewCommand(s),
-		image.NewCommand(s),
-		server.NewCommand(s),
-		sshkey.NewCommand(s),
-		version.NewCommand(s),
-		completion.NewCommand(s),
-		servertype.NewCommand(s),
-		context.NewCommand(s),
-		datacenter.NewCommand(s),
-		location.NewCommand(s),
-		iso.NewCommand(s),
-		volume.NewCommand(s),
-		network.NewCommand(s),
-		loadbalancer.NewCommand(s),
-		loadbalancertype.NewCommand(s),
-		certificate.NewCommand(s),
-		firewall.NewCommand(s),
-		placementgroup.NewCommand(s),
-		primaryip.NewCommand(s),
-	)
 	cmd.PersistentFlags().Duration("poll-interval", 500*time.Millisecond, "Interval at which to poll information, for example action progress")
 	cmd.PersistentFlags().Bool("quiet", false, "Only print error messages")
 

internal/cmd/context/active.go

@@ -25,8 +25,8 @@ func runActive(s state.State, cmd *cobra.Command, _ []string) error {
 	if os.Getenv("HCLOUD_TOKEN") != "" {
 		_, _ = fmt.Fprintln(os.Stderr, "Warning: HCLOUD_TOKEN is set. The active context will have no effect.")
 	}
-	if cfg := s.Config(); cfg.ActiveContext != nil {
-		cmd.Println(cfg.ActiveContext.Name)
+	if ctx := s.Config().ActiveContext(); ctx != nil {
+		cmd.Println(ctx.Name)
 	}
 	return nil
 }

internal/cmd/context/create.go

@@ -12,6 +12,7 @@ import (
 	"golang.org/x/term"
 
 	"github.com/hetznercloud/cli/internal/state"
+	"github.com/hetznercloud/cli/internal/state/config"
 )
 
 func newCreateCommand(s state.State) *cobra.Command {
@@ -40,7 +41,7 @@ func runCreate(s state.State, cmd *cobra.Command, args []string) error {
 		return errors.New("name already used")
 	}
 
-	context := &state.ConfigContext{Name: name}
+	context := &config.Context{Name: name}
 
 	var token string
 
@@ -82,8 +83,8 @@ func runCreate(s state.State, cmd *cobra.Command, args []string) error {
 
 	context.Token = token
 
-	cfg.Contexts = append(cfg.Contexts, context)
-	cfg.ActiveContext = context
+	cfg.SetContexts(append(cfg.Contexts(), context))
+	cfg.SetActiveContext(context)
 
 	if err := cfg.Write(); err != nil {
 		return err

internal/cmd/context/delete.go

@@ -30,9 +30,9 @@ func runDelete(s state.State, _ *cobra.Command, args []string) error {
 	if context == nil {
 		return fmt.Errorf("context not found: %v", name)
 	}
-	if cfg.ActiveContext == context {
+	if cfg.ActiveContext() == context {
 		_, _ = fmt.Fprintln(os.Stderr, "Warning: You are deleting the currently active context. Please select a new active context.")
-		cfg.ActiveContext = nil
+		cfg.SetActiveContext(nil)
 	}
 	cfg.RemoveContext(context)
 	return cfg.Write()

internal/cmd/context/list.go

@@ -56,13 +56,13 @@ func runList(s state.State, cmd *cobra.Command, _ []string) error {
 		tw.WriteHeader(cols)
 	}
 	cfg := s.Config()
-	for _, context := range cfg.Contexts {
+	for _, context := range cfg.Contexts() {
 		presentation := ContextPresentation{
 			Name:   context.Name,
 			Token:  context.Token,
 			Active: " ",
 		}
-		if ctx := cfg.ActiveContext; ctx != nil && ctx.Name == context.Name {
+		if ctx := cfg.ActiveContext(); ctx != nil && ctx.Name == context.Name {
 			presentation.Active = "*"
 		}
 

internal/cmd/context/use.go

@@ -33,6 +33,6 @@ func runUse(s state.State, _ *cobra.Command, args []string) error {
 	if context == nil {
 		return fmt.Errorf("context not found: %v", name)
 	}
-	cfg.ActiveContext = context
+	cfg.SetActiveContext(context)
 	return cfg.Write()
 }