Merge branch 'master' into v1.6593.0

Author: Mia-Cross

internal/namespaces/block/v1alpha1/block_cli.go

@@ -587,9 +587,9 @@ If your volume is in a transient state, you need to wait until the end of the cu
 			{
 				Name:       "volume-id",
 				Short:      `UUID of the volume to snapshot`,
-				Required:   false,
+				Required:   true,
 				Deprecated: false,
-				Positional: false,
+				Positional: true,
 			},
 			{
 				Name:       "name",

internal/namespaces/ipam/v1/ipam_cli.go

@@ -89,6 +89,12 @@ func ipamIPCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "source.vpc-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "is-ipv6",
 				Short:      `Request an IPv6 instead of an IPv4`,
@@ -491,6 +497,12 @@ func ipamIPList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "source-vpc-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "organization-id",
 				Short:      `Organization ID to filter for. Only IPs belonging to this Organization will be returned`,