Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from shin-/prevent_invalid_resources 

Update schemas to prevent invalid properties in deploy.resources
This commit is contained in:
Daniel Nephin 2017-08-18 11:42:39 -04:00 committed by GitHub
parent e57842edb8 1667073908
commit a8a3ffa8ef
7 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/compose/loader/loader_test.go
View File

@ -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"

10
cli/compose/schema/bindata.go
View File

File diff suppressed because one or more lines are too long

3
cli/compose/schema/data/config_schema_v3.0.json
View File

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

3
cli/compose/schema/data/config_schema_v3.1.json
View File

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

3
cli/compose/schema/data/config_schema_v3.2.json
View File

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

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

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

3
cli/compose/schema/data/config_schema_v3.4.json
View File

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