chore(limits): modify limits unit verification

Author: duanhongyi

cmd/limits.go

@@ -145,7 +145,7 @@ func parseLimits(limits []string) (map[string]interface{}, error) {
 }
 
 func parseLimit(limit string) (string, string, error) {
-	regex := regexp.MustCompile("^([a-z0-9]+(?:-[a-z0-9]+)*)=(([0-9]+[bkmgBKMG]{1,2}|[0-9.]{1,5}|[0-9.]{1,5}m?))$")
+	regex := regexp.MustCompile("^([a-z0-9]+(?:-[a-z0-9]+)*)=(([1-9][0-9]*[mgMG]|[1-9][0-9]*m?))$")
 
 	if !regex.MatchString(limit) {
 		return "", "", fmt.Errorf(`%s doesn't fit format type=#unit or type=#

cmd/limits_test.go

@@ -29,11 +29,11 @@ Examples: web=2G worker=500M db=1G`
 		{"web=2G", "web", "2G", false, ""},
 		{"web=2", "web", "2", false, ""},
 		{"web=100m", "web", "100m", false, ""},
-		{"web=0.1", "web", "0.1", false, ""},
-		{"web=.123", "web", ".123", false, ""},
 		{"web1=2G", "web1", "2G", false, ""},
 		{"web-server=2G", "web-server", "2G", false, ""},
 		{"web-server1=2G", "web-server1", "2G", false, ""},
+		{"web=0.1", "", "", true, "web=0.1" + errorHint},
+		{"web=.123", "", "", true, "web=.123" + errorHint},
 		{"=1", "", "", true, "=1" + errorHint},
 		{"web=", "", "", true, "web=" + errorHint},
 		{"1=", "", "", true, "1=" + errorHint},
@@ -307,7 +307,7 @@ Default
 				CPU: map[string]interface{}{
 					"web":    "2",
 					"worker": "300m",
-					"db":     "5.6",
+					"db":     "5",
 				},
 			}, r)
 		}
@@ -319,7 +319,7 @@ Default
 			"cpu": {
 				"web": "2",
 				"worker": "300m",
-				"db": "5.6"
+				"db": "5"
 			},
 			"cpu": {},
 			"tags": {},
@@ -331,7 +331,7 @@ Default
 	})
 	b.Reset()
 
-	err = cmdr.LimitsSet("phew", []string{"web=2", "worker=300m", "db=5.6"}, "cpu")
+	err = cmdr.LimitsSet("phew", []string{"web=2", "worker=300m", "db=5"}, "cpu")
 	assert.NoErr(t, err)
 
 	assert.Equal(t, testutil.StripProgress(b.String()), `Applying limits... done
@@ -342,7 +342,7 @@ Default
 Default
 
 --- CPU
-db         5.6
+db         5
 web        2
 worker     300m
 `, "output")

cmd/volumes.go

@@ -74,6 +74,11 @@ func (d *DryccCmd) VolumesCreate(appID, name string, size string) error {
 	if err != nil {
 		return err
 	}
+	regex := regexp.MustCompile("^([1-9][0-9]*[mgMG])$")
+	if !regex.MatchString(size) {
+		return fmt.Errorf(`%s doesn't fit format #unit
+Examples: 2G 2g 500M 500m`, size)
+	}
 
 	d.Printf("Creating %s to %s... ", name, appID)
 
@@ -152,7 +157,6 @@ func (d *DryccCmd) VolumesUnmount(appID string, name string, volumeVars []string
 		return err
 	}
 
-	// volumeMap, err := parseVolume(volumeVars)
 	valuesMap := make(map[string]interface{})
 	for _, volumeVar := range volumeVars {
 		valuesMap[volumeVar] = nil

cmd/volumes_test.go

@@ -72,6 +72,10 @@ func TestVolumesCreate(t *testing.T) {
 
 	err = cmdr.VolumesCreate("example-go", "myvolume", "500M")
 	assert.NoErr(t, err)
+	err = cmdr.VolumesCreate("example-go", "myvolume", "500K")
+	expected := `500K doesn't fit format #unit
+Examples: 2G 2g 500M 500m`
+	assert.Equal(t, err.Error(), expected, "output")
 
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating myvolume to example-go... done\n", "output")
 }

parser/limits.go

@@ -78,8 +78,8 @@ Arguments:
     Can be in <limit> format eg. web=2G db=1G
     You can only set one type of limit per call.
 
-    With --memory, units are represented in Bytes (B), Kilobytes (K), Megabytes
-    (M), or Gigabytes (G). For example, 'drycc limit:set cmd=1G' will restrict all
+    With --memory, units are represented in Megabytes(M), or Gigabytes (G).
+	For example, 'drycc limit:set cmd=1G' will restrict all
     "cmd" processes to a maximum of 1 Gigabyte of memory each.
 
     With --cpu, units are represented in the number of CPUs. For example,