Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/jedib0t/go-pretty/v6 v6.7.8
github.com/qdrant/qdrant-cloud-public-api v0.110.0
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/spf13/viper v1.21.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ github.com/qdrant/qdrant-cloud-public-api v0.110.0/go.mod h1:XqgxNTOYlCx1d6UKbPj
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down
12 changes: 12 additions & 0 deletions internal/cmd/backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ func NewCommand(s *state.State) *cobra.Command {
newDescribeCommand(s),
newCreateCommand(s),
newDeleteCommand(s),
newRestoreCommand(s),
newScheduleCommand(s),
)
return cmd
}
Expand All @@ -30,3 +32,13 @@ func NewCommand(s *state.State) *cobra.Command {
func backupStatusString(s backupv1.BackupStatus) string {
return strings.TrimPrefix(s.String(), "BACKUP_STATUS_")
}

// scheduleStatusString returns a concise status label for a BackupScheduleStatus.
func scheduleStatusString(s backupv1.BackupScheduleStatus) string {
return strings.TrimPrefix(s.String(), "BACKUP_SCHEDULE_STATUS_")
}

// restoreStatusString returns a concise status label for a BackupRestoreStatus.
func restoreStatusString(s backupv1.BackupRestoreStatus) string {
return strings.TrimPrefix(s.String(), "BACKUP_RESTORE_STATUS_")
}
3 changes: 2 additions & 1 deletion internal/cmd/backup/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/cmd/base"
"github.com/qdrant/qcloud-cli/internal/cmd/completion"
"github.com/qdrant/qcloud-cli/internal/cmd/util"
"github.com/qdrant/qcloud-cli/internal/state"
)
Expand All @@ -23,7 +24,7 @@ func newDeleteCommand(s *state.State) *cobra.Command {
cmd.Flags().BoolP("force", "f", false, "Skip confirmation prompt")
return cmd
},
ValidArgsFunction: backupIDCompletion(s),
ValidArgsFunction: completion.BackupIDCompletion(s),
Run: func(s *state.State, cmd *cobra.Command, args []string) error {
backupID := args[0]

Expand Down
3 changes: 2 additions & 1 deletion internal/cmd/backup/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/cmd/base"
"github.com/qdrant/qcloud-cli/internal/cmd/completion"
"github.com/qdrant/qcloud-cli/internal/cmd/output"
"github.com/qdrant/qcloud-cli/internal/cmd/util"
"github.com/qdrant/qcloud-cli/internal/state"
Expand All @@ -19,7 +20,7 @@ func newDescribeCommand(s *state.State) *cobra.Command {
Use: "describe <backup-id>",
Short: "Describe a backup",
Args: util.ExactArgs(1, "a backup ID"),
ValidArgsFunction: backupIDCompletion(s),
ValidArgsFunction: completion.BackupIDCompletion(s),
Fetch: func(s *state.State, cmd *cobra.Command, args []string) (*backupv1.Backup, error) {
ctx := cmd.Context()
client, err := s.Client(ctx)
Expand Down
20 changes: 20 additions & 0 deletions internal/cmd/backup/restore.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package backup

import (
"github.com/spf13/cobra"

"github.com/qdrant/qcloud-cli/internal/state"
)

func newRestoreCommand(s *state.State) *cobra.Command {
cmd := &cobra.Command{
Use: "restore",
Short: "Manage backup restores",
Args: cobra.NoArgs,
}
cmd.AddCommand(
newRestoreListCommand(s),
newRestoreTriggerCommand(s),
)
return cmd
}
73 changes: 73 additions & 0 deletions internal/cmd/backup/restore_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package backup

import (
"fmt"
"io"

"github.com/spf13/cobra"

backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/cmd/base"
"github.com/qdrant/qcloud-cli/internal/cmd/completion"
"github.com/qdrant/qcloud-cli/internal/cmd/output"
"github.com/qdrant/qcloud-cli/internal/state"
)

func newRestoreListCommand(s *state.State) *cobra.Command {
cmd := base.ListCmd[*backupv1.ListBackupRestoresResponse]{
Use: "list",
Short: "List backup restores",
Fetch: func(s *state.State, cmd *cobra.Command) (*backupv1.ListBackupRestoresResponse, error) {
ctx := cmd.Context()
client, err := s.Client(ctx)
if err != nil {
return nil, err
}

accountID, err := s.AccountID()
if err != nil {
return nil, err
}

req := &backupv1.ListBackupRestoresRequest{AccountId: accountID}
if cmd.Flags().Changed("cluster-id") {
clusterID, _ := cmd.Flags().GetString("cluster-id")
req.ClusterId = &clusterID
}

resp, err := client.Backup().ListBackupRestores(ctx, req)
if err != nil {
return nil, fmt.Errorf("failed to list backup restores: %w", err)
}
return resp, nil
},
PrintText: func(_ *cobra.Command, w io.Writer, resp *backupv1.ListBackupRestoresResponse) error {
t := output.NewTable[*backupv1.BackupRestore](w)
t.AddField("ID", func(v *backupv1.BackupRestore) string {
return v.GetId()
})
t.AddField("BACKUP", func(v *backupv1.BackupRestore) string {
return v.GetBackupId()
})
t.AddField("CLUSTER", func(v *backupv1.BackupRestore) string {
return v.GetClusterId()
})
t.AddField("STATUS", func(v *backupv1.BackupRestore) string {
return restoreStatusString(v.GetStatus())
})
t.AddField("CREATED", func(v *backupv1.BackupRestore) string {
if v.GetCreatedAt() != nil {
return output.HumanTime(v.GetCreatedAt().AsTime())
}
return ""
})
t.Write(resp.GetItems())
return nil
},
}.CobraCommand(s)

cmd.Flags().String("cluster-id", "", "Filter by cluster ID")
_ = cmd.RegisterFlagCompletionFunc("cluster-id", completion.ClusterIDCompletion(s))
return cmd
}
103 changes: 103 additions & 0 deletions internal/cmd/backup/restore_list_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
package backup_test

import (
"encoding/json"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/timestamppb"

backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/testutil"
)

func TestRestoreList_TableOutput(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.ListBackupRestoresCalls.Returns(
&backupv1.ListBackupRestoresResponse{
Items: []*backupv1.BackupRestore{
{
Id: "restore-1",
BackupId: "backup-abc",
ClusterId: "cluster-123",
Status: backupv1.BackupRestoreStatus_BACKUP_RESTORE_STATUS_SUCCEEDED,
CreatedAt: timestamppb.Now(),
},
},
},
nil,
)

stdout, _, err := testutil.Exec(t, env, "backup", "restore", "list")
require.NoError(t, err)
req, _ := env.BackupServer.ListBackupRestoresCalls.Last()
assert.Equal(t, "test-account-id", req.GetAccountId())
assert.Contains(t, stdout, "ID")
assert.Contains(t, stdout, "BACKUP")
assert.Contains(t, stdout, "CLUSTER")
assert.Contains(t, stdout, "STATUS")
assert.Contains(t, stdout, "restore-1")
assert.Contains(t, stdout, "backup-abc")
assert.Contains(t, stdout, "SUCCEEDED")
}

func TestRestoreList_JSONOutput(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.ListBackupRestoresCalls.Returns(
&backupv1.ListBackupRestoresResponse{
Items: []*backupv1.BackupRestore{
{Id: "restore-json", BackupId: "backup-123"},
},
},
nil,
)

stdout, _, err := testutil.Exec(t, env, "backup", "restore", "list", "--json")
require.NoError(t, err)

var result struct {
Items []struct {
ID string `json:"id"`
BackupID string `json:"backupId"`
} `json:"items"`
}
require.NoError(t, json.Unmarshal([]byte(stdout), &result))
require.Len(t, result.Items, 1)
assert.Equal(t, "restore-json", result.Items[0].ID)
assert.Equal(t, "backup-123", result.Items[0].BackupID)
}

func TestRestoreList_EmptyResponse(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.ListBackupRestoresCalls.Returns(&backupv1.ListBackupRestoresResponse{}, nil)

stdout, _, err := testutil.Exec(t, env, "backup", "restore", "list")
require.NoError(t, err)
assert.Contains(t, stdout, "ID")
assert.Contains(t, stdout, "STATUS")
}

func TestRestoreList_APIError(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.ListBackupRestoresCalls.Returns(nil, assert.AnError)

_, _, err := testutil.Exec(t, env, "backup", "restore", "list")
require.Error(t, err)
}

func TestRestoreList_ClusterIDFilter(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.ListBackupRestoresCalls.Returns(&backupv1.ListBackupRestoresResponse{}, nil)

_, _, err := testutil.Exec(t, env, "backup", "restore", "list", "--cluster-id=my-cluster")
require.NoError(t, err)
req, _ := env.BackupServer.ListBackupRestoresCalls.Last()
assert.Equal(t, "my-cluster", req.GetClusterId())
}
61 changes: 61 additions & 0 deletions internal/cmd/backup/restore_trigger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package backup

import (
"fmt"

"github.com/spf13/cobra"

backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/cmd/base"
"github.com/qdrant/qcloud-cli/internal/cmd/completion"
"github.com/qdrant/qcloud-cli/internal/cmd/util"
"github.com/qdrant/qcloud-cli/internal/state"
)

func newRestoreTriggerCommand(s *state.State) *cobra.Command {
return base.Cmd{
BaseCobraCommand: func() *cobra.Command {
cmd := &cobra.Command{
Use: "trigger <backup-id>",
Short: "Trigger a restore from a backup",
Args: util.ExactArgs(1, "a backup ID"),
}
cmd.Flags().BoolP("force", "f", false, "Skip confirmation prompt")
return cmd
},
ValidArgsFunction: completion.BackupIDCompletion(s),
Run: func(s *state.State, cmd *cobra.Command, args []string) error {
backupID := args[0]

force, _ := cmd.Flags().GetBool("force")
if !util.ConfirmAction(force, fmt.Sprintf("Are you sure you want to restore backup %s?", backupID)) {
fmt.Fprintln(cmd.OutOrStdout(), "Aborted.")
return nil
}

ctx := cmd.Context()
client, err := s.Client(ctx)
if err != nil {
return err
}

accountID, err := s.AccountID()
if err != nil {
return err
}

_, err = client.Backup().RestoreBackup(ctx, &backupv1.RestoreBackupRequest{
AccountId: accountID,
BackupId: backupID,
})
if err != nil {
return fmt.Errorf("failed to restore backup: %w", err)
}

fmt.Fprintf(cmd.OutOrStdout(), "Restore of backup %s started.\n", backupID)
fmt.Fprintln(cmd.OutOrStdout(), "Run 'qcloud backup restore list' to track progress.")
return nil
},
}.CobraCommand(s)
}
44 changes: 44 additions & 0 deletions internal/cmd/backup/restore_trigger_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package backup_test

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

backupv1 "github.com/qdrant/qdrant-cloud-public-api/gen/go/qdrant/cloud/cluster/backup/v1"

"github.com/qdrant/qcloud-cli/internal/testutil"
)

func TestRestoreTrigger_WithForce(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.RestoreBackupCalls.Returns(&backupv1.RestoreBackupResponse{}, nil)

stdout, _, err := testutil.Exec(t, env, "backup", "restore", "trigger", "backup-abc", "--force")
require.NoError(t, err)
req, _ := env.BackupServer.RestoreBackupCalls.Last()
assert.Equal(t, "test-account-id", req.GetAccountId())
assert.Equal(t, "backup-abc", req.GetBackupId())
assert.Contains(t, stdout, "Restore of backup backup-abc started.")
assert.Contains(t, stdout, "Run 'qcloud backup restore list' to track progress.")
}

func TestRestoreTrigger_Aborted(t *testing.T) {
env := testutil.NewTestEnv(t)

stdout, _, err := testutil.Exec(t, env, "backup", "restore", "trigger", "backup-abc")
require.NoError(t, err)
assert.Contains(t, stdout, "Aborted.")
assert.Equal(t, 0, env.BackupServer.RestoreBackupCalls.Count())
}

func TestRestoreTrigger_APIError(t *testing.T) {
env := testutil.NewTestEnv(t)

env.BackupServer.RestoreBackupCalls.Returns(nil, assert.AnError)

_, _, err := testutil.Exec(t, env, "backup", "restore", "trigger", "backup-abc", "--force")
require.Error(t, err)
}
Loading
Loading