From c5d3950e77a1602978c86313cdf8231094b9d632 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:23:17 +0100
Subject: [PATCH 1/9] feat: add better error messages for missing positional
 arguments

---
 internal/cmd/all/all.go                       |  3 +-
 internal/cmd/base/delete.go                   |  2 +-
 internal/cmd/base/describe.go                 |  2 +-
 internal/cmd/base/labels.go                   |  4 +--
 internal/cmd/base/set_rdns.go                 |  2 +-
 internal/cmd/base/update.go                   |  2 +-
 internal/cmd/certificate/certificate.go       |  3 +-
 internal/cmd/certificate/create.go            |  2 +-
 internal/cmd/completion/completion.go         |  3 +-
 internal/cmd/context/active.go                |  3 +-
 internal/cmd/context/context.go               |  3 +-
 internal/cmd/context/create.go                |  3 +-
 internal/cmd/context/delete.go                |  3 +-
 internal/cmd/context/list.go                  |  2 +-
 internal/cmd/context/use.go                   |  3 +-
 internal/cmd/datacenter/datacenter.go         |  3 +-
 internal/cmd/firewall/add_rule.go             |  3 +-
 internal/cmd/firewall/apply_to_resource.go    |  3 +-
 internal/cmd/firewall/create.go               |  2 +-
 internal/cmd/firewall/delete_rule.go          |  3 +-
 internal/cmd/firewall/firewall.go             |  2 +-
 internal/cmd/firewall/remove_from_resource.go |  3 +-
 internal/cmd/firewall/replace_rules.go        |  3 +-
 internal/cmd/floatingip/assign.go             |  3 +-
 internal/cmd/floatingip/create.go             |  2 +-
 internal/cmd/floatingip/disable_protection.go |  3 +-
 internal/cmd/floatingip/enable_protection.go  |  3 +-
 internal/cmd/floatingip/floatingip.go         |  2 +-
 internal/cmd/floatingip/unassign.go           |  3 +-
 internal/cmd/image/disable_protection.go      |  3 +-
 internal/cmd/image/enable_protection.go       |  3 +-
 internal/cmd/image/image.go                   |  2 +-
 internal/cmd/iso/iso.go                       |  3 +-
 internal/cmd/loadbalancer/add_service.go      |  3 +-
 internal/cmd/loadbalancer/add_target.go       |  2 +-
 .../cmd/loadbalancer/attach_to_network.go     |  3 +-
 internal/cmd/loadbalancer/change_algorithm.go |  3 +-
 internal/cmd/loadbalancer/change_type.go      |  3 +-
 internal/cmd/loadbalancer/create.go           |  2 +-
 .../cmd/loadbalancer/detach_from_network.go   |  3 +-
 .../cmd/loadbalancer/disable_protection.go    |  3 +-
 .../loadbalancer/disable_public_interface.go  |  3 +-
 .../cmd/loadbalancer/enable_protection.go     |  3 +-
 .../loadbalancer/enable_public_interface.go   |  3 +-
 internal/cmd/loadbalancer/load_balancer.go    |  2 +-
 internal/cmd/loadbalancer/metrics.go          |  2 +-
 internal/cmd/loadbalancer/remove_target.go    |  2 +-
 internal/cmd/loadbalancer/update_service.go   |  3 +-
 .../loadbalancertype/load_balancer_type.go    |  3 +-
 internal/cmd/location/location.go             |  3 +-
 internal/cmd/network/add_route.go             |  3 +-
 internal/cmd/network/add_subnet.go            |  3 +-
 internal/cmd/network/change_ip_range.go       |  3 +-
 internal/cmd/network/create.go                |  2 +-
 internal/cmd/network/disable_protection.go    |  3 +-
 internal/cmd/network/enable_protection.go     |  3 +-
 .../cmd/network/expose_routes_to_vswitch.go   |  3 +-
 internal/cmd/network/network.go               |  2 +-
 internal/cmd/network/remove_route.go          |  3 +-
 internal/cmd/network/remove_subnet.go         |  3 +-
 internal/cmd/placementgroup/placementgroup.go |  3 +-
 internal/cmd/primaryip/assign.go              |  3 +-
 internal/cmd/primaryip/create.go              |  2 +-
 internal/cmd/primaryip/disable_protection.go  |  3 +-
 internal/cmd/primaryip/enable_protection.go   |  3 +-
 internal/cmd/primaryip/primaryip.go           |  2 +-
 internal/cmd/primaryip/unassign.go            |  3 +-
 internal/cmd/server/add_to_placement_group.go |  3 +-
 internal/cmd/server/attach_iso.go             |  3 +-
 internal/cmd/server/attach_to_network.go      |  3 +-
 internal/cmd/server/change_alias_ips.go       |  3 +-
 internal/cmd/server/change_type.go            |  3 +-
 internal/cmd/server/create_image.go           |  3 +-
 internal/cmd/server/detach_from_network.go    |  3 +-
 internal/cmd/server/detach_iso.go             |  3 +-
 internal/cmd/server/disable_backup.go         |  3 +-
 internal/cmd/server/disable_protection.go     |  3 +-
 internal/cmd/server/disable_rescue.go         |  3 +-
 internal/cmd/server/enable_backup.go          |  3 +-
 internal/cmd/server/enable_protection.go      |  3 +-
 internal/cmd/server/enable_rescue.go          |  3 +-
 internal/cmd/server/ip.go                     |  3 +-
 internal/cmd/server/metrics.go                |  2 +-
 internal/cmd/server/poweroff.go               |  3 +-
 internal/cmd/server/poweron.go                |  3 +-
 internal/cmd/server/reboot.go                 |  3 +-
 internal/cmd/server/rebuild.go                |  3 +-
 .../cmd/server/remove_from_placement_group.go |  3 +-
 internal/cmd/server/request_console.go        |  2 +-
 internal/cmd/server/reset.go                  |  3 +-
 internal/cmd/server/reset_password.go         |  3 +-
 internal/cmd/server/server.go                 |  2 +-
 internal/cmd/server/shutdown.go               |  3 +-
 internal/cmd/server/ssh.go                    |  3 +-
 internal/cmd/servertype/server_type.go        |  3 +-
 internal/cmd/sshkey/create.go                 |  2 +-
 internal/cmd/sshkey/sshkey.go                 |  3 +-
 internal/cmd/util/validation.go               | 36 +++++++++++++++++++
 internal/cmd/version/version.go               |  3 +-
 internal/cmd/volume/attach.go                 |  3 +-
 internal/cmd/volume/create.go                 |  2 +-
 internal/cmd/volume/detach.go                 |  3 +-
 internal/cmd/volume/disable_protection.go     |  3 +-
 internal/cmd/volume/enable_protection.go      |  3 +-
 internal/cmd/volume/resize.go                 |  3 +-
 internal/cmd/volume/volume.go                 |  2 +-
 106 files changed, 220 insertions(+), 106 deletions(-)
 create mode 100644 internal/cmd/util/validation.go

diff --git a/internal/cmd/all/all.go b/internal/cmd/all/all.go
index 08e11b91..87182076 100644
--- a/internal/cmd/all/all.go
+++ b/internal/cmd/all/all.go
@@ -3,6 +3,7 @@ package all
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "all",
 		Short:                 "Commands that apply to all resources",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
