From 8eb0f667231045dc4b9324ea8b96de9b9266096f Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Wed, 17 Jun 2020 09:52:30 +0000 Subject: [PATCH 1/4] Extend Backup API --- client_admin_backup.go | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/client_admin_backup.go b/client_admin_backup.go index cd0f9499..1aac72f6 100644 --- a/client_admin_backup.go +++ b/client_admin_backup.go @@ -29,15 +29,24 @@ import ( // BackupMeta provides meta data of a backup type BackupMeta struct { - ID BackupID `json:"id,omitempty"` - Version string `json:"version,omitempty"` - DateTime time.Time `json:"datetime,omitempty"` - NumberOfFiles uint `json:"nrFiles,omitempty"` - NumberOfDBServers uint `json:"nrDBServers,omitempty"` - SizeInBytes uint64 `json:"sizeInBytes,omitempty"` - PotentiallyInconsistent bool `json:"potentiallyInconsistent,omitempty"` - Available bool `json:"available,omitempty"` - NumberOfPiecesPresent uint `json:"nrPiecesPresent,omitempty"` + ID BackupID `json:"id,omitempty"` + Version string `json:"version,omitempty"` + DateTime time.Time `json:"datetime,omitempty"` + NumberOfFiles uint `json:"nrFiles,omitempty"` + NumberOfDBServers uint `json:"nrDBServers,omitempty"` + SizeInBytes uint64 `json:"sizeInBytes,omitempty"` + PotentiallyInconsistent bool `json:"potentiallyInconsistent,omitempty"` + Available bool `json:"available,omitempty"` + NumberOfPiecesPresent uint `json:"nrPiecesPresent,omitempty"` + Keys BackupMetaSha256List `json:"keys.omitempty"` +} + +// BackupMetaSha256List baskup sha list +type BackupMetaSha256List []BackupMetaSha256 + +// BackupMetaSha256 backup sha details +type BackupMetaSha256 struct { + SHA256 string `json:"sha256"` } // BackupRestoreOptions provides options for Restore From 3a9b518b5892ebd2257d7640075d7a3c5181c984 Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:20:03 +0000 Subject: [PATCH 2/4] Fix JSON --- client_admin_backup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_admin_backup.go b/client_admin_backup.go index 1aac72f6..21af98b2 100644 --- a/client_admin_backup.go +++ b/client_admin_backup.go @@ -38,7 +38,7 @@ type BackupMeta struct { PotentiallyInconsistent bool `json:"potentiallyInconsistent,omitempty"` Available bool `json:"available,omitempty"` NumberOfPiecesPresent uint `json:"nrPiecesPresent,omitempty"` - Keys BackupMetaSha256List `json:"keys.omitempty"` + Keys BackupMetaSha256List `json:"keys,omitempty"` } // BackupMetaSha256List baskup sha list From 8985682a6665122a230a78c540e277f27aee289a Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:27:39 +0000 Subject: [PATCH 3/4] Fix JSON --- client_admin_backup.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client_admin_backup.go b/client_admin_backup.go index 21af98b2..e456ccc6 100644 --- a/client_admin_backup.go +++ b/client_admin_backup.go @@ -38,12 +38,9 @@ type BackupMeta struct { PotentiallyInconsistent bool `json:"potentiallyInconsistent,omitempty"` Available bool `json:"available,omitempty"` NumberOfPiecesPresent uint `json:"nrPiecesPresent,omitempty"` - Keys BackupMetaSha256List `json:"keys,omitempty"` + Keys []BackupMetaSha256 `json:"keys,omitempty"` } -// BackupMetaSha256List baskup sha list -type BackupMetaSha256List []BackupMetaSha256 - // BackupMetaSha256 backup sha details type BackupMetaSha256 struct { SHA256 string `json:"sha256"` From b4db590e8baf53fa5892a5d260cd1289491cabf0 Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:27:53 +0000 Subject: [PATCH 4/4] Fix JSON --- client_admin_backup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_admin_backup.go b/client_admin_backup.go index e456ccc6..18bd5aea 100644 --- a/client_admin_backup.go +++ b/client_admin_backup.go @@ -38,7 +38,7 @@ type BackupMeta struct { PotentiallyInconsistent bool `json:"potentiallyInconsistent,omitempty"` Available bool `json:"available,omitempty"` NumberOfPiecesPresent uint `json:"nrPiecesPresent,omitempty"` - Keys []BackupMetaSha256 `json:"keys,omitempty"` + Keys []BackupMetaSha256 `json:"keys,omitempty"` } // BackupMetaSha256 backup sha details