feat: save also lock.json and config info to transacion log

Author: tyru

dsl/deparse.go

@@ -1,24 +1,14 @@
 package dsl
 
 import (
-	"encoding/json"
-
 	"github.com/pkg/errors"
 	"github.com/vim-volt/volt/dsl/ops"
 	"github.com/vim-volt/volt/dsl/types"
 )
 
 // Deparse deparses types.Expr.
 // ["@", 1, 2, 3] becomes [1, 2, 3]
-func Deparse(expr types.Expr) ([]byte, error) {
-	value, err := deparse(expr)
-	if err != nil {
-		return nil, err
-	}
-	return json.Marshal(value)
-}
-
-func deparse(value types.Value) (interface{}, error) {
+func Deparse(value types.Value) (interface{}, error) {
 	if value.Type() == types.NullType {
 		return nil, nil
 	}
@@ -32,7 +22,7 @@ func deparse(value types.Value) (interface{}, error) {
 	case types.Object:
 		result := make(map[string]interface{}, len(val.Value()))
 		for k, o := range val.Value() {
-			v, err := deparse(o)
+			v, err := Deparse(o)
 			if err != nil {
 				return nil, err
 			}
@@ -47,7 +37,7 @@ func deparse(value types.Value) (interface{}, error) {
 			result = append(result, val.Op().String())
 		}
 		for i := range args {
-			v, err := deparse(args[i])
+			v, err := Deparse(args[i])
 			if err != nil {
 				return nil, err
 			}

dsl/execute.go

@@ -3,13 +3,16 @@ package dsl
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"io"
 	"os"
 	"path/filepath"
 
 	"github.com/pkg/errors"
+	"github.com/vim-volt/volt/config"
 	"github.com/vim-volt/volt/dsl/dslctx"
 	"github.com/vim-volt/volt/dsl/types"
+	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/transaction"
 )
@@ -38,7 +41,7 @@ func Execute(ctx context.Context, expr types.Expr) (_ types.Value, result error)
 	}
 
 	// Write given expression to $VOLTPATH/trx/lock/log.json
-	err = writeExpr(expr)
+	err = writeTrxLog(ctx, expr)
 	if err != nil {
 		return nil, err
 	}
@@ -63,18 +66,32 @@ func expandMacro(expr types.Expr) (types.Expr, error) {
 	return result, nil
 }
 
-func writeExpr(expr types.Expr) error {
+func writeTrxLog(ctx context.Context, expr types.Expr) error {
 	deparsed, err := Deparse(expr)
 	if err != nil {
 		return errors.Wrap(err, "failed to deparse expression")
 	}
 
+	type contentT struct {
+		Expr     interface{}        `json:"expr"`
+		Config   *config.Config     `json:"config"`
+		LockJSON *lockjson.LockJSON `json:"lockjson"`
+	}
+	content, err := json.Marshal(&contentT{
+		Expr:     deparsed,
+		Config:   ctx.Value(dslctx.ConfigKey).(*config.Config),
+		LockJSON: ctx.Value(dslctx.LockJSONKey).(*lockjson.LockJSON),
+	})
+	if err != nil {
+		return errors.Wrap(err, "failed to marshal as JSON")
+	}
+
 	filename := filepath.Join(pathutil.TrxDir(), "lock", "log.json")
 	logFile, err := os.Create(filename)
 	if err != nil {
 		return errors.Wrapf(err, "could not create %s", filename)
 	}
-	_, err = io.Copy(logFile, bytes.NewReader(deparsed))
+	_, err = io.Copy(logFile, bytes.NewReader(content))
 	if err != nil {
 		return errors.Wrapf(err, "failed to write transaction log %s", filename)
 	}