quality-of-life improvement

Signed-off-by: Daniel Hu <[email protected]>

Author: daniel-hutao

.gitignore

@@ -25,3 +25,6 @@
 
 # IDE
 .idea
+
+# state file
+*.state

cmd/devstream/install.go

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

devstream.state

@@ -51,7 +51,7 @@ func (a *ArgoCD) addHelmRepo() error {
 	return nil
 }
 
-func (a *ArgoCD) installOrUpgradeChart() error {
+func (a *ArgoCD) installOrUpgradeHelmChart() error {
 	log.Println("adding and updating argocd helm chart repo")
 	if err := a.addHelmRepo(); err != nil {
 		return err
@@ -61,7 +61,7 @@ func (a *ArgoCD) installOrUpgradeChart() error {
 		ReleaseName:     a.param.Chart.ReleaseName,
 		ChartName:       a.param.Chart.Name,
 		Namespace:       a.param.Chart.Namespace,
-    CreateNamespace: a.param.Chart.CreateNamespace,
+		CreateNamespace: a.param.Chart.CreateNamespace,
 		UpgradeCRDs:     true,
 		Wait:            true,
 		Timeout:         3 * time.Minute,

internal/pkg/argocd/argocd.go

@@ -12,7 +12,7 @@ func Install(options *map[string]interface{}) (bool, error) {
 	}
 
 	log.Println("installing or updating argocd helm chart")
-	if err := acd.installOrUpgradeChart(); err != nil {
+	if err := acd.installOrUpgradeHelmChart(); err != nil {
 		return false, err
 	}
 

internal/pkg/argocd/install.go

@@ -15,8 +15,8 @@ func Reinstall(options *map[string]interface{}) (bool, error) {
 		return false, err
 	}
 
-	log.Println("installing or updating argocd helm chart")
-	if err := acd.installOrUpgradeChart(); err != nil {
+	log.Println("installing argocd helm chart")
+	if err := acd.installOrUpgradeHelmChart(); err != nil {
 		return false, err
 	}
 

internal/pkg/argocd/reinstall.go

@@ -53,8 +53,7 @@ func NewPlan(smgr statemanager.Manager, cfg *configloader.Config) *Plan {
 		smgr.SetStates(states)
 		log.Println("succeeded to initialize States")
 	} else {
-		log.Printf("failed to initialize States. Error: (%s)", err)
-    log.Println("try to initialize the States.")
+		log.Printf("failed to initialize States. Error: (%s). try to initialize the States", err)
 	}
 
 	plan := &Plan{
@@ -73,7 +72,10 @@ func NewPlan(smgr statemanager.Manager, cfg *configloader.Config) *Plan {
 // All errors will be return.
 func (p *Plan) Execute() []error {
 	errors := make([]error, 0)
-	for _, c := range p.Changes {
+	log.Printf("changes count: %d", len(p.Changes))
+	for i, c := range p.Changes {
+		log.Printf("procprocessing progress: %d/%d", i+1, len(p.Changes))
+		log.Printf("processing: %s -> %s", c.Tool.Name, c.ActionName)
 		// We will consider how to execute Action concurrently later.
 		// It involves dependency management.
 		succeeded, err := c.Action(c.Tool)
@@ -97,6 +99,11 @@ func (p *Plan) Execute() []error {
 
 // handleResult is used to Write the latest States to Backend.
 func (p *Plan) handleResult(change *Change) error {
+	if change.ActionName == statemanager.ActionUninstall {
+		p.smgr.DeleteState(change.Tool.Name)
+		return p.smgr.Write(p.smgr.GetStates().Format())
+	}
+
 	var state = statemanager.NewState(
 		change.Tool.Name,
 		change.Tool.Version,
@@ -111,9 +118,9 @@ func (p *Plan) handleResult(change *Change) error {
 
 	if change.Result.Error != nil {
 		state.Status = statemanager.StatusFailed
-		log.Printf("=== plugin %s installation failed ===", change.Tool.Name)
+		log.Printf("=== plugin %s process failed ===", change.Tool.Name)
 	} else {
-		log.Printf("=== plugin %s installation done ===", change.Tool.Name)
+		log.Printf("=== plugin %s process done ===", change.Tool.Name)
 	}
 
 	p.smgr.AddState(state)