refactor: remove NoRollback, use nil instead

Author: tyru

dsl/execute.go

@@ -48,7 +48,9 @@ func Execute(ctx context.Context, expr types.Expr) (_ types.Value, result error)
 
 	val, rollback, err := expr.Eval(ctx)
 	if err != nil {
-		rollback()
+		if rollback != nil {
+			rollback()
+		}
 		return nil, errors.Wrap(err, "expression returned an error")
 	}
 	return val, nil

dsl/ops/func_lockjson_write.go

@@ -33,9 +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, rollback func(), result error) {
-	rollback = NoRollback
-
+func (*lockJSONWriteOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {
 	lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)
 	result = lockJSON.Write()
 	if result != nil {

dsl/ops/func_migrate_plugconf_config_func.go

@@ -44,8 +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, rollback func(), result error) {
-	rollback = NoRollback
+func (*migratePlugconfConfigFuncOp) EvalExpr(ctx context.Context, args []types.Value) (_ types.Value, _ func(), result error) {
 	lockJSON := ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON)
 	cfg := ctx.Value(dslctx.ConfigKey).(*config.Config)
 

dsl/ops/macro_array.go

@@ -28,5 +28,5 @@ func (*arrayOp) Bind(args ...types.Value) (types.Expr, error) {
 }
 
 func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
-	return types.NewArray(args, types.AnyValue), NoRollback, nil
+	return types.NewArray(args, types.AnyValue), nil, nil
 }

dsl/ops/macro_eval.go

@@ -30,7 +30,7 @@ func (*evalOp) Bind(args ...types.Value) (types.Expr, error) {
 
 func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
-		return nil, NoRollback, err
+		return nil, nil, err
 	}
 	return args[0].Eval(ctx)
 }

dsl/ops/macro_invert.go

@@ -30,8 +30,8 @@ func (*invertOp) Bind(args ...types.Value) (types.Expr, error) {
 
 func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
-		return nil, NoRollback, err
+		return nil, nil, err
 	}
 	val, err := args[0].Invert(ctx)
-	return val, NoRollback, err
+	return val, nil, err
 }