Update csc commands with new v1.2.0 flags

* Add optional secrets field to ListSnapshotsRequest * Add optional staging_path to NodeGetVolumeStatsRequest and NodeExpandVolumeRequest * Add optional volume_capability to ControllerExpandVolumeRequest and NodeExpandVolumeRequest
rexray · Jan 26, 2020 · 3cd9121 · 3cd9121
1 parent 8b92503
commit 3cd9121
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/csc/cmd/controller_expand_volume.go b/csc/cmd/controller_expand_volume.go
@@ -13,6 +13,7 @@ import (
 var expandVolume struct {
 	reqBytes int64
 	limBytes int64
+	volCap   *volumeCapabilitySliceArg
 }
 
 var expandVolumeCmd = &cobra.Command{
@@ -28,7 +29,8 @@ USAGE
 	RunE: func(cmd *cobra.Command, args []string) error {
 
 		req := csi.ControllerExpandVolumeRequest{
-			Secrets: root.secrets,
+			Secrets:          root.secrets,
+			VolumeCapability: expandVolume.volCap.data[0],
 		}
 
 		if expandVolume.reqBytes > 0 || expandVolume.limBytes > 0 {
@@ -68,6 +70,8 @@ func init() {
 
 	flagLimitBytes(expandVolumeCmd.Flags(), &expandVolume.limBytes)
 
+	flagVolumeCapability(nodeExpandVolumeCmd.Flags(), expandVolume.volCap)
+
 	flagWithRequiresCreds(
 		expandVolumeCmd.Flags(),
 		&root.withRequiresCreds,

diff --git a/csc/cmd/controller_list_snapshots.go b/csc/cmd/controller_list_snapshots.go
@@ -32,6 +32,7 @@ var listSnapshotsCmd = &cobra.Command{
 			StartingToken:  listSnapshots.startingToken,
 			SnapshotId:     listSnapshots.SnapshotId,
 			SourceVolumeId: listSnapshots.sourceVolumeId,
+			Secrets:        root.secrets,
 		}
 
 		// If auto-paging is not enabled then send a normal request.

diff --git a/csc/cmd/node_expand_volume.go b/csc/cmd/node_expand_volume.go
@@ -11,9 +11,10 @@ import (
 )
 
 var nodeExpandVolume struct {
-	reqBytes int64
-	limBytes int64
-	volPath  string
+	reqBytes    int64
+	limBytes    int64
+	stagingPath string
+	volCap      *volumeCapabilitySliceArg
 }
 
 var nodeExpandVolumeCmd = &cobra.Command{
@@ -30,8 +31,10 @@ USAGE
 
 		// Set the volume name and path for the current request.
 		req := csi.NodeExpandVolumeRequest{
-			VolumeId:   args[0],
-			VolumePath: args[1],
+			VolumeId:          args[0],
+			VolumePath:        args[1],
+			StagingTargetPath: nodeExpandVolume.stagingPath,
+			VolumeCapability:  nodeExpandVolume.volCap.data[0],
 		}
 
 		if nodeExpandVolume.reqBytes > 0 || nodeExpandVolume.limBytes > 0 {
@@ -66,4 +69,7 @@ func init() {
 
 	flagLimitBytes(nodeExpandVolumeCmd.Flags(), &nodeExpandVolume.limBytes)
 
+	flagStagingTargetPath(nodeExpandVolumeCmd.Flags(), &nodeExpandVolume.stagingPath)
+
+	flagVolumeCapability(nodeExpandVolumeCmd.Flags(), nodeExpandVolume.volCap)
 }
diff --git a/csc/cmd/node_get_volume_stats.go b/csc/cmd/node_get_volume_stats.go
@@ -11,21 +11,13 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 )
 
-var nodeGetVolumeStats struct {
-	nodeID            string
-	stagingTargetPath string
-	pubInfo           mapOfStringArg
-	attribs           mapOfStringArg
-	caps              volumeCapabilitySliceArg
-}
-
 var nodeGetVolumeStatsCmd = &cobra.Command{
 	Use:   "stats",
 	Short: `invokes the rpc "NodeGetVolumeStats"`,
 	Example: `
 USAGE
 
-	csc node stats VOLUME_ID:VOLUME_PATH [VOLUME_ID:VOLUME_PATh...]
+	csc node stats VOLUME_ID:VOLUME_PATH:STAGING_PATH [VOLUME_ID:VOLUME_PATH:STAGING_PATH...]
 `,
 	Args: cobra.MinimumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -39,6 +31,9 @@ USAGE
 			// Set the volume ID and volume path for the current request.
 			split := strings.Split(args[i], ":")
 			req.VolumeId, req.VolumePath = split[0], split[1]
+			if len(split) > 2 {
+				req.StagingTargetPath = split[2]
+			}
 
 			log.WithField("request", req).Debug("staging volume")
 			rep, err := node.client.NodeGetVolumeStats(ctx, &req)