index 1f215805..4b2af6ee 100644
--- a/internal/cmd/base/delete.go
+++ b/internal/cmd/base/delete.go
@@ -34,7 +34,7 @@ func (dc *DeleteCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("delete %s<%s>", opts, strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/describe.go b/internal/cmd/base/describe.go
index 0e3b7bcd..b3ec5106 100644
--- a/internal/cmd/base/describe.go
+++ b/internal/cmd/base/describe.go
@@ -35,7 +35,7 @@ func (dc *DescribeCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("describe [options] <%s>", strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/labels.go b/internal/cmd/base/labels.go
index a3aa4dbd..4f3b7db7 100644
--- a/internal/cmd/base/labels.go
+++ b/internal/cmd/base/labels.go
@@ -29,7 +29,7 @@ func (lc *LabelCmds) AddCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("add-label [--overwrite] <%s> <label>...", strings.ToLower(lc.ResourceNameSingular)),
 		Short:                 lc.ShortDescriptionAdd,
-		Args:                  cobra.MinimumNArgs(2),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
@@ -91,7 +91,7 @@ func (lc *LabelCmds) RemoveCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   fmt.Sprintf("remove-label <%s> (--all | <label>...)", strings.ToLower(lc.ResourceNameSingular)),
 		Short: lc.ShortDescriptionRemove,
-		Args:  cobra.MinimumNArgs(1),
+		Args:  util.Validate,
 		ValidArgsFunction: cmpl.SuggestArgs(
 			cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client())),
 			cmpl.SuggestCandidatesCtx(func(_ *cobra.Command, args []string) []string {
diff --git a/internal/cmd/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index e189a127..e593918a 100644
--- a/internal/cmd/base/set_rdns.go
+++ b/internal/cmd/base/set_rdns.go
@@ -30,7 +30,7 @@ func (rc *SetRdnsCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", strings.ToLower(rc.ResourceNameSingular)),
 		Short:                 rc.ShortDescription,
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(rc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/update.go b/internal/cmd/base/update.go
index 48458d64..a40f2373 100644
--- a/internal/cmd/base/update.go
+++ b/internal/cmd/base/update.go
@@ -30,7 +30,7 @@ func (uc *UpdateCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("update [options] <%s>", strings.ToLower(uc.ResourceNameSingular)),
 		Short:                 uc.ShortDescription,
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(uc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/certificate/certificate.go b/internal/cmd/certificate/certificate.go
index b5519c59..121c09d0 100644
--- a/internal/cmd/certificate/certificate.go
+++ b/internal/cmd/certificate/certificate.go
@@ -3,6 +3,7 @@ package certificate
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "certificate",
 		Short:                 "Manage certificates",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/certificate/create.go b/internal/cmd/certificate/create.go
index c23f119f..5d8219e7 100644
--- a/internal/cmd/certificate/create.go
+++ b/internal/cmd/certificate/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--type managed --domain <domain> | --type uploaded --cert-file <file> --key-file <file>)",
 			Short: "Create or upload a Certificate",
-			Args:  cobra.ExactArgs(0),
+			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Certificate name (required)")
diff --git a/internal/cmd/completion/completion.go b/internal/cmd/completion/completion.go
index 2a1cf56b..e068adaa 100644
--- a/internal/cmd/completion/completion.go
+++ b/internal/cmd/completion/completion.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -94,7 +95,7 @@ and source this file from your PowerShell profile.
 
   PS> hcloud completion powershell > hcloud.ps1
 `,
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgs:             []string{"bash", "fish", "zsh", "powershell"},
 		DisableFlagsInUseLine: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/internal/cmd/context/active.go b/internal/cmd/context/active.go
index cacfe057..ea3e4065 100644
--- a/internal/cmd/context/active.go
+++ b/internal/cmd/context/active.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -13,7 +14,7 @@ func newActiveCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "active",
 		Short:                 "Show active context",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runActive),
diff --git a/internal/cmd/context/context.go b/internal/cmd/context/context.go
index ff49fd42..f5c020b4 100644
--- a/internal/cmd/context/context.go
+++ b/internal/cmd/context/context.go
@@ -3,6 +3,7 @@ package context
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "context",
 		Short:                 "Manage contexts",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/context/create.go b/internal/cmd/context/create.go
index c8d8d27e..f013797f 100644
--- a/internal/cmd/context/create.go
+++ b/internal/cmd/context/create.go
@@ -11,6 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/cli/internal/state/config"
 )
@@ -19,7 +20,7 @@ func newCreateCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "create <name>",
 		Short:                 "Create a new context",
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runCreate),
diff --git a/internal/cmd/context/delete.go b/internal/cmd/context/delete.go
index a26f5193..56a77530 100644
--- a/internal/cmd/context/delete.go
+++ b/internal/cmd/context/delete.go
@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/cli/internal/state/config"
 )
@@ -15,7 +16,7 @@ func newDeleteCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "delete <context>",
 		Short:                 "Delete a context",
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/context/list.go b/internal/cmd/context/list.go
index 955a4f9f..a1b191b5 100644
--- a/internal/cmd/context/list.go
+++ b/internal/cmd/context/list.go
@@ -30,7 +30,7 @@ func newListCommand(s state.State) *cobra.Command {
 			"Displays a list of contexts.",
 			listTableOutput.Columns(),
 		),
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runList),
diff --git a/internal/cmd/context/use.go b/internal/cmd/context/use.go
index a4e73ce5..6dbf0d64 100644
--- a/internal/cmd/context/use.go
+++ b/internal/cmd/context/use.go
@@ -7,6 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/cli/internal/state/config"
 )
@@ -15,7 +16,7 @@ func newUseCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "use <context>",
 		Short:                 "Use a context",
-		Args:                  cobra.ExactArgs(1),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/datacenter/datacenter.go b/internal/cmd/datacenter/datacenter.go
index a5e55d7a..3e21df03 100644
--- a/internal/cmd/datacenter/datacenter.go
+++ b/internal/cmd/datacenter/datacenter.go
@@ -3,6 +3,7 @@ package datacenter
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "datacenter",
 		Short:                 "Manage datacenters",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
index 5f26737d..3ab3e2a1 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var AddRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|udp|tcp|esp|gre> <firewall>",
 			Short:                 "Add a single rule to a firewall",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 2909d9f7..0a7ff16b 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var ApplyToResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "apply-to-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Applies a Firewall to a single resource",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/create.go b/internal/cmd/firewall/create.go
index 4971a019..b43e4d76 100644
--- a/internal/cmd/firewall/create.go
+++ b/internal/cmd/firewall/create.go
@@ -22,7 +22,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name>",
 			Short: "Create a Firewall",
-			Args:  cobra.NoArgs,
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Name")
 		cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/firewall/delete_rule.go b/internal/cmd/firewall/delete_rule.go
index 371a506e..8a44afae 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +20,7 @@ var DeleteRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "delete-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|esp|gre|udp|tcp> <firewall>",
 			Short:                 "Delete a single rule to a firewall",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/firewall.go b/internal/cmd/firewall/firewall.go
index a41be725..393d97a5 100644
--- a/internal/cmd/firewall/firewall.go
+++ b/internal/cmd/firewall/firewall.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "firewall",
 		Short:                 "Manage Firewalls",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index b8c59a15..77ab87fc 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var RemoveFromResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-from-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Removes a Firewall from a single resource",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/replace_rules.go b/internal/cmd/firewall/replace_rules.go
index c633fae5..83235125 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -22,7 +23,7 @@ var ReplaceRulesCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "replace-rules --rules-file <file> <firewall>",
 			Short:                 "Replaces all rules from a Firewall from a file",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/floatingip/assign.go b/internal/cmd/floatingip/assign.go
index 693ff309..692d383d 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var AssignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
-			Args:  cobra.ExactArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/floatingip/create.go b/internal/cmd/floatingip/create.go
index 464fe117..0a0fa1d9 100644
--- a/internal/cmd/floatingip/create.go
+++ b/internal/cmd/floatingip/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> (--home-location <location> | --server <server>)",
 			Short:                 "Create a Floating IP",
-			Args:                  cobra.NoArgs,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/floatingip/disable_protection.go b/internal/cmd/floatingip/disable_protection.go
index e1904cb6..9ee5b2c4 100644
--- a/internal/cmd/floatingip/disable_protection.go
+++ b/internal/cmd/floatingip/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <floating-ip> <protection-level>...",
 			Short: "Disable resource protection for a Floating IP",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/floatingip/enable_protection.go b/internal/cmd/floatingip/enable_protection.go
index 7dd12abc..5dd8a9f1 100644
--- a/internal/cmd/floatingip/enable_protection.go
+++ b/internal/cmd/floatingip/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -62,7 +63,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <floating-ip> <protection-level>...",
 			Short: "Enable resource protection for a Floating IP",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/floatingip/floatingip.go b/internal/cmd/floatingip/floatingip.go
index c9e8b36c..67d6e636 100644
--- a/internal/cmd/floatingip/floatingip.go
+++ b/internal/cmd/floatingip/floatingip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "floating-ip",
 		Short:                 "Manage Floating IPs",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/floatingip/unassign.go b/internal/cmd/floatingip/unassign.go
index 8746e5d7..bc6bead5 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var UnassignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.FloatingIP().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/image/disable_protection.go b/internal/cmd/image/disable_protection.go
index 9ae5631b..bb5941d9 100644
--- a/internal/cmd/image/disable_protection.go
+++ b/internal/cmd/image/disable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <image> <protection-level>...",
 			Short: "Disable resource protection for an image",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Image().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/image/enable_protection.go b/internal/cmd/image/enable_protection.go
index 064f8bb1..dcaeb8c9 100644
--- a/internal/cmd/image/enable_protection.go
+++ b/internal/cmd/image/enable_protection.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -65,7 +66,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <image> <protection-level>...",
 			Short: "Enable resource protection for an image",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Image().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/image/image.go b/internal/cmd/image/image.go
index cad8cf5d..028468de 100644
--- a/internal/cmd/image/image.go
+++ b/internal/cmd/image/image.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "image",
 		Short:                 "Manage images",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/iso/iso.go b/internal/cmd/iso/iso.go
index 9f115fce..ea51f822 100644
--- a/internal/cmd/iso/iso.go
+++ b/internal/cmd/iso/iso.go
@@ -3,6 +3,7 @@ package iso
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "iso",
 		Short:                 "Manage ISOs",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/add_service.go b/internal/cmd/loadbalancer/add_service.go
index bc0e0b8f..9fd89578 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var AddServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-service [options] (--protocol http | --protocol tcp --listen-port <1-65535> --destination-port <1-65535> | --protocol https --http-certificates <ids>) <load-balancer>",
 			Short:                 "Add a service to a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/add_target.go b/internal/cmd/loadbalancer/add_target.go
index f7106274..3b1c99a5 100644
--- a/internal/cmd/loadbalancer/add_target.go
+++ b/internal/cmd/loadbalancer/add_target.go
@@ -19,7 +19,7 @@ var AddTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-target [options] (--server <server> | --label-selector <label-selector> | --ip <ip>) <load-balancer>",
 			Short:                 "Add a target to a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/attach_to_network.go b/internal/cmd/loadbalancer/attach_to_network.go
index 8027e407..f58d500d 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [--ip <ip>] --network <network> <load-balancer>",
 			Short:                 "Attach a Load Balancer to a Network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_algorithm.go b/internal/cmd/loadbalancer/change_algorithm.go
index d5b82041..15f3811a 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var ChangeAlgorithmCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-algorithm --algorithm-type <round_robin|least_connections> <load-balancer>",
 			Short:                 "Changes the algorithm of a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_type.go b/internal/cmd/loadbalancer/change_type.go
index d402a028..ec864c37 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "change-type <load-balancer> <load-balancer-type>",
 			Short: "Change type of a Load Balancer",
-			Args:  cobra.ExactArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidatesF(client.LoadBalancerType().Names),
diff --git a/internal/cmd/loadbalancer/create.go b/internal/cmd/loadbalancer/create.go
index f688c8c2..b8649896 100644
--- a/internal/cmd/loadbalancer/create.go
+++ b/internal/cmd/loadbalancer/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --type <type>",
 			Short:                 "Create a Load Balancer",
-			Args:                  cobra.NoArgs,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/loadbalancer/detach_from_network.go b/internal/cmd/loadbalancer/detach_from_network.go
index 0815e000..725cefba 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <load-balancer>",
 			Short:                 "Detach a Load Balancer from a Network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/disable_protection.go b/internal/cmd/loadbalancer/disable_protection.go
index 17607297..a51bcd64 100644
--- a/internal/cmd/loadbalancer/disable_protection.go
+++ b/internal/cmd/loadbalancer/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <load-balancer> <protection-level>...",
 			Short: "Disable resource protection for a Load Balancer",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/loadbalancer/disable_public_interface.go b/internal/cmd/loadbalancer/disable_public_interface.go
index c2098173..4f3802d1 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-public-interface <load-balancer>",
 			Short:                 "Disable the public interface of a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/enable_protection.go b/internal/cmd/loadbalancer/enable_protection.go
index 806334ff..b69e567b 100644
--- a/internal/cmd/loadbalancer/enable_protection.go
+++ b/internal/cmd/loadbalancer/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -62,7 +63,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <load-balancer> <protection-level>...",
 			Short: "Enable resource protection for a Load Balancer",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/loadbalancer/enable_public_interface.go b/internal/cmd/loadbalancer/enable_public_interface.go
index 7edb03a7..41f0de10 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var EnablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "enable-public-interface <load-balancer>",
 			Short:                 "Enable the public interface of a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/load_balancer.go b/internal/cmd/loadbalancer/load_balancer.go
index 12a06463..ca3b20d2 100644
--- a/internal/cmd/loadbalancer/load_balancer.go
+++ b/internal/cmd/loadbalancer/load_balancer.go
@@ -12,7 +12,7 @@ func NewCommand(s state.State) *cobra.Command {
 		Use:                   "load-balancer",
 		Short:                 "Manage Load Balancers",
 		Aliases:               []string{"loadbalancer"},
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/metrics.go b/internal/cmd/loadbalancer/metrics.go
index af071be3..c2021791 100644
--- a/internal/cmd/loadbalancer/metrics.go
+++ b/internal/cmd/loadbalancer/metrics.go
@@ -33,7 +33,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <load-balancer>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/remove_target.go b/internal/cmd/loadbalancer/remove_target.go
index db349b59..062314dd 100644
--- a/internal/cmd/loadbalancer/remove_target.go
+++ b/internal/cmd/loadbalancer/remove_target.go
@@ -19,7 +19,7 @@ var RemoveTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-target [options] <load-balancer>",
 			Short:                 "Remove a target from a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/update_service.go b/internal/cmd/loadbalancer/update_service.go
index f51c6000..b8aa9c77 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var UpdateServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "update-service [options] --listen-port <1-65535> <load-balancer>",
 			Short:                 "Updates a service from a Load Balancer",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancertype/load_balancer_type.go b/internal/cmd/loadbalancertype/load_balancer_type.go
index a83884ba..afc16006 100644
--- a/internal/cmd/loadbalancertype/load_balancer_type.go
+++ b/internal/cmd/loadbalancertype/load_balancer_type.go
@@ -3,6 +3,7 @@ package loadbalancertype
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "load-balancer-type",
 		Short:                 "Manage Load Balancer types",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/location/location.go b/internal/cmd/location/location.go
index 826ed45e..80acec9a 100644
--- a/internal/cmd/location/location.go
+++ b/internal/cmd/location/location.go
@@ -3,6 +3,7 @@ package location
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "location",
 		Short:                 "Manage locations",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/add_route.go b/internal/cmd/network/add_route.go
index ef7cae14..7df079e6 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var AddRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Add a route to a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/add_subnet.go b/internal/cmd/network/add_subnet.go
index 307516c5..ea08fa15 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var AddSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-subnet [options] --type <cloud|server|vswitch> --network-zone <zone> <network>",
 			Short:                 "Add a subnet to a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/change_ip_range.go b/internal/cmd/network/change_ip_range.go
index 0200729d..38bfee64 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var ChangeIPRangeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-ip-range --ip-range <ip-range> <network>",
 			Short:                 "Change the IP range of a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/create.go b/internal/cmd/network/create.go
index 8b9d097a..a42e055d 100644
--- a/internal/cmd/network/create.go
+++ b/internal/cmd/network/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> --ip-range <ip-range>",
 			Short: "Create a network",
-			Args:  cobra.NoArgs,
+			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Network name (required)")
diff --git a/internal/cmd/network/disable_protection.go b/internal/cmd/network/disable_protection.go
index 17cecc20..3ca7cf2d 100644
--- a/internal/cmd/network/disable_protection.go
+++ b/internal/cmd/network/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <network> <protection-level>...",
 			Short: "Disable resource protection for a network",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Network().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/network/enable_protection.go b/internal/cmd/network/enable_protection.go
index 0e1de52e..04898211 100644
--- a/internal/cmd/network/enable_protection.go
+++ b/internal/cmd/network/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -62,7 +63,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <network> <protection-level>...",
 			Short: "Enable resource protection for a network",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Network().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/network/expose_routes_to_vswitch.go b/internal/cmd/network/expose_routes_to_vswitch.go
index 98ceccaf..cd9ed5ba 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var ExposeRoutesToVSwitchCmd = base.Cmd{
 			Use:                   "expose-routes-to-vswitch [--disable] <network>",
 			Short:                 "Expose routes to connected vSwitch",
 			Long:                  "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/network.go b/internal/cmd/network/network.go
index cf9a23c2..9f396553 100644
--- a/internal/cmd/network/network.go
+++ b/internal/cmd/network/network.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "network",
 		Short:                 "Manage networks",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/remove_route.go b/internal/cmd/network/remove_route.go
index 3fcde1b2..3819c46e 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var RemoveRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Remove a route from a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/remove_subnet.go b/internal/cmd/network/remove_subnet.go
index 411d5bff..c8f1b331 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var RemoveSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-subnet --ip-range <ip-range> <network>",
 			Short:                 "Remove a subnet from a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/placementgroup/placementgroup.go b/internal/cmd/placementgroup/placementgroup.go
index 2b739e29..f54277b1 100644
--- a/internal/cmd/placementgroup/placementgroup.go
+++ b/internal/cmd/placementgroup/placementgroup.go
@@ -3,6 +3,7 @@ package placementgroup
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "placement-group",
 		Short:                 "Manage Placement Groups",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/assign.go b/internal/cmd/primaryip/assign.go
index 0b46c431..7caa9891 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var AssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "assign --server <server> <primary-ip>",
 			Short: "Assign a Primary IP to an assignee (usually a server)",
-			Args:  cobra.ExactArgs(1),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index b0ba6418..141091f2 100644
--- a/internal/cmd/primaryip/create.go
+++ b/internal/cmd/primaryip/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> --name <name>",
 			Short:                 "Create a Primary IP",
-			Args:                  cobra.NoArgs,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/primaryip/disable_protection.go b/internal/cmd/primaryip/disable_protection.go
index bcd14c05..c3af73aa 100644
--- a/internal/cmd/primaryip/disable_protection.go
+++ b/internal/cmd/primaryip/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "disable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Disable Protection for a Primary IP",
-			Args:  cobra.MinimumNArgs(1),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/primaryip/enable_protection.go b/internal/cmd/primaryip/enable_protection.go
index 21e10b63..4b182c62 100644
--- a/internal/cmd/primaryip/enable_protection.go
+++ b/internal/cmd/primaryip/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -60,7 +61,7 @@ var EnableProtectionCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "enable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Enable Protection for a Primary IP",
-			Args:  cobra.MinimumNArgs(1),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/primaryip/primaryip.go b/internal/cmd/primaryip/primaryip.go
index 3af9eee2..e3ea80cf 100644
--- a/internal/cmd/primaryip/primaryip.go
+++ b/internal/cmd/primaryip/primaryip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "primary-ip",
 		Short:                 "Manage Primary IPs",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/unassign.go b/internal/cmd/primaryip/unassign.go
index c3ededdd..3c662076 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var UnAssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "unassign <primary-ip>",
 			Short: "Unassign a Primary IP from an assignee (usually a server)",
-			Args:  cobra.ExactArgs(1),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/server/add_to_placement_group.go b/internal/cmd/server/add_to_placement_group.go
index 44ec1809..b98c2fac 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var AddToPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "add-to-placement-group --placement-group <placement-group> <server>",
 			Short:             "Add a server to a placement group",
-			Args:              cobra.ExactArgs(1),
+			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/attach_iso.go b/internal/cmd/server/attach_iso.go
index 239e1331..e6fe3071 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +18,7 @@ var AttachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
-			Args:             cobra.ExactArgs(2),
+			Args:             util.Validate,
 			TraverseChildren: true,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/server/attach_to_network.go b/internal/cmd/server/attach_to_network.go
index 09d6a03a..b9704181 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [options] --network <network> <server>",
 			Short:                 "Attach a server to a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_alias_ips.go b/internal/cmd/server/change_alias_ips.go
index a8e81e08..3961291d 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var ChangeAliasIPsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-alias-ips [options] --network <network> <server>",
 			Short:                 "Change a server's alias IPs in a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_type.go b/internal/cmd/server/change_type.go
index 145503df..290235f6 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "change-type [--keep-disk] <server> <server-type>",
 			Short: "Change type of a server",
-			Args:  cobra.ExactArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidatesF(client.ServerType().Names),
diff --git a/internal/cmd/server/create_image.go b/internal/cmd/server/create_image.go
index ed54877c..9a4fe925 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var CreateImageCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "create-image [options] --type <snapshot|backup> <server>",
 			Short: "Create an image from a server",
-			Args:  cobra.ExactArgs(1),
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("type", "", "Image type (required)")
 		cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("backup", "snapshot"))
diff --git a/internal/cmd/server/detach_from_network.go b/internal/cmd/server/detach_from_network.go
index 6e69b02d..f3f866db 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <server>",
 			Short:                 "Detach a server from a network",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/detach_iso.go b/internal/cmd/server/detach_iso.go
index 0c2ca945..d80f6d35 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DetachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_backup.go b/internal/cmd/server/disable_backup.go
index c4aaf5f0..e8369e5b 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableBackupCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_protection.go b/internal/cmd/server/disable_protection.go
index 72221b49..8d72fd6e 100644
--- a/internal/cmd/server/disable_protection.go
+++ b/internal/cmd/server/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <server> <protection-level>...",
 			Short: "Disable resource protection for a server",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidates("delete", "rebuild"),
diff --git a/internal/cmd/server/disable_rescue.go b/internal/cmd/server/disable_rescue.go
index a2861593..043000d7 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableRescueCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_backup.go b/internal/cmd/server/enable_backup.go
index 97eba93f..bee3316a 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var EnableBackupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_protection.go b/internal/cmd/server/enable_protection.go
index 464420c7..d02535bf 100644
--- a/internal/cmd/server/enable_protection.go
+++ b/internal/cmd/server/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -64,7 +65,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <server> <protection-level>...",
 			Short: "Enable resource protection for a server",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidates("delete", "rebuild"),
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index e2124755..233382bc 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var EnableRescueCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ip.go b/internal/cmd/server/ip.go
index 3f08c13f..eef0544d 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var IPCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/metrics.go b/internal/cmd/server/metrics.go
index 0a390c76..b9440706 100644
--- a/internal/cmd/server/metrics.go
+++ b/internal/cmd/server/metrics.go
@@ -32,7 +32,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <server>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweroff.go b/internal/cmd/server/poweroff.go
index fd100934..92b13cc3 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var PoweroffCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweron.go b/internal/cmd/server/poweron.go
index 17720867..d203f2e6 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var PoweronCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reboot.go b/internal/cmd/server/reboot.go
index 37eb1918..ef2c73e4 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var RebootCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/rebuild.go b/internal/cmd/server/rebuild.go
index d74fc71d..c975d256 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +19,7 @@ var RebuildCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/remove_from_placement_group.go b/internal/cmd/server/remove_from_placement_group.go
index 49c63a09..04e0b306 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var RemoveFromPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "remove-from-placement-group <server>",
 			Short:             "Removes a server from a placement group",
-			Args:              cobra.ExactArgs(1),
+			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/request_console.go b/internal/cmd/server/request_console.go
index 44db5869..2cb02be4 100644
--- a/internal/cmd/server/request_console.go
+++ b/internal/cmd/server/request_console.go
@@ -18,7 +18,7 @@ var RequestConsoleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "request-console [options] <server>",
 			Short:                 "Request a WebSocket VNC console for a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset.go b/internal/cmd/server/reset.go
index 34c7dc78..6dbd2135 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var ResetCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset_password.go b/internal/cmd/server/reset_password.go
index f216fb5f..e8185eab 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var ResetPasswordCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset-password <server>",
 			Short:                 "Reset the root password of a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/server.go b/internal/cmd/server/server.go
index c44d8465..48adcf6c 100644
--- a/internal/cmd/server/server.go
+++ b/internal/cmd/server/server.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server",
 		Short:                 "Manage servers",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/server/shutdown.go b/internal/cmd/server/shutdown.go
index 8d696885..6a4c7a17 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -26,7 +27,7 @@ var ShutdownCmd = base.Cmd{
 			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ssh.go b/internal/cmd/server/ssh.go
index 8cc046c1..090905f5 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -20,7 +21,7 @@ var SSHCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
-			Args:                  cobra.MinimumNArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/servertype/server_type.go b/internal/cmd/servertype/server_type.go
index 67463b88..7a35bde8 100644
--- a/internal/cmd/servertype/server_type.go
+++ b/internal/cmd/servertype/server_type.go
@@ -3,6 +3,7 @@ package servertype
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server-type",
 		Short:                 "Manage server types",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/sshkey/create.go b/internal/cmd/sshkey/create.go
index 154e97b7..5512114b 100644
--- a/internal/cmd/sshkey/create.go
+++ b/internal/cmd/sshkey/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--public-key <key> | --public-key-from-file <file>)",
 			Short: "Create a SSH key",
-			Args:  cobra.NoArgs,
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Key name (required)")
 		_ = cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/sshkey/sshkey.go b/internal/cmd/sshkey/sshkey.go
index 54431c18..db94e14a 100644
--- a/internal/cmd/sshkey/sshkey.go
+++ b/internal/cmd/sshkey/sshkey.go
@@ -3,6 +3,7 @@ package sshkey
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 )
 
@@ -10,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "ssh-key",
 		Short:                 "Manage SSH keys",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/util/validation.go b/internal/cmd/util/validation.go
new file mode 100644
index 00000000..6acd4513
--- /dev/null
+++ b/internal/cmd/util/validation.go
@@ -0,0 +1,36 @@
+package util
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+var posArgRegex = regexp.MustCompile(`\[.*?]|\(.*?\)|--.*?<.*?>|<(.*?)>`) // matches all positional args in group 1
+
+func Validate(cmd *cobra.Command, args []string) error {
+	matches := posArgRegex.FindAllStringSubmatch(cmd.Use, -1)
+	var expected []string
+	for _, match := range matches {
+		if match[1] != "" {
+			expected = append(expected, match[1])
+		}
+	}
+	if len(args) > len(expected) {
+		return fmt.Errorf("expected exactly %d positional arguments, but got %d", len(expected), len(args))
+	}
+	for i := 0; i < len(expected); i++ {
+		if i >= len(args) {
+			idx := strings.Index(cmd.Use, "<"+expected[i]+">")
+			if idx != -1 {
+				_, _ = fmt.Fprintln(os.Stderr, cmd.Use)
+				_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", idx+1)+strings.Repeat("^", len(expected[i])))
+			}
+			return fmt.Errorf("expected argument %s at position %d", strings.ReplaceAll(expected[i], "-", " "), i+1)
+		}
+	}
+	return nil
+}
diff --git a/internal/cmd/version/version.go b/internal/cmd/version/version.go
index 0ff31a3d..48a1d1f3 100644
--- a/internal/cmd/version/version.go
+++ b/internal/cmd/version/version.go
@@ -3,6 +3,7 @@ package version
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/cli/internal/version"
 )
@@ -11,7 +12,7 @@ func NewCommand(_ state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "version",
 		Short:                 "Print version information",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		DisableFlagsInUseLine: true,
 		RunE:                  runVersion,
 	}
diff --git a/internal/cmd/volume/attach.go b/internal/cmd/volume/attach.go
index cd101e94..411a0f5a 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -17,7 +18,7 @@ var AttachCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/create.go b/internal/cmd/volume/create.go
index 1128c72e..b0c2e4c3 100644
--- a/internal/cmd/volume/create.go
+++ b/internal/cmd/volume/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --size <size>",
 			Short:                 "Create a volume",
-			Args:                  cobra.NoArgs,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index 3e7eedcc..3b41a602 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DetachCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/disable_protection.go b/internal/cmd/volume/disable_protection.go
index cd160b04..c66b7049 100644
--- a/internal/cmd/volume/disable_protection.go
+++ b/internal/cmd/volume/disable_protection.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <volume> <protection-level>...",
 			Short: "Disable resource protection for a volume",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Volume().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/volume/enable_protection.go b/internal/cmd/volume/enable_protection.go
index 70ecfd68..f9248c27 100644
--- a/internal/cmd/volume/enable_protection.go
+++ b/internal/cmd/volume/enable_protection.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -62,7 +63,7 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <volume> <protection-level>...",
 			Short: "Enable resource protection for a volume",
-			Args:  cobra.MinimumNArgs(2),
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Volume().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/volume/resize.go b/internal/cmd/volume/resize.go
index 709eb4ed..3b90a056 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
+	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -16,7 +17,7 @@ var ResizeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
-			Args:                  cobra.ExactArgs(1),
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/volume.go b/internal/cmd/volume/volume.go
index b6a74569..911c4898 100644
--- a/internal/cmd/volume/volume.go
+++ b/internal/cmd/volume/volume.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "volume",
 		Short:                 "Manage Volumes",
-		Args:                  cobra.NoArgs,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}

From e0e6b30be25bbff7d5228cf557ea93e83d8e9dee Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:52:41 +0100
Subject: [PATCH 2/9] fixes

---
 internal/cmd/all/all.go                              |  2 +-
 internal/cmd/base/delete.go                          |  2 +-
 internal/cmd/base/describe.go                        |  2 +-
 internal/cmd/base/set_rdns.go                        |  2 +-
 internal/cmd/base/update.go                          |  2 +-
 internal/cmd/certificate/certificate.go              |  2 +-
 internal/cmd/certificate/create.go                   |  2 +-
 internal/cmd/completion/completion.go                |  2 +-
 internal/cmd/context/active.go                       |  2 +-
 internal/cmd/context/context.go                      |  2 +-
 internal/cmd/context/create.go                       |  2 +-
 internal/cmd/context/delete.go                       |  2 +-
 internal/cmd/context/list.go                         |  2 +-
 internal/cmd/context/use.go                          |  2 +-
 internal/cmd/datacenter/datacenter.go                |  2 +-
 internal/cmd/firewall/add_rule.go                    |  2 +-
 internal/cmd/firewall/apply_to_resource.go           |  2 +-
 internal/cmd/firewall/create.go                      |  2 +-
 internal/cmd/firewall/delete_rule.go                 |  2 +-
 internal/cmd/firewall/firewall.go                    |  2 +-
 internal/cmd/firewall/remove_from_resource.go        |  2 +-
 internal/cmd/firewall/replace_rules.go               |  2 +-
 internal/cmd/floatingip/assign.go                    |  2 +-
 internal/cmd/floatingip/create.go                    |  2 +-
 internal/cmd/floatingip/floatingip.go                |  2 +-
 internal/cmd/floatingip/unassign.go                  |  2 +-
 internal/cmd/image/image.go                          |  2 +-
 internal/cmd/iso/iso.go                              |  2 +-
 internal/cmd/loadbalancer/add_service.go             |  2 +-
 internal/cmd/loadbalancer/add_target.go              |  2 +-
 internal/cmd/loadbalancer/attach_to_network.go       |  2 +-
 internal/cmd/loadbalancer/change_algorithm.go        |  2 +-
 internal/cmd/loadbalancer/change_type.go             |  2 +-
 internal/cmd/loadbalancer/create.go                  |  2 +-
 internal/cmd/loadbalancer/detach_from_network.go     |  2 +-
 .../cmd/loadbalancer/disable_public_interface.go     |  2 +-
 internal/cmd/loadbalancer/enable_public_interface.go |  2 +-
 internal/cmd/loadbalancer/load_balancer.go           |  2 +-
 internal/cmd/loadbalancer/metrics.go                 |  2 +-
 internal/cmd/loadbalancer/remove_target.go           |  2 +-
 internal/cmd/loadbalancer/update_service.go          |  2 +-
 internal/cmd/loadbalancertype/load_balancer_type.go  |  2 +-
 internal/cmd/location/location.go                    |  2 +-
 internal/cmd/network/add_route.go                    |  2 +-
 internal/cmd/network/add_subnet.go                   |  2 +-
 internal/cmd/network/change_ip_range.go              |  2 +-
 internal/cmd/network/create.go                       |  2 +-
 internal/cmd/network/expose_routes_to_vswitch.go     |  2 +-
 internal/cmd/network/network.go                      |  2 +-
 internal/cmd/network/remove_route.go                 |  2 +-
 internal/cmd/network/remove_subnet.go                |  2 +-
 internal/cmd/placementgroup/placementgroup.go        |  2 +-
 internal/cmd/primaryip/assign.go                     |  2 +-
 internal/cmd/primaryip/create.go                     |  2 +-
 internal/cmd/primaryip/primaryip.go                  |  2 +-
 internal/cmd/primaryip/unassign.go                   |  2 +-
 internal/cmd/server/add_to_placement_group.go        |  2 +-
 internal/cmd/server/attach_iso.go                    |  2 +-
 internal/cmd/server/attach_to_network.go             |  2 +-
 internal/cmd/server/change_alias_ips.go              |  2 +-
 internal/cmd/server/change_type.go                   |  2 +-
 internal/cmd/server/create_image.go                  |  2 +-
 internal/cmd/server/detach_from_network.go           |  2 +-
 internal/cmd/server/detach_iso.go                    |  2 +-
 internal/cmd/server/disable_backup.go                |  2 +-
 internal/cmd/server/disable_rescue.go                |  2 +-
 internal/cmd/server/enable_backup.go                 |  2 +-
 internal/cmd/server/enable_rescue.go                 |  2 +-
 internal/cmd/server/ip.go                            |  2 +-
 internal/cmd/server/metrics.go                       |  2 +-
 internal/cmd/server/poweroff.go                      |  2 +-
 internal/cmd/server/poweron.go                       |  2 +-
 internal/cmd/server/reboot.go                        |  2 +-
 internal/cmd/server/rebuild.go                       |  2 +-
 internal/cmd/server/remove_from_placement_group.go   |  2 +-
 internal/cmd/server/request_console.go               |  2 +-
 internal/cmd/server/reset.go                         |  2 +-
 internal/cmd/server/reset_password.go                |  2 +-
 internal/cmd/server/server.go                        |  2 +-
 internal/cmd/server/shutdown.go                      |  2 +-
 internal/cmd/server/ssh.go                           |  2 +-
 internal/cmd/servertype/server_type.go               |  2 +-
 internal/cmd/sshkey/create.go                        |  2 +-
 internal/cmd/sshkey/sshkey.go                        |  2 +-
 internal/cmd/util/validation.go                      | 12 ++++++++++--
 internal/cmd/version/version.go                      |  2 +-
 internal/cmd/volume/attach.go                        |  2 +-
 internal/cmd/volume/create.go                        |  2 +-
 internal/cmd/volume/detach.go                        |  2 +-
 internal/cmd/volume/resize.go                        |  2 +-
 internal/cmd/volume/volume.go                        |  2 +-
 91 files changed, 100 insertions(+), 92 deletions(-)

diff --git a/internal/cmd/all/all.go b/internal/cmd/all/all.go
index 87182076..1fde6f3b 100644
--- a/internal/cmd/all/all.go
+++ b/internal/cmd/all/all.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "all",
 		Short:                 "Commands that apply to all resources",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
index 4b2af6ee..838a05ef 100644
--- a/internal/cmd/base/delete.go
+++ b/internal/cmd/base/delete.go
@@ -34,7 +34,7 @@ func (dc *DeleteCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("delete %s<%s>", opts, strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/describe.go b/internal/cmd/base/describe.go
index b3ec5106..3ac581fb 100644
--- a/internal/cmd/base/describe.go
+++ b/internal/cmd/base/describe.go
@@ -35,7 +35,7 @@ func (dc *DescribeCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("describe [options] <%s>", strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index e593918a..dcfb0d8b 100644
--- a/internal/cmd/base/set_rdns.go
+++ b/internal/cmd/base/set_rdns.go
@@ -30,7 +30,7 @@ func (rc *SetRdnsCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", strings.ToLower(rc.ResourceNameSingular)),
 		Short:                 rc.ShortDescription,
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(rc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/update.go b/internal/cmd/base/update.go
index a40f2373..4b4c3f72 100644
--- a/internal/cmd/base/update.go
+++ b/internal/cmd/base/update.go
@@ -30,7 +30,7 @@ func (uc *UpdateCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("update [options] <%s>", strings.ToLower(uc.ResourceNameSingular)),
 		Short:                 uc.ShortDescription,
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(uc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/certificate/certificate.go b/internal/cmd/certificate/certificate.go
index 121c09d0..55747d68 100644
--- a/internal/cmd/certificate/certificate.go
+++ b/internal/cmd/certificate/certificate.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "certificate",
 		Short:                 "Manage certificates",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/certificate/create.go b/internal/cmd/certificate/create.go
index 5d8219e7..6f77f5bf 100644
--- a/internal/cmd/certificate/create.go
+++ b/internal/cmd/certificate/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--type managed --domain <domain> | --type uploaded --cert-file <file> --key-file <file>)",
 			Short: "Create or upload a Certificate",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 		}
 
 		cmd.Flags().String("name", "", "Certificate name (required)")
diff --git a/internal/cmd/completion/completion.go b/internal/cmd/completion/completion.go
index e068adaa..ee622fee 100644
--- a/internal/cmd/completion/completion.go
+++ b/internal/cmd/completion/completion.go
@@ -95,7 +95,7 @@ and source this file from your PowerShell profile.
 
   PS> hcloud completion powershell > hcloud.ps1
 `,
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgs:             []string{"bash", "fish", "zsh", "powershell"},
 		DisableFlagsInUseLine: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/internal/cmd/context/active.go b/internal/cmd/context/active.go
index ea3e4065..49566e6c 100644
--- a/internal/cmd/context/active.go
+++ b/internal/cmd/context/active.go
@@ -14,7 +14,7 @@ func newActiveCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "active",
 		Short:                 "Show active context",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runActive),
diff --git a/internal/cmd/context/context.go b/internal/cmd/context/context.go
index f5c020b4..e7d73da7 100644
--- a/internal/cmd/context/context.go
+++ b/internal/cmd/context/context.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "context",
 		Short:                 "Manage contexts",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/context/create.go b/internal/cmd/context/create.go
index f013797f..82cef48b 100644
--- a/internal/cmd/context/create.go
+++ b/internal/cmd/context/create.go
@@ -20,7 +20,7 @@ func newCreateCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "create <name>",
 		Short:                 "Create a new context",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runCreate),
diff --git a/internal/cmd/context/delete.go b/internal/cmd/context/delete.go
index 56a77530..aaa181d3 100644
--- a/internal/cmd/context/delete.go
+++ b/internal/cmd/context/delete.go
@@ -16,7 +16,7 @@ func newDeleteCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "delete <context>",
 		Short:                 "Delete a context",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/context/list.go b/internal/cmd/context/list.go
index a1b191b5..6cb35182 100644
--- a/internal/cmd/context/list.go
+++ b/internal/cmd/context/list.go
@@ -30,7 +30,7 @@ func newListCommand(s state.State) *cobra.Command {
 			"Displays a list of contexts.",
 			listTableOutput.Columns(),
 		),
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runList),
diff --git a/internal/cmd/context/use.go b/internal/cmd/context/use.go
index 6dbf0d64..e94aee59 100644
--- a/internal/cmd/context/use.go
+++ b/internal/cmd/context/use.go
@@ -16,7 +16,7 @@ func newUseCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "use <context>",
 		Short:                 "Use a context",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/datacenter/datacenter.go b/internal/cmd/datacenter/datacenter.go
index 3e21df03..ebfc89c8 100644
--- a/internal/cmd/datacenter/datacenter.go
+++ b/internal/cmd/datacenter/datacenter.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "datacenter",
 		Short:                 "Manage datacenters",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
index 3ab3e2a1..2c375dff 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -19,7 +19,7 @@ var AddRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|udp|tcp|esp|gre> <firewall>",
 			Short:                 "Add a single rule to a firewall",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 0a7ff16b..754345f9 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -18,7 +18,7 @@ var ApplyToResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "apply-to-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Applies a Firewall to a single resource",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/create.go b/internal/cmd/firewall/create.go
index b43e4d76..31bd59c4 100644
--- a/internal/cmd/firewall/create.go
+++ b/internal/cmd/firewall/create.go
@@ -22,7 +22,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name>",
 			Short: "Create a Firewall",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 		}
 		cmd.Flags().String("name", "", "Name")
 		cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/firewall/delete_rule.go b/internal/cmd/firewall/delete_rule.go
index 8a44afae..df987962 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -20,7 +20,7 @@ var DeleteRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "delete-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|esp|gre|udp|tcp> <firewall>",
 			Short:                 "Delete a single rule to a firewall",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/firewall.go b/internal/cmd/firewall/firewall.go
index 393d97a5..923d90cd 100644
--- a/internal/cmd/firewall/firewall.go
+++ b/internal/cmd/firewall/firewall.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "firewall",
 		Short:                 "Manage Firewalls",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index 77ab87fc..9ec20033 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -18,7 +18,7 @@ var RemoveFromResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-from-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Removes a Firewall from a single resource",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/replace_rules.go b/internal/cmd/firewall/replace_rules.go
index 83235125..979ba243 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -23,7 +23,7 @@ var ReplaceRulesCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "replace-rules --rules-file <file> <firewall>",
 			Short:                 "Replaces all rules from a Firewall from a file",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/floatingip/assign.go b/internal/cmd/floatingip/assign.go
index 692d383d..69e0a3f1 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -17,7 +17,7 @@ var AssignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/floatingip/create.go b/internal/cmd/floatingip/create.go
index 0a0fa1d9..eebb077d 100644
--- a/internal/cmd/floatingip/create.go
+++ b/internal/cmd/floatingip/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> (--home-location <location> | --server <server>)",
 			Short:                 "Create a Floating IP",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/floatingip/floatingip.go b/internal/cmd/floatingip/floatingip.go
index 67d6e636..b7dd74e1 100644
--- a/internal/cmd/floatingip/floatingip.go
+++ b/internal/cmd/floatingip/floatingip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "floating-ip",
 		Short:                 "Manage Floating IPs",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/floatingip/unassign.go b/internal/cmd/floatingip/unassign.go
index bc6bead5..d062a65a 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -17,7 +17,7 @@ var UnassignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.FloatingIP().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/image/image.go b/internal/cmd/image/image.go
index 028468de..b03477ab 100644
--- a/internal/cmd/image/image.go
+++ b/internal/cmd/image/image.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "image",
 		Short:                 "Manage images",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/iso/iso.go b/internal/cmd/iso/iso.go
index ea51f822..ab695bf2 100644
--- a/internal/cmd/iso/iso.go
+++ b/internal/cmd/iso/iso.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "iso",
 		Short:                 "Manage ISOs",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/add_service.go b/internal/cmd/loadbalancer/add_service.go
index 9fd89578..99f2e474 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -18,7 +18,7 @@ var AddServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-service [options] (--protocol http | --protocol tcp --listen-port <1-65535> --destination-port <1-65535> | --protocol https --http-certificates <ids>) <load-balancer>",
 			Short:                 "Add a service to a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/add_target.go b/internal/cmd/loadbalancer/add_target.go
index 3b1c99a5..af4a4698 100644
--- a/internal/cmd/loadbalancer/add_target.go
+++ b/internal/cmd/loadbalancer/add_target.go
@@ -19,7 +19,7 @@ var AddTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-target [options] (--server <server> | --label-selector <label-selector> | --ip <ip>) <load-balancer>",
 			Short:                 "Add a target to a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/attach_to_network.go b/internal/cmd/loadbalancer/attach_to_network.go
index f58d500d..2ccd372d 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -18,7 +18,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [--ip <ip>] --network <network> <load-balancer>",
 			Short:                 "Attach a Load Balancer to a Network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_algorithm.go b/internal/cmd/loadbalancer/change_algorithm.go
index 15f3811a..1822c1b3 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -18,7 +18,7 @@ var ChangeAlgorithmCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-algorithm --algorithm-type <round_robin|least_connections> <load-balancer>",
 			Short:                 "Changes the algorithm of a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_type.go b/internal/cmd/loadbalancer/change_type.go
index ec864c37..a6075659 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -18,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "change-type <load-balancer> <load-balancer-type>",
 			Short: "Change type of a Load Balancer",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidatesF(client.LoadBalancerType().Names),
diff --git a/internal/cmd/loadbalancer/create.go b/internal/cmd/loadbalancer/create.go
index b8649896..6d58ae1b 100644
--- a/internal/cmd/loadbalancer/create.go
+++ b/internal/cmd/loadbalancer/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --type <type>",
 			Short:                 "Create a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/loadbalancer/detach_from_network.go b/internal/cmd/loadbalancer/detach_from_network.go
index 725cefba..6c055025 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -18,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <load-balancer>",
 			Short:                 "Detach a Load Balancer from a Network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/disable_public_interface.go b/internal/cmd/loadbalancer/disable_public_interface.go
index 4f3802d1..f12296a7 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -17,7 +17,7 @@ var DisablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-public-interface <load-balancer>",
 			Short:                 "Disable the public interface of a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/enable_public_interface.go b/internal/cmd/loadbalancer/enable_public_interface.go
index 41f0de10..c39f8816 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -17,7 +17,7 @@ var EnablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "enable-public-interface <load-balancer>",
 			Short:                 "Enable the public interface of a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/load_balancer.go b/internal/cmd/loadbalancer/load_balancer.go
index ca3b20d2..a0b70f9e 100644
--- a/internal/cmd/loadbalancer/load_balancer.go
+++ b/internal/cmd/loadbalancer/load_balancer.go
@@ -12,7 +12,7 @@ func NewCommand(s state.State) *cobra.Command {
 		Use:                   "load-balancer",
 		Short:                 "Manage Load Balancers",
 		Aliases:               []string{"loadbalancer"},
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/metrics.go b/internal/cmd/loadbalancer/metrics.go
index c2021791..4af6c9ac 100644
--- a/internal/cmd/loadbalancer/metrics.go
+++ b/internal/cmd/loadbalancer/metrics.go
@@ -33,7 +33,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <load-balancer>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/remove_target.go b/internal/cmd/loadbalancer/remove_target.go
index 062314dd..0ec85a74 100644
--- a/internal/cmd/loadbalancer/remove_target.go
+++ b/internal/cmd/loadbalancer/remove_target.go
@@ -19,7 +19,7 @@ var RemoveTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-target [options] <load-balancer>",
 			Short:                 "Remove a target from a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/update_service.go b/internal/cmd/loadbalancer/update_service.go
index b8aa9c77..042ef217 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -19,7 +19,7 @@ var UpdateServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "update-service [options] --listen-port <1-65535> <load-balancer>",
 			Short:                 "Updates a service from a Load Balancer",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancertype/load_balancer_type.go b/internal/cmd/loadbalancertype/load_balancer_type.go
index afc16006..85445140 100644
--- a/internal/cmd/loadbalancertype/load_balancer_type.go
+++ b/internal/cmd/loadbalancertype/load_balancer_type.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "load-balancer-type",
 		Short:                 "Manage Load Balancer types",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/location/location.go b/internal/cmd/location/location.go
index 80acec9a..2cfb3e6b 100644
--- a/internal/cmd/location/location.go
+++ b/internal/cmd/location/location.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "location",
 		Short:                 "Manage locations",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/add_route.go b/internal/cmd/network/add_route.go
index 7df079e6..bb867b07 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -19,7 +19,7 @@ var AddRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Add a route to a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/add_subnet.go b/internal/cmd/network/add_subnet.go
index ea08fa15..5a3d17ea 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -19,7 +19,7 @@ var AddSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-subnet [options] --type <cloud|server|vswitch> --network-zone <zone> <network>",
 			Short:                 "Add a subnet to a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/change_ip_range.go b/internal/cmd/network/change_ip_range.go
index 38bfee64..e56a5de6 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -19,7 +19,7 @@ var ChangeIPRangeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-ip-range --ip-range <ip-range> <network>",
 			Short:                 "Change the IP range of a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/create.go b/internal/cmd/network/create.go
index a42e055d..2436061f 100644
--- a/internal/cmd/network/create.go
+++ b/internal/cmd/network/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> --ip-range <ip-range>",
 			Short: "Create a network",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 		}
 
 		cmd.Flags().String("name", "", "Network name (required)")
diff --git a/internal/cmd/network/expose_routes_to_vswitch.go b/internal/cmd/network/expose_routes_to_vswitch.go
index cd9ed5ba..cbe73757 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -19,7 +19,7 @@ var ExposeRoutesToVSwitchCmd = base.Cmd{
 			Use:                   "expose-routes-to-vswitch [--disable] <network>",
 			Short:                 "Expose routes to connected vSwitch",
 			Long:                  "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/network.go b/internal/cmd/network/network.go
index 9f396553..0e0860fb 100644
--- a/internal/cmd/network/network.go
+++ b/internal/cmd/network/network.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "network",
 		Short:                 "Manage networks",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/remove_route.go b/internal/cmd/network/remove_route.go
index 3819c46e..873d8a8f 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -19,7 +19,7 @@ var RemoveRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Remove a route from a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/remove_subnet.go b/internal/cmd/network/remove_subnet.go
index c8f1b331..981c33c1 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -19,7 +19,7 @@ var RemoveSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-subnet --ip-range <ip-range> <network>",
 			Short:                 "Remove a subnet from a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/placementgroup/placementgroup.go b/internal/cmd/placementgroup/placementgroup.go
index f54277b1..8baed0ce 100644
--- a/internal/cmd/placementgroup/placementgroup.go
+++ b/internal/cmd/placementgroup/placementgroup.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "placement-group",
 		Short:                 "Manage Placement Groups",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/assign.go b/internal/cmd/primaryip/assign.go
index 7caa9891..1b7127b7 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -18,7 +18,7 @@ var AssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "assign --server <server> <primary-ip>",
 			Short: "Assign a Primary IP to an assignee (usually a server)",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index 141091f2..13a7181b 100644
--- a/internal/cmd/primaryip/create.go
+++ b/internal/cmd/primaryip/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> --name <name>",
 			Short:                 "Create a Primary IP",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/primaryip/primaryip.go b/internal/cmd/primaryip/primaryip.go
index e3ea80cf..e0a344a1 100644
--- a/internal/cmd/primaryip/primaryip.go
+++ b/internal/cmd/primaryip/primaryip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "primary-ip",
 		Short:                 "Manage Primary IPs",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/unassign.go b/internal/cmd/primaryip/unassign.go
index 3c662076..749f4f0f 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -17,7 +17,7 @@ var UnAssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "unassign <primary-ip>",
 			Short: "Unassign a Primary IP from an assignee (usually a server)",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/server/add_to_placement_group.go b/internal/cmd/server/add_to_placement_group.go
index b98c2fac..ceb4577b 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -17,7 +17,7 @@ var AddToPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "add-to-placement-group --placement-group <placement-group> <server>",
 			Short:             "Add a server to a placement group",
-			Args:              util.Validate,
+			Args:              util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/attach_iso.go b/internal/cmd/server/attach_iso.go
index e6fe3071..638f6406 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -18,7 +18,7 @@ var AttachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
-			Args:             util.Validate,
+			Args:             util.ValidateExact,
 			TraverseChildren: true,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/server/attach_to_network.go b/internal/cmd/server/attach_to_network.go
index b9704181..3e1bf05c 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -19,7 +19,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [options] --network <network> <server>",
 			Short:                 "Attach a server to a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_alias_ips.go b/internal/cmd/server/change_alias_ips.go
index 3961291d..411c7138 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -19,7 +19,7 @@ var ChangeAliasIPsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-alias-ips [options] --network <network> <server>",
 			Short:                 "Change a server's alias IPs in a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_type.go b/internal/cmd/server/change_type.go
index 290235f6..6d143b20 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -18,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "change-type [--keep-disk] <server> <server-type>",
 			Short: "Change type of a server",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidatesF(client.ServerType().Names),
diff --git a/internal/cmd/server/create_image.go b/internal/cmd/server/create_image.go
index 9a4fe925..3fb004b1 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -18,7 +18,7 @@ var CreateImageCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "create-image [options] --type <snapshot|backup> <server>",
 			Short: "Create an image from a server",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 		}
 		cmd.Flags().String("type", "", "Image type (required)")
 		cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("backup", "snapshot"))
diff --git a/internal/cmd/server/detach_from_network.go b/internal/cmd/server/detach_from_network.go
index f3f866db..b5631888 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -18,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <server>",
 			Short:                 "Detach a server from a network",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/detach_iso.go b/internal/cmd/server/detach_iso.go
index d80f6d35..7ba772bc 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -17,7 +17,7 @@ var DetachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_backup.go b/internal/cmd/server/disable_backup.go
index e8369e5b..7a0d6449 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -17,7 +17,7 @@ var DisableBackupCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_rescue.go b/internal/cmd/server/disable_rescue.go
index 043000d7..8ed96bbb 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -17,7 +17,7 @@ var DisableRescueCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_backup.go b/internal/cmd/server/enable_backup.go
index bee3316a..00f92941 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -17,7 +17,7 @@ var EnableBackupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index 233382bc..49b7fe0b 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -18,7 +18,7 @@ var EnableRescueCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ip.go b/internal/cmd/server/ip.go
index eef0544d..8e91c14a 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -17,7 +17,7 @@ var IPCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/metrics.go b/internal/cmd/server/metrics.go
index b9440706..e224aa54 100644
--- a/internal/cmd/server/metrics.go
+++ b/internal/cmd/server/metrics.go
@@ -32,7 +32,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <server>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweroff.go b/internal/cmd/server/poweroff.go
index 92b13cc3..0a6b7c07 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -17,7 +17,7 @@ var PoweroffCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweron.go b/internal/cmd/server/poweron.go
index d203f2e6..2e6cd1d7 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -17,7 +17,7 @@ var PoweronCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reboot.go b/internal/cmd/server/reboot.go
index ef2c73e4..aeae1cc2 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -17,7 +17,7 @@ var RebootCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/rebuild.go b/internal/cmd/server/rebuild.go
index c975d256..39e4a719 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -19,7 +19,7 @@ var RebuildCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/remove_from_placement_group.go b/internal/cmd/server/remove_from_placement_group.go
index 04e0b306..a1415ed2 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -17,7 +17,7 @@ var RemoveFromPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "remove-from-placement-group <server>",
 			Short:             "Removes a server from a placement group",
-			Args:              util.Validate,
+			Args:              util.ValidateExact,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/request_console.go b/internal/cmd/server/request_console.go
index 2cb02be4..18862344 100644
--- a/internal/cmd/server/request_console.go
+++ b/internal/cmd/server/request_console.go
@@ -18,7 +18,7 @@ var RequestConsoleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "request-console [options] <server>",
 			Short:                 "Request a WebSocket VNC console for a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset.go b/internal/cmd/server/reset.go
index 6dbd2135..5c36ca9a 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -17,7 +17,7 @@ var ResetCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset_password.go b/internal/cmd/server/reset_password.go
index e8185eab..f1ad3805 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -17,7 +17,7 @@ var ResetPasswordCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset-password <server>",
 			Short:                 "Reset the root password of a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/server.go b/internal/cmd/server/server.go
index 48adcf6c..a4c234a7 100644
--- a/internal/cmd/server/server.go
+++ b/internal/cmd/server/server.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server",
 		Short:                 "Manage servers",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/server/shutdown.go b/internal/cmd/server/shutdown.go
index 6a4c7a17..4f25340c 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -27,7 +27,7 @@ var ShutdownCmd = base.Cmd{
 			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ssh.go b/internal/cmd/server/ssh.go
index 090905f5..21b98db0 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -21,7 +21,7 @@ var SSHCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/servertype/server_type.go b/internal/cmd/servertype/server_type.go
index 7a35bde8..1eecfba8 100644
--- a/internal/cmd/servertype/server_type.go
+++ b/internal/cmd/servertype/server_type.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server-type",
 		Short:                 "Manage server types",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/sshkey/create.go b/internal/cmd/sshkey/create.go
index 5512114b..b17b1f6e 100644
--- a/internal/cmd/sshkey/create.go
+++ b/internal/cmd/sshkey/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--public-key <key> | --public-key-from-file <file>)",
 			Short: "Create a SSH key",
-			Args:  util.Validate,
+			Args:  util.ValidateExact,
 		}
 		cmd.Flags().String("name", "", "Key name (required)")
 		_ = cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/sshkey/sshkey.go b/internal/cmd/sshkey/sshkey.go
index db94e14a..5e3b7998 100644
--- a/internal/cmd/sshkey/sshkey.go
+++ b/internal/cmd/sshkey/sshkey.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "ssh-key",
 		Short:                 "Manage SSH keys",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/util/validation.go b/internal/cmd/util/validation.go
index 6acd4513..c9069159 100644
--- a/internal/cmd/util/validation.go
+++ b/internal/cmd/util/validation.go
@@ -11,7 +11,15 @@ import (
 
 var posArgRegex = regexp.MustCompile(`\[.*?]|\(.*?\)|--.*?<.*?>|<(.*?)>`) // matches all positional args in group 1
 
+func ValidateExact(cmd *cobra.Command, args []string) error {
+	return validate(cmd, args, true)
+}
+
 func Validate(cmd *cobra.Command, args []string) error {
+	return validate(cmd, args, false)
+}
+
+func validate(cmd *cobra.Command, args []string, exact bool) error {
 	matches := posArgRegex.FindAllStringSubmatch(cmd.Use, -1)
 	var expected []string
 	for _, match := range matches {
@@ -19,7 +27,7 @@ func Validate(cmd *cobra.Command, args []string) error {
 			expected = append(expected, match[1])
 		}
 	}
-	if len(args) > len(expected) {
+	if len(args) > len(expected) && exact {
 		return fmt.Errorf("expected exactly %d positional arguments, but got %d", len(expected), len(args))
 	}
 	for i := 0; i < len(expected); i++ {
@@ -29,7 +37,7 @@ func Validate(cmd *cobra.Command, args []string) error {
 				_, _ = fmt.Fprintln(os.Stderr, cmd.Use)
 				_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", idx+1)+strings.Repeat("^", len(expected[i])))
 			}
-			return fmt.Errorf("expected argument %s at position %d", strings.ReplaceAll(expected[i], "-", " "), i+1)
+			return fmt.Errorf("expected argument %s at position %d", expected[i], i+1)
 		}
 	}
 	return nil
diff --git a/internal/cmd/version/version.go b/internal/cmd/version/version.go
index 48a1d1f3..3bca97b6 100644
--- a/internal/cmd/version/version.go
+++ b/internal/cmd/version/version.go
@@ -12,7 +12,7 @@ func NewCommand(_ state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "version",
 		Short:                 "Print version information",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		DisableFlagsInUseLine: true,
 		RunE:                  runVersion,
 	}
diff --git a/internal/cmd/volume/attach.go b/internal/cmd/volume/attach.go
index 411a0f5a..4a6c8445 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -18,7 +18,7 @@ var AttachCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/create.go b/internal/cmd/volume/create.go
index b0c2e4c3..a83d9267 100644
--- a/internal/cmd/volume/create.go
+++ b/internal/cmd/volume/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --size <size>",
 			Short:                 "Create a volume",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index 3b41a602..87643c98 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -17,7 +17,7 @@ var DetachCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/resize.go b/internal/cmd/volume/resize.go
index 3b90a056..4dc5847a 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -17,7 +17,7 @@ var ResizeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
-			Args:                  util.Validate,
+			Args:                  util.ValidateExact,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/volume.go b/internal/cmd/volume/volume.go
index 911c4898..e6b45ac3 100644
--- a/internal/cmd/volume/volume.go
+++ b/internal/cmd/volume/volume.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "volume",
 		Short:                 "Manage Volumes",
-		Args:                  util.Validate,
+		Args:                  util.ValidateExact,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}

From 71fdd49c254236b4358b8e9b5312494efa60bfe8 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:11:30 +0100
Subject: [PATCH 3/9] add tests

---
 internal/cmd/util/validation_test.go | 70 ++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 internal/cmd/util/validation_test.go

diff --git a/internal/cmd/util/validation_test.go b/internal/cmd/util/validation_test.go
new file mode 100644
index 00000000..9a56a54c
--- /dev/null
+++ b/internal/cmd/util/validation_test.go
@@ -0,0 +1,70 @@
+package util
+
+import (
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/hetznercloud/cli/internal/testutil"
+)
+
+func TestValidateExact(t *testing.T) {
+	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+		return ValidateExact(&cobra.Command{
+			Use: "test <arg1> <arg2>",
+		}, []string{"arg1", "arg2"})
+	})
+
+	assert.Empty(t, stdout)
+	assert.Empty(t, stderr)
+	assert.NoError(t, err)
+}
+
+func TestValidateExactMissing(t *testing.T) {
+	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+		return ValidateExact(&cobra.Command{
+			Use: "test <arg1> <arg2> <arg3>",
+		}, []string{"arg1", "arg2"})
+	})
+
+	assert.Empty(t, stdout)
+	assert.Equal(t, "test <arg1> <arg2> <arg3>\n                    ^^^^\n", stderr)
+	assert.EqualError(t, err, "expected argument arg3 at position 3")
+}
+
+func TestValidateExactTooMany(t *testing.T) {
+	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+		return ValidateExact(&cobra.Command{
+			Use: "test <arg1> <arg2>",
+		}, []string{"arg1", "arg2", "arg3"})
+	})
+
+	assert.Empty(t, stdout)
+	assert.Empty(t, stderr)
+	assert.EqualError(t, err, "expected exactly 2 positional arguments, but got 3")
+}
+
+func TestValidateTooMany(t *testing.T) {
+	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+		return Validate(&cobra.Command{
+			Use: "test <arg1> <arg2>",
+		}, []string{"arg1", "arg2", "arg3"})
+	})
+
+	assert.Empty(t, stdout)
+	assert.Empty(t, stderr)
+	assert.NoError(t, err)
+}
+
+func TestValidateExactComplexUsage(t *testing.T) {
+	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+		return ValidateExact(&cobra.Command{
+			Use: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+		}, []string{"arg1", "arg2"})
+	})
+
+	assert.Empty(t, stdout)
+	assert.Empty(t, stderr)
+	assert.NoError(t, err)
+}

