fix: more env version write tests

See toolshed/organising#661

cli/app/deploy.go

@@ -122,21 +122,23 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			}
 		}
 
-		isChaosCommit, err = app.Recipe.EnsureVersion(toDeployVersion)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if isChaosCommit {
-			log.Debugf("assuming chaos commit: %s", toDeployVersion)
-
-			internal.Chaos = true
-			toDeployChaosVersion = toDeployVersion
-
-			toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
+		if !internal.Chaos {
+			isChaosCommit, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
 				log.Fatal(err)
 			}
+
+			if isChaosCommit {
+				log.Debugf("assuming chaos commit: %s", toDeployVersion)
+
+				internal.Chaos = true
+				toDeployChaosVersion = toDeployVersion
+
+				toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
+				if err != nil {
+					log.Fatal(err)
+				}
+			}
 		}
 
 		if err := validateSecrets(cl, app); err != nil {
@@ -171,7 +173,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 
 		toDeployChaosVersionLabel := toDeployChaosVersion
 		if app.Recipe.Dirty {
-			toDeployChaosVersionLabel = fmt.Sprintf("%s%s", toDeployChaosVersion, config.DIRTY_DEFAULT)
+			toDeployChaosVersionLabel = formatter.AddDirtyMarker(toDeployChaosVersionLabel)
 		}
 
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)

cli/app/env.go

@@ -7,7 +7,6 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/log"
 	"github.com/spf13/cobra"
 )
 
@@ -26,10 +25,6 @@ var AppEnvCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			log.Fatal(err)
-		}
-
 		var envKeys []string
 		for k := range app.Env {
 			envKeys = append(envKeys, k)

cli/app/rollback.go

@@ -232,7 +232,7 @@ func chooseDowngrade(
 		Options: internal.SortVersionsDesc(availableDowngrades),
 	}
 
-	if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
+	if err := survey.AskOne(prompt, chosenDowngrade); err != nil {
 		return err
 	}
 

cli/app/undeploy.go

@@ -81,7 +81,12 @@ Passing "--prune/-p" does not remove those volumes.`,
 			}
 		}
 
-		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
+		toWriteVersion := deployMeta.Version
+		if deployMeta.IsChaos {
+			toWriteVersion = chaosVersion
+		}
+
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
 			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},

cli/app/upgrade.go

@@ -274,7 +274,7 @@ func chooseUpgrade(
 		Options: internal.SortVersionsDesc(availableUpgrades),
 	}
 
-	if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
+	if err := survey.AskOne(prompt, chosenUpgrade); err != nil {
 		return err
 	}