Fix after fork merged in

- Move metadata types to a new package
- Fix the rest

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Author: vdemeester

internal/helm/helm.go

@@ -8,8 +8,6 @@ import (
 	"regexp"
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
-
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/compose"
 	"github.com/docker/app/internal/helm/templateconversion"
@@ -19,11 +17,13 @@ import (
 	"github.com/docker/app/internal/slices"
 	"github.com/docker/app/render"
 	"github.com/docker/app/types"
+	"github.com/docker/app/types/metadata"
 	"github.com/docker/cli/cli/command/stack/kubernetes"
 	"github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/kubernetes/compose/v1beta1"
 	"github.com/docker/cli/kubernetes/compose/v1beta2"
 	"github.com/pkg/errors"
+	yaml "gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -210,9 +210,9 @@ func helmRender(app *types.App, targetDir string, env map[string]string, stackVe
 	return ioutil.WriteFile(filepath.Join(targetDir, "templates", "stack.yaml"), stackData, 0644)
 }
 
-func makeChart(metadata []byte, targetDir string) error {
-	var meta types.AppMetadata
-	err := yaml.Unmarshal(metadata, &meta)
+func makeChart(data []byte, targetDir string) error {
+	var meta metadata.AppMetadata
+	err := yaml.Unmarshal(data, &meta)
 	if err != nil {
 		return errors.Wrap(err, "failed to parse application metadata")
 	}
@@ -272,7 +272,7 @@ type helmMeta struct {
 	Maintainers []helmMaintainer
 }
 
-func toHelmMeta(meta *types.AppMetadata) (*helmMeta, error) {
+func toHelmMeta(meta *metadata.AppMetadata) (*helmMeta, error) {
 	res := &helmMeta{
 		Name:        meta.Name,
 		Version:     meta.Version,

internal/inspect/inspect.go

@@ -8,13 +8,14 @@ import (
 
 	"github.com/docker/app/internal/settings"
 	"github.com/docker/app/types"
+	"github.com/docker/app/types/metadata"
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 )
 
 // Inspect dumps the metadata of an app
 func Inspect(out io.Writer, app *types.App) error {
-	var meta types.AppMetadata
+	var meta metadata.AppMetadata
 	err := yaml.Unmarshal(app.Metadata(), &meta)
 	if err != nil {
 		return errors.Wrap(err, "failed to parse application metadata")

internal/inspect/inspect_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/docker/app/internal"
 	"github.com/docker/app/types"
-
 	"gotest.tools/assert"
 	is "gotest.tools/assert/cmp"
 	"gotest.tools/fs"

internal/packager/fork.go

@@ -9,8 +9,7 @@ import (
 	"strings"
 
 	"github.com/docker/app/internal"
-	"github.com/docker/app/internal/types"
-
+	"github.com/docker/app/types/metadata"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v2"
@@ -42,7 +41,9 @@ func Fork(originName, forkName, outputDir string, maintainers []string) error {
 	// create app dir in output-dir
 	namespace, name := splitPackageName(forkName)
 	appPath := filepath.Join(outputDir, internal.DirNameFromAppName(name))
-	os.MkdirAll(appPath, 0755)
+	if err := os.MkdirAll(appPath, 0755); err != nil {
+		return err
+	}
 
 	// iterate tar contents
 	tarfile, err := os.Open(filepath.Join(tmpdir, internal.DirNameFromAppName(imgRef.Name)))
@@ -87,11 +88,11 @@ func updateMetadata(raw []byte, namespace, name string, maintainers []string) ([
 	}
 	// insert retrieved data in fork history section
 	log.Debug("Generating fork metadata")
-	newMeta := types.MetadataFrom(
+	newMeta := metadata.From(
 		meta,
-		types.WithName(name),
-		types.WithNamespace(namespace),
-		types.WithMaintainers(parseMaintainersData(maintainers)),
+		metadata.WithName(name),
+		metadata.WithNamespace(namespace),
+		metadata.WithMaintainers(parseMaintainersData(maintainers)),
 	)
 
 	// update metadata file
@@ -102,8 +103,8 @@ func updateMetadata(raw []byte, namespace, name string, maintainers []string) ([
 	return yamlMeta, nil
 }
 
-func loadMetadata(raw []byte) (types.AppMetadata, error) {
-	var meta types.AppMetadata
+func loadMetadata(raw []byte) (metadata.AppMetadata, error) {
+	var meta metadata.AppMetadata
 	if err := yaml.Unmarshal(raw, &meta); err != nil {
 		return meta, errors.Wrap(err, "failed to parse application metadata")
 	}

internal/packager/fork_test.go

@@ -3,8 +3,7 @@ package packager
 import (
 	"testing"
 
-	"github.com/docker/app/internal/types"
-
+	"github.com/docker/app/types/metadata"
 	"gotest.tools/assert"
 )
 
@@ -31,23 +30,23 @@ maintainers:
     email: billy@pumpkins.net
 `
 
-var decodedSampleMetadata = types.AppMetadata{
+var decodedSampleMetadata = metadata.AppMetadata{
 	Name:      "machine",
 	Namespace: "heavy.metal",
 	Version:   "2000",
-	Maintainers: []types.Maintainer{
+	Maintainers: []metadata.Maintainer{
 		{Name: "Billy Corgan", Email: "billy@pumpkins.net"},
 	},
 }
 
 func TestLoadMetadata(t *testing.T) {
 	appmeta, err := loadMetadata([]byte(sampleMetadata))
 	assert.NilError(t, err)
-	assert.DeepEqual(t, appmeta, types.AppMetadata{
+	assert.DeepEqual(t, appmeta, metadata.AppMetadata{
 		Name:      "machine",
 		Namespace: "heavy.metal",
 		Version:   "2000",
-		Maintainers: []types.Maintainer{
+		Maintainers: []metadata.Maintainer{
 			{Name: "Billy Corgan", Email: "billy@pumpkins.net"},
 		},
 	})
@@ -56,7 +55,7 @@ func TestLoadMetadata(t *testing.T) {
 func TestLoadEmptyMetadata(t *testing.T) {
 	appmeta, err := loadMetadata([]byte(""))
 	assert.NilError(t, err)
-	assert.DeepEqual(t, appmeta, types.AppMetadata{})
+	assert.DeepEqual(t, appmeta, metadata.AppMetadata{})
 }
 
 func TestLoadInvalidMetadata(t *testing.T) {
@@ -73,14 +72,14 @@ func TestUpdateMetadata(t *testing.T) {
 	assert.NilError(t, err)
 	decodedOutput, err := loadMetadata(output)
 	assert.NilError(t, err)
-	assert.DeepEqual(t, decodedOutput, types.AppMetadata{
+	assert.DeepEqual(t, decodedOutput, metadata.AppMetadata{
 		Name:      "machine",
 		Namespace: "frog",
 		Version:   decodedSampleMetadata.Version,
-		Maintainers: []types.Maintainer{
+		Maintainers: []metadata.Maintainer{
 			{Name: "infected mushroom", Email: "im@psy.net"},
 		},
-		Parents: types.Parents{
+		Parents: metadata.Parents{
 			{
 				Name:        decodedSampleMetadata.Name,
 				Namespace:   decodedSampleMetadata.Namespace,

internal/packager/init.go

@@ -16,6 +16,7 @@ import (
 	"github.com/docker/app/loader"
 	"github.com/docker/app/render"
 	"github.com/docker/app/types"
+	"github.com/docker/app/types/metadata"
 	composeloader "github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/schema"
 	"github.com/docker/cli/opts"
@@ -216,21 +217,21 @@ func writeMetadataFile(name, dirName string, description string, maintainers []s
 
 // parseMaintainersData parses user-provided data through the maintainers flag and returns
 // a slice of Maintainer instances
-func parseMaintainersData(maintainers []string) []types.Maintainer {
-	var res []types.Maintainer
+func parseMaintainersData(maintainers []string) []metadata.Maintainer {
+	var res []metadata.Maintainer
 	for _, m := range maintainers {
 		ne := strings.SplitN(m, ":", 2)
 		var email string
 		if len(ne) > 1 {
 			email = ne[1]
 		}
-		res = append(res, types.Maintainer{Name: ne[0], Email: email})
+		res = append(res, metadata.Maintainer{Name: ne[0], Email: email})
 	}
 	return res
 }
 
-func newMetadata(name string, description string, maintainers []string) types.AppMetadata {
-	res := types.AppMetadata{
+func newMetadata(name string, description string, maintainers []string) metadata.AppMetadata {
+	res := metadata.AppMetadata{
 		Version:     "0.1.0",
 		Name:        name,
 		Description: description,
@@ -241,7 +242,7 @@ func newMetadata(name string, description string, maintainers []string) types.Ap
 		if userData != nil {
 			userName = userData.Username
 		}
-		res.Maintainers = []types.Maintainer{{Name: userName}}
+		res.Maintainers = []metadata.Maintainer{{Name: userName}}
 	} else {
 		res.Maintainers = parseMaintainersData(maintainers)
 	}

internal/packager/init_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/docker/app/internal"
-	"github.com/docker/app/internal/types"
+	"github.com/docker/app/types/metadata"
 	"gotest.tools/assert"
 	"gotest.tools/fs"
 )
@@ -150,7 +150,7 @@ func TestParseMaintainersData(t *testing.T) {
 		"perfect:cherry:blossom",
 	}
 
-	expectedOutput := []types.Maintainer{
+	expectedOutput := []metadata.Maintainer{
 		{Name: "sakuya", Email: "sakuya.izayoi@touhou.jp"},
 		{Name: "marisa.kirisame", Email: ""},
 		{Name: "Reimu Hakurei", Email: ""},

internal/packager/registry.go

@@ -13,14 +13,15 @@ import (
 
 	"github.com/docker/app/internal"
 	"github.com/docker/app/types"
+	"github.com/docker/app/types/metadata"
 	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"
 	yaml "gopkg.in/yaml.v2"
 )
 
 // Save saves an app to docker and returns the image name.
 func Save(app *types.App, namespace, tag string) (string, error) {
-	var meta types.AppMetadata
+	var meta metadata.AppMetadata
 	err := yaml.Unmarshal(app.Metadata(), &meta)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to parse application metadata")

types/metadata.go types/metadata/metadata.gotypes/metadata.go renamed to types/metadata/metadata.go

@@ -1,4 +1,4 @@
-package types
+package metadata
 
 import (
 	"strings"
@@ -52,12 +52,12 @@ type ParentMetadata struct {
 	Maintainers Maintainers
 }
 
-// MetadataModifier is a function signature that takes and returns an AppMetadata object
-type MetadataModifier func(AppMetadata) AppMetadata
+// Modifier is a function signature that takes and returns an AppMetadata object
+type Modifier func(AppMetadata) AppMetadata
 
-// MetadataFrom returns an AppMetadata instance based on the provided AppMetadata
+// From returns an AppMetadata instance based on the provided AppMetadata
 // and applicable modifier functions
-func MetadataFrom(orig AppMetadata, modifiers ...MetadataModifier) AppMetadata {
+func From(orig AppMetadata, modifiers ...Modifier) AppMetadata {
 	parent := ParentMetadata{
 		Name:        orig.Name,
 		Namespace:   orig.Namespace,
@@ -80,23 +80,23 @@ func MetadataFrom(orig AppMetadata, modifiers ...MetadataModifier) AppMetadata {
 }
 
 // WithMaintainers returns a modified AppMetadata with updated maintainers field
-func WithMaintainers(maintainers Maintainers) MetadataModifier {
+func WithMaintainers(maintainers Maintainers) Modifier {
 	return func(parent AppMetadata) AppMetadata {
 		parent.Maintainers = maintainers
 		return parent
 	}
 }
 
 // WithName returns a modified AppMetadata with updated name field
-func WithName(name string) MetadataModifier {
+func WithName(name string) Modifier {
 	return func(parent AppMetadata) AppMetadata {
 		parent.Name = name
 		return parent
 	}
 }
 
 // WithNamespace returns a modified AppMetadata with updated namespace field
-func WithNamespace(namespace string) MetadataModifier {
+func WithNamespace(namespace string) Modifier {
 	return func(parent AppMetadata) AppMetadata {
 		parent.Namespace = namespace
 		return parent

types/metadata_test.go types/metadata/metadata_test.gotypes/metadata_test.go renamed to types/metadata/metadata_test.go

@@ -1,4 +1,4 @@
-package types
+package metadata
 
 import (
 	"testing"