From e7f9e74d22fa1c712ac8363d30efe0499916e859 Mon Sep 17 00:00:00 2001
From: phm07 <22707808+phm07@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:33:26 +0200
Subject: [PATCH] feat: improve missing argument error messages (#711)

This PR adds a custom Cobra command validator that outputs useful errors
when positional arguments are missing during command execution. For
example, such an error could look like this:
```
$ hcloud server describe
hcloud server describe [options] <server>
                                  ^^^^^^
hcloud: expected argument server at position 1
```

Where previously it would look like this:
```
$ hcloud server describe
hcloud: accepts 1 arg(s), received 0
```

Additionally, if there are more arguments provided than necessary, the
following error message will appear:
```
$ hcloud server describe arg1 arg2
hcloud server describe [options] <server>
                                          ^
hcloud: expected exactly 1 positional argument(s), but got 2
```

This is done by parsing the `Use` property of a Cobra command with a
regular expression and then matching the corresponding missing
arguments.

Fixes #700

---------

Co-authored-by: pauhull <22707808+pauhull@users.noreply.github.com>
---
 CONTRIBUTING.md                               |  24 +++-
 internal/cmd/all/all.go                       |   3 +-
 internal/cmd/base/cmd.go                      |   2 +-
 internal/cmd/base/create.go                   |   2 +-
 internal/cmd/base/delete.go                   |   5 +-
 internal/cmd/base/describe.go                 |   5 +-
 internal/cmd/base/labels.go                   |   8 +-
 internal/cmd/base/list.go                     |   1 +
 internal/cmd/base/set_rdns.go                 |   5 +-
 internal/cmd/base/update.go                   |   5 +-
 internal/cmd/certificate/certificate.go       |   3 +-
 internal/cmd/certificate/create.go            |   1 -
 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             |   1 -
 internal/cmd/firewall/apply_to_resource.go    |   1 -
 internal/cmd/firewall/create.go               |   1 -
 internal/cmd/firewall/delete_rule.go          |   1 -
 internal/cmd/firewall/firewall.go             |   2 +-
 internal/cmd/firewall/remove_from_resource.go |   1 -
 internal/cmd/firewall/replace_rules.go        |   1 -
 internal/cmd/floatingip/assign.go             |   1 -
 internal/cmd/floatingip/create.go             |   1 -
 internal/cmd/floatingip/disable_protection.go |   1 -
 internal/cmd/floatingip/enable_protection.go  |   1 -
 internal/cmd/floatingip/floatingip.go         |   2 +-
 internal/cmd/floatingip/unassign.go           |   1 -
 internal/cmd/image/disable_protection.go      |   1 -
 internal/cmd/image/enable_protection.go       |   1 -
 internal/cmd/image/image.go                   |   2 +-
 internal/cmd/iso/iso.go                       |   3 +-
 internal/cmd/loadbalancer/add_service.go      |   1 -
 internal/cmd/loadbalancer/add_target.go       |   1 -
 .../cmd/loadbalancer/attach_to_network.go     |   1 -
 internal/cmd/loadbalancer/change_algorithm.go |   1 -
 internal/cmd/loadbalancer/change_type.go      |   1 -
 internal/cmd/loadbalancer/create.go           |   1 -
 internal/cmd/loadbalancer/delete_service.go   |   1 -
 .../cmd/loadbalancer/detach_from_network.go   |   1 -
 .../cmd/loadbalancer/disable_protection.go    |   1 -
 .../loadbalancer/disable_public_interface.go  |   1 -
 .../cmd/loadbalancer/enable_protection.go     |   1 -
 .../loadbalancer/enable_public_interface.go   |   1 -
 internal/cmd/loadbalancer/load_balancer.go    |   2 +-
 internal/cmd/loadbalancer/metrics.go          |   1 -
 internal/cmd/loadbalancer/remove_target.go    |   1 -
 internal/cmd/loadbalancer/update_service.go   |   1 -
 .../loadbalancertype/load_balancer_type.go    |   3 +-
 internal/cmd/location/location.go             |   3 +-
 internal/cmd/network/add_route.go             |   1 -
 internal/cmd/network/add_subnet.go            |   1 -
 internal/cmd/network/change_ip_range.go       |   1 -
 internal/cmd/network/create.go                |   1 -
 internal/cmd/network/disable_protection.go    |   1 -
 internal/cmd/network/enable_protection.go     |   1 -
 .../cmd/network/expose_routes_to_vswitch.go   |   1 -
 internal/cmd/network/network.go               |   2 +-
 internal/cmd/network/remove_route.go          |   1 -
 internal/cmd/network/remove_subnet.go         |   1 -
 internal/cmd/placementgroup/placementgroup.go |   3 +-
 internal/cmd/primaryip/assign.go              |   1 -
 internal/cmd/primaryip/create.go              |   1 -
 internal/cmd/primaryip/disable_protection.go  |   1 -
 internal/cmd/primaryip/enable_protection.go   |   1 -
 internal/cmd/primaryip/primaryip.go           |   2 +-
 internal/cmd/primaryip/unassign.go            |   1 -
 internal/cmd/server/add_to_placement_group.go |   1 -
 internal/cmd/server/attach_iso.go             |   1 -
 internal/cmd/server/attach_to_network.go      |   1 -
 internal/cmd/server/change_alias_ips.go       |   1 -
 internal/cmd/server/change_type.go            |   1 -
 internal/cmd/server/create_image.go           |   1 -
 internal/cmd/server/detach_from_network.go    |   1 -
 internal/cmd/server/detach_iso.go             |   1 -
 internal/cmd/server/disable_backup.go         |   1 -
 internal/cmd/server/disable_protection.go     |   1 -
 internal/cmd/server/disable_rescue.go         |   1 -
 internal/cmd/server/enable_backup.go          |   1 -
 internal/cmd/server/enable_protection.go      |   1 -
 internal/cmd/server/enable_rescue.go          |   1 -
 internal/cmd/server/ip.go                     |   1 -
 internal/cmd/server/metrics.go                |   1 -
 internal/cmd/server/poweroff.go               |   1 -
 internal/cmd/server/poweron.go                |   1 -
 internal/cmd/server/reboot.go                 |   1 -
 internal/cmd/server/rebuild.go                |   1 -
 .../cmd/server/remove_from_placement_group.go |   1 -
 internal/cmd/server/request_console.go        |   1 -
 internal/cmd/server/reset.go                  |   1 -
 internal/cmd/server/reset_password.go         |   1 -
 internal/cmd/server/server.go                 |   2 +-
 internal/cmd/server/shutdown.go               |   1 -
 internal/cmd/server/ssh.go                    |   1 -
 internal/cmd/servertype/server_type.go        |   3 +-
 internal/cmd/sshkey/create.go                 |   1 -
 internal/cmd/sshkey/sshkey.go                 |   3 +-
 internal/cmd/util/util.go                     |   5 +
 internal/cmd/util/util_internal_test.go       |   5 +
 internal/cmd/util/validation.go               |  73 ++++++++++++
 internal/cmd/util/validation_test.go          | 108 ++++++++++++++++++
 internal/cmd/version/version.go               |   3 +-
 internal/cmd/volume/attach.go                 |   1 -
 internal/cmd/volume/create.go                 |   1 -
 internal/cmd/volume/detach.go                 |   1 -
 internal/cmd/volume/disable_protection.go     |   1 -
 internal/cmd/volume/enable_protection.go      |   1 -
 internal/cmd/volume/resize.go                 |   1 -
 internal/cmd/volume/volume.go                 |   2 +-
 114 files changed, 270 insertions(+), 120 deletions(-)
 create mode 100644 internal/cmd/util/validation.go
 create mode 100644 internal/cmd/util/validation_test.go

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.
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/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/delete.go b/internal/cmd/base/delete.go
index 1f215805..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,9 +31,9 @@ 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:                  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..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,9 +32,9 @@ 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:                  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..5feadeff 100644
--- a/internal/cmd/base/labels.go
+++ b/internal/cmd/base/labels.go
@@ -27,9 +27,9 @@ 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:                  cobra.MinimumNArgs(2),
+		Args:                  util.Validate,
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client()))),
 		TraverseChildren:      true,
 		DisableFlagsInUseLine: true,
