Merge pull request #22 from mnottale/metadata-flatten

metadata: Flatten struct.

Author: mnottale

e2e/render/envvariables.docker-app/metadata.yml

@@ -1,11 +1,10 @@
 version: 0.0.1
-application:
-  name: myapp
-  description: ""
-  tag: ""
-  labels:
-  - alpha
-  author: bearclaw
+name: myapp
+description: ""
+tag: ""
+labels:
+- alpha
+author: bearclaw
 targets:
   swarm: true
   kubernetes: true

e2e/render/templates.docker-app/metadata.yml

@@ -1,11 +1,10 @@
 version: 0.0.1
-application:
-  name: myapp
-  description: ""
-  tag: ""
-  labels:
-  - alpha
-  author: bearclaw
+name: myapp
+description: ""
+tag: ""
+labels:
+- alpha
+author: bearclaw
 targets:
   swarm: true
   kubernetes: true

examples/simple/README.md

@@ -137,13 +137,12 @@ services:
 ```yaml
 # docker-app inspect simple
 version: 0.1.0
-application:
-  name: simple
-  description: ""
-  tag: ""
-  labels:
-  - alpha
-  author: sakuya.izayoi
+name: simple
+description: ""
+tag: ""
+labels:
+- alpha
+author: sakuya.izayoi
 targets:
   swarm: true
   kubernetes: true

packager/init.go

@@ -105,15 +105,12 @@ func newMetadata(name string) types.AppMetadata {
 	if userData != nil {
 		userName = userData.Username
 	}
-	info := types.ApplicationInfo{
-		Name:   name,
-		Labels: []string{"alpha"},
-		Author: userName,
-	}
 	return types.AppMetadata{
-		Version:     "0.1.0",
-		Targets:     target,
-		Application: info,
+		Version: "0.1.0",
+		Targets: target,
+		Name:    name,
+		Labels:  []string{"alpha"},
+		Author:  userName,
 	}
 }
 

renderer/helm.go

@@ -28,11 +28,11 @@ type helmMeta struct {
 
 func toHelmMeta(meta *types.AppMetadata) (*helmMeta, error) {
 	return &helmMeta{
-		Name:        meta.Application.Name,
+		Name:        meta.Name,
 		Version:     meta.Version,
-		Description: meta.Application.Description,
-		Keywords:    meta.Application.Labels,
-		Maintainers: []helmMaintainer{{Name: meta.Application.Author}},
+		Description: meta.Description,
+		Keywords:    meta.Labels,
+		Maintainers: []helmMaintainer{{Name: meta.Author}},
 	}, nil
 }
 

types/metadata.go

@@ -3,18 +3,12 @@ package types
 // AppMetadata is the format of the data found inside the metadata.yml file
 type AppMetadata struct {
 	Version     string
-	Application ApplicationInfo
-	Targets     ApplicationTarget
-}
-
-// ApplicationInfo represents general user-provided information about
-// a given app package
-type ApplicationInfo struct {
 	Name        string
 	Description string
 	Tag         string
 	Labels      []string
 	Author      string
+	Targets     ApplicationTarget
 }
 
 // ApplicationTarget represents which platform(s) / orchestrator(s) the