fix: use k8s json lib (#476)

* fix: use k8s json lib Signed-off-by: Charles-Edouard Brétéché <[email protected]> * fix tests Signed-off-by: Charles-Edouard Brétéché <[email protected]> --------- Signed-off-by: Charles-Edouard Brétéché <[email protected]>
kyverno · Sep 16, 2024 · eed05d1 · eed05d1
1 parent ae1603e
commit eed05d1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pkg/apis/policy/v1alpha1/any.go b/pkg/apis/policy/v1alpha1/any.go
@@ -1,9 +1,8 @@
 package v1alpha1
 
 import (
-	"encoding/json"
-
 	"github.com/jinzhu/copier"
+	"k8s.io/apimachinery/pkg/util/json"
 )
 
 // Any can be any type.

diff --git a/pkg/apis/policy/v1alpha1/any_test.go b/pkg/apis/policy/v1alpha1/any_test.go
@@ -109,7 +109,7 @@ func TestAny_UnmarshalJSON(t *testing.T) {
 	}, {
 		name:    "int",
 		data:    []byte("42"),
-		want:    &Any{Value: 42.0},
+		want:    &Any{Value: int64(42)},
 		wantErr: false,
 	}, {
 		name:    "string",
@@ -119,7 +119,7 @@ func TestAny_UnmarshalJSON(t *testing.T) {
 	}, {
 		name:    "map",
 		data:    []byte(`{"foo":42}`),
-		want:    &Any{Value: map[string]any{"foo": 42.0}},
+		want:    &Any{Value: map[string]any{"foo": int64(42)}},
 		wantErr: false,
 	}, {
 		name:    "error",

diff --git a/pkg/engine/template/functions/json_parse.go b/pkg/engine/template/functions/json_parse.go
@@ -1,8 +1,9 @@
 package functions
 
 import (
-	"encoding/json"
 	"errors"
+
+	"k8s.io/apimachinery/pkg/util/json"
 )
 
 func jpfJsonParse(arguments []any) (any, error) {

diff --git a/pkg/engine/template/kyverno/functions.go b/pkg/engine/template/kyverno/functions.go
@@ -7,7 +7,6 @@ import (
 	"crypto/x509"
 	"encoding/asn1"
 	"encoding/base64"
-	"encoding/json"
 	"encoding/pem"
 	"errors"
 	"fmt"
@@ -26,6 +25,7 @@ import (
 	regen "github.com/zach-klippenstein/goregen"
 	"golang.org/x/crypto/cryptobyte"
 	cryptobyte_asn1 "golang.org/x/crypto/cryptobyte/asn1"
+	"k8s.io/apimachinery/pkg/util/json"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/pkg/payload/load.go b/pkg/payload/load.go
@@ -1,14 +1,14 @@
 package payload
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"github.com/kyverno/pkg/ext/file"
 	yamlutils "github.com/kyverno/pkg/ext/yaml"
 	"gopkg.in/yaml.v3"
+	"k8s.io/apimachinery/pkg/util/json"
 )
 
 func Load(path string) (any, error) {