fix(clean-up): Call env cleanup method when executing render and sync (…

…#125) Closes #100
mykso · Nov 1, 2023 · cfedbde · cfedbde
1 parent b29f264
commit cfedbde
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/logrusorgru/aurora/v4"
+	aurora "github.com/logrusorgru/aurora/v4"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

diff --git a/internal/myks/environment.go b/internal/myks/environment.go
@@ -106,6 +106,37 @@ func (e *Environment) Render(asyncLevel int) error {
 	return e.Cleanup()
 }
 
+func (e *Environment) SyncAndRender(asyncLevel int, vendirSecrets string) error {
+	if err := e.renderArgoCD(); err != nil {
+		return err
+	}
+	err := process(asyncLevel, e.Applications, func(item interface{}) error {
+		app, ok := item.(*Application)
+		if !ok {
+			return fmt.Errorf("Unable to cast item to *Application")
+		}
+		if err := app.Sync(vendirSecrets); err != nil {
+			return err
+		}
+		yamlTemplatingTools := []YamlTemplatingTool{
+			&Helm{ident: "helm", app: app, additive: true},
+			&YttPkg{ident: "ytt-pkg", app: app, additive: true},
+			&Ytt{ident: "ytt", app: app, additive: false},
+			&GlobalYtt{ident: "global-ytt", app: app, additive: false},
+		}
+		if err := app.RenderAndSlice(yamlTemplatingTools); err != nil {
+			return err
+		}
+		return app.renderArgoCD()
+	})
+	if err != nil {
+		log.Error().Err(err).Msg(e.Msg("Unable to sync and render applications"))
+		return err
+	}
+
+	return e.Cleanup()
+}
+
 func (e *Environment) Cleanup() error {
 	apps, err := e.renderedApplications()
 	if err != nil {
@@ -171,31 +202,6 @@ func (e *Environment) missingApplications() ([]string, error) {
 	return missingApps, nil
 }
 
-func (e *Environment) SyncAndRender(asyncLevel int, vendirSecrets string) error {
-	if err := e.renderArgoCD(); err != nil {
-		return err
-	}
-	return process(asyncLevel, e.Applications, func(item interface{}) error {
-		app, ok := item.(*Application)
-		if !ok {
-			return fmt.Errorf("Unable to cast item to *Application")
-		}
-		if err := app.Sync(vendirSecrets); err != nil {
-			return err
-		}
-		yamlTemplatingTools := []YamlTemplatingTool{
-			&Helm{ident: "helm", app: app, additive: true},
-			&YttPkg{ident: "ytt-pkg", app: app, additive: true},
-			&Ytt{ident: "ytt", app: app, additive: false},
-			&GlobalYtt{ident: "global-ytt", app: app, additive: false},
-		}
-		if err := app.RenderAndSlice(yamlTemplatingTools); err != nil {
-			return err
-		}
-		return app.renderArgoCD()
-	})
-}
-
 func (e *Environment) setId() error {
 	yamlBytes, err := os.ReadFile(e.EnvironmentDataFile)
 	if err != nil {