Merge pull request docker#1749 from thaJeztah/compose_3.8_compose_credential_spec_fix

vdemeester · web-flow · commit f2123b3fe41e · 2019-03-18T16:02:47.000+01:00
Update compose 3.8 to disallow additional properties
diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.8.json b/cli/compose/schema/data/config_schema_v3.8.json
@@ -122,10 +122,14 @@
           }
         },
         "container_name": {"type": "string"},
-        "credential_spec": {"type": "object", "properties": {
-          "file": {"type": "string"},
-          "registry": {"type": "string"}
-        }},
+        "credential_spec": {
+          "type": "object",
+          "properties": {
+            "file": {"type": "string"},
+            "registry": {"type": "string"}
+          },
+          "additionalProperties": false
+        },
         "depends_on": {"$ref": "#/definitions/list_of_strings"},
         "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
         "dns": {"$ref": "#/definitions/string_or_list"},
diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go
@@ -80,17 +80,6 @@ func TestValidateAllowsXFields(t *testing.T) {
 }
 
 func TestValidateCredentialSpecs(t *testing.T) {
-	config := dict{
-		"version": "99.99",
-		"services": dict{
-			"foo": dict{
-				"image": "busybox",
-				"credential_spec": dict{
-					"config": "foobar",
-				},
-			},
-		},
-	}
 	tests := []struct {
 		version     string
 		expectedErr string
@@ -103,11 +92,23 @@ func TestValidateCredentialSpecs(t *testing.T) {
 		{version: "3.5", expectedErr: "config"},
 		{version: "3.6", expectedErr: "config"},
 		{version: "3.7", expectedErr: "config"},
+		{version: "3.8", expectedErr: "something"},
 	}
 
 	for _, tc := range tests {
 		tc := tc
 		t.Run(tc.version, func(t *testing.T) {
+			config := dict{
+				"version": "99.99",
+				"services": dict{
+					"foo": dict{
+						"image": "busybox",
+						"credential_spec": dict{
+							tc.expectedErr: "foobar",
+						},
+					},
+				},
+			}
 			err := Validate(config, tc.version)
 			if tc.expectedErr != "" {
 				assert.ErrorContains(t, err, fmt.Sprintf("Additional property %s is not allowed", tc.expectedErr))
