Merge pull request #455 from shin-/prevent_invalid_resources

Update schemas to prevent invalid properties in deploy.resources

cli/compose/loader/loader_test.go

@@ -584,6 +584,21 @@ services:
 	assert.Contains(t, forbidden, "extends")
 }
 
+func TestInvalidResource(t *testing.T) {
+	_, err := loadYAML(`
+        version: "3"
+        services:
+          foo:
+            image: busybox
+            deploy:
+              resources:
+                impossible:
+                  x: 1
+`)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Additional property impossible is not allowed")
+}
+
 func TestInvalidExternalAndDriverCombination(t *testing.T) {
 	_, err := loadYAML(`
 version: "3"

cli/compose/schema/data/config_schema_v3.0.json

@@ -240,7 +240,8 @@
           "properties": {
             "limits": {"$ref": "#/definitions/resource"},
             "reservations": {"$ref": "#/definitions/resource"}
-          }
+          },
+          "additionalProperties": false
         },
         "restart_policy": {
           "type": "object",

cli/compose/schema/data/config_schema_v3.1.json

@@ -269,7 +269,8 @@
           "properties": {
             "limits": {"$ref": "#/definitions/resource"},
             "reservations": {"$ref": "#/definitions/resource"}
-          }
+          },
+          "additionalProperties": false
         },
         "restart_policy": {
           "type": "object",

cli/compose/schema/data/config_schema_v3.2.json

@@ -314,7 +314,8 @@
           "properties": {
             "limits": {"$ref": "#/definitions/resource"},
             "reservations": {"$ref": "#/definitions/resource"}
-          }
+          },
+          "additionalProperties": false
         },
         "restart_policy": {
           "type": "object",

cli/compose/schema/data/config_schema_v3.3.json

@@ -348,7 +348,8 @@
           "properties": {
             "limits": {"$ref": "#/definitions/resource"},
             "reservations": {"$ref": "#/definitions/resource"}
-          }
+          },
+          "additionalProperties": false
         },
         "restart_policy": {
           "type": "object",

cli/compose/schema/data/config_schema_v3.4.json

@@ -353,7 +353,8 @@
           "properties": {
             "limits": {"$ref": "#/definitions/resource"},
             "reservations": {"$ref": "#/definitions/resource"}
-          }
+          },
+          "additionalProperties": false
         },
         "restart_policy": {
           "type": "object",