Merge pull request #115 from TIBCOSoftware/fix_113_114

fix issue #113 and #114
TIBCOSoftware · Aug 1, 2018 · ef52c5f · ef52c5f
2 parents 132fc57 + 8c6908e
commit ef52c5f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 20 deletions.
diff --git a/app/api.go b/app/api.go
@@ -260,9 +260,11 @@ func doPrepare(env env.Project, options *PrepareOptions) (err error) {
 						cmd.Stdout = os.Stdout
 						cmd.Stderr = os.Stderr
 						cmd.Dir = env.GetAppDir()
-						cmd.Env = append(os.Environ(),
-							fmt.Sprintf("GOPATH=%s", env.GetRootDir()),
-						)
+						//cmd.Env = append(os.Environ(),
+						//	fmt.Sprintf("GOPATH=%s", env.GetRootDir()),
+						//)
+						cmd.Env = fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", env.GetRootDir())
+
 
 						err = cmd.Run()
 						if err != nil {
@@ -278,9 +280,11 @@ func doPrepare(env env.Project, options *PrepareOptions) (err error) {
 						cmd := exec.Command("make", "-C", env.GetAppDir())
 						cmd.Stdout = os.Stdout
 						cmd.Stderr = os.Stderr
-						cmd.Env = append(os.Environ(),
-							fmt.Sprintf("GOPATH=%s", env.GetRootDir()),
-						)
+						//cmd.Env = append(os.Environ(),
+						//	fmt.Sprintf("GOPATH=%s", env.GetRootDir()),
+						//)
+						cmd.Env = fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", env.GetRootDir())
+
 
 						err = cmd.Run()
 						if err != nil {

diff --git a/config/config.go b/config/config.go
@@ -174,7 +174,7 @@ func ExtractAllDependencies(appjson string) ([]*Dependency, error) {
 	}
 	deps = append(deps, resourceDeps...)
 
-	deps = append(deps, ExtractDependenciesActionOld(flogoApp.Actions)...)
+	deps = append(deps, ExtractDependenciesSharedActions(flogoApp.Actions)...)
 	return deps, nil
 }
 
@@ -187,7 +187,9 @@ func extractTrigersDependency(triggers []*trigger.Config) []*Dependency {
 			if t.Handlers != nil {
 				for _, t := range t.Handlers {
 					if t.Action != nil {
-						deps = append(deps, &Dependency{ContribType: ACTION, Ref: t.Action.Ref})
+						if t.Action.Ref != "" {
+							deps = append(deps, &Dependency{ContribType: ACTION, Ref: t.Action.Ref})
+						}
 					}
 				}
 			}
@@ -246,12 +248,13 @@ type depHolder struct {
 }
 
 // ExtractDependencies extracts dependencies from from application descriptor
-func ExtractDependenciesActionOld(actions []*ActionDescriptor) []*Dependency {
+func ExtractDependenciesSharedActions(actions []*ActionDescriptor) []*Dependency {
 	dh := &depHolder{}
 
 	for _, action := range actions {
 		dh.deps = append(dh.deps, &Dependency{ContribType: ACTION, Ref: action.Ref})
 
+		//todo remove
 		if action.Data != nil && action.Data.Flow != nil {
 			extractDepsFromTaskOld(action.Data.Flow.RootTask, dh)
 			//Error handle flow

diff --git a/dep/dep.go b/dep/dep.go
@@ -43,9 +43,9 @@ func (b *DepManager) Init() error {
 
 	cmd := exec.Command("dep", "init")
 	cmd.Dir = b.Env.GetAppDir()
-	newEnv := os.Environ()
-	newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", b.Env.GetRootDir()))
-	cmd.Env = newEnv
+	//newEnv := os.Environ()
+	//newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", b.Env.GetRootDir()))
+	cmd.Env = fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", b.Env.GetRootDir())
 
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -112,9 +112,10 @@ func (b *DepManager) Ensure(args ...string) error {
 
 	cmd := exec.Command("dep", ensureArgs...)
 	cmd.Dir = b.Env.GetAppDir()
-	newEnv := os.Environ()
-	newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", b.Env.GetRootDir()))
-	cmd.Env = newEnv
+	//newEnv := os.Environ()
+	//newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", b.Env.GetRootDir()))
+	//cmd.Env = newEnv
+	cmd.Env = fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", b.Env.GetRootDir())
 
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -324,9 +325,10 @@ func GetExistingConstraint(rootDir, appDir, depPath string) (*ConstraintDef, err
 	// Validate that the install project does not exist in Gopkg.toml
 	cmd := exec.Command("dep", "status", "-json")
 	cmd.Dir = appDir
-	newEnv := os.Environ()
-	newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", rootDir))
-	cmd.Env = newEnv
+	//newEnv := os.Environ()
+	//newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", rootDir))
+	//cmd.Env = newEnv
+	cmd.Env = fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", rootDir)
 
 	status, err := cmd.Output()
 	if err != nil {

diff --git a/env/project.go b/env/project.go
@@ -161,8 +161,10 @@ func (e *FlogoProject) Build() error {
 
 	cmd := exec.Command("go", "install", "./...")
 	cmd.Dir = e.GetAppDir()
-	newEnv := os.Environ()
-	newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", e.GetRootDir()))
+	//newEnv := os.Environ()
+	//newEnv = append(newEnv, fmt.Sprintf("GOPATH=%s", e.GetRootDir()))
+	newEnv := fgutil.ReplaceEnvValue(os.Environ(), "GOPATH", e.GetRootDir())
+
 	os.Unsetenv("GOBIN")
 	if e.GetDockerBuild() {
 		fmt.Println("Setting GOOS to linux because this is a docker build")

diff --git a/util/env.go b/util/env.go
@@ -0,0 +1,15 @@
+package fgutil
+
+import "strings"
+
+func ReplaceEnvValue(env []string, envKey string, newValue string) []string {
+	for key, entry := range env {
+
+		if strings.HasPrefix(entry, envKey + "=") {
+			env[key] = envKey + "=" + newValue
+			break
+		}
+	}
+
+	return env
+}