Parse service device count to int if possible

XiangRongLin · XiangRongLin · commit ecd8478aa718 · 2023-08-04T15:54:05.000+02:00
When set via an environment variable an integer will be represented by a string, resulting in an error. fixes: docker/compose#10667 Signed-off-by: Xiang Rong Lin <41164160+XiangRongLin@users.noreply.github.com>
diff --git a/loader/loader.go b/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)
 			}
diff --git a/loader/loader_test.go b/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) {

Original file line number	Diff line number	Diff line change
`@@ -1038,7 +1038,12 @@ var transformServiceDeviceRequest TransformerFunc = func(data interface{}) (inte`
`1038`	`1038`	`value["count"] = -1`
`1039`	`1039`	`return value, nil`
`1040`	`1040`	`}`
`1041`		`- return data, errors.Errorf("invalid string value for 'count' (the only value allowed is 'all')")`
	`1041`	`+ i, err := strconv.ParseInt(val, 10, 64)`
	`1042`	`+ if err == nil {`
	`1043`	`+ value["count"] = i`
	`1044`	`+ return value, nil`
	`1045`	`+ }`
	`1046`	`+ return data, errors.Errorf("invalid string value for 'count' (the only value allowed is 'all' or a number)")`
`1042`	`1047`	`default:`
`1043`	`1048`	`return data, errors.Errorf("invalid type %T for device count", val)`
`1044`	`1049`	`}`