Change iops params to not handle GB/MB etc.

Author: sunnylovestiramisu

pkg/common/parameters.go

@@ -152,7 +152,7 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
 				p.Labels[labelKey] = labelValue
 			}
 		case ParameterKeyProvisionedIOPSOnCreate:
-			paramProvisionedIOPSOnCreate, err := ConvertGiBStringToInt64(v)
+			paramProvisionedIOPSOnCreate, err := ConvertStringToInt64(v)
 			if err != nil {
 				return p, fmt.Errorf("parameters contain invalid provisionedIOPSOnCreate parameter: %w", err)
 			}

pkg/common/parameters_test.go

@@ -76,7 +76,7 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 		},
 		{
 			name:       "values from parameters, checking pd-extreme",
-			parameters: map[string]string{ParameterKeyType: "pd-extreme", ParameterKeyReplicationType: "none", ParameterKeyDiskEncryptionKmsKey: "foo/key", ParameterKeyLabels: "key1=value1,key2=value2", ParameterKeyProvisionedIOPSOnCreate: "10000Gi"},
+			parameters: map[string]string{ParameterKeyType: "pd-extreme", ParameterKeyReplicationType: "none", ParameterKeyDiskEncryptionKmsKey: "foo/key", ParameterKeyLabels: "key1=value1,key2=value2", ParameterKeyProvisionedIOPSOnCreate: "10K"},
 			labels:     map[string]string{},
 			expectParams: DiskParameters{
 				DiskType:             "pd-extreme",

pkg/common/utils.go

@@ -19,6 +19,7 @@ package common
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
@@ -59,6 +60,9 @@ const (
 	multiRegionalLocationFmt = "^[a-z]+$"
 	// Example: us-east1
 	regionalLocationFmt = "^[a-z]+-[a-z]+[0-9]$"
+
+	thousand = int64(1000)
+	million  = int64(1000000)
 )
 
 var (
@@ -251,15 +255,39 @@ func ValidateSnapshotType(snapshotType string) error {
 	}
 }
 
-// ConvertGiBStringToInt64 converts a GiB string to int64
-func ConvertGiBStringToInt64(str string) (int64, error) {
+// ConvertStringToInt64 converts a string to int64
+func ConvertStringToInt64(str string) (int64, error) {
 	// Verify regex before
-	match, _ := regexp.MatchString("^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$", str)
+	match, _ := regexp.MatchString("^([+-]?[0-9.]+)([mkKM]*[-+]?[0-9]*)$", str)
 	if !match {
 		return 0, fmt.Errorf("invalid string %s", str)
 	}
-	quantity := resource.MustParse(str)
-	return volumehelpers.RoundUpToGiB(quantity)
+
+	multiplier := int64(1)
+	value, err := strconv.ParseInt(str, 10, 64)
+	if err != nil {
+		// the string ends with m, M or k, K
+		last := string(str[len(str)-1])
+
+		switch last {
+		case "k":
+			multiplier = thousand
+		case "K":
+			multiplier = thousand
+		case "m":
+			multiplier = million
+		case "M":
+			multiplier = million
+		default:
+			return 0, fmt.Errorf("invalid string %s", str)
+		}
+		str = str[:len(str)-1]
+		value, err = strconv.ParseInt(str, 10, 64)
+		if err != nil {
+			return 0, fmt.Errorf("invalid string %s", str)
+		}
+	}
+	return value * multiplier, nil
 }
 
 // ConvertMiBStringToInt64 converts a GiB string to int64

pkg/common/utils_test.go

@@ -578,7 +578,7 @@ func TestSnapshotStorageLocations(t *testing.T) {
 	}
 }
 
-func TestConvertGiBStringToInt64(t *testing.T) {
+func TestConvertStringToInt64(t *testing.T) {
 	tests := []struct {
 		desc        string
 		inputStr    string
@@ -588,60 +588,48 @@ func TestConvertGiBStringToInt64(t *testing.T) {
 		{
 			"valid number string",
 			"10000",
-			1,
+			10000,
 			false,
 		},
 		{
-			"round Ki to GiB",
-			"1000Ki",
-			1,
+			"round M to number",
+			"1M",
+			1000000,
 			false,
 		},
 		{
-			"round k to GiB",
-			"1000k",
-			1,
+			"round m to number",
+			"1m",
+			1000000,
 			false,
 		},
 		{
-			"round Mi to GiB",
-			"1000Mi",
-			1,
-			false,
-		},
-		{
-			"round M to GiB",
-			"1000M",
-			1,
+			"round k to number",
+			"1k",
+			1000,
 			false,
 		},
 		{
-			"round G to GiB",
-			"1000G",
-			932,
+			"round K to number",
+			"2K",
+			2000,
 			false,
 		},
 		{
-			"round Gi to GiB",
-			"10000Gi",
+			"invalid empty string",
+			"",
 			10000,
-			false,
-		},
-		{
-			"round decimal to GiB",
-			"1.2Gi",
-			2,
-			false,
+			true,
 		},
 		{
-			"round big value to GiB",
-			"8191Pi",
-			8588886016,
-			false,
+			"invalid string with duplicate valid alphabets",
+			"2kk",
+			10000,
+			true,
 		},
 		{
-			"invalid empty string",
-			"",
+			"invalid string contains valid string",
+			"10k10",
 			10000,
 			true,
 		},
@@ -654,7 +642,7 @@ func TestConvertGiBStringToInt64(t *testing.T) {
 	}
 	for _, tc := range tests {
 		t.Run(tc.desc, func(t *testing.T) {
-			actualInt64, err := ConvertGiBStringToInt64(tc.inputStr)
+			actualInt64, err := ConvertStringToInt64(tc.inputStr)
 			if err != nil && !tc.expectError {
 				t.Errorf("Got error %v converting string to int64 %s; expect no error", err, tc.inputStr)
 			}

test/k8s-integration/config/sc-extreme.yaml

@@ -5,7 +5,7 @@ metadata:
 provisioner: pd.csi.storage.gke.io
 parameters:
   type: pd-extreme
-  provisioned-iops-on-create: '10000Gi'
+  provisioned-iops-on-create: '10000'
   # Add labels for testing.
   labels: key1=value1,key2=value2
 volumeBindingMode: WaitForFirstConsumer