Merge pull request #95 from daniel-hutao/dev-2

fix: #49 #93 - argocdapp installation failed & logs improved

Author: daniel-hutao

cmd/devstream/install.go

@@ -42,16 +42,16 @@ func installCMDFunc(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	errs := p.Execute()
-	if len(errs) == 0 {
+	errsMap := p.Execute()
+	if len(errsMap) == 0 {
 		log.Println("=== all plugins' Install/Uninstall/Reinstall process are succeeded ===")
 		log.Println("=== END ===")
 		return
 	}
 
 	log.Println("=== some errors occurred during plugins Install/Uninstall/Reinstall process ===")
-	for _, err := range errs {
-		log.Println(err)
+	for k, err := range errsMap {
+		log.Printf("%s -> %s", k, err)
 	}
 	log.Println("=== END ===")
 }

internal/pkg/argocdapp/argocdapp.go

@@ -20,11 +20,15 @@ type Action string
 
 func kubectlAction(action Action, filename string) error {
 	cmd := exec.Command("kubectl", string(action), "-f", filename)
-	stdout, err := cmd.Output()
+	cOut, err := cmd.CombinedOutput()
 	if err != nil {
+		// TODO(Daniel Hu): Handle the Error below:
+		// Error from server (NotFound): error when deleting "./app.yaml": applications.argoproj.io "hello" not found
+		log.Printf("failed to exec: < %s >", cmd.String())
+		log.Printf("exec logs: < %s >. got error: %s", string(cOut), err)
 		return err
 	}
-	log.Println(strings.TrimSuffix(string(stdout), "\n"))
+	log.Println(strings.TrimSuffix(string(cOut), "\n"))
 	return nil
 }
 

internal/pkg/argocdapp/install.go

@@ -18,7 +18,7 @@ func Install(options *map[string]interface{}) (bool, error) {
 		return false, err
 	}
 
-	err = kubectlAction(ActionDelete, file)
+	err = kubectlAction(ActionApply, file)
 	if err != nil {
 		return false, err
 	}

internal/pkg/planmanager/plan.go

@@ -1,6 +1,7 @@
 package planmanager
 
 import (
+	"fmt"
 	"log"
 	"time"
 
@@ -50,8 +51,8 @@ func NewPlan(smgr statemanager.Manager, cfg *configloader.Config) *Plan {
 
 // Execute will execute all changes included in the Plan and record results.
 // All errors will be return.
-func (p *Plan) Execute() []error {
-	errors := make([]error, 0)
+func (p *Plan) Execute() map[string]error {
+	errorsMap := make(map[string]error)
 	log.Printf("changes count: %d", len(p.Changes))
 	for i, c := range p.Changes {
 		log.Printf("processing progress: %d/%d", i+1, len(p.Changes))
@@ -60,7 +61,8 @@ func (p *Plan) Execute() []error {
 		// It involves dependency management.
 		succeeded, err := c.Action(c.Tool)
 		if err != nil {
-			errors = append(errors, err)
+			key := fmt.Sprintf("%s-%s", c.Tool.Name, c.ActionName)
+			errorsMap[key] = err
 		}
 
 		c.Result = &ChangeResult{
@@ -71,8 +73,8 @@ func (p *Plan) Execute() []error {
 
 		err = p.handleResult(c)
 		if err != nil {
-			errors = append(errors, err)
+			errorsMap["handle-result"] = err
 		}
 	}
-	return errors
+	return errorsMap
 }

internal/pkg/planmanager/result.go

@@ -31,11 +31,11 @@ func (p *Plan) handleResult(change *Change) error {
 	// uninstall failed
 	if change.ActionName == statemanager.ActionUninstall && !change.Result.Succeeded {
 		state.Status = statemanager.StatusInstalled
-		log.Printf("=== plugin %s process failed ===", change.Tool.Name)
+		log.Printf("=== plugin %s uninstall failed ===", change.Tool.Name)
 		// install or reinstall failed
 	} else if !change.Result.Succeeded {
 		state.Status = statemanager.StatusFailed
-		log.Printf("=== plugin %s process failed ===", change.Tool.Name)
+		log.Printf("=== plugin %s (re)install failed ===", change.Tool.Name)
 		// install or reinstall succeeded
 	} else {
 		log.Printf("=== plugin %s process done ===", change.Tool.Name)