resolve review comments

Author: Shivaji Kharse

graphql/admin/list_backups.go

@@ -105,6 +105,11 @@ func resolveListBackups(ctx context.Context, q schema.Query) *resolve.Resolved {
 		return resolve.EmptyResult(q, err)
 	}
 
+	filter, err := buildBackupDateFilter(input)
+	if err != nil {
+		return resolve.EmptyResult(q, err)
+	}
+
 	creds := &x.MinioCredentials{
 		AccessKey:    input.AccessKey,
 		SecretKey:    input.SecretKey,
@@ -115,11 +120,6 @@ func resolveListBackups(ctx context.Context, q schema.Query) *resolve.Resolved {
 	if err != nil {
 		return resolve.EmptyResult(q, errors.Errorf("%s: %s", x.Error, err.Error()))
 	}
-
-	filter, err := buildBackupDateFilter(input)
-	if err != nil {
-		return resolve.EmptyResult(q, err)
-	}
 	manifests = worker.FilterManifestsByDate(manifests, filter)
 
 	convertedManifests := convertManifests(manifests)

systest/backup/filesystem/testdata/manifest_summary.json

@@ -1,5 +1,5 @@
 {
-  "manifests": [
+  "Manifests": [
     {
       "type": "full",
       "since": 0,

systest/backup/minio/backup_test.go

@@ -387,8 +387,10 @@ func copyToLocalFs(t *testing.T) {
 		minio.ListObjectsOptions{Prefix: "", Recursive: false})
 	for object := range objectCh1 {
 		require.NoError(t, object.Err)
-		if object.Key != "manifest.json" {
-			dstDir := backupDir + "/" + object.Key
+		// Only create local directories for backup sub-folder keys (end with "/").
+		// Root-level files like manifest.json and manifest_summary.json are not directories.
+		if strings.HasSuffix(object.Key, "/") {
+			dstDir := backupDir + "/" + strings.TrimSuffix(object.Key, "/")
 			require.NoError(t, os.MkdirAll(dstDir, os.ModePerm))
 		}
 

systest/integration2/backup_summary_compat_test.go

@@ -34,9 +34,9 @@ type masterManifest struct {
 }
 
 // masterManifestSummary mirrors the top-level shape of manifest_summary.json
-// (lowercase "manifests", matches the MasterManifestSummary JSON tag).
+// (capital "Manifests", matching Go's default JSON encoding for MasterManifestSummary).
 type masterManifestSummary struct {
-	Manifests []manifestEntry `json:"manifests"`
+	Manifests []manifestEntry `json:"Manifests"`
 }
 
 // queryNames runs {q(func: has(name)) {name}} and returns a sorted list of

worker/backup.go

@@ -58,13 +58,13 @@ type ManifestBase struct {
 	BackupNum uint64 `json:"backup_num"`
 	// Version specifies the Dgraph predicate-encoding version in use at backup time.
 	// 0 means pre-21.03 (no namespace prefix). The restore path reads this to trigger upgrades.
-	Version int `json:"version,omitempty"`
+	Version int `json:"version"`
 	// Path is the name of the backup directory that holds this backup's data files.
 	Path string `json:"path"`
 	// Encrypted indicates whether this backup was encrypted.
 	Encrypted bool `json:"encrypted"`
 	// Compression records the codec used to compress backup data files.
-	Compression string `json:"compression,omitempty"`
+	Compression string `json:"compression"`
 }
 
 // ValidReadTs returns the effective read timestamp for this backup entry.
@@ -101,7 +101,7 @@ type ManifestSummary struct {
 }
 
 type MasterManifestSummary struct {
-	Manifests []*ManifestSummary `json:"manifests"`
+	Manifests []*ManifestSummary
 }
 
 func (m *Manifest) getPredsInGroup(gid uint32) predicateSet {