From 4ea3ca8d5bfcfa9ad53dcc519ff4ed6c9570796d Mon Sep 17 00:00:00 2001 From: Somefive Date: Wed, 22 Jun 2022 18:08:19 +0800 Subject: [PATCH] Fix: json-patch & json-merge-patch open result Signed-off-by: Somefive --- pkg/cue/model/sets/operation.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/cue/model/sets/operation.go b/pkg/cue/model/sets/operation.go index cf428f549..56680b605 100644 --- a/pkg/cue/model/sets/operation.go +++ b/pkg/cue/model/sets/operation.go @@ -358,7 +358,11 @@ func jsonMergePatch(base cue.Value, patch cue.Value) (string, error) { if err != nil { return "", errors.Wrapf(err, "failed to merge base value and patch value by JsonMergePatch") } - return string(merged), nil + output, err := OpenBaiscLit(string(merged)) + if err != nil { + return "", errors.Wrapf(err, "failed to parse open basic lit for merged result") + } + return output, nil } func jsonPatch(base cue.Value, patch cue.Value) (string, error) { @@ -379,5 +383,9 @@ func jsonPatch(base cue.Value, patch cue.Value) (string, error) { if err != nil { return "", errors.Wrapf(err, "failed to apply json patch") } - return string(merged), nil + output, err := OpenBaiscLit(string(merged)) + if err != nil { + return "", errors.Wrapf(err, "failed to parse open basic lit for merged result") + } + return output, nil }