merge resolved config into default template and save it as lima.yaml

Signed-off-by: Ansuman Sahoo <[email protected]>

Author: unsuman

pkg/instance/create.go

@@ -18,6 +18,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/store"
 	"github.com/lima-vm/lima/v2/pkg/store/filenames"
 	"github.com/lima-vm/lima/v2/pkg/version"
+	"github.com/lima-vm/lima/v2/pkg/yqutil"
 )
 
 func Create(ctx context.Context, instName string, instConfig []byte, saveBrokenYAML bool) (*limatype.Instance, error) {
@@ -61,7 +62,17 @@ func Create(ctx context.Context, instName string, instConfig []byte, saveBrokenY
 	if err := os.MkdirAll(instDir, 0o700); err != nil {
 		return nil, err
 	}
-	if err := os.WriteFile(filePath, instConfig, 0o644); err != nil {
+
+	resolvedConfigBytes, err := limayaml.Marshal(loadedInstConfig, false)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal resolved configuration: %w", err)
+	}
+	mergedConfig, err := yqutil.MergeWithResolved(instConfig, resolvedConfigBytes)
+	if err != nil {
+		return nil, fmt.Errorf("failed to merge resolved config into template: %w", err)
+	}
+
+	if err := os.WriteFile(filePath, mergedConfig, 0o644); err != nil {
 		return nil, err
 	}
 	if err := cidata.GenerateCloudConfig(instDir, instName, loadedInstConfig); err != nil {

pkg/yqutil/yqutil.go

@@ -132,3 +132,10 @@ func yamlfmtBasicFormatter() (*basic.BasicFormatter, error) {
 	}
 	return basicFormatter, nil
 }
+
+func MergeWithResolved(originalTemplate, resolvedConfig []byte) ([]byte, error) {
+	documents := fmt.Sprintf("%s\n---\n%s", string(originalTemplate), string(resolvedConfig))
+	expression := "select(document_index == 0) * select(document_index == 1)"
+
+	return EvaluateExpression(expression, []byte(documents))
+}