* Factorize the 3 file names used in docker-app

* Cleaned a useless yaml annotation

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

internal/names.go

@@ -14,6 +14,11 @@ const (
 	ImageLabel = "com.docker.application"
 )
 
+var (
+	// Application file names, in order.
+	FileNames = []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
+)
+
 var appNameRe, _ = regexp.Compile("^[a-zA-Z][a-zA-Z0-9_-]+$")
 
 // AppNameFromDir takes a path to an app directory and returns

internal/packager/extract.go

@@ -153,7 +153,6 @@ func extractSingleFile(appname, appDir string) error {
 	if len(parts) != 3 {
 		return fmt.Errorf("malformed single-file application: expected 3 documents")
 	}
-	names := []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
 	for i, p := range parts {
 		data := ""
 		if i == 0 {
@@ -164,7 +163,7 @@ func extractSingleFile(appname, appDir string) error {
 				data = d[1]
 			}
 		}
-		err = ioutil.WriteFile(filepath.Join(appDir, names[i]), []byte(data), 0644)
+		err = ioutil.WriteFile(filepath.Join(appDir, internal.FileNames[i]), []byte(data), 0644)
 		if err != nil {
 			return errors.Wrap(err, "failed to write application file")
 		}

internal/packager/packing.go

@@ -43,8 +43,7 @@ func tarAddDir(tarout *tar.Writer, path string) error {
 // Pack packs the app as a single file
 func Pack(appname string, target io.Writer) error {
 	tarout := tar.NewWriter(target)
-	files := []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
-	for _, f := range files {
+	for _, f := range internal.FileNames {
 		err := tarAdd(tarout, f, filepath.Join(appname, f))
 		if err != nil {
 			return err

internal/packager/split.go

@@ -5,6 +5,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/docker/app/internal"
 )
 
 // Split converts an app package to the split version
@@ -13,8 +15,7 @@ func Split(appname string, outputDir string) error {
 	if err != nil {
 		return err
 	}
-	names := []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
-	for _, n := range names {
+	for _, n := range internal.FileNames {
 		input, err := ioutil.ReadFile(filepath.Join(appname, n))
 		if err != nil {
 			return err
@@ -29,8 +30,7 @@ func Split(appname string, outputDir string) error {
 
 // Merge converts an app-package to the single-file merged version
 func Merge(appname string, target io.Writer) error {
-	names := []string{"metadata.yml", "docker-compose.yml", "settings.yml"}
-	for i, n := range names {
+	for i, n := range internal.FileNames {
 		input, err := ioutil.ReadFile(filepath.Join(appname, n))
 		if err != nil {
 			return err

internal/types/metadata.go

@@ -33,7 +33,7 @@ type AppMetadata struct {
 	Version     string
 	Name        string
 	Description string
-	Namespace   string `yaml:"namespace"`
+	Namespace   string
 	Maintainers Maintainers
 	Targets     ApplicationTarget
 }