Bump ABS version SHA to fix restore validation issue

Author: abhishekdwivedi3060

go.mod

@@ -3,7 +3,7 @@ module github.com/aerospike/aerospike-kubernetes-operator/v4
 go 1.23.11
 
 require (
-	github.com/aerospike/aerospike-backup-service/v3 v3.4.0
+	github.com/aerospike/aerospike-backup-service/v3 v3.4.1-0.20251113113955-5523ec8870b1
 	github.com/aerospike/aerospike-client-go/v8 v8.4.0
 	github.com/aerospike/aerospike-management-lib v1.8.1-0.20251029081729-d5f8b09e1080
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d

go.sum

@@ -2,8 +2,8 @@ cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
 cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/aerospike/aerospike-backup-service/v3 v3.4.0 h1:9h24Zc7erQnG/de7+ISBbt+k9Ddp+7YOgDAsI8FgfH4=
-github.com/aerospike/aerospike-backup-service/v3 v3.4.0/go.mod h1:O96iFIRIgxZsp2J0LW/aT68Cxro+SkyRBmiYDgvJOOI=
+github.com/aerospike/aerospike-backup-service/v3 v3.4.1-0.20251113113955-5523ec8870b1 h1:BgwbeMCy6hfosvtG19rEwk3N2DohzxKiej6r98X0Ndc=
+github.com/aerospike/aerospike-backup-service/v3 v3.4.1-0.20251113113955-5523ec8870b1/go.mod h1:O96iFIRIgxZsp2J0LW/aT68Cxro+SkyRBmiYDgvJOOI=
 github.com/aerospike/aerospike-client-go/v8 v8.4.0 h1:bcFaOMIT09DnWPiXjepHQ7sgZNraqojQBuzEaZnW00I=
 github.com/aerospike/aerospike-client-go/v8 v8.4.0/go.mod h1:t1LXZ3QVi4B4lR9qEkyei1eMbuohBJBGs1YY5b5fYEI=
 github.com/aerospike/aerospike-management-lib v1.8.1-0.20251029081729-d5f8b09e1080 h1:9KqMRrlFJ3hx1BuKqhWWedr3ZMYWxaEX9G1Dq1JxZhE=

test/restore/restore_test.go

@@ -179,26 +179,27 @@ var _ = Describe(
 
 						err = validateRestoredData(k8sClient)
 						Expect(err).ToNot(HaveOccurred())
-
 					},
 				)
 
 				It(
 					"Should complete restore for Timestamp restore type", func() {
-						restoreConfig := getRestoreConfigInMap(backupDataPath)
-						delete(restoreConfig, asdbv1beta1.SourceKey)
-						delete(restoreConfig, asdbv1beta1.BackupDataPathKey)
+						configBytes, err := getTimeStampRestoreConfigBytes(getRestoreConfigInMap(backupDataPath))
+						Expect(err).ToNot(HaveOccurred())
+
+						restore = newRestoreWithConfig(restoreNsNm, asdbv1beta1.Timestamp, configBytes)
 
-						parts := strings.Split(backupDataPath, "/")
-						time := parts[len(parts)-3]
-						timeInt, err := strconv.Atoi(time)
+						err = createRestore(k8sClient, restore)
 						Expect(err).ToNot(HaveOccurred())
 
-						// increase time by 1 millisecond to consider the latest backup under time bound
-						restoreConfig[asdbv1beta1.TimeKey] = int64(timeInt) + 1
-						restoreConfig[asdbv1beta1.RoutineKey] = parts[len(parts)-5]
+						err = validateRestoredData(k8sClient)
+						Expect(err).ToNot(HaveOccurred())
+					},
+				)
 
-						configBytes, err := json.Marshal(restoreConfig)
+				It(
+					"Should complete restore for Timestamp restore type and with TLS configured", func() {
+						configBytes, err := getTimeStampRestoreConfigBytes(getRestoreConfigWithTLSInMap(backupDataPath))
 						Expect(err).ToNot(HaveOccurred())
 
 						restore = newRestoreWithConfig(restoreNsNm, asdbv1beta1.Timestamp, configBytes)
@@ -208,8 +209,23 @@ var _ = Describe(
 
 						err = validateRestoredData(k8sClient)
 						Expect(err).ToNot(HaveOccurred())
-
 					},
 				)
 			})
 	})
+
+func getTimeStampRestoreConfigBytes(restoreConfig map[string]interface{}) (configBytes []byte, err error) {
+	delete(restoreConfig, asdbv1beta1.SourceKey)
+	delete(restoreConfig, asdbv1beta1.BackupDataPathKey)
+
+	parts := strings.Split(backupDataPath, "/")
+	time := parts[len(parts)-3]
+	timeInt, err := strconv.Atoi(time)
+	Expect(err).ToNot(HaveOccurred())
+
+	// increase time by 1 millisecond to consider the latest backup under time bound
+	restoreConfig[asdbv1beta1.TimeKey] = int64(timeInt) + 1
+	restoreConfig[asdbv1beta1.RoutineKey] = parts[len(parts)-5]
+
+	return getRestoreConfBytes(restoreConfig)
+}

test/restore/test_utils.go

@@ -189,6 +189,8 @@ func waitForRestore(cl client.Client, restore *asdbv1beta1.AerospikeRestore,
 		return fmt.Errorf("restore result is not set")
 	}
 
+	pkgLog.Info(fmt.Sprintf("Restore result %s", string(restore.Status.RestoreResult.Raw)))
+
 	var restoreResult dto.RestoreJobStatus
 
 	if err := json.Unmarshal(restore.Status.RestoreResult.Raw, &restoreResult); err != nil {
@@ -199,6 +201,10 @@ func waitForRestore(cl client.Client, restore *asdbv1beta1.AerospikeRestore,
 		return fmt.Errorf("restore job status is not done")
 	}
 
+	if restoreResult.InsertedRecords == 0 {
+		return fmt.Errorf("no records were restored")
+	}
+
 	if restoreResult.Error != "" {
 		return fmt.Errorf("restore job failed with error: %s", restoreResult.Error)
 	}