@@ -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:  cobra.MinimumNArgs(1),
+		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/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/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index e189a127..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,9 +27,9 @@ 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:                  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..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,9 +27,9 @@ 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:                  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..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:  cobra.ExactArgs(0),
 		}
 
 		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..ac5648fd 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..28af9848 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..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:  cobra.NoArgs,
 		}
 		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..cf16a3b4 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -19,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:                  cobra.ExactArgs(1),
 			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..e2da1cf9 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..a06bc8a7 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -22,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:                  cobra.ExactArgs(1),
 			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..b2da0a92 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -16,7 +16,6 @@ var AssignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
-			Args:  cobra.ExactArgs(2),
 			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..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:                  cobra.NoArgs,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/floatingip/disable_protection.go b/internal/cmd/floatingip/disable_protection.go
index e1904cb6..6634eeed 100644
--- a/internal/cmd/floatingip/disable_protection.go
+++ b/internal/cmd/floatingip/disable_protection.go
@@ -16,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:  cobra.MinimumNArgs(2),
 			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..c6598d29 100644
--- a/internal/cmd/floatingip/enable_protection.go
+++ b/internal/cmd/floatingip/enable_protection.go
@@ -62,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:  cobra.MinimumNArgs(2),
 			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..6a65810d 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -16,7 +16,6 @@ var UnassignCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
