refactor/fix: deploy/upgrade/rollback

See coop-cloud/abra#461

pkg/app/app_test.go

@@ -211,7 +211,7 @@ func TestWriteRecipeVersionOverwrite(t *testing.T) {
 		}
 	})
 
-	assert.Equal(t, "", app.Recipe.Version)
+	assert.Equal(t, "", app.Recipe.EnvVersion)
 
 	if err := app.WriteRecipeVersion("foo", false); err != nil {
 		t.Fatal(err)
@@ -222,7 +222,7 @@ func TestWriteRecipeVersionOverwrite(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, "foo", app.Recipe.Version)
+	assert.Equal(t, "foo", app.Recipe.EnvVersion)
 
 	app.Recipe.Dirty = true
 	if err := app.WriteRecipeVersion("foo+U", false); err != nil {
@@ -234,5 +234,5 @@ func TestWriteRecipeVersionOverwrite(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, "foo+U", app.Recipe.Version)
+	assert.Equal(t, "foo+U", app.Recipe.EnvVersion)
 }

pkg/config/abra.go

@@ -118,4 +118,6 @@ var (
 
 	NO_DOMAIN_DEFAULT  = "N/A"
 	NO_VERSION_DEFAULT = "N/A"
+
+	UNKNOWN_DEFAULT = "unknown"
 )

pkg/formatter/formatter.go

@@ -125,6 +125,10 @@ func CreateOverview(header string, rows [][]string) string {
 
 	var renderedRows []string
 	for _, row := range rows {
+		if len(row) < 2 {
+			continue
+		}
+
 		if len(row) > 2 {
 			panic("CreateOverview: only accepts rows of len == 2")
 		}
@@ -140,6 +144,7 @@ func CreateOverview(header string, rows [][]string) string {
 		}
 
 		rendered := horizontal(leftStyle.Render(row[0]), offset, rightStyle.Render(row[1]))
+
 		if row[1] == "---" {
 			rendered = horizontal(
 				leftStyle.

pkg/recipe/git.go

@@ -13,13 +13,20 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
-// Ensure makes sure the recipe exists, is up to date and has the latest version checked out.
-func (r Recipe) Ensure(chaos bool, offline bool) error {
+type EnsureContext struct {
+	Chaos     bool
+	Offline   bool
+	IgnoreEnv bool
+}
+
+// Ensure makes sure the recipe exists, is up to date and has the specific
+// version checked out.
+func (r Recipe) Ensure(ctx EnsureContext) error {
 	if err := r.EnsureExists(); err != nil {
 		return err
 	}
 
-	if chaos {
+	if ctx.Chaos {
 		return nil
 	}
 
@@ -27,15 +34,16 @@ func (r Recipe) Ensure(chaos bool, offline bool) error {
 		return err
 	}
 
-	if !offline {
+	if !ctx.Offline {
 		if err := r.EnsureUpToDate(); err != nil {
 			log.Fatal(err)
 		}
 	}
 
-	if r.Version != "" {
-		log.Debugf("ensuring version %s", r.Version)
-		if _, err := r.EnsureVersion(r.Version); err != nil {
+	if r.EnvVersion != "" && !ctx.IgnoreEnv {
+		log.Debugf("ensuring env version %s", r.EnvVersion)
+
+		if _, err := r.EnsureVersion(r.EnvVersion); err != nil {
 			return err
 		}
 
@@ -65,6 +73,41 @@ func (r Recipe) EnsureExists() error {
 	return nil
 }
 
+// IsChaosCommit determines if a version sttring is a chaos commit or not.
+func (r Recipe) IsChaosCommit(version string) (bool, error) {
+	isChaosCommit := false
+
+	if err := gitPkg.EnsureGitRepo(r.Dir); err != nil {
+		return isChaosCommit, err
+	}
+
+	repo, err := git.PlainOpen(r.Dir)
+	if err != nil {
+		return isChaosCommit, err
+	}
+
+	tags, err := repo.Tags()
+	if err != nil {
+		return isChaosCommit, err
+	}
+
+	var tagRef plumbing.ReferenceName
+	if err := tags.ForEach(func(ref *plumbing.Reference) (err error) {
+		if ref.Name().Short() == version {
+			tagRef = ref.Name()
+		}
+		return nil
+	}); err != nil {
+		return isChaosCommit, err
+	}
+
+	if tagRef.String() == "" {
+		isChaosCommit = true
+	}
+
+	return true, nil
+}
+
 // EnsureVersion checks whether a specific version exists for a recipe.
 func (r Recipe) EnsureVersion(version string) (bool, error) {
 	isChaosCommit := false

pkg/recipe/recipe.go

@@ -159,11 +159,11 @@ func Get(name string) Recipe {
 	dir := path.Join(config.RECIPES_DIR, escapeRecipeName(name))
 
 	r := Recipe{
-		Name:    name,
-		Version: version,
-		Dir:     dir,
-		GitURL:  gitURL,
-		SSHURL:  sshURL,
+		Name:       name,
+		EnvVersion: version,
+		Dir:        dir,
+		GitURL:     gitURL,
+		SSHURL:     sshURL,
 
 		ComposePath:   path.Join(dir, "compose.yml"),
 		ReadmePath:    path.Join(dir, "README.md"),
@@ -179,12 +179,12 @@ func Get(name string) Recipe {
 }
 
 type Recipe struct {
-	Name    string
-	Version string
-	Dirty   bool // NOTE(d1): git terminology for unstaged changes
-	Dir     string
-	GitURL  string
-	SSHURL  string
+	Name       string
+	EnvVersion string
+	Dirty      bool // NOTE(d1): git terminology for unstaged changes
+	Dir        string
+	GitURL     string
+	SSHURL     string
 
 	ComposePath   string
 	ReadmePath    string
@@ -195,7 +195,7 @@ type Recipe struct {
 // String outputs a human-friendly string representation.
 func (r Recipe) String() string {
 	out := fmt.Sprintf("{name: %s, ", r.Name)
-	out += fmt.Sprintf("version : %s, ", r.Version)
+	out += fmt.Sprintf("version : %s, ", r.EnvVersion)
 	out += fmt.Sprintf("dirty: %v, ", r.Dirty)
 	out += fmt.Sprintf("dir: %s, ", r.Dir)
 	out += fmt.Sprintf("git url: %s, ", r.GitURL)

pkg/recipe/recipe_test.go

@@ -33,7 +33,7 @@ func TestGet(t *testing.T) {
 			name: "foo:1.2.3",
 			recipe: Recipe{
 				Name:          "foo",
-				Version:       "1.2.3",
+				EnvVersion:    "1.2.3",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/foo"),
 				GitURL:        "https://git.coopcloud.tech/coop-cloud/foo.git",
 				SSHURL:        "ssh://git@git.coopcloud.tech:2222/coop-cloud/foo.git",
@@ -60,7 +60,7 @@ func TestGet(t *testing.T) {
 			name: "mygit.org/myorg/cool-recipe:1.2.4",
 			recipe: Recipe{
 				Name:          "mygit.org/myorg/cool-recipe",
-				Version:       "1.2.4",
+				EnvVersion:    "1.2.4",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/mygit_org_myorg_cool-recipe"),
 				GitURL:        "https://mygit.org/myorg/cool-recipe.git",
 				SSHURL:        "ssh://git@mygit.org/myorg/cool-recipe.git",
@@ -108,5 +108,5 @@ func TestGetVersionLabelLocalDoesNotUseTimeoutLabel(t *testing.T) {
 
 func TestDirtyMarkerRemoved(t *testing.T) {
 	r := Get("abra-test-recipe:1e83340e+U")
-	assert.Equal(t, "1e83340e", r.Version)
+	assert.Equal(t, "1e83340e", r.EnvVersion)
 }