Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(rdb): print messages while exporting backup #3479

Merged
merged 2 commits into from
Nov 10, 2023
Merged

feat(rdb): print messages while exporting backup #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3cf0d6
feat(rdb): print messages while exporting backup
Mia-Cross Nov 8, 2023
e8a9ebc
Merge branch 'master' into rdb_autoexport_backup
Mia-Cross Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion internal/namespaces/rdb/v1/custom_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/v2/internal/core"
"github.com/scaleway/scaleway-cli/v2/internal/human"
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
)
Expand Down Expand Up @@ -291,7 +292,12 @@ func backupDownloadCommand() *core.Command {
if err != nil {
return nil, err
}
if backup.DownloadURL == nil {
needExport := backup.DownloadURL == nil
if needExport {
_, err = interactive.Print("Exporting backup... ")
if err != nil {
return nil, err
}
exportRequest := rdb.ExportDatabaseBackupRequest{
DatabaseBackupID: args.BackupID,
Region: args.Region,
Expand All @@ -306,6 +312,12 @@ func backupDownloadCommand() *core.Command {
if err != nil {
return nil, err
}
if needExport {
_, err = interactive.Println("OK")
}
if err != nil {
return nil, err
}

httpClient := core.ExtractHTTPClient(ctx)
res, err := httpClient.Get(*backup.DownloadURL)
Expand Down
362 changes: 208 additions & 154 deletions internal/namespaces/rdb/v1/testdata/test-create-backup-simple.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions internal/namespaces/rdb/v1/testdata/test-create-backup-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
ID 3bf50ced-a397-4b85-bcb1-cd7b50b8dd5c
InstanceID 35318361-b651-4879-820d-a061a70f2f86
ID 895f74c4-e352-4de5-b06f-495ec8d07722
InstanceID 0c4a2cde-c9f4-4090-a1eb-815f29d1e3f7
DatabaseName rdb
Name foobar
Status ready
Expand All @@ -14,8 +14,8 @@ Region nl-ams
SameRegion false
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
{
"id": "3bf50ced-a397-4b85-bcb1-cd7b50b8dd5c",
"instance_id": "35318361-b651-4879-820d-a061a70f2f86",
"id": "895f74c4-e352-4de5-b06f-495ec8d07722",
"instance_id": "0c4a2cde-c9f4-4090-a1eb-815f29d1e3f7",
"database_name": "rdb",
"name": "foobar",
"status": "ready",
Expand Down
438 changes: 219 additions & 219 deletions internal/namespaces/rdb/v1/testdata/test-download-backup-simple.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

504 changes: 195 additions & 309 deletions ...espaces/rdb/v1/testdata/test-download-backup-with-no-previous-export-backup.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

414 changes: 231 additions & 183 deletions internal/namespaces/rdb/v1/testdata/test-export-backup-simple.cassette.yaml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions internal/namespaces/rdb/v1/testdata/test-export-backup-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
ID 046c5f84-8419-4fa2-b32f-24d218dd8752
InstanceID 02769cf3-bcf6-4e77-aa36-2bff1163f26a
ID f3e15b2d-ac65-413d-a027-8c63cf1bf674
InstanceID 0e434676-e0c1-476e-963f-cda4bae23b33
DatabaseName rdb
Name foobar
Status ready
Expand All @@ -10,14 +10,14 @@ ExpiresAt few seconds ago
CreatedAt few seconds ago
UpdatedAt few seconds ago
InstanceName cli-test
DownloadURL https://s3.nl-ams.scw.cloud/65940610-0e5e-4a98-9306-568aa4eb3673/02769cf3-bcf6-4e77-aa36-2bff1163f26a/046c5f84-8419-4fa2-b32f-24d218dd8752.custom?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=SCW2HJV1WMKPE0CKDAW5%2F20231108%2Fnl-ams%2Fs3%2Faws4_request&X-Amz-Date=20231108T205833Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=25669d2d48ac765c3ccac39e60bbdce391a5bbf6132c66cdcd07d8d7ad6a8d0f
DownloadURL https://s3.nl-ams.scw.cloud/65940610-0e5e-4a98-9306-568aa4eb3673/0e434676-e0c1-476e-963f-cda4bae23b33/f3e15b2d-ac65-413d-a027-8c63cf1bf674.custom?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=SCW2HJV1WMKPE0CKDAW5%2F20231109%2Fnl-ams%2Fs3%2Faws4_request&X-Amz-Date=20231109T191717Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=44ba03c3e09d75780222bd3b15feebc62c50f5d890196aa1d3e0e3c84f9aa385
DownloadURLExpiresAt few seconds ago
Region fr-par
SameRegion false
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
{
"id": "046c5f84-8419-4fa2-b32f-24d218dd8752",
"instance_id": "02769cf3-bcf6-4e77-aa36-2bff1163f26a",
"id": "f3e15b2d-ac65-413d-a027-8c63cf1bf674",
"instance_id": "0e434676-e0c1-476e-963f-cda4bae23b33",
"database_name": "rdb",
"name": "foobar",
"status": "ready",
Expand All @@ -26,7 +26,7 @@ SameRegion false
"created_at": "1970-01-01T00:00:00.0Z",
"updated_at": "1970-01-01T00:00:00.0Z",
"instance_name": "cli-test",
"download_url": "https://s3.nl-ams.scw.cloud/65940610-0e5e-4a98-9306-568aa4eb3673/02769cf3-bcf6-4e77-aa36-2bff1163f26a/046c5f84-8419-4fa2-b32f-24d218dd8752.custom?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=SCW2HJV1WMKPE0CKDAW5%2F20231108%2Fnl-ams%2Fs3%2Faws4_request\u0026X-Amz-Date=20231108T205833Z\u0026X-Amz-Expires=86400\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=25669d2d48ac765c3ccac39e60bbdce391a5bbf6132c66cdcd07d8d7ad6a8d0f",
"download_url": "https://s3.nl-ams.scw.cloud/65940610-0e5e-4a98-9306-568aa4eb3673/0e434676-e0c1-476e-963f-cda4bae23b33/f3e15b2d-ac65-413d-a027-8c63cf1bf674.custom?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=SCW2HJV1WMKPE0CKDAW5%2F20231109%2Fnl-ams%2Fs3%2Faws4_request\u0026X-Amz-Date=20231109T191717Z\u0026X-Amz-Expires=86400\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=44ba03c3e09d75780222bd3b15feebc62c50f5d890196aa1d3e0e3c84f9aa385",
"download_url_expires_at": "1970-01-01T00:00:00.0Z",
"region": "fr-par",
"same_region": false
Expand Down
Loading
Loading