-			Args:                  cobra.ExactArgs(1),
 			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..26ae7fc1 100644
--- a/internal/cmd/image/disable_protection.go
+++ b/internal/cmd/image/disable_protection.go
@@ -18,7 +18,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <image> <protection-level>...",
 			Short: "Disable resource protection for an image",
-			Args:  cobra.MinimumNArgs(2),
 			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..d74a1fa7 100644
--- a/internal/cmd/image/enable_protection.go
+++ b/internal/cmd/image/enable_protection.go
@@ -65,7 +65,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <image> <protection-level>...",
 			Short: "Enable resource protection for an image",
-			Args:  cobra.MinimumNArgs(2),
 			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..885dd681 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..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:                  cobra.ExactArgs(1),
 			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..c2183c75 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..88483c00 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..ca918fe9 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -17,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:  cobra.ExactArgs(2),
 			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..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:                  cobra.NoArgs,
 			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 0815e000..1f6b1bf9 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..6e7ae911 100644
--- a/internal/cmd/loadbalancer/disable_protection.go
+++ b/internal/cmd/loadbalancer/disable_protection.go
@@ -16,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:  cobra.MinimumNArgs(2),
 			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..1edf6c33 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -16,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:                  cobra.ExactArgs(1),
 			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..c915c0e1 100644
--- a/internal/cmd/loadbalancer/enable_protection.go
+++ b/internal/cmd/loadbalancer/enable_protection.go
@@ -62,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:  cobra.MinimumNArgs(2),
 			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..21963d4f 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -16,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:                  cobra.ExactArgs(1),
 			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..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:                  cobra.ExactArgs(1),
 			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..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:                  cobra.ExactArgs(1),
 			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..75810a41 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..307b1f93 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..9f3d0f86 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..a0270431 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..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:  cobra.NoArgs,
 		}
 
 		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..97042046 100644
--- a/internal/cmd/network/disable_protection.go
+++ b/internal/cmd/network/disable_protection.go
@@ -16,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <network> <protection-level>...",
 			Short: "Disable resource protection for a network",
-			Args:  cobra.MinimumNArgs(2),
 			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..2603adc3 100644
--- a/internal/cmd/network/enable_protection.go
+++ b/internal/cmd/network/enable_protection.go
@@ -62,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <network> <protection-level>...",
 			Short: "Enable resource protection for a network",
-			Args:  cobra.MinimumNArgs(2),
 			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..959fef16 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..51bafdd3 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..5c5007a5 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..e5f825c2 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -17,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:  cobra.ExactArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(
 				cmpl.SuggestCandidatesF(client.PrimaryIP().Names),
 			),
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index b0ba6418..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:                  cobra.NoArgs,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/primaryip/disable_protection.go b/internal/cmd/primaryip/disable_protection.go
index bcd14c05..ebbe4cbe 100644
--- a/internal/cmd/primaryip/disable_protection.go
+++ b/internal/cmd/primaryip/disable_protection.go
@@ -16,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:  cobra.MinimumNArgs(1),
 			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..b5afac52 100644
