cr updates

Author: manueltellez

internal/os/volume/api.go

@@ -24,6 +24,23 @@ func runExec(cmd string) ([]byte, error) {
 	return out, err
 }
 
+func getVolumeSize(volumeID string) (int64, error) {
+	cmd := fmt.Sprintf("(Get-Volume -UniqueId \"%s\" | Get-partition).Size", volumeID)
+	out, err := runExec(cmd)
+
+	if err != nil || len(out) == 0 {
+		return -1, fmt.Errorf("error getting size of the partition from mount. cmd %s, output: %s, error: %v", cmd, string(out), err)
+	}
+
+	outString := strings.TrimSpace(string(out))
+	volumeSize, err := strconv.ParseInt(outString, 10, 64)
+	if err != nil {
+		return -1, fmt.Errorf("error parsing size of volume %s received %v trimmed to %v err %v", volumeID, out, outString, err)
+	}
+
+	return volumeSize, nil
+}
+
 // ListVolumesOnDisk - returns back list of volumes(volumeIDs) in the disk (requested in diskID).
 func (VolAPIImplementor) ListVolumesOnDisk(diskID string) (volumeIDs []string, err error) {
 	cmd := fmt.Sprintf("(Get-Disk -DeviceId %s |Get-Partition | Get-Volume).UniqueId", diskID)
@@ -110,22 +127,11 @@ func (VolAPIImplementor) ResizeVolume(volumeID string, size int64) error {
 		finalSize = size
 	}
 
-	cmd = fmt.Sprintf("Get-Volume -UniqueId \"%s\" | Get-partition | Select Size", volumeID)
-	out, err = runExec(cmd)
-
-	if err != nil || len(out) == 0 {
-		return fmt.Errorf("error getting size of the partition from moun. cmd %s, output: %s, error: %v", cmd, string(out), err)
-	}
-
-	var getPartitionSizing map[string]int64
-	outString = string(out)
-	err = json.Unmarshal([]byte(outString), &getPartitionSizing)
+	currentSize, err := getVolumeSize(volumeID)
 	if err != nil {
-		return fmt.Errorf("out %v outstring %v err %v", out, outString, err)
+		return fmt.Errorf("error getting the current size of volume (%s) with error (%v)", volumeID, err)
 	}
 
-	currentSize := getPartitionSizing["Size"]
-
 	//if the partition's size is already the size we want this is a noop, just return
 	if currentSize >= finalSize {
 		return nil