fix: allow same recipe to be executed twice

internal/cli/execute.go

@@ -16,7 +16,6 @@ import (
 	"github.com/futurice/jalapeno/pkg/ui/survey"
 	"github.com/gofrs/uuid"
 	"github.com/spf13/cobra"
-	"golang.org/x/mod/semver"
 )
 
 type executeOptions struct {
@@ -30,10 +29,6 @@ type executeOptions struct {
 	option.Timeout
 }
 
-var (
-	ErrAlreadyExecuted = errors.New("recipe has been already executed")
-)
-
 func NewExecuteCmd() *cobra.Command {
 	var opts executeOptions
 	var cmd = &cobra.Command{
@@ -149,14 +144,6 @@ func executeRecipe(cmd *cobra.Command, opts executeOptions, re *recipe.Recipe) e
 		return err
 	}
 
-	for _, sauce := range existingSauces {
-		if sauce.Recipe.Name == re.Name &&
-			semver.Compare(sauce.Recipe.Metadata.Version, re.Metadata.Version) == 0 &&
-			sauce.SubPath == opts.Subpath {
-			return fmt.Errorf("recipe '%s@%s': %w. If you want to re-execute the recipe with different values, use `upgrade` command with `--reuse-old-values=false` flag", re.Name, re.Metadata.Version, ErrAlreadyExecuted)
-		}
-	}
-
 	reusedValues := make(recipe.VariableValues)
 	if opts.ReuseOtherSauceValues && len(existingSauces) > 0 {
 		for _, sauce := range existingSauces {
@@ -237,7 +224,7 @@ func executeRecipe(cmd *cobra.Command, opts executeOptions, re *recipe.Recipe) e
 	for _, s := range existingSauces {
 		if conflicts := s.Conflicts(sauce); conflicts != nil {
 			retryMessage := cliutil.MakeRetryMessage(os.Args, values)
-			return fmt.Errorf("conflict in recipe '%s': file '%s' was already created by recipe '%s'.\n\n%s", re.Name, conflicts[0].Path, s.Recipe.Name, retryMessage)
+			return fmt.Errorf("conflict in recipe '%s': file '%s' was already created by other recipe '%s' (sauce ID: %s).\n\n%s", re.Name, conflicts[0].Path, s.Recipe.Name, s.ID, retryMessage)
 		}
 	}
 
@@ -313,18 +300,14 @@ func executeManifest(cmd *cobra.Command, opts executeOptions, manifest *recipe.M
 
 		opts.Values.Flags = valueFlags
 
-		err = executeRecipe(cmd, opts, re)
-		if err != nil {
-			if errors.Is(err, ErrAlreadyExecuted) {
-				cmd.Printf("Recipe '%s@%s' has already been executed, skipping...\n", re.Name, re.Version)
-			} else {
-				return err
-			}
+		if err := executeRecipe(cmd, opts, re); err != nil {
+			return err
 		}
 
 		if i < len(manifest.Recipes)-1 {
 			cmd.Print("\n- - - - - - - - - -\n\n")
 		}
 	}
+
 	return nil
 }

pkg/recipe/variable_test.go

@@ -70,8 +70,6 @@ func TestVariableValidation(t *testing.T) {
 
 func TestVariableRegExpValidation(t *testing.T) {
 	variable := &Variable{
-		Name:        "foo",
-		Description: "foo description",
 		Validators: []VariableValidator{
 			{
 				Pattern: "^[a-zA-Z0-9_.()-]{0,89}[a-zA-Z0-9_()-]$",
@@ -117,8 +115,6 @@ func TestVariableRegExpValidation(t *testing.T) {
 
 func TestUniqueColumnValidation(t *testing.T) {
 	variable := &Variable{
-		Name:        "foo",
-		Description: "foo description",
 		Validators: []VariableValidator{
 			{
 				Unique: true,

test/features/execute-manifest.feature

@@ -50,24 +50,4 @@ Feature: Execute manifests
 		| foo |
 		| conflicts-with-foo |
 		When I execute the manifest file
-		Then CLI produced an error "^Error: conflict in recipe 'conflicts-with-foo': file 'foo\.md' was already created by recipe 'foo'\."
-
-	Scenario: Already executed recipes are skipped when executing a manifest
-		Given a recipe "foo"
-		And recipe "foo" generates file "foo.md" with content "initial"
-		And a recipe "bar"
-		And recipe "bar" generates file "bar.md" with content "initial"
-		And a manifest file that includes recipes
-		| foo |
-		When I execute the manifest file
-		Then no errors were printed
-
-		Given I clear the output
-		And a manifest file that includes recipes
-		| foo |
-		| bar |
-		When I execute the manifest file
-		Then no errors were printed
-		And CLI produced an output "Recipe '[email protected]' has already been executed, skipping"
-		And the project directory should contain file "foo.md"
-		And the project directory should contain file "bar.md"
+		Then CLI produced an error "^Error: conflict in recipe 'conflicts-with-foo': file 'foo\.md' was already created by other recipe 'foo'"

test/features/execute-recipes.feature

@@ -50,16 +50,7 @@ Feature: Execute recipes
 		And no errors were printed
 		Then execution of the recipe has succeeded
 		When I execute recipe "quux"
-		Then CLI produced an error "file 'Taskfile.yml' was already created by recipe 'bar'"
-
-	Scenario: Same recipe is executed twice
-		Given a recipe "foo"
-		And recipe "foo" generates file "README.md" with content "initial"
-		When I execute recipe "foo"
-		And no errors were printed
-		Then execution of the recipe has succeeded
-		When I execute recipe "foo"
-		Then CLI produced an error "recipe 'foo@v0\.0\.1': recipe has been already executed"
+		Then CLI produced an error "file 'Taskfile.yml' was already created by other recipe 'bar'"
 
 	Scenario: Execute single recipe to a subpath
 		Given a recipe "foo"