From a0ad65150fe47eb77e519fb021fb1f7b311576d4 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:24:38 +0100
Subject: [PATCH 4/9] include full usage string

---
 internal/cmd/util/validation.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/internal/cmd/util/validation.go b/internal/cmd/util/validation.go
index c9069159..a6867092 100644
--- a/internal/cmd/util/validation.go
+++ b/internal/cmd/util/validation.go
@@ -20,6 +20,7 @@ func Validate(cmd *cobra.Command, args []string) error {
 }
 
 func validate(cmd *cobra.Command, args []string, exact bool) error {
+
 	matches := posArgRegex.FindAllStringSubmatch(cmd.Use, -1)
 	var expected []string
 	for _, match := range matches {
@@ -30,11 +31,19 @@ func validate(cmd *cobra.Command, args []string, exact bool) error {
 	if len(args) > len(expected) && exact {
 		return fmt.Errorf("expected exactly %d positional arguments, but got %d", len(expected), len(args))
 	}
+
+	use := cmd.Use
+	paren := cmd.Parent()
+	for paren != nil {
+		use = paren.Use + " " + use
+		paren = paren.Parent()
+	}
+
 	for i := 0; i < len(expected); i++ {
 		if i >= len(args) {
-			idx := strings.Index(cmd.Use, "<"+expected[i]+">")
+			idx := strings.Index(use, "<"+expected[i]+">")
 			if idx != -1 {
-				_, _ = fmt.Fprintln(os.Stderr, cmd.Use)
+				_, _ = fmt.Fprintln(os.Stderr, use)
 				_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", idx+1)+strings.Repeat("^", len(expected[i])))
 			}
 			return fmt.Errorf("expected argument %s at position %d", expected[i], i+1)

From 9381db51097bc08db41c196e596f029ee378e297 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:43:17 +0100
Subject: [PATCH 5/9] table testing & more test cases

---
 internal/cmd/util/validation_test.go | 162 ++++++++++++++++++---------
 1 file changed, 107 insertions(+), 55 deletions(-)

diff --git a/internal/cmd/util/validation_test.go b/internal/cmd/util/validation_test.go
index 9a56a54c..6bd27924 100644
--- a/internal/cmd/util/validation_test.go
+++ b/internal/cmd/util/validation_test.go
@@ -9,62 +9,114 @@ import (
 	"github.com/hetznercloud/cli/internal/testutil"
 )
 
-func TestValidateExact(t *testing.T) {
-	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
-		return ValidateExact(&cobra.Command{
-			Use: "test <arg1> <arg2>",
-		}, []string{"arg1", "arg2"})
-	})
+func TestValidate(t *testing.T) {
+	tests := []struct {
+		name           string
+		use            string
+		args           []string
+		exact          bool
+		expectedStdout string
+		expectedStderr string
+		expectedErr    string
+	}{
+		{
+			name: "correct usage",
+			use:  "test <arg1> <arg2>",
+			args: []string{"arg1", "arg2"},
+		},
+		{
+			name:  "correct usage exact",
+			use:   "test <arg1> <arg2>",
+			args:  []string{"arg1", "arg2"},
+			exact: true,
+		},
+		{
+			name:           "missing arg",
+			use:            "test <arg1> <arg2>",
+			args:           []string{"arg1"},
+			expectedStderr: "test <arg1> <arg2>\n             ^^^^\n",
+			expectedErr:    "expected argument arg2 at position 2",
+		},
+		{
+			name:           "missing arg exact",
+			use:            "test <arg1> <arg2>",
+			args:           []string{"arg1"},
+			expectedStderr: "test <arg1> <arg2>\n             ^^^^\n",
+			expectedErr:    "expected argument arg2 at position 2",
+			exact:          true,
+		},
+		{
+			name: "too many args",
+			use:  "test <arg1> <arg2>",
+			args: []string{"arg1", "arg2", "arg3"},
+		},
+		{
+			name:        "too many args exact",
+			use:         "test <arg1> <arg2>",
+			args:        []string{"arg1", "arg2", "arg3"},
+			exact:       true,
+			expectedErr: "expected exactly 2 positional arguments, but got 3",
+		},
+		{
+			name: "correct usage complex",
+			use:  "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args: []string{"arg1", "arg2"},
+		},
+		{
+			name:  "correct usage complex exact",
+			use:   "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:  []string{"arg1", "arg2"},
+			exact: true,
+		},
+		{
+			name:           "complex missing arg",
+			use:            "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:           []string{"arg1"},
+			expectedStderr: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                                            ^^^^\n",
+			expectedErr:    "expected argument arg2 at position 2",
+		},
+		{
+			name:           "complex missing arg exact",
+			use:            "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:           []string{"arg1"},
+			exact:          true,
+			expectedStderr: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                                            ^^^^\n",
+			expectedErr:    "expected argument arg2 at position 2",
+		},
+		{
+			name: "complex too many args",
+			use:  "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args: []string{"arg1", "arg2", "arg3"},
+		},
 
-	assert.Empty(t, stdout)
-	assert.Empty(t, stderr)
-	assert.NoError(t, err)
-}
-
-func TestValidateExactMissing(t *testing.T) {
-	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
-		return ValidateExact(&cobra.Command{
-			Use: "test <arg1> <arg2> <arg3>",
-		}, []string{"arg1", "arg2"})
-	})
-
-	assert.Empty(t, stdout)
-	assert.Equal(t, "test <arg1> <arg2> <arg3>\n                    ^^^^\n", stderr)
-	assert.EqualError(t, err, "expected argument arg3 at position 3")
-}
-
-func TestValidateExactTooMany(t *testing.T) {
-	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
-		return ValidateExact(&cobra.Command{
-			Use: "test <arg1> <arg2>",
-		}, []string{"arg1", "arg2", "arg3"})
-	})
-
-	assert.Empty(t, stdout)
-	assert.Empty(t, stderr)
-	assert.EqualError(t, err, "expected exactly 2 positional arguments, but got 3")
-}
-
-func TestValidateTooMany(t *testing.T) {
-	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
-		return Validate(&cobra.Command{
-			Use: "test <arg1> <arg2>",
-		}, []string{"arg1", "arg2", "arg3"})
-	})
-
-	assert.Empty(t, stdout)
-	assert.Empty(t, stderr)
-	assert.NoError(t, err)
-}
+		{
+			name:        "complex too many args exact",
+			use:         "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:        []string{"arg1", "arg2", "arg3"},
+			exact:       true,
+			expectedErr: "expected exactly 2 positional arguments, but got 3",
+		},
+	}
 
