Introduce a new Flogo import syntax

Author: debovema

api/build.go

@@ -81,6 +81,8 @@ func BuildProject(project common.AppProject, options BuildOptions) error {
 		fmt.Println("Path to exe is ", exePath)
 	}
 	if _, err := os.Stat(exePath); err == nil {
+		finalExePath := project.Executable()
+		os.MkdirAll(filepath.Dir(finalExePath), os.ModePerm)
 		err = os.Rename(exePath, project.Executable())
 
 		if err != nil {
@@ -125,7 +127,12 @@ func prepareShim(project common.AppProject, shim string) (bool, error) {
 				}
 			}
 
-			path, err := project.GetPath(ref)
+			refImport, err := util.NewFlogoImportFromPath(ref)
+			if err != nil {
+				return false, err
+			}
+
+			path, err := project.GetPath(refImport)
 			if err != nil {
 				return false, err
 			}
@@ -205,7 +212,12 @@ func createShimSupportGoFile(project common.AppProject, create bool) error {
 		return nil
 	}
 
-	corePath, err := project.GetPath(flogoCoreRepo)
+	flogoCoreImport, err := util.NewFlogoImportFromPath(flogoCoreRepo)
+	if err != nil {
+		return err
+	}
+
+	corePath, err := project.GetPath(flogoCoreImport)
 	if err != nil {
 		return err
 	}

api/create.go

@@ -146,8 +146,10 @@ func setupAppDirectory(dm util.DepManager, appPath, coreVersion string) error {
 
 	fmt.Println("installing core")
 
+	flogoCoreImport := util.NewFlogoImport(flogoCoreRepo, "", coreVersion, "")
+
 	// add & fetch the core library
-	dm.AddDependency(flogoCoreRepo, coreVersion, true)
+	dm.AddDependency(flogoCoreImport, true)
 
 	return nil
 }
@@ -192,7 +194,7 @@ func importDependencies(project common.AppProject) error {
 			fmt.Printf("%-20s %s\n", instStr, imp)
 		}
 
-		legacy, err := IsLegacySupportRequired(desc, path, imp, true)
+		legacy, err := IsLegacySupportRequired(desc, path, imp.ImportPath(), true)
 		if err != nil {
 			return err
 		}
@@ -210,7 +212,12 @@ func importDependencies(project common.AppProject) error {
 
 func createMain(dm util.DepManager, appDir string) error {
 
-	corePath, err := dm.GetPath(flogoCoreRepo)
+	flogoCoreImport, err := util.NewFlogoImportFromPath(flogoCoreRepo)
+	if err != nil {
+		return err
+	}
+
+	corePath, err := dm.GetPath(flogoCoreImport)
 	if err != nil {
 		return err
 	}
@@ -233,7 +240,12 @@ func getAndUpdateAppJson(dm util.DepManager, appName, appJson string) (string, e
 	if len(appJson) == 0 {
 
 		// appJson wasn't provided, so lets grab the example
-		corePath, err := dm.GetPath(flogoCoreRepo)
+		flogoCoreImport, err := util.NewFlogoImportFromPath(flogoCoreRepo)
+		if err != nil {
+			return "", err
+		}
+
+		corePath, err := dm.GetPath(flogoCoreImport)
 		if err != nil {
 			return "", err
 		}

api/imports.go

@@ -59,7 +59,12 @@ func registerImport(project common.AppProject, anImport string) error {
 
 func getContribType(project common.AppProject, ref string) (string, error) {
 
-	path, err := project.GetPath(ref)
+	refAsFlogoImport, err := util.NewFlogoImportFromPath(ref)
+	if err != nil {
+		return "", err
+	}
+
+	path, err := project.GetPath(refAsFlogoImport)
 	if err != nil {
 		return "", err
 	}

api/install.go

@@ -15,12 +15,17 @@ import (
 
 func InstallPackage(project common.AppProject, pkg string) error {
 
-	err := project.AddImports(false, pkg)
+	flogoImport, err := util.ParseImport(pkg)
 	if err != nil {
 		return err
 	}
 
-	path, err := project.GetPath(pkg)
+	err = project.AddImports(false, flogoImport)
+	if err != nil {
+		return err
+	}
+
+	path, err := project.GetPath(flogoImport)
 	if Verbose() {
 		fmt.Println("Installed path", path)
 	}
@@ -72,6 +77,7 @@ func InstallPalette(project common.AppProject, path string) error {
 	return nil
 
 }
+
 func ListPackages(project common.AppProject, format bool, all bool) error {
 
 	err := util.ExecCmd(exec.Command("go", "mod", "tidy"), project.SrcDir())
@@ -80,21 +86,21 @@ func ListPackages(project common.AppProject, format bool, all bool) error {
 		return err
 	}
 
-	var contribs []string
+	var contribs util.Imports
 
 	if all {
-		contribs, _ = util.GetAllImports(filepath.Join(project.SrcDir(), fileImportsGo)) // Get Imports from imports.go
-
+		imports, _ := util.GetAllImports(filepath.Join(project.SrcDir(), fileImportsGo)) // Get Imports from imports.go
+		for _, i := range imports {
+			flogoImport, _ := util.ParseImport(i)
+			contribs = append(contribs, flogoImport)
+		}
 	} else {
 		contribs, _ = util.GetImports(filepath.Join(project.Dir(), fileFlogoJson)) // Get Imports from flogo.json
-
 	}
 
 	var result []interface{}
 
 	for _, contrib := range contribs {
-		contrib = clearVersion(contrib)
-
 		path, err := project.GetPath(contrib)
 		if Verbose() {
 			fmt.Println("Path of contrib", path, "for contrib", contrib)
@@ -127,7 +133,7 @@ func ListPackages(project common.AppProject, format bool, all bool) error {
 			desc.Type,
 			desc.Description,
 			desc.Homepage,
-			contrib,
+			contrib.ModulePath(),
 			getDescriptorFile(path),
 		}
 
@@ -157,12 +163,3 @@ func getDescriptorFile(path string) string {
 	}
 	return ""
 }
-func clearVersion(pkg string) string {
-
-	if strings.Contains(pkg, "@") {
-
-		return strings.Split(pkg, "@")[0]
-
-	}
-	return pkg
-}

api/legacy.go

@@ -35,7 +35,11 @@ func IsLegacySupportRequired(desc *util.FlogoContribDescriptor, path, pkg string
 }
 
 func InstallLegacySupport(project common.AppProject) error {
-	err := project.AddImports(false, pkgLegacySupport)
+	pkgLegacySupportImport, err := util.NewFlogoImportFromPath(pkgLegacySupport)
+	if err != nil {
+		return err
+	}
+	err = project.AddImports(false, pkgLegacySupportImport)
 	if err == nil {
 		fmt.Println("Installed Legacy Support")
 	}

api/project.go

@@ -11,7 +11,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"runtime"
 
 	"github.com/project-flogo/cli/common"
@@ -103,12 +102,11 @@ func (p *appProjectImpl) Executable() string {
 	return execPath
 }
 
-func (p *appProjectImpl) GetPath(pkg string) (string, error) {
-
-	return p.dm.GetPath(pkg)
+func (p *appProjectImpl) GetPath(flogoImport util.Import) (string, error) {
+	return p.dm.GetPath(flogoImport)
 }
 
-func (p *appProjectImpl) addImportsInGo(ignoreError bool, imports ...string) error {
+func (p *appProjectImpl) addImportsInGo(ignoreError bool, imports ...util.Import) error {
 	importsFile := filepath.Join(p.SrcDir(), fileImportsGo)
 
 	fset := token.NewFileSet()
@@ -117,16 +115,16 @@ func (p *appProjectImpl) addImportsInGo(ignoreError bool, imports ...string) err
 		return err
 	}
 
-	for _, importPath := range imports {
-		importPath, err := p.DepManager().AddDependency(importPath, "", true)
+	for _, i := range imports {
+		err := p.DepManager().AddDependency(i, true)
 		if err != nil {
 			if ignoreError {
-				fmt.Printf("Warning: unable to install %s\n", importPath)
+				fmt.Printf("Warning: unable to install %s\n", i)
 				continue
 			}
 			return err
 		}
-		util.AddImport(fset, file, importPath)
+		util.AddImport(fset, file, i.ImportPath())
 	}
 
 	f, err := os.Create(importsFile)
@@ -146,7 +144,7 @@ func (p *appProjectImpl) addImportsInGo(ignoreError bool, imports ...string) err
 	return nil
 }
 
-func (p *appProjectImpl) addImportsInJson(ignoreError bool, imports ...string) error {
+func (p *appProjectImpl) addImportsInJson(ignoreError bool, imports ...util.Import) error {
 	appDescriptorFile := filepath.Join(p.appDir, fileFlogoJson)
 	appDescriptorJsonFile, err := os.Open(appDescriptorFile)
 	if err != nil {
@@ -162,18 +160,16 @@ func (p *appProjectImpl) addImportsInJson(ignoreError bool, imports ...string) e
 	var appDescriptor app.Config
 	json.Unmarshal([]byte(appDescriptorData), &appDescriptor)
 
-	importPattern := regexp.MustCompile(`^([^ ]* )?([^@]*)@?(.*)?$`) // extract import path even if there is an alias and/or a version
-
 	// list existing imports in JSON to avoid duplicates
 	existingImports := make(map[string]bool)
-	for _, e := range appDescriptor.Imports {
-		importPath := importPattern.FindStringSubmatch(e)[2]
-		existingImports[importPath] = true
+	jsonImports, _ := util.ParseImports(appDescriptor.Imports)
+	for _, e := range jsonImports {
+		existingImports[e.CanonicalImport()] = true
 	}
 
 	for _, i := range imports {
-		if _, ok := existingImports[i]; !ok {
-			appDescriptor.Imports = append(appDescriptor.Imports, importPattern.FindStringSubmatch(i)[2])
+		if _, ok := existingImports[i.CanonicalImport()]; !ok {
+			appDescriptor.Imports = append(appDescriptor.Imports, i.CanonicalImport())
 		}
 	}
 
@@ -192,7 +188,7 @@ func (p *appProjectImpl) addImportsInJson(ignoreError bool, imports ...string) e
 	return nil
 }
 
-func (p *appProjectImpl) AddImports(ignoreError bool, imports ...string) error {
+func (p *appProjectImpl) AddImports(ignoreError bool, imports ...util.Import) error {
 	err := p.addImportsInGo(ignoreError, imports...) // begin with Go imports as they are more likely to fail
 	if err != nil {
 		return err

common/project.go

@@ -9,8 +9,8 @@ type AppProject interface {
 	BinDir() string
 	SrcDir() string
 	Executable() string
-	AddImports(ignoreError bool, imports ...string) error
+	AddImports(ignoreError bool, imports ...util.Import) error
 	RemoveImports(imports ...string) error
-	GetPath(pkg string) (string, error)
+	GetPath(flogoImport util.Import) (string, error)
 	DepManager() util.DepManager
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/project-flogo/cli
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/project-flogo/core v0.9.0-alpha.4.0.20190220191401-07116138c345
+	github.com/project-flogo/core v0.9.0-alpha.4.0.20190222151024-3eb86689b764
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.2.2

util/flogo.go

@@ -87,7 +87,7 @@ func GetContribDescriptor(path string) (*FlogoContribDescriptor, error) {
 }
 
 // ParseAppDescriptor parse the application descriptor
-func GetImports(appJsonPath string) ([]string, error) {
+func GetImports(appJsonPath string) (Imports, error) {
 
 	importSet := make(map[string]struct{})
 
@@ -116,7 +116,16 @@ func GetImports(appJsonPath string) ([]string, error) {
 		allImports = append(allImports, key)
 	}
 
-	return allImports, nil
+	var result Imports
+	for _, i := range allImports {
+		parsedImport, err := ParseImport(i)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, parsedImport)
+	}
+
+	return result, nil
 }
 
 func getImports(appJsonPath string) ([]string, error) {