Merge pull request #1100 from himanshuvar/master

[AWS Block Support] Update AWS Volume Size to take inputs as bytes

contrib/datastore/block/aws/aws.go

@@ -61,7 +61,7 @@ func (ad *AwsAdapter) ParseVolume(volumeAWS *awsec2.Volume) (*block.Volume, erro
 	}
 
 	volume := &block.Volume{
-		Size:               *volumeAWS.Size,
+		Size:               *volumeAWS.Size * utils.GB_FACTOR,
 		Encrypted:          *volumeAWS.Encrypted,
 		Status:             *volumeAWS.State,
 		SnapshotId:         *volumeAWS.SnapshotId,
@@ -102,7 +102,7 @@ func (ad *AwsAdapter) ParseUpdatedVolume(volumeAWS *awsec2.VolumeModification) (
 	}
 
 	volume := &block.Volume{
-		Size:     *volumeAWS.TargetSize,
+		Size:     *volumeAWS.TargetSize * utils.GB_FACTOR,
 		Status:   *volumeAWS.ModificationState,
 		Iops:     *volumeAWS.TargetIops,
 		Type:     *volumeAWS.TargetVolumeType,
@@ -149,7 +149,7 @@ func (ad *AwsAdapter) CreateVolume(ctx context.Context, volume *block.CreateVolu
 
 	input := &awsec2.CreateVolumeInput{
 		AvailabilityZone:  aws.String(volume.Volume.AvailabilityZone),
-		Size:              aws.Int64(volume.Volume.Size),
+		Size:              aws.Int64(volume.Volume.Size / utils.GB_FACTOR),
 		VolumeType:        aws.String(volume.Volume.Type),
 		TagSpecifications: []*awsec2.TagSpecification{tagList},
 		Encrypted:         aws.Bool(volume.Volume.Encrypted),
@@ -308,7 +308,7 @@ func (ad *AwsAdapter) UpdateVolume(ctx context.Context, in *block.UpdateVolumeRe
 	if in.Volume.Type != "" {
 		input := &awsec2.ModifyVolumeInput{
 			VolumeId:   aws.String(in.Volume.Metadata.Fields[VolumeId].GetStringValue()),
-			Size:       aws.Int64(in.Volume.Size),
+			Size:       aws.Int64(in.Volume.Size / utils.GB_FACTOR),
 			VolumeType: aws.String(in.Volume.Type),
 			Iops:       aws.Int64(in.Volume.Iops),
 		}