-func TestValidateExactComplexUsage(t *testing.T) {
-	stdout, stderr, err := testutil.CaptureOutStreams(func() error {
-		return ValidateExact(&cobra.Command{
-			Use: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
-		}, []string{"arg1", "arg2"})
-	})
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			stdout, stderr, err := testutil.CaptureOutStreams(func() error {
+				cmd := &cobra.Command{Use: test.use}
+				if test.exact {
+					return ValidateExact(cmd, test.args)
+				} else {
+					return Validate(cmd, test.args)
+				}
+			})
 
-	assert.Empty(t, stdout)
-	assert.Empty(t, stderr)
-	assert.NoError(t, err)
+			assert.Equal(t, test.expectedStdout, stdout)
+			assert.Equal(t, test.expectedStderr, stderr)
+			if test.expectedErr == "" {
+				assert.NoError(t, err)
+			} else {
+				assert.EqualError(t, err, test.expectedErr)
+			}
+		})
+	}
 }

From a5ecc5a3e2575cb222aef7a192d5122c84153f41 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:19:53 +0100
Subject: [PATCH 6/9] automatically detect variadic usage, allow lenient
 validation

---
 internal/cmd/all/all.go                       |  2 +-
 internal/cmd/base/delete.go                   |  2 +-
 internal/cmd/base/describe.go                 |  2 +-
 internal/cmd/base/set_rdns.go                 |  2 +-
 internal/cmd/base/update.go                   |  2 +-
 internal/cmd/certificate/certificate.go       |  2 +-
 internal/cmd/certificate/create.go            |  2 +-
 internal/cmd/completion/completion.go         |  2 +-
 internal/cmd/context/active.go                |  2 +-
 internal/cmd/context/context.go               |  2 +-
 internal/cmd/context/create.go                |  2 +-
 internal/cmd/context/delete.go                |  2 +-
 internal/cmd/context/list.go                  |  2 +-
 internal/cmd/context/use.go                   |  2 +-
 internal/cmd/datacenter/datacenter.go         |  2 +-
 internal/cmd/firewall/add_rule.go             |  2 +-
 internal/cmd/firewall/apply_to_resource.go    |  2 +-
 internal/cmd/firewall/create.go               |  2 +-
 internal/cmd/firewall/delete_rule.go          |  2 +-
 internal/cmd/firewall/firewall.go             |  2 +-
 internal/cmd/firewall/remove_from_resource.go |  2 +-
 internal/cmd/firewall/replace_rules.go        |  2 +-
 internal/cmd/floatingip/assign.go             |  2 +-
 internal/cmd/floatingip/create.go             |  2 +-
 internal/cmd/floatingip/floatingip.go         |  2 +-
 internal/cmd/floatingip/unassign.go           |  2 +-
 internal/cmd/image/image.go                   |  2 +-
 internal/cmd/iso/iso.go                       |  2 +-
 internal/cmd/loadbalancer/add_service.go      |  2 +-
 internal/cmd/loadbalancer/add_target.go       |  2 +-
 .../cmd/loadbalancer/attach_to_network.go     |  2 +-
 internal/cmd/loadbalancer/change_algorithm.go |  2 +-
 internal/cmd/loadbalancer/change_type.go      |  2 +-
 internal/cmd/loadbalancer/create.go           |  2 +-
 .../cmd/loadbalancer/detach_from_network.go   |  2 +-
 .../loadbalancer/disable_public_interface.go  |  2 +-
 .../loadbalancer/enable_public_interface.go   |  2 +-
 internal/cmd/loadbalancer/load_balancer.go    |  2 +-
 internal/cmd/loadbalancer/metrics.go          |  2 +-
 internal/cmd/loadbalancer/remove_target.go    |  2 +-
 internal/cmd/loadbalancer/update_service.go   |  2 +-
 .../loadbalancertype/load_balancer_type.go    |  2 +-
 internal/cmd/location/location.go             |  2 +-
 internal/cmd/network/add_route.go             |  2 +-
 internal/cmd/network/add_subnet.go            |  2 +-
 internal/cmd/network/change_ip_range.go       |  2 +-
 internal/cmd/network/create.go                |  2 +-
 .../cmd/network/expose_routes_to_vswitch.go   |  2 +-
 internal/cmd/network/network.go               |  2 +-
 internal/cmd/network/remove_route.go          |  2 +-
 internal/cmd/network/remove_subnet.go         |  2 +-
 internal/cmd/placementgroup/placementgroup.go |  2 +-
 internal/cmd/primaryip/assign.go              |  2 +-
 internal/cmd/primaryip/create.go              |  2 +-
 internal/cmd/primaryip/primaryip.go           |  2 +-
 internal/cmd/primaryip/unassign.go            |  2 +-
 internal/cmd/server/add_to_placement_group.go |  2 +-
 internal/cmd/server/attach_iso.go             |  2 +-
 internal/cmd/server/attach_to_network.go      |  2 +-
 internal/cmd/server/change_alias_ips.go       |  2 +-
 internal/cmd/server/change_type.go            |  2 +-
 internal/cmd/server/create_image.go           |  2 +-
 internal/cmd/server/detach_from_network.go    |  2 +-
 internal/cmd/server/detach_iso.go             |  2 +-
 internal/cmd/server/disable_backup.go         |  2 +-
 internal/cmd/server/disable_rescue.go         |  2 +-
 internal/cmd/server/enable_backup.go          |  2 +-
 internal/cmd/server/enable_rescue.go          |  2 +-
 internal/cmd/server/ip.go                     |  2 +-
 internal/cmd/server/metrics.go                |  2 +-
 internal/cmd/server/poweroff.go               |  2 +-
 internal/cmd/server/poweron.go                |  2 +-
 internal/cmd/server/reboot.go                 |  2 +-
 internal/cmd/server/rebuild.go                |  2 +-
 .../cmd/server/remove_from_placement_group.go |  2 +-
 internal/cmd/server/request_console.go        |  2 +-
 internal/cmd/server/reset.go                  |  2 +-
 internal/cmd/server/reset_password.go         |  2 +-
 internal/cmd/server/server.go                 |  2 +-
 internal/cmd/server/shutdown.go               |  2 +-
 internal/cmd/server/ssh.go                    |  2 +-
 internal/cmd/servertype/server_type.go        |  2 +-
 internal/cmd/sshkey/create.go                 |  2 +-
 internal/cmd/sshkey/sshkey.go                 |  2 +-
 internal/cmd/util/validation.go               | 52 ++++++++----
 internal/cmd/util/validation_test.go          | 84 ++++++++-----------
 internal/cmd/version/version.go               |  2 +-
 internal/cmd/volume/attach.go                 |  2 +-
 internal/cmd/volume/create.go                 |  2 +-
 internal/cmd/volume/detach.go                 |  2 +-
 internal/cmd/volume/resize.go                 |  2 +-
 internal/cmd/volume/volume.go                 |  2 +-
 92 files changed, 161 insertions(+), 155 deletions(-)

