Merge pull request #442 from XiangRongLin/device-count-string-int

loader/loader.go

@@ -1038,7 +1038,12 @@ var transformServiceDeviceRequest TransformerFunc = func(data interface{}) (inte
 					value["count"] = -1
 					return value, nil
 				}
-				return data, errors.Errorf("invalid string value for 'count' (the only value allowed is 'all')")
+				i, err := strconv.ParseInt(val, 10, 64)
+				if err == nil {
+					value["count"] = i
+					return value, nil
+				}
+				return data, errors.Errorf("invalid string value for 'count' (the only value allowed is 'all' or a number)")
 			default:
 				return data, errors.Errorf("invalid type %T for device count", val)
 			}

loader/loader_test.go

@@ -2044,7 +2044,24 @@ func TestLoadWithExtendsWithContextUrl(t *testing.T) {
 	assert.Check(t, is.DeepEqual(expServices, actual.Services))
 }
 
-func TestServiceDeviceRequestCount(t *testing.T) {
+func TestServiceDeviceRequestCountIntegerType(t *testing.T) {
+	_, err := loadYAML(`
+name: service-device-request-count
+services:
+  hello-world:
+    image: redis:alpine
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              capabilities: [gpu]
+              count: 1
+`)
+	assert.NilError(t, err)
+}
+
+func TestServiceDeviceRequestCountStringType(t *testing.T) {
 	_, err := loadYAML(`
 name: service-device-request-count
 services:
@@ -2061,7 +2078,24 @@ services:
 	assert.NilError(t, err)
 }
 
-func TestServiceDeviceRequestCountType(t *testing.T) {
+func TestServiceDeviceRequestCountIntegerAsStringType(t *testing.T) {
+	_, err := loadYAML(`
+name: service-device-request-count-type
+services:
+  hello-world:
+    image: redis:alpine
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              capabilities: [gpu]
+              count: "1"
+`)
+	assert.NilError(t, err)
+}
+
+func TestServiceDeviceRequestCountInvalidStringType(t *testing.T) {
 	_, err := loadYAML(`
 name: service-device-request-count-type
 services:
@@ -2075,7 +2109,7 @@ services:
               capabilities: [gpu]
               count: somestring
 `)
-	assert.ErrorContains(t, err, "invalid string value for 'count' (the only value allowed is 'all')")
+	assert.ErrorContains(t, err, "invalid string value for 'count' (the only value allowed is 'all' or a number)")
 }
 
 func TestServicePullPolicy(t *testing.T) {