Report action cleanup errors to the user & various cleanup fixes for recipe action

action.go

@@ -2,6 +2,8 @@ package debos
 
 import (
  "bytes"
+ "log"
+
  "github.com/go-debos/fakemachine"
 )
 
@@ -53,6 +55,17 @@ func (c *DebosContext) Origin(o string) (string, bool) {
  }
 }
 
+func HandleError(context *DebosContext, err error, a Action, stage string) bool {
+ if err == nil {
+ return false
+ }
+
+ context.State = Failed
+ log.Printf("Action `%s` failed at stage %s, error: %s", a, stage, err)
+ DebugShell(*context)
+ return true
+}
+
 type Action interface {
  /* FIXME verify should probably be prepare or somesuch */
  Verify(context *DebosContext) error

actions/recipe_action.go

@@ -45,6 +45,9 @@ type RecipeAction struct {
  Actions Recipe `yaml:"-"`
  templateVars map[string]string
  context debos.DebosContext
+
+ cleanupActions []YamlAction
+ postMachineCleanupActions []YamlAction
 }
 
 func (recipe *RecipeAction) Verify(context *debos.DebosContext) error {
@@ -96,6 +99,8 @@ func (recipe *RecipeAction) PreMachine(context *debos.DebosContext, m *fakemachi
  m.AddVolume(recipe.context.RecipeDir)
 
  for _, a := range recipe.Actions.Actions {
+ recipe.postMachineCleanupActions = append(recipe.postMachineCleanupActions, a)
+
  if err := a.PreMachine(&recipe.context, m, args); err != nil {
  return err
  }
@@ -106,6 +111,8 @@ func (recipe *RecipeAction) PreMachine(context *debos.DebosContext, m *fakemachi
 
 func (recipe *RecipeAction) PreNoMachine(context *debos.DebosContext) error {
  for _, a := range recipe.Actions.Actions {
+ recipe.postMachineCleanupActions = append(recipe.postMachineCleanupActions, a)
+
  if err := a.PreNoMachine(&recipe.context); err != nil {
  return err
  }
@@ -116,6 +123,8 @@ func (recipe *RecipeAction) PreNoMachine(context *debos.DebosContext) error {
 
 func (recipe *RecipeAction) Run(context *debos.DebosContext) error {
  for _, a := range recipe.Actions.Actions {
+ recipe.cleanupActions = append(recipe.cleanupActions, a)
+
  log.Printf("==== %s ====\n", a)
  if err := a.Run(&recipe.context); err != nil {
  return err
@@ -125,11 +134,18 @@ func (recipe *RecipeAction) Run(context *debos.DebosContext) error {
  return nil
 }
 
-func (recipe *RecipeAction) Cleanup(context *debos.DebosContext) error {
- for _, a := range recipe.Actions.Actions {
- if err := a.Cleanup(&recipe.context); err != nil {
- return err
- }
+func (recipe *RecipeAction) Cleanup(context *debos.DebosContext) (err error) {
+ /* only run Cleanup if Run was attempted */
+ for _, a := range recipe.cleanupActions {
+ defer func(action debos.Action) {
+ cleanup_err := action.Cleanup(context)
+
+ /* Cannot bubble multiple errors, so check for an error locally and
+ * return a generic error if the child recipe failed to cleanup. */
+ if debos.HandleError(context, cleanup_err, action, "Cleanup") {
+ err = errors.New("Child recipe failed")
+ }
+ }(a)
  }
 
  return nil
@@ -145,11 +161,18 @@ func (recipe *RecipeAction) PostMachine(context *debos.DebosContext) error {
  return nil
 }
 
-func (recipe *RecipeAction) PostMachineCleanup(context *debos.DebosContext) error {
- for _, a := range recipe.Actions.Actions {
- if err := a.PostMachineCleanup(&recipe.context); err != nil {
- return err
- }
+func (recipe *RecipeAction) PostMachineCleanup(context *debos.DebosContext) (err error) {
+ /* only run PostMachineCleanup if PreNoMachine OR PreMachine was attempted */
+ for _, a := range recipe.postMachineCleanupActions {
+ defer func(action debos.Action) {
+ cleanup_err := action.PostMachineCleanup(context)
+
+ /* Cannot bubble multiple errors, so check for an error locally and
+ * return a generic error if the child recipe failed to cleanup. */
+ if debos.HandleError(context, cleanup_err, action, "PostMachineCleanup") {
+ err = errors.New("Child recipe failed")
+ }
+ }(a)
  }
 
  return nil