Do not use dev/generator

go.mod

@@ -3,8 +3,9 @@ module github.com/elastic/package-storage
 go 1.12
 
 require (
-	github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e // indirect
+	github.com/elastic/package-registry v0.4.1-0.20200616071216-a501181d0902
 	github.com/magefile/mage v1.9.0
+	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.4.0
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -13,6 +13,8 @@ github.com/elastic/package-registry v0.4.1-0.20200608174321-955239d698d3 h1:dYB7
 github.com/elastic/package-registry v0.4.1-0.20200608174321-955239d698d3/go.mod h1:na9XU9OeCK7NOcsrpKxtKHgXdysHUJpq4Dam7EgvpyE=
 github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e h1:XKn6lil8hTPTf5IFAVpwDQGWeWhzNljr6sfOppiFZZ4=
 github.com/elastic/package-registry v0.4.1-0.20200609082938-e56da291a24e/go.mod h1:na9XU9OeCK7NOcsrpKxtKHgXdysHUJpq4Dam7EgvpyE=
+github.com/elastic/package-registry v0.4.1-0.20200616071216-a501181d0902 h1:4oYpK6A2uICScU3u4547Ofton7SDirATYm+DgZ5qmHs=
+github.com/elastic/package-registry v0.4.1-0.20200616071216-a501181d0902/go.mod h1:na9XU9OeCK7NOcsrpKxtKHgXdysHUJpq4Dam7EgvpyE=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=

magefile.go

@@ -12,13 +12,15 @@ import (
 	"path/filepath"
 
 	"github.com/magefile/mage/sh"
+	"github.com/pkg/errors"
+
+	"github.com/elastic/package-registry/util"
 )
 
 var (
 	buildDir     = "./build"
 	publicDir    = filepath.Join(buildDir, "public")
 	packagePaths = []string{"./packages"}
-	tarGz        = true
 )
 
 func Build() error {
@@ -32,12 +34,100 @@ func Build() error {
 		return err
 	}
 
-	for _, p := range packagePaths {
-		err := sh.Run("go", "run", "github.com/elastic/package-registry/dev/generator",
-			"-sourceDir="+p, "-publicDir="+publicDir)
+	err = buildPackages()
+	if err != nil {
+		return err
+	}
+
+	err = dryRunPackageRegistry()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func buildPackages() error {
+	packagePaths, err := findPackages()
+	if err != nil {
+		return err
+	}
+
+	for _, packagePath := range packagePaths {
+		srcDir := packagePath + "/"
+		p, err := util.NewPackage(srcDir)
 		if err != nil {
 			return err
 		}
+		dstDir := filepath.Join(publicDir, "package", p.Name, p.Version)
+
+		err = copyPackageFromSource(srcDir, dstDir)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func findPackages() ([]string, error) {
+	var matches []string
+	for _, sourceDir := range packagePaths {
+		err := filepath.Walk(sourceDir, func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+
+			f, err := os.Stat(path)
+			if err != nil {
+				return err
+			}
+
+			if !f.IsDir() {
+				return nil // skip as the path is not a directory
+			}
+
+			manifestPath := filepath.Join(path, "manifest.yml")
+			_, err = os.Stat(manifestPath)
+			if os.IsNotExist(err) {
+				return nil
+			}
+			matches = append(matches, path)
+			return filepath.SkipDir
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+	return matches, nil
+}
+
+func copyPackageFromSource(src, dst string) error {
+	err := os.MkdirAll(dst, 0755)
+	if err != nil {
+		return err
+	}
+	err = sh.RunV("rsync", "-a", src, dst)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func dryRunPackageRegistry() error {
+	currentDir, err := os.Getwd()
+	if err != nil {
+		return errors.Wrap(err, "reading current directory failed")
+	}
+	defer os.Chdir(currentDir)
+
+	err = os.Chdir(buildDir)
+	if err != nil {
+		return errors.Wrapf(err, "can't change directory to %s", buildDir)
+	}
+
+	err = sh.Run("go", "run", "github.com/elastic/package-registry", "-dry-run=true")
+	if err != nil {
+		return errors.Wrap(err, "package-registry dry-run failed")
 	}
 	return nil
 }