Adding volume username lookups to block and file commands. #722

Author: allmightyspiff

plugin/commands/block/block.go

@@ -12,6 +12,7 @@ func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
 	StorageCommand := &metadata.SoftlayerStorageCommand{
 		SoftlayerCommand: sl,
 		StorageI18n:      map[string]interface{}{"storageType": "block"},
+		StorageType: 	  "block",
 	}
 	cobraCmd := &cobra.Command{
 		Use:   "block",

plugin/commands/block/volume_detail.go

@@ -45,7 +45,19 @@ func (cmd *VolumeDetailCommand) Run(args []string) error {
 
 	volumeID, err := strconv.Atoi(args[0])
 	if err != nil {
-		return slErr.NewInvalidSoftlayerIdInputError("Volume ID")
+		// Maybe this is a volume username
+		volumes, err := cmd.StorageManager.ListVolumes(cmd.StorageType, "", args[0], "", "", 0, "mask[id,username]")
+		if err != nil {
+			fmt.Printf("=============== ERROR: %s\n", err.Error())
+			return slErr.NewInvalidSoftlayerIdInputError("Volume ID")
+		}
+		if len(volumes) != 1 {
+			subs := map[string]interface{}{"VolumeName": args[0], "VolumeCount": len(volumes)}
+			return slErr.New(
+				T("Search for volume {{.VolumeName}} found {{.VolumeCount}} volumes, expected 1.", subs),
+			)
+		}
+		volumeID = *volumes[0].Id
 	}
 
 	outputFormat := cmd.GetOutputFlag()

plugin/commands/file/file.go

@@ -21,6 +21,7 @@ func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
 	StorageCommand := &metadata.SoftlayerStorageCommand{
 		SoftlayerCommand: sl,
 		StorageI18n:      map[string]interface{}{"storageType": "file"},
+		StorageType:	  "file",
 	}
 	cobraCmd := &cobra.Command{
 		Use:   "file",