--- a/internal/cmd/primaryip/enable_protection.go
+++ b/internal/cmd/primaryip/enable_protection.go
@@ -60,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:  cobra.MinimumNArgs(1),
 			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..725cc624 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -16,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:  cobra.ExactArgs(1),
 			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..284d8ea2 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -16,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:              cobra.ExactArgs(1),
 			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..2e056449 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -17,7 +17,6 @@ var AttachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
-			Args:             cobra.ExactArgs(2),
 			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..a38706e0 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..919ef298 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -18,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:                  cobra.ExactArgs(1),
 			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..cb7dbfcb 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -17,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:  cobra.ExactArgs(2),
 			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..4f862105 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -17,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:  cobra.ExactArgs(1),
 		}
 		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..bb0b4f48 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -17,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:                  cobra.ExactArgs(1),
 			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..d538eae7 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -16,7 +16,6 @@ var DetachISOCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
-			Args:                  cobra.ExactArgs(1),
 			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..a97eb40f 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -16,7 +16,6 @@ var DisableBackupCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
-			Args:                  cobra.ExactArgs(1),
 			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..e8f4c16d 100644
--- a/internal/cmd/server/disable_protection.go
+++ b/internal/cmd/server/disable_protection.go
@@ -16,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <server> <protection-level>...",
 			Short: "Disable resource protection for a server",
-			Args:  cobra.MinimumNArgs(2),
 			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..db60da85 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -16,7 +16,6 @@ var DisableRescueCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
-			Args:                  cobra.ExactArgs(1),
 			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..d4608483 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -16,7 +16,6 @@ var EnableBackupCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
-			Args:                  cobra.ExactArgs(1),
 			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..2831dac2 100644
--- a/internal/cmd/server/enable_protection.go
+++ b/internal/cmd/server/enable_protection.go
@@ -64,7 +64,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <server> <protection-level>...",
 			Short: "Enable resource protection for a server",
-			Args:  cobra.MinimumNArgs(2),
 			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..fd2157bf 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -17,7 +17,6 @@ var EnableRescueCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
-			Args:                  cobra.ExactArgs(1),
 			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..4df15ea5 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -16,7 +16,6 @@ var IPCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
-			Args:                  cobra.ExactArgs(1),
 			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..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:                  cobra.ExactArgs(1),
 			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..aff5f64c 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -16,7 +16,6 @@ var PoweroffCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
-			Args:                  cobra.ExactArgs(1),
 			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..eb3e06bb 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -16,7 +16,6 @@ var PoweronCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
-			Args:                  cobra.ExactArgs(1),
 			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..9f3609b8 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -16,7 +16,6 @@ var RebootCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
-			Args:                  cobra.ExactArgs(1),
 			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..3b637d06 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -18,7 +18,6 @@ var RebuildCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
-			Args:                  cobra.ExactArgs(1),
 			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..3a25b698 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -16,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:              cobra.ExactArgs(1),
 			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..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:                  cobra.ExactArgs(1),
 			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..3b97a862 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -16,7 +16,6 @@ var ResetCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
-			Args:                  cobra.ExactArgs(1),
 			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 8942aabe..28987fe9 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -18,7 +18,6 @@ var ResetPasswordCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "reset-password [options] <server>",
 			Short:                 "Reset the root password of a server",
-			Args:                  cobra.ExactArgs(1),
 			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..bd225210 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -26,7 +26,6 @@ var ShutdownCmd = base.Cmd{
 			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
-			Args:                  cobra.ExactArgs(1),
 			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..3c4d5f4b 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -20,7 +20,6 @@ var SSHCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
-			Args:                  cobra.MinimumNArgs(1),
 			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..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:  cobra.NoArgs,
 		}
 		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/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"))
