adapt ssh json schema declaration to follow specification change

Signed-off-by: Guillaume Lours <[email protected]>

Author: glours

loader/full-example.yml

@@ -7,7 +7,8 @@ services:
       dockerfile: Dockerfile
       args:
         foo: bar
-      ssh: default
+      ssh:
+        - default
       target: foo
       network: foo
       cache_from:

loader/loader.go

@@ -981,10 +981,19 @@ var transformServiceNetworkMap TransformerFunc = func(value interface{}) (interf
 
 var transformSSHConfig TransformerFunc = func(data interface{}) (interface{}, error) {
 	switch value := data.(type) {
+	case map[string]interface{}:
+		var result []types.SSHKey
+		for key, val := range value {
+			if val == nil {
+				val = ""
+			}
+			result = append(result, types.SSHKey{ID: key, Path: val.(string)})
+		}
+		return result, nil
 	case []interface{}:
 		var result []types.SSHKey
-		for _, value := range value {
-			key, val := transformValueToMapEntry(value.(string), "=", false)
+		for _, v := range value {
+			key, val := transformValueToMapEntry(v.(string), "=", false)
 			result = append(result, types.SSHKey{ID: key, Path: val.(string)})
 		}
 		return result, nil

loader/loader_test.go

@@ -1898,7 +1898,7 @@ services:
   test:
     build:
       context: .
-      ssh: default
+      ssh: [default]
 `)
 	assert.NilError(t, err)
 	svc, err := actual.GetService("test")
@@ -1914,7 +1914,8 @@ services:
   test:
     build:
       context: .
-      ssh: key1=value1
+      ssh: 
+        key1: value1
 `)
 	assert.NilError(t, err)
 	svc, err := actual.GetService("test")

schema/compose-spec.json

@@ -91,12 +91,7 @@
                 "context": {"type": "string"},
                 "dockerfile": {"type": "string"},
                 "args": {"$ref": "#/definitions/list_or_dict"},
-                "ssh": {
-                  "oneOf": [
-                    {"type": "string"},
-                    {"$ref": "#/definitions/list_or_dict"}
-                  ]
-                },
+                "ssh": {"$ref": "#/definitions/list_or_dict"},
                 "labels": {"$ref": "#/definitions/list_or_dict"},
                 "cache_from": {"type": "array", "items": {"type": "string"}},
                 "cache_to": {"type": "array", "items": {"type": "string"}},