removing gjson

Author: 09harsh

e2e/test_operator_backups/operator_backup_test.go

@@ -25,14 +25,14 @@ This test suite contains tests related to backup and restore with the operator.
 */
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 
 	fdbv1beta2 "github.com/FoundationDB/fdb-kubernetes-operator/v2/api/v1beta2"
 	"github.com/FoundationDB/fdb-kubernetes-operator/v2/e2e/fixtures"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/tidwall/gjson"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/ptr"
 )
@@ -150,7 +150,8 @@ func describeBackupMode(backupMode fdbv1beta2.BackupMode) {
 
 		When("encryption is enabled", func() {
 			JustBeforeEach(func() {
-				if !factory.GetFDBVersion().IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
+				if !factory.GetFDBVersion().
+					IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
 					Skip("version doesn't support the encryption feature")
 				}
 				performBackupSetup(true, false)
@@ -166,14 +167,20 @@ func describeBackupMode(backupMode fdbv1beta2.BackupMode) {
 				// TODO (09harsh): Enable this test when we have the fileLevelEncryption in json parser
 				// here: https://github.com/apple/foundationdb/blob/main/fdbclient/BackupContainer.actor.cpp#L193-L250
 				PIt("should have file level encryption enabled", func() {
-					fileLevelEncryption := gjson.Get(describeOutput, "FileLevelEncryption").Bool()
+					var describeData map[string]interface{}
+					err := json.Unmarshal([]byte(describeOutput), &describeData)
+					Expect(err).NotTo(HaveOccurred())
+					fileLevelEncryption := describeData["FileLevelEncryption"].(bool)
 					Expect(fileLevelEncryption).To(BeTrue())
 				})
 
-				It("should be able to restore the cluster successfully with a restorable version", func() {
-					restore = factory.CreateRestoreForCluster(backup, currentRestorableVersion)
-					Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
-				})
+				It(
+					"should be able to restore the cluster successfully with a restorable version",
+					func() {
+						restore = factory.CreateRestoreForCluster(backup, currentRestorableVersion)
+						Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+					},
+				)
 			})
 
 			It("should restore the cluster successfully with a restorable version", func() {

go.mod

@@ -38,7 +38,6 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_model v0.6.2
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/tidwall/gjson v1.18.0
 )
 
 require (
@@ -95,8 +94,6 @@ require (
 	github.com/spf13/afero v1.12.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect

go.sum

@@ -195,12 +195,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=