diff --git a/internal/cmd/all/all.go b/internal/cmd/all/all.go
index 1fde6f3b..87182076 100644
--- a/internal/cmd/all/all.go
+++ b/internal/cmd/all/all.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "all",
 		Short:                 "Commands that apply to all resources",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
index 838a05ef..4b2af6ee 100644
--- a/internal/cmd/base/delete.go
+++ b/internal/cmd/base/delete.go
@@ -34,7 +34,7 @@ func (dc *DeleteCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("delete %s<%s>", opts, strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/describe.go b/internal/cmd/base/describe.go
index 3ac581fb..b3ec5106 100644
--- a/internal/cmd/base/describe.go
+++ b/internal/cmd/base/describe.go
@@ -35,7 +35,7 @@ func (dc *DescribeCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("describe [options] <%s>", strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index dcfb0d8b..e593918a 100644
--- a/internal/cmd/base/set_rdns.go
+++ b/internal/cmd/base/set_rdns.go
@@ -30,7 +30,7 @@ func (rc *SetRdnsCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", strings.ToLower(rc.ResourceNameSingular)),
 		Short:                 rc.ShortDescription,
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(rc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/base/update.go b/internal/cmd/base/update.go
index 4b4c3f72..a40f2373 100644
--- a/internal/cmd/base/update.go
+++ b/internal/cmd/base/update.go
@@ -30,7 +30,7 @@ func (uc *UpdateCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   fmt.Sprintf("update [options] <%s>", strings.ToLower(uc.ResourceNameSingular)),
 		Short:                 uc.ShortDescription,
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(uc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/certificate/certificate.go b/internal/cmd/certificate/certificate.go
index 55747d68..121c09d0 100644
--- a/internal/cmd/certificate/certificate.go
+++ b/internal/cmd/certificate/certificate.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "certificate",
 		Short:                 "Manage certificates",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/certificate/create.go b/internal/cmd/certificate/create.go
index 6f77f5bf..5d8219e7 100644
--- a/internal/cmd/certificate/create.go
+++ b/internal/cmd/certificate/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--type managed --domain <domain> | --type uploaded --cert-file <file> --key-file <file>)",
 			Short: "Create or upload a Certificate",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Certificate name (required)")
diff --git a/internal/cmd/completion/completion.go b/internal/cmd/completion/completion.go
index ee622fee..e068adaa 100644
--- a/internal/cmd/completion/completion.go
+++ b/internal/cmd/completion/completion.go
@@ -95,7 +95,7 @@ and source this file from your PowerShell profile.
 
   PS> hcloud completion powershell > hcloud.ps1
 `,
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgs:             []string{"bash", "fish", "zsh", "powershell"},
 		DisableFlagsInUseLine: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/internal/cmd/context/active.go b/internal/cmd/context/active.go
index 49566e6c..ea3e4065 100644
--- a/internal/cmd/context/active.go
+++ b/internal/cmd/context/active.go
@@ -14,7 +14,7 @@ func newActiveCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "active",
 		Short:                 "Show active context",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runActive),
diff --git a/internal/cmd/context/context.go b/internal/cmd/context/context.go
index e7d73da7..f5c020b4 100644
--- a/internal/cmd/context/context.go
+++ b/internal/cmd/context/context.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "context",
 		Short:                 "Manage contexts",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/context/create.go b/internal/cmd/context/create.go
index 82cef48b..f013797f 100644
--- a/internal/cmd/context/create.go
+++ b/internal/cmd/context/create.go
@@ -20,7 +20,7 @@ func newCreateCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "create <name>",
 		Short:                 "Create a new context",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runCreate),
diff --git a/internal/cmd/context/delete.go b/internal/cmd/context/delete.go
index aaa181d3..56a77530 100644
--- a/internal/cmd/context/delete.go
+++ b/internal/cmd/context/delete.go
@@ -16,7 +16,7 @@ func newDeleteCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "delete <context>",
 		Short:                 "Delete a context",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/context/list.go b/internal/cmd/context/list.go
index 6cb35182..a1b191b5 100644
--- a/internal/cmd/context/list.go
+++ b/internal/cmd/context/list.go
@@ -30,7 +30,7 @@ func newListCommand(s state.State) *cobra.Command {
 			"Displays a list of contexts.",
 			listTableOutput.Columns(),
 		),
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		RunE:                  state.Wrap(s, runList),
diff --git a/internal/cmd/context/use.go b/internal/cmd/context/use.go
index e94aee59..6dbf0d64 100644
--- a/internal/cmd/context/use.go
+++ b/internal/cmd/context/use.go
@@ -16,7 +16,7 @@ func newUseCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "use <context>",
 		Short:                 "Use a context",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
diff --git a/internal/cmd/datacenter/datacenter.go b/internal/cmd/datacenter/datacenter.go
index ebfc89c8..3e21df03 100644
--- a/internal/cmd/datacenter/datacenter.go
+++ b/internal/cmd/datacenter/datacenter.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "datacenter",
 		Short:                 "Manage datacenters",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
index 2c375dff..3ab3e2a1 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -19,7 +19,7 @@ var AddRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|udp|tcp|esp|gre> <firewall>",
 			Short:                 "Add a single rule to a firewall",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 754345f9..0a7ff16b 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -18,7 +18,7 @@ var ApplyToResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "apply-to-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Applies a Firewall to a single resource",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/create.go b/internal/cmd/firewall/create.go
index 31bd59c4..b43e4d76 100644
--- a/internal/cmd/firewall/create.go
+++ b/internal/cmd/firewall/create.go
@@ -22,7 +22,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name>",
 			Short: "Create a Firewall",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Name")
 		cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/firewall/delete_rule.go b/internal/cmd/firewall/delete_rule.go
index df987962..8a44afae 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -20,7 +20,7 @@ var DeleteRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "delete-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|esp|gre|udp|tcp> <firewall>",
 			Short:                 "Delete a single rule to a firewall",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/firewall.go b/internal/cmd/firewall/firewall.go
index 923d90cd..393d97a5 100644
--- a/internal/cmd/firewall/firewall.go
+++ b/internal/cmd/firewall/firewall.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "firewall",
 		Short:                 "Manage Firewalls",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index 9ec20033..77ab87fc 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -18,7 +18,7 @@ var RemoveFromResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-from-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Removes a Firewall from a single resource",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/replace_rules.go b/internal/cmd/firewall/replace_rules.go
index 979ba243..83235125 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -23,7 +23,7 @@ var ReplaceRulesCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "replace-rules --rules-file <file> <firewall>",
 			Short:                 "Replaces all rules from a Firewall from a file",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/floatingip/assign.go b/internal/cmd/floatingip/assign.go
index 69e0a3f1..692d383d 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -17,7 +17,7 @@ var AssignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/floatingip/create.go b/internal/cmd/floatingip/create.go
index eebb077d..0a0fa1d9 100644
--- a/internal/cmd/floatingip/create.go
+++ b/internal/cmd/floatingip/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> (--home-location <location> | --server <server>)",
 			Short:                 "Create a Floating IP",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/floatingip/floatingip.go b/internal/cmd/floatingip/floatingip.go
index b7dd74e1..67d6e636 100644
--- a/internal/cmd/floatingip/floatingip.go
+++ b/internal/cmd/floatingip/floatingip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "floating-ip",
 		Short:                 "Manage Floating IPs",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/floatingip/unassign.go b/internal/cmd/floatingip/unassign.go
index d062a65a..bc6bead5 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -17,7 +17,7 @@ var UnassignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.FloatingIP().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/image/image.go b/internal/cmd/image/image.go
index b03477ab..028468de 100644
--- a/internal/cmd/image/image.go
+++ b/internal/cmd/image/image.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "image",
 		Short:                 "Manage images",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/iso/iso.go b/internal/cmd/iso/iso.go
index ab695bf2..ea51f822 100644
--- a/internal/cmd/iso/iso.go
+++ b/internal/cmd/iso/iso.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "iso",
 		Short:                 "Manage ISOs",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/add_service.go b/internal/cmd/loadbalancer/add_service.go
index 99f2e474..9fd89578 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -18,7 +18,7 @@ var AddServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-service [options] (--protocol http | --protocol tcp --listen-port <1-65535> --destination-port <1-65535> | --protocol https --http-certificates <ids>) <load-balancer>",
 			Short:                 "Add a service to a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/add_target.go b/internal/cmd/loadbalancer/add_target.go
index af4a4698..3b1c99a5 100644
--- a/internal/cmd/loadbalancer/add_target.go
+++ b/internal/cmd/loadbalancer/add_target.go
@@ -19,7 +19,7 @@ var AddTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-target [options] (--server <server> | --label-selector <label-selector> | --ip <ip>) <load-balancer>",
 			Short:                 "Add a target to a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/attach_to_network.go b/internal/cmd/loadbalancer/attach_to_network.go
index 2ccd372d..f58d500d 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -18,7 +18,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [--ip <ip>] --network <network> <load-balancer>",
 			Short:                 "Attach a Load Balancer to a Network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_algorithm.go b/internal/cmd/loadbalancer/change_algorithm.go
index 1822c1b3..15f3811a 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -18,7 +18,7 @@ var ChangeAlgorithmCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-algorithm --algorithm-type <round_robin|least_connections> <load-balancer>",
 			Short:                 "Changes the algorithm of a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_type.go b/internal/cmd/loadbalancer/change_type.go
index a6075659..ec864c37 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -18,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "change-type <load-balancer> <load-balancer-type>",
 			Short: "Change type of a Load Balancer",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidatesF(client.LoadBalancerType().Names),
diff --git a/internal/cmd/loadbalancer/create.go b/internal/cmd/loadbalancer/create.go
index 6d58ae1b..b8649896 100644
--- a/internal/cmd/loadbalancer/create.go
+++ b/internal/cmd/loadbalancer/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --type <type>",
 			Short:                 "Create a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/loadbalancer/detach_from_network.go b/internal/cmd/loadbalancer/detach_from_network.go
index 6c055025..725cefba 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -18,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <load-balancer>",
 			Short:                 "Detach a Load Balancer from a Network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/disable_public_interface.go b/internal/cmd/loadbalancer/disable_public_interface.go
index f12296a7..4f3802d1 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -17,7 +17,7 @@ var DisablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-public-interface <load-balancer>",
 			Short:                 "Disable the public interface of a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/enable_public_interface.go b/internal/cmd/loadbalancer/enable_public_interface.go
index c39f8816..41f0de10 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -17,7 +17,7 @@ var EnablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "enable-public-interface <load-balancer>",
 			Short:                 "Enable the public interface of a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/load_balancer.go b/internal/cmd/loadbalancer/load_balancer.go
index a0b70f9e..ca3b20d2 100644
--- a/internal/cmd/loadbalancer/load_balancer.go
+++ b/internal/cmd/loadbalancer/load_balancer.go
@@ -12,7 +12,7 @@ func NewCommand(s state.State) *cobra.Command {
 		Use:                   "load-balancer",
 		Short:                 "Manage Load Balancers",
 		Aliases:               []string{"loadbalancer"},
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/loadbalancer/metrics.go b/internal/cmd/loadbalancer/metrics.go
index 4af6c9ac..c2021791 100644
--- a/internal/cmd/loadbalancer/metrics.go
+++ b/internal/cmd/loadbalancer/metrics.go
@@ -33,7 +33,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <load-balancer>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/remove_target.go b/internal/cmd/loadbalancer/remove_target.go
index 0ec85a74..062314dd 100644
--- a/internal/cmd/loadbalancer/remove_target.go
+++ b/internal/cmd/loadbalancer/remove_target.go
@@ -19,7 +19,7 @@ var RemoveTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-target [options] <load-balancer>",
 			Short:                 "Remove a target from a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/update_service.go b/internal/cmd/loadbalancer/update_service.go
index 042ef217..b8aa9c77 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -19,7 +19,7 @@ var UpdateServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "update-service [options] --listen-port <1-65535> <load-balancer>",
 			Short:                 "Updates a service from a Load Balancer",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancertype/load_balancer_type.go b/internal/cmd/loadbalancertype/load_balancer_type.go
index 85445140..afc16006 100644
--- a/internal/cmd/loadbalancertype/load_balancer_type.go
+++ b/internal/cmd/loadbalancertype/load_balancer_type.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "load-balancer-type",
 		Short:                 "Manage Load Balancer types",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/location/location.go b/internal/cmd/location/location.go
index 2cfb3e6b..80acec9a 100644
--- a/internal/cmd/location/location.go
+++ b/internal/cmd/location/location.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "location",
 		Short:                 "Manage locations",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/add_route.go b/internal/cmd/network/add_route.go
index bb867b07..7df079e6 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -19,7 +19,7 @@ var AddRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Add a route to a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/add_subnet.go b/internal/cmd/network/add_subnet.go
index 5a3d17ea..ea08fa15 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -19,7 +19,7 @@ var AddSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-subnet [options] --type <cloud|server|vswitch> --network-zone <zone> <network>",
 			Short:                 "Add a subnet to a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/change_ip_range.go b/internal/cmd/network/change_ip_range.go
index e56a5de6..38bfee64 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -19,7 +19,7 @@ var ChangeIPRangeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-ip-range --ip-range <ip-range> <network>",
 			Short:                 "Change the IP range of a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/create.go b/internal/cmd/network/create.go
index 2436061f..a42e055d 100644
--- a/internal/cmd/network/create.go
+++ b/internal/cmd/network/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> --ip-range <ip-range>",
 			Short: "Create a network",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Network name (required)")
diff --git a/internal/cmd/network/expose_routes_to_vswitch.go b/internal/cmd/network/expose_routes_to_vswitch.go
index cbe73757..cd9ed5ba 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -19,7 +19,7 @@ var ExposeRoutesToVSwitchCmd = base.Cmd{
 			Use:                   "expose-routes-to-vswitch [--disable] <network>",
 			Short:                 "Expose routes to connected vSwitch",
 			Long:                  "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/network.go b/internal/cmd/network/network.go
index 0e0860fb..9f396553 100644
--- a/internal/cmd/network/network.go
+++ b/internal/cmd/network/network.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "network",
 		Short:                 "Manage networks",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/network/remove_route.go b/internal/cmd/network/remove_route.go
index 873d8a8f..3819c46e 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -19,7 +19,7 @@ var RemoveRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Remove a route from a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/remove_subnet.go b/internal/cmd/network/remove_subnet.go
index 981c33c1..c8f1b331 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -19,7 +19,7 @@ var RemoveSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-subnet --ip-range <ip-range> <network>",
 			Short:                 "Remove a subnet from a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/placementgroup/placementgroup.go b/internal/cmd/placementgroup/placementgroup.go
index 8baed0ce..f54277b1 100644
--- a/internal/cmd/placementgroup/placementgroup.go
+++ b/internal/cmd/placementgroup/placementgroup.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "placement-group",
 		Short:                 "Manage Placement Groups",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/assign.go b/internal/cmd/primaryip/assign.go
index 1b7127b7..7caa9891 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -18,7 +18,7 @@ var AssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "assign --server <server> <primary-ip>",
 			Short: "Assign a Primary IP to an assignee (usually a server)",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index 13a7181b..141091f2 100644
--- a/internal/cmd/primaryip/create.go
+++ b/internal/cmd/primaryip/create.go
@@ -16,7 +16,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> --name <name>",
 			Short:                 "Create a Primary IP",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/primaryip/primaryip.go b/internal/cmd/primaryip/primaryip.go
index e0a344a1..e3ea80cf 100644
--- a/internal/cmd/primaryip/primaryip.go
+++ b/internal/cmd/primaryip/primaryip.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "primary-ip",
 		Short:                 "Manage Primary IPs",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/primaryip/unassign.go b/internal/cmd/primaryip/unassign.go
index 749f4f0f..3c662076 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -17,7 +17,7 @@ var UnAssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "unassign <primary-ip>",
 			Short: "Unassign a Primary IP from an assignee (usually a server)",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/server/add_to_placement_group.go b/internal/cmd/server/add_to_placement_group.go
index ceb4577b..b98c2fac 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -17,7 +17,7 @@ var AddToPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "add-to-placement-group --placement-group <placement-group> <server>",
 			Short:             "Add a server to a placement group",
-			Args:              util.ValidateExact,
+			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/attach_iso.go b/internal/cmd/server/attach_iso.go
index 638f6406..e6fe3071 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -18,7 +18,7 @@ var AttachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
-			Args:             util.ValidateExact,
+			Args:             util.Validate,
 			TraverseChildren: true,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/server/attach_to_network.go b/internal/cmd/server/attach_to_network.go
index 3e1bf05c..b9704181 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -19,7 +19,7 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [options] --network <network> <server>",
 			Short:                 "Attach a server to a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_alias_ips.go b/internal/cmd/server/change_alias_ips.go
index 411c7138..3961291d 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -19,7 +19,7 @@ var ChangeAliasIPsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-alias-ips [options] --network <network> <server>",
 			Short:                 "Change a server's alias IPs in a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_type.go b/internal/cmd/server/change_type.go
index 6d143b20..290235f6 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -18,7 +18,7 @@ var ChangeTypeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "change-type [--keep-disk] <server> <server-type>",
 			Short: "Change type of a server",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidatesF(client.ServerType().Names),
diff --git a/internal/cmd/server/create_image.go b/internal/cmd/server/create_image.go
index 3fb004b1..9a4fe925 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -18,7 +18,7 @@ var CreateImageCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "create-image [options] --type <snapshot|backup> <server>",
 			Short: "Create an image from a server",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("type", "", "Image type (required)")
 		cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("backup", "snapshot"))
diff --git a/internal/cmd/server/detach_from_network.go b/internal/cmd/server/detach_from_network.go
index b5631888..f3f866db 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -18,7 +18,7 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <server>",
 			Short:                 "Detach a server from a network",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/detach_iso.go b/internal/cmd/server/detach_iso.go
index 7ba772bc..d80f6d35 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -17,7 +17,7 @@ var DetachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_backup.go b/internal/cmd/server/disable_backup.go
index 7a0d6449..e8369e5b 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -17,7 +17,7 @@ var DisableBackupCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_rescue.go b/internal/cmd/server/disable_rescue.go
index 8ed96bbb..043000d7 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -17,7 +17,7 @@ var DisableRescueCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_backup.go b/internal/cmd/server/enable_backup.go
index 00f92941..bee3316a 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -17,7 +17,7 @@ var EnableBackupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index 49b7fe0b..233382bc 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -18,7 +18,7 @@ var EnableRescueCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ip.go b/internal/cmd/server/ip.go
index 8e91c14a..eef0544d 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -17,7 +17,7 @@ var IPCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/metrics.go b/internal/cmd/server/metrics.go
index e224aa54..b9440706 100644
--- a/internal/cmd/server/metrics.go
+++ b/internal/cmd/server/metrics.go
@@ -32,7 +32,7 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <server>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweroff.go b/internal/cmd/server/poweroff.go
index 0a6b7c07..92b13cc3 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -17,7 +17,7 @@ var PoweroffCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweron.go b/internal/cmd/server/poweron.go
index 2e6cd1d7..d203f2e6 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -17,7 +17,7 @@ var PoweronCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reboot.go b/internal/cmd/server/reboot.go
index aeae1cc2..ef2c73e4 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -17,7 +17,7 @@ var RebootCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/rebuild.go b/internal/cmd/server/rebuild.go
index 39e4a719..c975d256 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -19,7 +19,7 @@ var RebuildCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/remove_from_placement_group.go b/internal/cmd/server/remove_from_placement_group.go
index a1415ed2..04e0b306 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -17,7 +17,7 @@ var RemoveFromPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "remove-from-placement-group <server>",
 			Short:             "Removes a server from a placement group",
-			Args:              util.ValidateExact,
+			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/request_console.go b/internal/cmd/server/request_console.go
index 18862344..2cb02be4 100644
--- a/internal/cmd/server/request_console.go
+++ b/internal/cmd/server/request_console.go
@@ -18,7 +18,7 @@ var RequestConsoleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "request-console [options] <server>",
 			Short:                 "Request a WebSocket VNC console for a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset.go b/internal/cmd/server/reset.go
index 5c36ca9a..6dbd2135 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -17,7 +17,7 @@ var ResetCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset_password.go b/internal/cmd/server/reset_password.go
index f1ad3805..e8185eab 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -17,7 +17,7 @@ var ResetPasswordCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset-password <server>",
 			Short:                 "Reset the root password of a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/server.go b/internal/cmd/server/server.go
index a4c234a7..48adcf6c 100644
--- a/internal/cmd/server/server.go
+++ b/internal/cmd/server/server.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server",
 		Short:                 "Manage servers",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/server/shutdown.go b/internal/cmd/server/shutdown.go
index 4f25340c..6a4c7a17 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -27,7 +27,7 @@ var ShutdownCmd = base.Cmd{
 			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ssh.go b/internal/cmd/server/ssh.go
index 21b98db0..090905f5 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -21,7 +21,7 @@ var SSHCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/servertype/server_type.go b/internal/cmd/servertype/server_type.go
index 1eecfba8..7a35bde8 100644
--- a/internal/cmd/servertype/server_type.go
+++ b/internal/cmd/servertype/server_type.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "server-type",
 		Short:                 "Manage server types",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/sshkey/create.go b/internal/cmd/sshkey/create.go
index b17b1f6e..5512114b 100644
--- a/internal/cmd/sshkey/create.go
+++ b/internal/cmd/sshkey/create.go
@@ -18,7 +18,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--public-key <key> | --public-key-from-file <file>)",
 			Short: "Create a SSH key",
-			Args:  util.ValidateExact,
+			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Key name (required)")
 		_ = cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/sshkey/sshkey.go b/internal/cmd/sshkey/sshkey.go
index 5e3b7998..db94e14a 100644
--- a/internal/cmd/sshkey/sshkey.go
+++ b/internal/cmd/sshkey/sshkey.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "ssh-key",
 		Short:                 "Manage SSH keys",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}
diff --git a/internal/cmd/util/validation.go b/internal/cmd/util/validation.go
index a6867092..2c967dc4 100644
--- a/internal/cmd/util/validation.go
+++ b/internal/cmd/util/validation.go
@@ -9,34 +9,54 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var posArgRegex = regexp.MustCompile(`\[.*?]|\(.*?\)|--.*?<.*?>|<(.*?)>`) // matches all positional args in group 1
-
-func ValidateExact(cmd *cobra.Command, args []string) error {
-	return validate(cmd, args, true)
-}
+// posArgRegex matches the placeholders for positional arguments in the usage string of a cobra.Command.
+// Breakdown:
+// 1. `\[.*?]` matches everything in square brackets, but does not capture them, so it is ignored.
+// 2. `\(.*?\)` same as (1) but with parentheses.
+// 3. `--.*?<.*?>` matches flags and ignores them, so that `--flag <arg>` is not counted as a positional argument.
+// 4. `<([a-zA-Z0-9-_]*?)>\.\.\.` matches variadic arguments and captures the name of the argument in group 2.
+// 5. `<([a-zA-Z0-9-_]*?)>` matches regular arguments and captures the name of the argument in group 1.
+var posArgRegex = regexp.MustCompile(`\[.*?]|\(.*?\)|--.*?<.*?>|<([a-zA-Z0-9-_]*?)>\.\.\.|<([a-zA-Z0-9-_]*?)>`)
 
+// Validate checks if the number of positional arguments matches the usage string of a cobra.Command.
+// It returns an error if the number of arguments does not match the usage string (if it is not variadic) or if an
+// argument is missing.
+// If your command usage has optional positional arguments, use ValidateLenient instead.
 func Validate(cmd *cobra.Command, args []string) error {
 	return validate(cmd, args, false)
 }
 
-func validate(cmd *cobra.Command, args []string, exact bool) error {
+// ValidateLenient checks if the number of positional arguments matches the usage string of a cobra.Command.
+// In contrast to Validate, it does not return an error if there are more arguments than expected.
+// This can be useful for commands that have optional positional arguments.
+func ValidateLenient(cmd *cobra.Command, args []string) error {
+	return validate(cmd, args, true)
+}
+
+func validate(cmd *cobra.Command, args []string, lenient bool) error {
+
+	use := cmd.Use
+	paren := cmd.Parent()
+	for paren != nil {
+		use = paren.Use + " " + use
+		paren = paren.Parent()
+	}
 
 	matches := posArgRegex.FindAllStringSubmatch(cmd.Use, -1)
+	isVariadic := false
 	var expected []string
 	for _, match := range matches {
 		if match[1] != "" {
 			expected = append(expected, match[1])
+			isVariadic = true
+		} else if match[2] != "" {
+			expected = append(expected, match[2])
 		}
 	}
-	if len(args) > len(expected) && exact {
-		return fmt.Errorf("expected exactly %d positional arguments, but got %d", len(expected), len(args))
-	}
-
-	use := cmd.Use
-	paren := cmd.Parent()
-	for paren != nil {
-		use = paren.Use + " " + use
-		paren = paren.Parent()
+	if len(args) > len(expected) && !isVariadic && !lenient {
+		_, _ = fmt.Fprintln(os.Stderr, use)
+		_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", len(use)+1)+"^")
+		return fmt.Errorf("expected exactly %d positional argument(s), but got %d", len(expected), len(args))
 	}
 
 	for i := 0; i < len(expected); i++ {
@@ -46,7 +66,7 @@ func validate(cmd *cobra.Command, args []string, exact bool) error {
 				_, _ = fmt.Fprintln(os.Stderr, use)
 				_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", idx+1)+strings.Repeat("^", len(expected[i])))
 			}
-			return fmt.Errorf("expected argument %s at position %d", expected[i], i+1)
+			return fmt.Errorf("expected argument(s) %s at position %d", expected[i], i+1)
 		}
 	}
 	return nil
diff --git a/internal/cmd/util/validation_test.go b/internal/cmd/util/validation_test.go
index 6bd27924..1d169fd3 100644
--- a/internal/cmd/util/validation_test.go
+++ b/internal/cmd/util/validation_test.go
@@ -14,7 +14,7 @@ func TestValidate(t *testing.T) {
 		name           string
 		use            string
 		args           []string
-		exact          bool
+		lenient        bool
 		expectedStdout string
 		expectedStderr string
 		expectedErr    string
@@ -24,77 +24,63 @@ func TestValidate(t *testing.T) {
 			use:  "test <arg1> <arg2>",
 			args: []string{"arg1", "arg2"},
 		},
-		{
-			name:  "correct usage exact",
-			use:   "test <arg1> <arg2>",
-			args:  []string{"arg1", "arg2"},
-			exact: true,
-		},
 		{
 			name:           "missing arg",
 			use:            "test <arg1> <arg2>",
 			args:           []string{"arg1"},
 			expectedStderr: "test <arg1> <arg2>\n             ^^^^\n",
-			expectedErr:    "expected argument arg2 at position 2",
+			expectedErr:    "expected argument(s) arg2 at position 2",
 		},
 		{
-			name:           "missing arg exact",
-			use:            "test <arg1> <arg2>",
+			name:           "missing arg variadic",
+			use:            "test <arg1> <arg2>...",
 			args:           []string{"arg1"},
-			expectedStderr: "test <arg1> <arg2>\n             ^^^^\n",
-			expectedErr:    "expected argument arg2 at position 2",
-			exact:          true,
+			expectedStderr: "test <arg1> <arg2>...\n             ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
 		},
 		{
-			name: "too many args",
-			use:  "test <arg1> <arg2>",
-			args: []string{"arg1", "arg2", "arg3"},
-		},
-		{
-			name:        "too many args exact",
-			use:         "test <arg1> <arg2>",
-			args:        []string{"arg1", "arg2", "arg3"},
-			exact:       true,
-			expectedErr: "expected exactly 2 positional arguments, but got 3",
+			name:           "too many args",
+			use:            "test <arg1> <arg2>",
+			args:           []string{"arg1", "arg2", "arg3"},
+			expectedStderr: "test <arg1> <arg2>\n                   ^\n",
+			expectedErr:    "expected exactly 2 positional argument(s), but got 3",
 		},
 		{
-			name: "correct usage complex",
-			use:  "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			name: "complex correct usage",
+			use:  "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
 			args: []string{"arg1", "arg2"},
 		},
 		{
-			name:  "correct usage complex exact",
-			use:   "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
-			args:  []string{"arg1", "arg2"},
-			exact: true,
+			name: "complex correct usage variadic",
+			use:  "test [options] <arg1> --flag <not-an-arg> <arg2>... [<arg3>]",
+			args: []string{"arg1", "arg2", "arg3"},
 		},
 		{
 			name:           "complex missing arg",
-			use:            "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			use:            "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
 			args:           []string{"arg1"},
-			expectedStderr: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                                            ^^^^\n",
-			expectedErr:    "expected argument arg2 at position 2",
+			expectedStderr: "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                           ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
 		},
 		{
-			name:           "complex missing arg exact",
-			use:            "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			name:           "complex missing arg variadic",
+			use:            "test [options] <arg1> --flag <not-an-arg> <arg2>... [<arg3>]",
 			args:           []string{"arg1"},
-			exact:          true,
-			expectedStderr: "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                                            ^^^^\n",
-			expectedErr:    "expected argument arg2 at position 2",
+			expectedStderr: "test [options] <arg1> --flag <not-an-arg> <arg2>... [<arg3>]\n                                           ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
 		},
-		{
-			name: "complex too many args",
-			use:  "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
-			args: []string{"arg1", "arg2", "arg3"},
+		{ // note: ValidateLenient should be used here, because there are optional positional arguments; this is just for testing
+			name:           "complex too many args not lenient",
+			use:            "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:           []string{"arg1", "arg2", "arg3"},
+			expectedStderr: "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                                          ^\n",
+			expectedErr:    "expected exactly 2 positional argument(s), but got 3",
 		},
-
 		{
-			name:        "complex too many args exact",
-			use:         "test [options] [<optional-arg>] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
-			args:        []string{"arg1", "arg2", "arg3"},
-			exact:       true,
-			expectedErr: "expected exactly 2 positional arguments, but got 3",
+			name:    "complex too many args lenient",
+			use:     "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:    []string{"arg1", "arg2", "arg3"},
+			lenient: true,
 		},
 	}
 
@@ -103,8 +89,8 @@ func TestValidate(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			stdout, stderr, err := testutil.CaptureOutStreams(func() error {
 				cmd := &cobra.Command{Use: test.use}
-				if test.exact {
-					return ValidateExact(cmd, test.args)
+				if test.lenient {
+					return ValidateLenient(cmd, test.args)
 				} else {
 					return Validate(cmd, test.args)
 				}
diff --git a/internal/cmd/version/version.go b/internal/cmd/version/version.go
index 3bca97b6..48a1d1f3 100644
--- a/internal/cmd/version/version.go
+++ b/internal/cmd/version/version.go
@@ -12,7 +12,7 @@ func NewCommand(_ state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "version",
 		Short:                 "Print version information",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		DisableFlagsInUseLine: true,
 		RunE:                  runVersion,
 	}
diff --git a/internal/cmd/volume/attach.go b/internal/cmd/volume/attach.go
index 4a6c8445..411a0f5a 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -18,7 +18,7 @@ var AttachCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/create.go b/internal/cmd/volume/create.go
index a83d9267..b0c2e4c3 100644
--- a/internal/cmd/volume/create.go
+++ b/internal/cmd/volume/create.go
@@ -19,7 +19,7 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --size <size>",
 			Short:                 "Create a volume",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index 87643c98..3b41a602 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -17,7 +17,7 @@ var DetachCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/resize.go b/internal/cmd/volume/resize.go
index 4dc5847a..3b90a056 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -17,7 +17,7 @@ var ResizeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
-			Args:                  util.ValidateExact,
+			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/volume.go b/internal/cmd/volume/volume.go
index e6b45ac3..911c4898 100644
--- a/internal/cmd/volume/volume.go
+++ b/internal/cmd/volume/volume.go
@@ -11,7 +11,7 @@ func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                   "volume",
 		Short:                 "Manage Volumes",
-		Args:                  util.ValidateExact,
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 	}

From d41c4864981588032f5046af2ab88c7141dab9b3 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:23:56 +0100
Subject: [PATCH 7/9] move Args property into base commands

---
 internal/cmd/base/cmd.go                              | 2 +-
 internal/cmd/base/create.go                           | 2 +-
 internal/cmd/base/list.go                             | 1 +
 internal/cmd/certificate/create.go                    | 1 -
 internal/cmd/firewall/add_rule.go                     | 2 --
 internal/cmd/firewall/apply_to_resource.go            | 2 --
 internal/cmd/firewall/create.go                       | 1 -
 internal/cmd/firewall/delete_rule.go                  | 2 --
 internal/cmd/firewall/remove_from_resource.go         | 2 --
 internal/cmd/firewall/replace_rules.go                | 2 --
 internal/cmd/floatingip/assign.go                     | 2 --
 internal/cmd/floatingip/create.go                     | 1 -
 internal/cmd/floatingip/disable_protection.go         | 2 --
 internal/cmd/floatingip/enable_protection.go          | 2 --
 internal/cmd/floatingip/unassign.go                   | 2 --
 internal/cmd/image/disable_protection.go              | 2 --
 internal/cmd/image/enable_protection.go               | 2 --
 internal/cmd/loadbalancer/add_service.go              | 2 --
 internal/cmd/loadbalancer/add_target.go               | 1 -
 internal/cmd/loadbalancer/attach_to_network.go        | 2 --
 internal/cmd/loadbalancer/change_algorithm.go         | 2 --
 internal/cmd/loadbalancer/change_type.go              | 2 --
 internal/cmd/loadbalancer/create.go                   | 1 -
 internal/cmd/loadbalancer/delete_service.go           | 1 -
 internal/cmd/loadbalancer/detach_from_network.go      | 2 --
 internal/cmd/loadbalancer/disable_protection.go       | 2 --
 internal/cmd/loadbalancer/disable_public_interface.go | 2 --
 internal/cmd/loadbalancer/enable_protection.go        | 2 --
 internal/cmd/loadbalancer/enable_public_interface.go  | 2 --
 internal/cmd/loadbalancer/metrics.go                  | 1 -
 internal/cmd/loadbalancer/remove_target.go            | 1 -
 internal/cmd/loadbalancer/update_service.go           | 2 --
 internal/cmd/network/add_route.go                     | 2 --
 internal/cmd/network/add_subnet.go                    | 2 --
 internal/cmd/network/change_ip_range.go               | 2 --
 internal/cmd/network/create.go                        | 1 -
 internal/cmd/network/disable_protection.go            | 2 --
 internal/cmd/network/enable_protection.go             | 2 --
 internal/cmd/network/expose_routes_to_vswitch.go      | 2 --
 internal/cmd/network/remove_route.go                  | 2 --
 internal/cmd/network/remove_subnet.go                 | 2 --
 internal/cmd/primaryip/assign.go                      | 2 --
 internal/cmd/primaryip/create.go                      | 1 -
 internal/cmd/primaryip/disable_protection.go          | 2 --
 internal/cmd/primaryip/enable_protection.go           | 2 --
 internal/cmd/primaryip/unassign.go                    | 2 --
 internal/cmd/server/add_to_placement_group.go         | 2 --
 internal/cmd/server/attach_iso.go                     | 2 --
 internal/cmd/server/attach_to_network.go              | 2 --
 internal/cmd/server/change_alias_ips.go               | 2 --
 internal/cmd/server/change_type.go                    | 2 --
 internal/cmd/server/create_image.go                   | 2 --
 internal/cmd/server/detach_from_network.go            | 2 --
 internal/cmd/server/detach_iso.go                     | 2 --
 internal/cmd/server/disable_backup.go                 | 2 --
 internal/cmd/server/disable_protection.go             | 2 --
 internal/cmd/server/disable_rescue.go                 | 2 --
 internal/cmd/server/enable_backup.go                  | 2 --
 internal/cmd/server/enable_protection.go              | 2 --
 internal/cmd/server/enable_rescue.go                  | 2 --
 internal/cmd/server/ip.go                             | 2 --
 internal/cmd/server/metrics.go                        | 1 -
 internal/cmd/server/poweroff.go                       | 2 --
 internal/cmd/server/poweron.go                        | 2 --
 internal/cmd/server/reboot.go                         | 2 --
 internal/cmd/server/rebuild.go                        | 2 --
 internal/cmd/server/remove_from_placement_group.go    | 2 --
 internal/cmd/server/request_console.go                | 1 -
 internal/cmd/server/reset.go                          | 2 --
 internal/cmd/server/reset_password.go                 | 2 --
 internal/cmd/server/shutdown.go                       | 2 --
 internal/cmd/server/ssh.go                            | 2 --
 internal/cmd/sshkey/create.go                         | 1 -
 internal/cmd/volume/attach.go                         | 2 --
 internal/cmd/volume/create.go                         | 1 -
 internal/cmd/volume/detach.go                         | 2 --
 internal/cmd/volume/disable_protection.go             | 2 --
 internal/cmd/volume/enable_protection.go              | 2 --
 internal/cmd/volume/resize.go                         | 2 --
 79 files changed, 3 insertions(+), 140 deletions(-)

diff --git a/internal/cmd/base/cmd.go b/internal/cmd/base/cmd.go
index 079680d3..765aa42f 100644
--- a/internal/cmd/base/cmd.go
+++ b/internal/cmd/base/cmd.go
@@ -19,7 +19,7 @@ func (gc *Cmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := gc.BaseCobraCommand(s.Client())
 
 	if cmd.Args == nil {
-		cmd.Args = cobra.NoArgs
+		cmd.Args = util.Validate
 	}
 
 	cmd.TraverseChildren = true
diff --git a/internal/cmd/base/create.go b/internal/cmd/base/create.go
index cbd4460e..934f5928 100644
--- a/internal/cmd/base/create.go
+++ b/internal/cmd/base/create.go
@@ -27,7 +27,7 @@ func (cc *CreateCmd) CobraCommand(s state.State) *cobra.Command {
 	output.AddFlag(cmd, output.OptionJSON(), output.OptionYAML())
 
 	if cmd.Args == nil {
-		cmd.Args = cobra.NoArgs
+		cmd.Args = util.Validate
 	}
 
 	cmd.TraverseChildren = true
diff --git a/internal/cmd/base/list.go b/internal/cmd/base/list.go
index c6ccb5e8..a878a653 100644
--- a/internal/cmd/base/list.go
+++ b/internal/cmd/base/list.go
@@ -35,6 +35,7 @@ func (lc *ListCmd) CobraCommand(s state.State) *cobra.Command {
 			fmt.Sprintf("Displays a list of %s.", lc.ResourceNamePlural),
 			outputColumns,
 		),
+		Args:                  util.Validate,
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
 		PreRunE:               s.EnsureToken,
diff --git a/internal/cmd/certificate/create.go b/internal/cmd/certificate/create.go
index 5d8219e7..a177e47b 100644
--- a/internal/cmd/certificate/create.go
+++ b/internal/cmd/certificate/create.go
@@ -19,7 +19,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--type managed --domain <domain> | --type uploaded --cert-file <file> --key-file <file>)",
 			Short: "Create or upload a Certificate",
-			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Certificate name (required)")
diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
index 3ab3e2a1..ac5648fd 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var AddRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|udp|tcp|esp|gre> <firewall>",
 			Short:                 "Add a single rule to a firewall",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 0a7ff16b..28af9848 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var ApplyToResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "apply-to-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Applies a Firewall to a single resource",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/create.go b/internal/cmd/firewall/create.go
index b43e4d76..d560aa5f 100644
--- a/internal/cmd/firewall/create.go
+++ b/internal/cmd/firewall/create.go
@@ -22,7 +22,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name>",
 			Short: "Create a Firewall",
-			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Name")
 		cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/firewall/delete_rule.go b/internal/cmd/firewall/delete_rule.go
index 8a44afae..cf16a3b4 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -20,7 +19,6 @@ var DeleteRuleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "delete-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|esp|gre|udp|tcp> <firewall>",
 			Short:                 "Delete a single rule to a firewall",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index 77ab87fc..e2da1cf9 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var RemoveFromResourceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-from-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Removes a Firewall from a single resource",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/firewall/replace_rules.go b/internal/cmd/firewall/replace_rules.go
index 83235125..a06bc8a7 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -23,7 +22,6 @@ var ReplaceRulesCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "replace-rules --rules-file <file> <firewall>",
 			Short:                 "Replaces all rules from a Firewall from a file",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/floatingip/assign.go b/internal/cmd/floatingip/assign.go
index 692d383d..b2da0a92 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var AssignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/floatingip/create.go b/internal/cmd/floatingip/create.go
index 0a0fa1d9..b88e9bb0 100644
--- a/internal/cmd/floatingip/create.go
+++ b/internal/cmd/floatingip/create.go
@@ -19,7 +19,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> (--home-location <location> | --server <server>)",
 			Short:                 "Create a Floating IP",
-			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/floatingip/disable_protection.go b/internal/cmd/floatingip/disable_protection.go
index 9ee5b2c4..6634eeed 100644
--- a/internal/cmd/floatingip/disable_protection.go
+++ b/internal/cmd/floatingip/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <floating-ip> <protection-level>...",
 			Short: "Disable resource protection for a Floating IP",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/floatingip/enable_protection.go b/internal/cmd/floatingip/enable_protection.go
index 5dd8a9f1..c6598d29 100644
--- a/internal/cmd/floatingip/enable_protection.go
+++ b/internal/cmd/floatingip/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -63,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <floating-ip> <protection-level>...",
 			Short: "Enable resource protection for a Floating IP",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.FloatingIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/floatingip/unassign.go b/internal/cmd/floatingip/unassign.go
index bc6bead5..6a65810d 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var UnassignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.FloatingIP().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/image/disable_protection.go b/internal/cmd/image/disable_protection.go
index bb5941d9..26ae7fc1 100644
--- a/internal/cmd/image/disable_protection.go
+++ b/internal/cmd/image/disable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <image> <protection-level>...",
 			Short: "Disable resource protection for an image",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Image().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/image/enable_protection.go b/internal/cmd/image/enable_protection.go
index dcaeb8c9..d74a1fa7 100644
--- a/internal/cmd/image/enable_protection.go
+++ b/internal/cmd/image/enable_protection.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -66,7 +65,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <image> <protection-level>...",
 			Short: "Enable resource protection for an image",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Image().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/loadbalancer/add_service.go b/internal/cmd/loadbalancer/add_service.go
index 9fd89578..885dd681 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var AddServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-service [options] (--protocol http | --protocol tcp --listen-port <1-65535> --destination-port <1-65535> | --protocol https --http-certificates <ids>) <load-balancer>",
 			Short:                 "Add a service to a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/add_target.go b/internal/cmd/loadbalancer/add_target.go
index 3b1c99a5..cf64e5e1 100644
--- a/internal/cmd/loadbalancer/add_target.go
+++ b/internal/cmd/loadbalancer/add_target.go
@@ -19,7 +19,6 @@ var AddTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-target [options] (--server <server> | --label-selector <label-selector> | --ip <ip>) <load-balancer>",
 			Short:                 "Add a target to a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/attach_to_network.go b/internal/cmd/loadbalancer/attach_to_network.go
index f58d500d..c2183c75 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [--ip <ip>] --network <network> <load-balancer>",
 			Short:                 "Attach a Load Balancer to a Network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_algorithm.go b/internal/cmd/loadbalancer/change_algorithm.go
index 15f3811a..88483c00 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var ChangeAlgorithmCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-algorithm --algorithm-type <round_robin|least_connections> <load-balancer>",
 			Short:                 "Changes the algorithm of a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/change_type.go b/internal/cmd/loadbalancer/change_type.go
index ec864c37..ca918fe9 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var ChangeTypeCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "change-type <load-balancer> <load-balancer-type>",
 			Short: "Change type of a Load Balancer",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidatesF(client.LoadBalancerType().Names),
diff --git a/internal/cmd/loadbalancer/create.go b/internal/cmd/loadbalancer/create.go
index b8649896..92615ef4 100644
--- a/internal/cmd/loadbalancer/create.go
+++ b/internal/cmd/loadbalancer/create.go
@@ -16,7 +16,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --type <type>",
 			Short:                 "Create a Load Balancer",
-			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/loadbalancer/delete_service.go b/internal/cmd/loadbalancer/delete_service.go
index 8aff8679..fe38fd72 100644
--- a/internal/cmd/loadbalancer/delete_service.go
+++ b/internal/cmd/loadbalancer/delete_service.go
@@ -17,7 +17,6 @@ var DeleteServiceCmd = base.Cmd{
 			Use:                   "delete-service --listen-port <1-65535> <load-balancer>",
 			Short:                 "Deletes a service from a Load Balancer",
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
-			Args:                  cobra.RangeArgs(1, 2),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/loadbalancer/detach_from_network.go b/internal/cmd/loadbalancer/detach_from_network.go
index 725cefba..1f6b1bf9 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <load-balancer>",
 			Short:                 "Detach a Load Balancer from a Network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/disable_protection.go b/internal/cmd/loadbalancer/disable_protection.go
index a51bcd64..6e7ae911 100644
--- a/internal/cmd/loadbalancer/disable_protection.go
+++ b/internal/cmd/loadbalancer/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <load-balancer> <protection-level>...",
 			Short: "Disable resource protection for a Load Balancer",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/loadbalancer/disable_public_interface.go b/internal/cmd/loadbalancer/disable_public_interface.go
index 4f3802d1..1edf6c33 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-public-interface <load-balancer>",
 			Short:                 "Disable the public interface of a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/enable_protection.go b/internal/cmd/loadbalancer/enable_protection.go
index b69e567b..c915c0e1 100644
--- a/internal/cmd/loadbalancer/enable_protection.go
+++ b/internal/cmd/loadbalancer/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -63,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <load-balancer> <protection-level>...",
 			Short: "Enable resource protection for a Load Balancer",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.LoadBalancer().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/loadbalancer/enable_public_interface.go b/internal/cmd/loadbalancer/enable_public_interface.go
index 41f0de10..21963d4f 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var EnablePublicInterfaceCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "enable-public-interface <load-balancer>",
 			Short:                 "Enable the public interface of a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/metrics.go b/internal/cmd/loadbalancer/metrics.go
index c2021791..8f070e37 100644
--- a/internal/cmd/loadbalancer/metrics.go
+++ b/internal/cmd/loadbalancer/metrics.go
@@ -33,7 +33,6 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <load-balancer>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/remove_target.go b/internal/cmd/loadbalancer/remove_target.go
index 062314dd..ec0f6c1e 100644
--- a/internal/cmd/loadbalancer/remove_target.go
+++ b/internal/cmd/loadbalancer/remove_target.go
@@ -19,7 +19,6 @@ var RemoveTargetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-target [options] <load-balancer>",
 			Short:                 "Remove a target from a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/loadbalancer/update_service.go b/internal/cmd/loadbalancer/update_service.go
index b8aa9c77..75810a41 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var UpdateServiceCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "update-service [options] --listen-port <1-65535> <load-balancer>",
 			Short:                 "Updates a service from a Load Balancer",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/add_route.go b/internal/cmd/network/add_route.go
index 7df079e6..307b1f93 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var AddRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Add a route to a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/add_subnet.go b/internal/cmd/network/add_subnet.go
index ea08fa15..9f3d0f86 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var AddSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "add-subnet [options] --type <cloud|server|vswitch> --network-zone <zone> <network>",
 			Short:                 "Add a subnet to a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/change_ip_range.go b/internal/cmd/network/change_ip_range.go
index 38bfee64..a0270431 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var ChangeIPRangeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-ip-range --ip-range <ip-range> <network>",
 			Short:                 "Change the IP range of a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/create.go b/internal/cmd/network/create.go
index a42e055d..706f4a68 100644
--- a/internal/cmd/network/create.go
+++ b/internal/cmd/network/create.go
@@ -18,7 +18,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> --ip-range <ip-range>",
 			Short: "Create a network",
-			Args:  util.Validate,
 		}
 
 		cmd.Flags().String("name", "", "Network name (required)")
diff --git a/internal/cmd/network/disable_protection.go b/internal/cmd/network/disable_protection.go
index 3ca7cf2d..97042046 100644
--- a/internal/cmd/network/disable_protection.go
+++ b/internal/cmd/network/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <network> <protection-level>...",
 			Short: "Disable resource protection for a network",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Network().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/network/enable_protection.go b/internal/cmd/network/enable_protection.go
index 04898211..2603adc3 100644
--- a/internal/cmd/network/enable_protection.go
+++ b/internal/cmd/network/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -63,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <network> <protection-level>...",
 			Short: "Enable resource protection for a network",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Network().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/network/expose_routes_to_vswitch.go b/internal/cmd/network/expose_routes_to_vswitch.go
index cd9ed5ba..959fef16 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var ExposeRoutesToVSwitchCmd = base.Cmd{
 			Use:                   "expose-routes-to-vswitch [--disable] <network>",
 			Short:                 "Expose routes to connected vSwitch",
 			Long:                  "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/remove_route.go b/internal/cmd/network/remove_route.go
index 3819c46e..51bafdd3 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var RemoveRouteCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Remove a route from a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/network/remove_subnet.go b/internal/cmd/network/remove_subnet.go
index c8f1b331..5c5007a5 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var RemoveSubnetCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "remove-subnet --ip-range <ip-range> <network>",
 			Short:                 "Remove a subnet from a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/primaryip/assign.go b/internal/cmd/primaryip/assign.go
index 7caa9891..e5f825c2 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var AssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "assign --server <server> <primary-ip>",
 			Short: "Assign a Primary IP to an assignee (usually a server)",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index 141091f2..9f58a40f 100644
--- a/internal/cmd/primaryip/create.go
+++ b/internal/cmd/primaryip/create.go
@@ -16,7 +16,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --type <ipv4|ipv6> --name <name>",
 			Short:                 "Create a Primary IP",
-			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/primaryip/disable_protection.go b/internal/cmd/primaryip/disable_protection.go
index c3af73aa..ebbe4cbe 100644
--- a/internal/cmd/primaryip/disable_protection.go
+++ b/internal/cmd/primaryip/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "disable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Disable Protection for a Primary IP",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/primaryip/enable_protection.go b/internal/cmd/primaryip/enable_protection.go
index 4b182c62..b5afac52 100644
--- a/internal/cmd/primaryip/enable_protection.go
+++ b/internal/cmd/primaryip/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -61,7 +60,6 @@ var EnableProtectionCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "enable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Enable Protection for a Primary IP",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/primaryip/unassign.go b/internal/cmd/primaryip/unassign.go
index 3c662076..725cc624 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var UnAssignCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "unassign <primary-ip>",
 			Short: "Unassign a Primary IP from an assignee (usually a server)",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/server/add_to_placement_group.go b/internal/cmd/server/add_to_placement_group.go
index b98c2fac..284d8ea2 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var AddToPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "add-to-placement-group --placement-group <placement-group> <server>",
 			Short:             "Add a server to a placement group",
-			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/attach_iso.go b/internal/cmd/server/attach_iso.go
index e6fe3071..2e056449 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -18,7 +17,6 @@ var AttachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
-			Args:             util.Validate,
 			TraverseChildren: true,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
diff --git a/internal/cmd/server/attach_to_network.go b/internal/cmd/server/attach_to_network.go
index b9704181..a38706e0 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var AttachToNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach-to-network [options] --network <network> <server>",
 			Short:                 "Attach a server to a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_alias_ips.go b/internal/cmd/server/change_alias_ips.go
index 3961291d..919ef298 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var ChangeAliasIPsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "change-alias-ips [options] --network <network> <server>",
 			Short:                 "Change a server's alias IPs in a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/change_type.go b/internal/cmd/server/change_type.go
index 290235f6..cb7dbfcb 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var ChangeTypeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "change-type [--keep-disk] <server> <server-type>",
 			Short: "Change type of a server",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidatesF(client.ServerType().Names),
diff --git a/internal/cmd/server/create_image.go b/internal/cmd/server/create_image.go
index 9a4fe925..4f862105 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var CreateImageCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:   "create-image [options] --type <snapshot|backup> <server>",
 			Short: "Create an image from a server",
-			Args:  util.Validate,
 		}
 		cmd.Flags().String("type", "", "Image type (required)")
 		cmd.RegisterFlagCompletionFunc("type", cmpl.SuggestCandidates("backup", "snapshot"))
diff --git a/internal/cmd/server/detach_from_network.go b/internal/cmd/server/detach_from_network.go
index f3f866db..bb0b4f48 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var DetachFromNetworkCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "detach-from-network --network <network> <server>",
 			Short:                 "Detach a server from a network",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/detach_iso.go b/internal/cmd/server/detach_iso.go
index d80f6d35..d538eae7 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DetachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_backup.go b/internal/cmd/server/disable_backup.go
index e8369e5b..a97eb40f 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableBackupCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/disable_protection.go b/internal/cmd/server/disable_protection.go
index 8d72fd6e..e8f4c16d 100644
--- a/internal/cmd/server/disable_protection.go
+++ b/internal/cmd/server/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <server> <protection-level>...",
 			Short: "Disable resource protection for a server",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidates("delete", "rebuild"),
diff --git a/internal/cmd/server/disable_rescue.go b/internal/cmd/server/disable_rescue.go
index 043000d7..db60da85 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableRescueCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_backup.go b/internal/cmd/server/enable_backup.go
index bee3316a..d4608483 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var EnableBackupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/enable_protection.go b/internal/cmd/server/enable_protection.go
index d02535bf..2831dac2 100644
--- a/internal/cmd/server/enable_protection.go
+++ b/internal/cmd/server/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -65,7 +64,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <server> <protection-level>...",
 			Short: "Enable resource protection for a server",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Server().Names),
 				cmpl.SuggestCandidates("delete", "rebuild"),
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index 233382bc..fd2157bf 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var EnableRescueCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ip.go b/internal/cmd/server/ip.go
index eef0544d..4df15ea5 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var IPCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/metrics.go b/internal/cmd/server/metrics.go
index b9440706..819b37e8 100644
--- a/internal/cmd/server/metrics.go
+++ b/internal/cmd/server/metrics.go
@@ -32,7 +32,6 @@ var MetricsCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <server>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweroff.go b/internal/cmd/server/poweroff.go
index 92b13cc3..aff5f64c 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var PoweroffCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/poweron.go b/internal/cmd/server/poweron.go
index d203f2e6..eb3e06bb 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var PoweronCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reboot.go b/internal/cmd/server/reboot.go
index ef2c73e4..9f3609b8 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var RebootCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/rebuild.go b/internal/cmd/server/rebuild.go
index c975d256..3b637d06 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -19,7 +18,6 @@ var RebuildCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/remove_from_placement_group.go b/internal/cmd/server/remove_from_placement_group.go
index 04e0b306..3a25b698 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var RemoveFromPlacementGroupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:               "remove-from-placement-group <server>",
 			Short:             "Removes a server from a placement group",
-			Args:              util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 		}
 
diff --git a/internal/cmd/server/request_console.go b/internal/cmd/server/request_console.go
index 2cb02be4..e3983f11 100644
--- a/internal/cmd/server/request_console.go
+++ b/internal/cmd/server/request_console.go
@@ -18,7 +18,6 @@ var RequestConsoleCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "request-console [options] <server>",
 			Short:                 "Request a WebSocket VNC console for a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset.go b/internal/cmd/server/reset.go
index 6dbd2135..3b97a862 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var ResetCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/reset_password.go b/internal/cmd/server/reset_password.go
index e8185eab..ec881416 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var ResetPasswordCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset-password <server>",
 			Short:                 "Reset the root password of a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/shutdown.go b/internal/cmd/server/shutdown.go
index 6a4c7a17..bd225210 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -27,7 +26,6 @@ var ShutdownCmd = base.Cmd{
 			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/server/ssh.go b/internal/cmd/server/ssh.go
index 090905f5..3c4d5f4b 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -21,7 +20,6 @@ var SSHCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/sshkey/create.go b/internal/cmd/sshkey/create.go
index 5512114b..ef5d7a2f 100644
--- a/internal/cmd/sshkey/create.go
+++ b/internal/cmd/sshkey/create.go
@@ -18,7 +18,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:   "create [options] --name <name> (--public-key <key> | --public-key-from-file <file>)",
 			Short: "Create a SSH key",
-			Args:  util.Validate,
 		}
 		cmd.Flags().String("name", "", "Key name (required)")
 		_ = cmd.MarkFlagRequired("name")
diff --git a/internal/cmd/volume/attach.go b/internal/cmd/volume/attach.go
index 411a0f5a..8da5902b 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -18,7 +17,6 @@ var AttachCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/create.go b/internal/cmd/volume/create.go
index b0c2e4c3..1aa3a110 100644
--- a/internal/cmd/volume/create.go
+++ b/internal/cmd/volume/create.go
@@ -19,7 +19,6 @@ var CreateCmd = base.CreateCmd{
 		cmd := &cobra.Command{
 			Use:                   "create [options] --name <name> --size <size>",
 			Short:                 "Create a volume",
-			Args:                  util.Validate,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index 3b41a602..084b87ba 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DetachCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
diff --git a/internal/cmd/volume/disable_protection.go b/internal/cmd/volume/disable_protection.go
index c66b7049..234c7a50 100644
--- a/internal/cmd/volume/disable_protection.go
+++ b/internal/cmd/volume/disable_protection.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <volume> <protection-level>...",
 			Short: "Disable resource protection for a volume",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Volume().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/volume/enable_protection.go b/internal/cmd/volume/enable_protection.go
index f9248c27..f3600842 100644
--- a/internal/cmd/volume/enable_protection.go
+++ b/internal/cmd/volume/enable_protection.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -63,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <volume> <protection-level>...",
 			Short: "Enable resource protection for a volume",
-			Args:  util.Validate,
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.Volume().Names),
 				cmpl.SuggestCandidates("delete"),
diff --git a/internal/cmd/volume/resize.go b/internal/cmd/volume/resize.go
index 3b90a056..eb20fc03 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hetznercloud/cli/internal/cmd/base"
 	"github.com/hetznercloud/cli/internal/cmd/cmpl"
-	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/hcapi2"
 	"github.com/hetznercloud/cli/internal/state"
 )
@@ -17,7 +16,6 @@ var ResizeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
-			Args:                  util.Validate,
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,

From 713d9f129c1b10da0a258731c87947a0c7de40b6 Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:32:15 +0100
Subject: [PATCH 8/9] fix tests

---
 internal/cmd/base/delete.go             | 3 +--
 internal/cmd/base/describe.go           | 3 +--
 internal/cmd/base/labels.go             | 6 +++---
 internal/cmd/base/set_rdns.go           | 3 +--
 internal/cmd/base/update.go             | 3 +--
 internal/cmd/util/util.go               | 5 +++++
 internal/cmd/util/util_internal_test.go | 5 +++++
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
index 4b2af6ee..1fb0b3b0 100644
--- a/internal/cmd/base/delete.go
+++ b/internal/cmd/base/delete.go
@@ -3,7 +3,6 @@ package base
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -32,7 +31,7 @@ func (dc *DeleteCmd) CobraCommand(s state.State) *cobra.Command {
 	}
 
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("delete %s<%s>", opts, strings.ToLower(dc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("delete %s<%s>", opts, util.ToKebabCase(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
 		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/describe.go b/internal/cmd/base/describe.go
index b3ec5106..c3c6c733 100644
--- a/internal/cmd/base/describe.go
+++ b/internal/cmd/base/describe.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -33,7 +32,7 @@ type DescribeCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (dc *DescribeCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("describe [options] <%s>", strings.ToLower(dc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("describe [options] <%s>", util.ToKebabCase(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
 		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/labels.go b/internal/cmd/base/labels.go
index 4f3b7db7..5feadeff 100644
--- a/internal/cmd/base/labels.go
+++ b/internal/cmd/base/labels.go
@@ -27,7 +27,7 @@ type LabelCmds struct {
 // AddCobraCommand creates a command that can be registered with cobra.
 func (lc *LabelCmds) AddCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("add-label [--overwrite] <%s> <label>...", strings.ToLower(lc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("add-label [--overwrite] <%s> <label>...", util.ToKebabCase(lc.ResourceNameSingular)),
 		Short:                 lc.ShortDescriptionAdd,
 		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client()))),
@@ -89,9 +89,9 @@ func validateAddLabel(_ *cobra.Command, args []string) error {
 // RemoveCobraCommand creates a command that can be registered with cobra.
 func (lc *LabelCmds) RemoveCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("remove-label <%s> (--all | <label>...)", strings.ToLower(lc.ResourceNameSingular)),
+		Use:   fmt.Sprintf("remove-label <%s> (--all | <label>...)", util.ToKebabCase(lc.ResourceNameSingular)),
 		Short: lc.ShortDescriptionRemove,
-		Args:  util.Validate,
+		Args:  util.ValidateLenient,
 		ValidArgsFunction: cmpl.SuggestArgs(
 			cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client())),
 			cmpl.SuggestCandidatesCtx(func(_ *cobra.Command, args []string) []string {
diff --git a/internal/cmd/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index e593918a..b5c15780 100644
--- a/internal/cmd/base/set_rdns.go
+++ b/internal/cmd/base/set_rdns.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -28,7 +27,7 @@ type SetRdnsCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (rc *SetRdnsCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", strings.ToLower(rc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", util.ToKebabCase(rc.ResourceNameSingular)),
 		Short:                 rc.ShortDescription,
 		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(rc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/update.go b/internal/cmd/base/update.go
index a40f2373..c9785615 100644
--- a/internal/cmd/base/update.go
+++ b/internal/cmd/base/update.go
@@ -3,7 +3,6 @@ package base
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -28,7 +27,7 @@ type UpdateCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (uc *UpdateCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("update [options] <%s>", strings.ToLower(uc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("update [options] <%s>", util.ToKebabCase(uc.ResourceNameSingular)),
 		Short:                 uc.ShortDescription,
 		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(uc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/util/util.go b/internal/cmd/util/util.go
index dd62a127..05c8301e 100644
--- a/internal/cmd/util/util.go
+++ b/internal/cmd/util/util.go
@@ -204,3 +204,8 @@ func AddGroup(cmd *cobra.Command, id string, title string, groupCmds ...*cobra.C
 	}
 	cmd.AddCommand(groupCmds...)
 }
+
+// ToKebabCase converts the passed string to kebab-case.
+func ToKebabCase(s string) string {
+	return strings.ReplaceAll(strings.ToLower(s), " ", "-")
+}
diff --git a/internal/cmd/util/util_internal_test.go b/internal/cmd/util/util_internal_test.go
index c8ce5b03..535fcccf 100644
--- a/internal/cmd/util/util_internal_test.go
+++ b/internal/cmd/util/util_internal_test.go
@@ -116,3 +116,8 @@ func TestWrap(t *testing.T) {
 	jsonString, _ := json.Marshal(wrapped)
 	assert.JSONEq(t, `{"json": {"foo": "bar"}}`, string(jsonString))
 }
+
+func TestToKebabCase(t *testing.T) {
+	assert.Equal(t, "foo-bar", ToKebabCase("Foo Bar"))
+	assert.Equal(t, "foo", ToKebabCase("Foo"))
+}

From 103f542456ef2b0b301cb3c566e60494ac2e204e Mon Sep 17 00:00:00 2001
From: pauhull <22707808+pauhull@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:39:02 +0100
Subject: [PATCH 9/9] update CONTRIBUTING.md

---
 CONTRIBUTING.md | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 93267bbf..db27c4cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -139,8 +139,30 @@ Additional Commands:
   ssh                         Spawn an SSH connection for the server
 ```
 
+### Command validation
+
+Please use the `util.Validate` method to make sure the command is validated against its usage string during runtime.
+This can be done by setting the `Args` field of the `cobra.Command` struct to `util.Validate`:
+
+```go
+cmd := &cobra.Command{
+   Use:   "my-command [options]",
+   Args:  util.Validate,
+   Run: func(cmd *cobra.Command, args []string) {
+      // ...
+   },
+}
+```
+
+If you are using base commands like `base.Cmd` or `base.ListCmd` etc., this is already done for you.
+
+**Note:** Your command usage needs to follow the [docopt](http://docopt.org/) syntax for this to work.
+If your command uses optional positional arguments or other complicated usage that necessitates to disable
+argument count checking, you use `util.ValidateLenient` instead. It will not throw an error if there are
+more arguments than expected.
+
 ### Generated files
 
-Generated files (that are created by running `go generate`) should be prefixed with `zz_`. This is to group them 
+Generated files (that are created by running `go generate`) should be prefixed with `zz_`. This is to group them
 together in the file list and to easily identify them as generated files. Also, it allows the CI to check if the
 generated files are up-to-date.