Update metadata schema + style fixes

Signed-off-by: Joffrey F <joffrey@docker.com>

Author: shin-

internal/packager/fork.go

@@ -83,7 +83,7 @@ func updateMetadata(raw []byte, namespace, name string, maintainers []string) ([
 	var yamlMeta []byte
 	meta, err := loadMetadata(raw)
 	if err != nil {
-		return yamlMeta, err
+		return nil, err
 	}
 	// insert retrieved data in fork history section
 	log.Debug("Generating fork metadata")
@@ -97,15 +97,14 @@ func updateMetadata(raw []byte, namespace, name string, maintainers []string) ([
 	// update metadata file
 	yamlMeta, err = yaml.Marshal(newMeta)
 	if err != nil {
-		return yamlMeta, errors.Wrap(err, "failed to render metadata structure")
+		return nil, errors.Wrap(err, "failed to render metadata structure")
 	}
 	return yamlMeta, nil
 }
 
 func loadMetadata(raw []byte) (types.AppMetadata, error) {
 	var meta types.AppMetadata
-	err := yaml.Unmarshal(raw, &meta)
-	if err != nil {
+	if err := yaml.Unmarshal(raw, &meta); err != nil {
 		return meta, errors.Wrap(err, "failed to parse application metadata")
 	}
 	return meta, nil

internal/packager/init.go

@@ -212,7 +212,7 @@ func parseMaintainersData(maintainers []string) []types.Maintainer {
 	var res []types.Maintainer
 	for _, m := range maintainers {
 		ne := strings.SplitN(m, ":", 2)
-		email := ""
+		var email string
 		if len(ne) > 1 {
 			email = ne[1]
 		}

internal/packager/registry_test.go

@@ -33,6 +33,7 @@ func TestSplitImageName(t *testing.T) {
 		"__.dockerapp",
 		"colon:colon:colon.dockerapp:colon",
 		"nametag.dockerapp:",
+		"ends/with/slash/",
 	}
 
 	for _, item := range invalids {

specification/schemas/metadata_schema_v0.1.json

@@ -22,23 +22,56 @@
         "maintainers": {
             "type": "array",
             "items": {
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    },
-                    "email": {
-                        "type": [
-                            "string",
-                            "null"
-                        ],
-                        "format": "email"
-                    }
-                }
+                "$ref": "#/definitions/maintainer"
+            }
+        },
+        "parents": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/parent"
             }
         }
     },
     "required": [
         "name",
         "version"
-    ]
+    ],
+    "definitions": {
+        "maintainer": {
+            "id": "#/definitions/maintainer",
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "format": "email"
+                }
+            }
+        },
+        "parent": {
+            "id": "#/definitions/parent",
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "format": "hostname"
+                },
+                "namespace": {
+                    "type": "string"
+                },
+                "version": {
+                    "type": "string"
+                },
+                "maintainers": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/maintainer"
+                    }
+                }
+            }
+        }
 }