Use sonic instead of standard json library

cmd/agentbasedinstaller/import.go

@@ -2,11 +2,11 @@ package agentbasedinstaller
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"io/fs"
 	"os"
 
+	json "github.com/bytedance/sonic"
 	"github.com/go-openapi/strfmt"
 	"github.com/openshift/assisted-service/client"
 	"github.com/openshift/assisted-service/client/installer"

cmd/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"net/http"
@@ -15,6 +14,7 @@ import (
 	"time"
 
 	"github.com/NYTimes/gziphandler"
+	json "github.com/bytedance/sonic"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"

cmd/operator/main.go

@@ -18,11 +18,11 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"os"
 
+	json "github.com/bytedance/sonic"
 	certtypes "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	configv1 "github.com/openshift/api/config/v1"
 	routev1 "github.com/openshift/api/route/v1"

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/aws/aws-sdk-go v1.49.13
 	github.com/bombsimon/logrusr/v3 v3.0.0
 	github.com/buger/jsonparser v1.1.1
+	github.com/bytedance/sonic v1.12.9
 	github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e
 	github.com/cert-manager/cert-manager v1.14.7
 	github.com/coreos/ignition/v2 v2.14.0
@@ -99,7 +100,9 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
+	github.com/bytedance/sonic/loader v0.2.2 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/containerd/containerd v1.7.12 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
@@ -120,6 +123,7 @@ require (
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -141,13 +145,15 @@ require (
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/xdg/scram v1.0.5 // indirect
 	github.com/xdg/stringprep v1.0.3 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/tools v0.23.0 // indirect

go.sum

@@ -148,6 +148,11 @@ github.com/bombsimon/logrusr/v3 v3.0.0 h1:tcAoLfuAhKP9npBxWzSdpsvKPQt1XV02nSf2lZ
 github.com/bombsimon/logrusr/v3 v3.0.0/go.mod h1:PksPPgSFEL2I52pla2glgCyyd2OqOHAnFF5E+g8Ixco=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/bytedance/sonic v1.12.9 h1:Od1BvK55NnewtGaJsTDeAOSnLVO2BTSLOe0+ooKokmQ=
+github.com/bytedance/sonic v1.12.9/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o=
+github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e h1:hHg27A0RSSp2Om9lubZpiMgVbvn39bsUmW9U5h0twqc=
 github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
@@ -174,6 +179,9 @@ github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2u
 github.com/clarketm/json v1.14.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@@ -810,7 +818,11 @@ github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2g
 github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1249,6 +1261,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
@@ -1377,6 +1391,8 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 go4.org v0.0.0-20200104003542-c7e774b10ea0/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -1611,6 +1627,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1971,6 +1988,7 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 open-cluster-management.io/api v0.12.0 h1:sNkj4k2XyWA/GLsTiFg82bLIZ7JDZKkLLLyZjJUlJMs=
 open-cluster-management.io/api v0.12.0/go.mod h1:/CZhelEH+30/pX7vXGSZOzLMX0zvjthYOkT/5ZTzVTQ=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

internal/bminventory/inventory.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"crypto/md5" // #nosec
 	"crypto/x509"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net"
@@ -14,6 +13,7 @@ import (
 	"strings"
 	"time"
 
+	json "github.com/bytedance/sonic"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
@@ -508,7 +508,7 @@ func MarshalNewClusterParamsNoPullSecret(params installer.V2RegisterClusterParam
 		clusterParamsNoPullSecret.PullSecret = &newSecret
 	}
 
-	jsonNewClusterParams, err := json.Marshal(clusterParamsNoPullSecret)
+	jsonNewClusterParams, err := json.ConfigStd.Marshal(clusterParamsNoPullSecret)
 	if err != nil {
 		log.Error("An error occurred while marshaling the new cluster's parameters: ", err)
 		return nil
@@ -2940,7 +2940,7 @@ func (b *bareMetalInventory) setDefaultUsage(cluster *models.Cluster) error {
 	if err != nil {
 		return fmt.Errorf("failed setting platform usages, error is: %w", err)
 	}
-	featusage, _ := json.Marshal(usages)
+	featusage, _ := json.ConfigStd.Marshal(usages)
 	cluster.FeatureUsage = string(featusage)
 	return nil
 }
@@ -3812,7 +3812,7 @@ func filterReply(expected interface{}, input string) (string, error) {
 	if err := json.Unmarshal([]byte(input), expected); err != nil {
 		return "", err
 	}
-	reply, err := json.Marshal(expected)
+	reply, err := json.ConfigStd.Marshal(expected)
 	if err != nil {
 		return "", err
 	}
@@ -4617,7 +4617,7 @@ func (b *bareMetalInventory) DeregisterInfraEnvInternal(ctx context.Context, par
 	if len(hosts) > 0 {
 		msg := fmt.Sprintf("failed to deregister infraEnv %s, %d hosts are still associated", params.InfraEnvID, len(hosts))
 		log.Error(msg)
-		return common.NewApiError(http.StatusBadRequest, fmt.Errorf(msg))
+		return common.NewApiError(http.StatusBadRequest, errors.New(msg))
 	}
 
 	if err = b.infraEnvApi.DeregisterInfraEnv(ctx, params.InfraEnvID); err != nil {
@@ -4824,7 +4824,7 @@ func (b *bareMetalInventory) RegisterInfraEnvInternal(ctx context.Context, kubeK
 		var kernelArguments *string
 		if len(params.InfraenvCreateParams.KernelArguments) > 0 {
 			var b []byte
-			b, err = json.Marshal(&params.InfraenvCreateParams.KernelArguments)
+			b, err = json.ConfigStd.Marshal(&params.InfraenvCreateParams.KernelArguments)
 			if err != nil {
 				return common.NewApiError(http.StatusBadRequest, errors.Wrap(err, "failed to format kernel arguments as json"))
 			}
@@ -5456,7 +5456,7 @@ func (b *bareMetalInventory) updateInfraEnvKernelArguments(params installer.Upda
 	}
 
 	if len(params.InfraEnvUpdateParams.KernelArguments) > 0 {
-		b, err := json.Marshal(&params.InfraEnvUpdateParams.KernelArguments)
+		b, err := json.ConfigStd.Marshal(&params.InfraEnvUpdateParams.KernelArguments)
 		if err != nil {
 			return common.NewApiError(http.StatusBadRequest, errors.Wrap(err, "failed to format kernel arguments as json"))
 		}
@@ -6006,7 +6006,7 @@ func (b *bareMetalInventory) V2UpdateHostInstallerArgsInternal(ctx context.Conte
 		return nil, err
 	}
 
-	argsBytes, err := json.Marshal(params.InstallerArgsParams.Args)
+	argsBytes, err := json.ConfigStd.Marshal(params.InstallerArgsParams.Args)
 	if err != nil {
 		return nil, err
 	}
@@ -6455,7 +6455,7 @@ func (b *bareMetalInventory) updateIgnitionEndpointHTTPHeaders(ctx context.Conte
 		ignitionEndpointHTTPHeaders[*hdr.Key] = *hdr.Value
 	}
 
-	ignitionEndpointHTTPHeadersStr, err := json.Marshal(ignitionEndpointHTTPHeaders)
+	ignitionEndpointHTTPHeadersStr, err := json.ConfigStd.Marshal(ignitionEndpointHTTPHeaders)
 	if err != nil {
 		return common.NewApiError(http.StatusBadRequest, errors.Wrapf(err, "failed to marshal ignition endpoint HTTP Headers for host %s", host.ID))
 	}

internal/bminventory/inventory_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io"
 	"mime/multipart"
@@ -22,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	json "github.com/bytedance/sonic"
 	"github.com/cavaliercoder/go-cpio"
 	ign_3_1 "github.com/coreos/ignition/v2/config/v3_1"
 	"github.com/go-openapi/runtime"
@@ -396,7 +396,7 @@ func addVMToCluster(cluster *common.Cluster, db *gorm.DB) {
 			Virtual: true,
 		},
 	}
-	inventoryByte, err := json.Marshal(inventory)
+	inventoryByte, err := json.ConfigStd.Marshal(inventory)
 	Expect(err).ToNot(HaveOccurred())
 	host := addHost(hostID, models.HostRoleAutoAssign, models.HostStatusKnown, models.HostKindHost,
 		*infraEnv.ID, *cluster.ID, string(inventoryByte), db)
@@ -871,7 +871,7 @@ func makeFreeNetworksAddresses(elems ...*models.FreeNetworkAddresses) models.Fre
 
 func makeFreeNetworksAddressesStr(elems ...*models.FreeNetworkAddresses) string {
 	toMarshal := models.FreeNetworksAddresses(elems)
-	b, err := json.Marshal(&toMarshal)
+	b, err := json.ConfigStd.Marshal(&toMarshal)
 	Expect(err).ToNot(HaveOccurred())
 	return string(b)
 }
@@ -898,7 +898,7 @@ var _ = Describe("v2PostStepReply", func() {
 
 	Context("Free addresses", func() {
 		var makeStepReply = func(clusterID, hostID strfmt.UUID, freeAddresses models.FreeNetworksAddresses) installer.V2PostStepReplyParams {
-			b, _ := json.Marshal(&freeAddresses)
+			b, _ := json.ConfigStd.Marshal(&freeAddresses)
 			return installer.V2PostStepReplyParams{
 				InfraEnvID: clusterID,
 				HostID:     hostID,
@@ -985,7 +985,7 @@ var _ = Describe("v2PostStepReply", func() {
 			Expect(db.Create(&host).Error).ShouldNot(HaveOccurred())
 		})
 		var makeStepReply = func(clusterID, hostID strfmt.UUID, response models.VerifyVipsResponse) installer.V2PostStepReplyParams {
-			b, _ := json.Marshal(&response)
+			b, _ := json.ConfigStd.Marshal(&response)
 			return installer.V2PostStepReplyParams{
 				InfraEnvID: clusterID,
 				HostID:     hostID,
@@ -997,7 +997,7 @@ var _ = Describe("v2PostStepReply", func() {
 		}
 
 		marshal := func(response models.VerifyVipsResponse) string {
-			b, err := json.Marshal(&response)
+			b, err := json.ConfigStd.Marshal(&response)
 			Expect(err).ToNot(HaveOccurred())
 			return string(b)
 		}
@@ -1018,7 +1018,7 @@ var _ = Describe("v2PostStepReply", func() {
 		var (
 			clusterId, hostId *strfmt.UUID
 			makeStepReply     = func(clusterID, hostID strfmt.UUID, dhcpAllocationResponse *models.DhcpAllocationResponse) installer.V2PostStepReplyParams {
-				b, err := json.Marshal(dhcpAllocationResponse)
+				b, err := json.ConfigStd.Marshal(dhcpAllocationResponse)
 				Expect(err).ToNot(HaveOccurred())
 				return installer.V2PostStepReplyParams{
 					InfraEnvID: clusterID,
@@ -1198,7 +1198,7 @@ var _ = Describe("v2PostStepReply", func() {
 				NtpSources: ntpSources,
 			}
 
-			b, _ := json.Marshal(&response)
+			b, _ := json.ConfigStd.Marshal(&response)
 
 			return installer.V2PostStepReplyParams{
 				InfraEnvID: clusterID,
@@ -1257,7 +1257,7 @@ var _ = Describe("v2PostStepReply", func() {
 				Images: statuses,
 			}
 
-			b, err := json.Marshal(&response)
+			b, err := json.ConfigStd.Marshal(&response)
 			Expect(err).ShouldNot(HaveOccurred())
 
 			return installer.V2PostStepReplyParams{
@@ -1320,7 +1320,7 @@ var _ = Describe("v2PostStepReply", func() {
 				Path:           path,
 			}
 
-			b, err := json.Marshal(&response)
+			b, err := json.ConfigStd.Marshal(&response)
 			Expect(err).ShouldNot(HaveOccurred())
 
 			return installer.V2PostStepReplyParams{
@@ -6166,7 +6166,7 @@ var _ = Describe("V2UpdateCluster", func() {
 							SerialNumber: "VMware-12 34 56 78 90 12 ab cd-ef gh 12 34 56 67 89 90",
 						},
 					}
-					inventoryByte, err := json.Marshal(inventory)
+					inventoryByte, err := json.ConfigStd.Marshal(inventory)
 					Expect(err).ToNot(HaveOccurred())
 					addHost(strfmt.UUID(uuid.New().String()), role, models.HostStatusKnown, models.HostKindHost, clusterID, string(inventoryByte), db)
 				}
@@ -8847,7 +8847,7 @@ var _ = Describe("infraEnvs", func() {
 			var dbInfraEnv common.InfraEnv
 			Expect(db.First(&dbInfraEnv, "id = ?", actual.Payload.ID.String()).Error).To(Succeed())
 			Expect(dbInfraEnv.ImageTokenKey).NotTo(Equal(""))
-			jsonEncodedKernelParameters, err := json.Marshal(&kernelArguments)
+			jsonEncodedKernelParameters, err := json.ConfigStd.Marshal(&kernelArguments)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(swag.StringValue(dbInfraEnv.KernelArguments)).To(Equal(string(jsonEncodedKernelParameters)))
 		})
@@ -8891,7 +8891,7 @@ var _ = Describe("infraEnvs", func() {
 			var dbInfraEnv common.InfraEnv
 			Expect(db.First(&dbInfraEnv, "id = ?", actual.Payload.ID.String()).Error).To(Succeed())
 			Expect(dbInfraEnv.ImageTokenKey).NotTo(Equal(""))
-			jsonEncodedKernelParameters, err := json.Marshal(&kernelArguments)
+			jsonEncodedKernelParameters, err := json.ConfigStd.Marshal(&kernelArguments)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(swag.StringValue(dbInfraEnv.KernelArguments)).To(Equal(string(jsonEncodedKernelParameters)))
 		})
@@ -9410,7 +9410,7 @@ var _ = Describe("infraEnvs", func() {
 			})
 			Context("Update discovery kernel arguments", func() {
 				jsonEncodeKernelArguments := func(array models.KernelArguments) string {
-					b, e := json.Marshal(&array)
+					b, e := json.ConfigStd.Marshal(&array)
 					Expect(e).ToNot(HaveOccurred())
 					return string(b)
 				}
@@ -13336,7 +13336,7 @@ func getInventoryStr(hostname, bootMode string, ipv4Addresses ...string) string
 			{Path: "/dev/sdb", Bootable: false},
 		},
 	}
-	ret, _ := json.Marshal(&inventory)
+	ret, _ := json.ConfigStd.Marshal(&inventory)
 	return string(ret)
 }
 
@@ -13356,7 +13356,7 @@ func getInventoryStrWithIPv6(hostname, bootMode string, ipv4Addresses []string,
 			{Path: "/dev/sdb", Bootable: false},
 		},
 	}
-	ret, _ := json.Marshal(&inventory)
+	ret, _ := json.ConfigStd.Marshal(&inventory)
 	return string(ret)
 }