diff --git a/command/alloc_status.go b/command/alloc_status.go index 2dc8947a36f7..0c9e697b1fe7 100644 --- a/command/alloc_status.go +++ b/command/alloc_status.go @@ -785,7 +785,7 @@ FOUND: hostVolumesOutput = append(hostVolumesOutput, "ID|Read Only") if verbose { csiVolumesOutput = append(csiVolumesOutput, - "ID|Plugin|Provider|Schedulable|Read Only|Mount Options") + "Name|ID|Plugin|Provider|Schedulable|Read Only|Mount Options") } else { csiVolumesOutput = append(csiVolumesOutput, "ID|Read Only") } @@ -800,15 +800,16 @@ FOUND: if verbose { // there's an extra API call per volume here so we toggle it // off with the -verbose flag - vol, _, err := client.CSIVolumes().Info(volReq.Name, nil) + vol, _, err := client.CSIVolumes().Info(volReq.Source, nil) if err != nil { c.Ui.Error(fmt.Sprintf("Error retrieving volume info for %q: %s", volReq.Name, err)) continue } csiVolumesOutput = append(csiVolumesOutput, - fmt.Sprintf("%s|%s|%s|%v|%v|%s", + fmt.Sprintf("%s|%s|%s|%s|%v|%v|%s", volReq.Name, + vol.ID, vol.PluginID, vol.Provider, vol.Schedulable, diff --git a/command/alloc_status_test.go b/command/alloc_status_test.go index df921c7cc733..c875a5bc0abb 100644 --- a/command/alloc_status_test.go +++ b/command/alloc_status_test.go @@ -491,7 +491,7 @@ func TestAllocStatusCommand_CSIVolumes(t *testing.T) { vol0: { Name: vol0, Type: structs.VolumeTypeCSI, - Source: "/tmp/vol0", + Source: vol0, }, } job.TaskGroups[0].Tasks[0].VolumeMounts = []*structs.VolumeMount{