From 711c4e5ee8e2d5cfe00570bd6a96337a7ea6dcd7 Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Mon, 22 Nov 2021 18:38:59 +0100
Subject: [PATCH] fix: warn on invalid envs for catalogue generation

Closes https://git.coopcloud.tech/coop-cloud/organising/issues/256.
---
 cli/internal/validate.go | 6 +++++-
 pkg/recipe/recipe.go     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cli/internal/validate.go b/cli/internal/validate.go
index 1823d72d..7c5896ae 100644
--- a/cli/internal/validate.go
+++ b/cli/internal/validate.go
@@ -27,7 +27,11 @@ func ValidateRecipe(c *cli.Context) recipe.Recipe {
 
 	recipe, err := recipe.Get(recipeName)
 	if err != nil {
-		logrus.Fatal(err)
+		if c.Command.Name == "generate" {
+			logrus.Warn(err)
+		} else {
+			logrus.Fatal(err)
+		}
 	}
 
 	logrus.Debugf("validated '%s' as recipe argument", recipeName)
diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go
index f6edf7ee..c17317ca 100644
--- a/pkg/recipe/recipe.go
+++ b/pkg/recipe/recipe.go
@@ -84,7 +84,7 @@ func Get(recipeName string) (Recipe, error) {
 	envSamplePath := path.Join(config.ABRA_DIR, "apps", recipeName, ".env.sample")
 	sampleEnv, err := config.ReadEnv(envSamplePath)
 	if err != nil {
-		logrus.Fatal(err)
+		return Recipe{}, err
 	}
 
 	opts := stack.Deploy{Composefiles: composeFiles}