fix: context is not passed to rollback function

tyru · tyru · commit 31449a26bf7c · 2018-04-24T23:17:27.000+09:00
diff --git a/dsl/execute.go b/dsl/execute.go
@@ -50,14 +50,14 @@ func Execute(ctx context.Context, expr types.Expr) (_ types.Value, result error)
 	val, rollback, err := evalDepthFirst(ctx, expr)
 	if err != nil {
 		if rollback != nil {
-			rollback()
+			rollback(ctx)
 		}
 		return nil, errors.Wrap(err, "expression returned an error")
 	}
 	return val, nil
 }
 
-func evalDepthFirst(ctx context.Context, expr types.Expr) (_ types.Value, _ func(), result error) {
+func evalDepthFirst(ctx context.Context, expr types.Expr) (_ types.Value, _ func(context.Context), result error) {
 	op := expr.Op()
 	g := util.FuncGuard(op.String())
 	defer func() {
diff --git a/dsl/ops/func_do.go b/dsl/ops/func_do.go
@@ -43,7 +43,7 @@ func (*doOp) InvertExpr(ctx context.Context, args []types.Value) (types.Value, e
 	return DoOp.Bind(newargs...)
 }
 
-func (*doOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {
+func (*doOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {
 	g := util.FuncGuard(DoOp.String())
 	defer func() {
 		result = g.Error(recover())
diff --git a/dsl/ops/func_lockjson_write.go b/dsl/ops/func_lockjson_write.go
@@ -33,7 +33,7 @@ func (*lockJSONWriteOp) InvertExpr(_ context.Context, args []types.Value) (types
 	return LockJSONWriteOp.Bind(args...)
 }
 
-func (*lockJSONWriteOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {
+func (*lockJSONWriteOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {
 	lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)
 	result = lockJSON.Write()
 	if result != nil {
diff --git a/dsl/ops/func_migrate_plugconf_config_func.go b/dsl/ops/func_migrate_plugconf_config_func.go
@@ -44,7 +44,7 @@ func (*migratePlugconfConfigFuncOp) InvertExpr(_ context.Context, args []types.V
 	return MigratePlugconfConfigFuncOp.Bind(args...)
 }
 
-func (*migratePlugconfConfigFuncOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {
+func (*migratePlugconfConfigFuncOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {
 	lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)
 	cfg := ctx.Value(dslctx.ConfigKey).(*config.Config)
 
diff --git a/dsl/ops/macro.go b/dsl/ops/macro.go
@@ -17,7 +17,7 @@ func (*macroBase) IsMacro() bool {
 }
 
 // macroInvertExpr inverts the result of op.Execute() which expands an expression
-func (*macroBase) macroInvertExpr(ctx context.Context, val types.Value, _ func(), err error) (types.Value, error) {
+func (*macroBase) macroInvertExpr(ctx context.Context, val types.Value, _ func(context.Context), err error) (types.Value, error) {
 	if err != nil {
 		return nil, err
 	}
diff --git a/dsl/ops/macro_array.go b/dsl/ops/macro_array.go
@@ -27,6 +27,6 @@ func (*arrayOp) Bind(args ...types.Value) (types.Expr, error) {
 	return expr, nil
 }
 
-func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {
 	return types.NewArray(args, types.AnyValue), nil, nil
 }
diff --git a/dsl/ops/macro_eval.go b/dsl/ops/macro_eval.go
@@ -28,7 +28,7 @@ func (*evalOp) Bind(args ...types.Value) (types.Expr, error) {
 	return expr, nil
 }
 
-func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
 		return nil, nil, err
 	}
diff --git a/dsl/ops/macro_invert.go b/dsl/ops/macro_invert.go
@@ -28,7 +28,7 @@ func (*invertOp) Bind(args ...types.Value) (types.Expr, error) {
 	return expr, nil
 }
 
-func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
 		return nil, nil, err
 	}
diff --git a/dsl/ops/util/guard.go b/dsl/ops/util/guard.go
@@ -1,7 +1,9 @@
 package util
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/pkg/errors"
 )
 
@@ -24,10 +26,10 @@ type Guard interface {
 	Error(v interface{}) error
 
 	// Rollback calls rollback functions in reversed order
-	Rollback()
+	Rollback(ctx context.Context)
 
 	// Add adds given rollback functions, but skips if f == nil
-	Add(f func())
+	Add(f func(context.Context))
 }
 
 // FuncGuard returns Guard instance for function
@@ -38,7 +40,7 @@ func FuncGuard(name string) Guard {
 type guard struct {
 	errMsg  string
 	err     error
-	rbFuncs []func()
+	rbFuncs []func(context.Context)
 }
 
 func (g *guard) Error(v interface{}) error {
@@ -50,14 +52,14 @@ func (g *guard) Error(v interface{}) error {
 	return g.err
 }
 
-func (g *guard) Rollback() {
+func (g *guard) Rollback(ctx context.Context) {
 	for i := len(g.rbFuncs) - 1; i >= 0; i-- {
-		g.rbFuncs[i]()
+		g.rbFuncs[i](ctx)
 	}
 	g.rbFuncs = nil // do not rollback twice
 }
 
-func (g *guard) Add(f func()) {
+func (g *guard) Add(f func(context.Context)) {
 	if f != nil {
 		g.rbFuncs = append(g.rbFuncs, f)
 	}
diff --git a/dsl/types/expr.go b/dsl/types/expr.go
@@ -39,7 +39,7 @@ func (expr *expr) RetType() Type {
 	return expr.retType
 }
 
-func (expr *expr) Eval(ctx context.Context) (val Value, rollback func(), err error) {
+func (expr *expr) Eval(ctx context.Context) (val Value, rollback func(context.Context), err error) {
 	return expr.op.EvalExpr(ctx, expr.args)
 }
 
diff --git a/dsl/types/json.go b/dsl/types/json.go
@@ -13,7 +13,7 @@ func (*nullT) Invert(context.Context) (Value, error) {
 	return NullValue, nil
 }
 
-func (v *nullT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *nullT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
@@ -57,7 +57,7 @@ func (v *boolT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *boolT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *boolT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
@@ -92,7 +92,7 @@ func (v *numberT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *numberT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *numberT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
@@ -127,7 +127,7 @@ func (v *stringT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *stringT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *stringT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
@@ -165,7 +165,7 @@ func (v *arrayT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *arrayT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *arrayT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
@@ -203,7 +203,7 @@ func (v *objectT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *objectT) Eval(context.Context) (val Value, rollback func(), err error) {
+func (v *objectT) Eval(context.Context) (val Value, rollback func(context.Context), err error) {
 	return v, nil, nil
 }
 
diff --git a/dsl/types/lambda.go b/dsl/types/lambda.go
@@ -19,7 +19,7 @@ func (v *lambdaT) Invert(context.Context) (Value, error) {
 	return v, nil
 }
 
-func (v *lambdaT) Eval(context.Context) (Value, func(), error) {
+func (v *lambdaT) Eval(context.Context) (Value, func(context.Context), error) {
 	return v, nil, nil
 }
 
diff --git a/dsl/types/op.go b/dsl/types/op.go
@@ -17,7 +17,7 @@ type Op interface {
 	// If this operator is a function, it executes the operation and returns its
 	// result and error.
 	// If this operator is a macro, this expands expression.
-	EvalExpr(ctx context.Context, args []Value) (ret Value, rollback func(), err error)
+	EvalExpr(ctx context.Context, args []Value) (ret Value, rollback func(context.Context), err error)
 
 	// IsMacro returns true if this operator is a macro
 	IsMacro() bool
diff --git a/dsl/types/value.go b/dsl/types/value.go
@@ -12,7 +12,7 @@ type Value interface {
 
 	// Eval returns a evaluated value.
 	// Literals like string,number,... return itself as-is.
-	Eval(ctx context.Context) (val Value, rollback func(), err error)
+	Eval(ctx context.Context) (val Value, rollback func(context.Context), err error)
 
 	// Type returns the type of this value.
 	Type() Type

Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ func Execute(ctx context.Context, expr types.Expr) (_ types.Value, result error)`
`50`	`50`	`val, rollback, err := evalDepthFirst(ctx, expr)`
`51`	`51`	`if err != nil {`
`52`	`52`	`if rollback != nil {`
`53`		`- rollback()`
	`53`	`+ rollback(ctx)`
`54`	`54`	`}`
`55`	`55`	`return nil, errors.Wrap(err, "expression returned an error")`
`56`	`56`	`}`
`57`	`57`	`return val, nil`
`58`	`58`	`}`
`59`	`59`
`60`		`-func evalDepthFirst(ctx context.Context, expr types.Expr) (_ types.Value, _ func(), result error) {`
	`60`	`+func evalDepthFirst(ctx context.Context, expr types.Expr) (_ types.Value, _ func(context.Context), result error) {`
`61`	`61`	`op := expr.Op()`
`62`	`62`	`g := util.FuncGuard(op.String())`
`63`	`63`	`defer func() {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (*doOp) InvertExpr(ctx context.Context, args []types.Value) (types.Value, e`
`43`	`43`	`return DoOp.Bind(newargs...)`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (*doOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {`
	`46`	`+func (*doOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {`
`47`	`47`	`g := util.FuncGuard(DoOp.String())`
`48`	`48`	`defer func() {`
`49`	`49`	`result = g.Error(recover())`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (*lockJSONWriteOp) InvertExpr(_ context.Context, args []types.Value) (types`
`33`	`33`	`return LockJSONWriteOp.Bind(args...)`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (*lockJSONWriteOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {`
	`36`	`+func (*lockJSONWriteOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {`
`37`	`37`	`lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)`
`38`	`38`	`result = lockJSON.Write()`
`39`	`39`	`if result != nil {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (*migratePlugconfConfigFuncOp) InvertExpr(_ context.Context, args []types.V`
`44`	`44`	`return MigratePlugconfConfigFuncOp.Bind(args...)`
`45`	`45`	`}`
`46`	`46`
`47`		`-func (*migratePlugconfConfigFuncOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {`
	`47`	`+func (*migratePlugconfConfigFuncOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(context.Context), result error) {`
`48`	`48`	`lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)`
`49`	`49`	`cfg := ctx.Value(dslctx.ConfigKey).(*config.Config)`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func (*macroBase) IsMacro() bool {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`// macroInvertExpr inverts the result of op.Execute() which expands an expression`
`20`		`-func (*macroBase) macroInvertExpr(ctx context.Context, val types.Value, _ func(), err error) (types.Value, error) {`
	`20`	`+func (*macroBase) macroInvertExpr(ctx context.Context, val types.Value, _ func(context.Context), err error) (types.Value, error) {`
`21`	`21`	`if err != nil {`
`22`	`22`	`return nil, err`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ func (*arrayOp) Bind(args ...types.Value) (types.Expr, error) {`
`27`	`27`	`return expr, nil`
`28`	`28`	`}`
`29`	`29`
`30`		`-func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {`
	`30`	`+func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {`
`31`	`31`	`return types.NewArray(args, types.AnyValue), nil, nil`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (*evalOp) Bind(args ...types.Value) (types.Expr, error) {`
`28`	`28`	`return expr, nil`
`29`	`29`	`}`
`30`	`30`
`31`		`-func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {`
	`31`	`+func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {`
`32`	`32`	`if err := util.Signature(types.AnyValue).Check(args); err != nil {`
`33`	`33`	`return nil, nil, err`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (*invertOp) Bind(args ...types.Value) (types.Expr, error) {`
`28`	`28`	`return expr, nil`
`29`	`29`	`}`
`30`	`30`
`31`		`-func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {`
	`31`	`+func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(context.Context), error) {`
`32`	`32`	`if err := util.Signature(types.AnyValue).Check(args); err != nil {`
`33`	`33`	`return nil, nil, err`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`package util`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "context"`
`4`	`5`	`"fmt"`
	`6`	`+`
`5`	`7`	`"github.com/pkg/errors"`
`6`	`8`	`)`
`7`	`9`
`@@ -24,10 +26,10 @@ type Guard interface {`
`24`	`26`	`Error(v interface{}) error`
`25`	`27`
`26`	`28`	`// Rollback calls rollback functions in reversed order`
`27`		`- Rollback()`
	`29`	`+ Rollback(ctx context.Context)`
`28`	`30`
`29`	`31`	`// Add adds given rollback functions, but skips if f == nil`
`30`		`- Add(f func())`
	`32`	`+ Add(f func(context.Context))`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`// FuncGuard returns Guard instance for function`
`@@ -38,7 +40,7 @@ func FuncGuard(name string) Guard {`
`38`	`40`	`type guard struct {`
`39`	`41`	`errMsg string`
`40`	`42`	`err error`
`41`		`- rbFuncs []func()`
	`43`	`+ rbFuncs []func(context.Context)`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`func (g *guard) Error(v interface{}) error {`
`@@ -50,14 +52,14 @@ func (g *guard) Error(v interface{}) error {`
`50`	`52`	`return g.err`
`51`	`53`	`}`
`52`	`54`
`53`		`-func (g *guard) Rollback() {`
	`55`	`+func (g *guard) Rollback(ctx context.Context) {`
`54`	`56`	`for i := len(g.rbFuncs) - 1; i >= 0; i-- {`
`55`		`- g.rbFuncs[i]()`
	`57`	`+ g.rbFuncs[i](ctx)`
`56`	`58`	`}`
`57`	`59`	`g.rbFuncs = nil // do not rollback twice`
`58`	`60`	`}`
`59`	`61`
`60`		`-func (g *guard) Add(f func()) {`
	`62`	`+func (g *guard) Add(f func(context.Context)) {`
`61`	`63`	`if f != nil {`
`62`	`64`	`g.rbFuncs = append(g.rbFuncs, f)`
`63`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (expr *expr) RetType() Type {`
`39`	`39`	`return expr.retType`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (expr *expr) Eval(ctx context.Context) (val Value, rollback func(), err error) {`
	`42`	`+func (expr *expr) Eval(ctx context.Context) (val Value, rollback func(context.Context), err error) {`
`43`	`43`	`return expr.op.EvalExpr(ctx, expr.args)`
`44`	`44`	`}`
`45`	`45`