+}
diff --git a/internal/cmd/util/validation.go b/internal/cmd/util/validation.go
new file mode 100644
index 00000000..2c967dc4
--- /dev/null
+++ b/internal/cmd/util/validation.go
@@ -0,0 +1,73 @@
+package util
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+// 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)
+}
+
+// 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) && !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++ {
+		if i >= len(args) {
+			idx := strings.Index(use, "<"+expected[i]+">")
+			if idx != -1 {
+				_, _ = fmt.Fprintln(os.Stderr, use)
+				_, _ = fmt.Fprintln(os.Stderr, strings.Repeat(" ", idx+1)+strings.Repeat("^", len(expected[i])))
+			}
+			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
new file mode 100644
index 00000000..1d169fd3
--- /dev/null
+++ b/internal/cmd/util/validation_test.go
@@ -0,0 +1,108 @@
+package util
+
+import (
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/hetznercloud/cli/internal/testutil"
+)
+
+func TestValidate(t *testing.T) {
+	tests := []struct {
+		name           string
+		use            string
+		args           []string
+		lenient        bool
+		expectedStdout string
+		expectedStderr string
+		expectedErr    string
+	}{
+		{
+			name: "correct usage",
+			use:  "test <arg1> <arg2>",
+			args: []string{"arg1", "arg2"},
+		},
+		{
+			name:           "missing arg",
+			use:            "test <arg1> <arg2>",
+			args:           []string{"arg1"},
+			expectedStderr: "test <arg1> <arg2>\n             ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
+		},
+		{
+			name:           "missing arg variadic",
+			use:            "test <arg1> <arg2>...",
+			args:           []string{"arg1"},
+			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"},
+			expectedStderr: "test <arg1> <arg2>\n                   ^\n",
+			expectedErr:    "expected exactly 2 positional argument(s), but got 3",
+		},
+		{
+			name: "complex correct usage",
+			use:  "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args: []string{"arg1", "arg2"},
+		},
+		{
+			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] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:           []string{"arg1"},
+			expectedStderr: "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]\n                                           ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
+		},
+		{
+			name:           "complex missing arg variadic",
+			use:            "test [options] <arg1> --flag <not-an-arg> <arg2>... [<arg3>]",
+			args:           []string{"arg1"},
+			expectedStderr: "test [options] <arg1> --flag <not-an-arg> <arg2>... [<arg3>]\n                                           ^^^^\n",
+			expectedErr:    "expected argument(s) arg2 at position 2",
+		},
+		{ // 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 lenient",
+			use:     "test [options] <arg1> --flag <not-an-arg> <arg2> [<arg3>]",
+			args:    []string{"arg1", "arg2", "arg3"},
+			lenient: true,
+		},
+	}
+
+	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.lenient {
+					return ValidateLenient(cmd, test.args)
+				} else {
+					return Validate(cmd, test.args)
+				}
+			})
+
+			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)
+			}
+		})
+	}
+}
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..8da5902b 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -17,7 +17,6 @@ var AttachCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
-			Args:                  cobra.ExactArgs(1),
 			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..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:                  cobra.NoArgs,
 			TraverseChildren:      true,
 			DisableFlagsInUseLine: true,
 		}
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index 3e7eedcc..084b87ba 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -16,7 +16,6 @@ var DetachCmd = base.Cmd{
 		return &cobra.Command{
 			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
-			Args:                  cobra.ExactArgs(1),
 			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..234c7a50 100644
--- a/internal/cmd/volume/disable_protection.go
+++ b/internal/cmd/volume/disable_protection.go
@@ -16,7 +16,6 @@ var DisableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "disable-protection <volume> <protection-level>...",
 			Short: "Disable resource protection for a volume",
-			Args:  cobra.MinimumNArgs(2),
 			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..f3600842 100644
--- a/internal/cmd/volume/enable_protection.go
+++ b/internal/cmd/volume/enable_protection.go
@@ -62,7 +62,6 @@ var EnableProtectionCmd = base.Cmd{
 		return &cobra.Command{
 			Use:   "enable-protection <volume> <protection-level>...",
 			Short: "Enable resource protection for a volume",
-			Args:  cobra.MinimumNArgs(2),
 			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..eb20fc03 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -16,7 +16,6 @@ var ResizeCmd = base.Cmd{
 		cmd := &cobra.Command{
 			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
-			Args:                  cobra.ExactArgs(1),
 			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,
 	}