modules: extract github.com/scylladb/scylla-manager/v3/pkg/managercli…

…ent as submodule ...so that it can be imported to other project as go get github.com/scylladb/scylla-manager/v3/pkg/managerclient
scylladb · Sep 3, 2024 · 3a3f8f9 · 3a3f8f9
1 parent 7a7bbb7
commit 3a3f8f9
Show file tree

Hide file tree

Showing 46 changed files with 326 additions and 163 deletions.
diff --git a/pkg/cmd/sctool/sctool.go b/pkg/cmd/sctool/sctool.go
@@ -35,7 +35,7 @@ import (
 	"github.com/scylladb/scylla-manager/v3/pkg/command/suspend"
 	"github.com/scylladb/scylla-manager/v3/pkg/command/tasks"
 	"github.com/scylladb/scylla-manager/v3/pkg/command/version"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 )
 
@@ -44,15 +44,15 @@ func main() {
 
 	cmd := buildCommand()
 	if err := cmd.Execute(); err != nil {
-		managerclient.PrintError(cmd.OutOrStderr(), err)
+		managerclient2.PrintError(cmd.OutOrStderr(), err)
 		os.Exit(1)
 	}
 
 	os.Exit(0)
 }
 
 func buildCommand() *cobra.Command {
-	var client managerclient.Client
+	var client managerclient2.Client
 
 	backupCmd := backup.NewCommand(&client)
 	backupCmd.AddCommand(

diff --git a/pkg/command/backup/backupvalidate/cmd.go b/pkg/command/backup/backupvalidate/cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
@@ -21,23 +21,23 @@ var updateRes []byte
 
 type command struct {
 	flag.TaskBase
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	cluster             string
 	location            []string
 	deleteOrphanedFiles bool
 	parallel            int
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := newCommand(client, false)
 	updateCmd := newCommand(client, true)
 	cmd.AddCommand(&updateCmd.Command)
 
 	return &cmd.Command
 }
 
-func newCommand(client *managerclient.Client, update bool) *command {
+func newCommand(client *managerclient2.Client, update bool) *command {
 	var (
 		cmd = &command{
 			client: client,
@@ -74,20 +74,20 @@ func (cmd *command) init() {
 
 func (cmd *command) run(args []string) error {
 	var (
-		task *managerclient.Task
+		task *managerclient2.Task
 		ok   bool
 	)
 
 	if cmd.Update() {
-		a := managerclient.ValidateBackupTask
+		a := managerclient2.ValidateBackupTask
 		if len(args) > 0 {
 			a = args[0]
 		}
 		taskType, taskID, err := cmd.client.TaskSplit(cmd.Context(), cmd.cluster, a)
 		if err != nil {
 			return err
 		}
-		if taskType != managerclient.ValidateBackupTask {
+		if taskType != managerclient2.ValidateBackupTask {
 			return fmt.Errorf("can't handle %s task", taskType)
 		}
 		task, err = cmd.client.GetTask(cmd.Context(), cmd.cluster, taskType, taskID)
@@ -96,7 +96,7 @@ func (cmd *command) run(args []string) error {
 		}
 		ok = cmd.UpdateTask(task)
 	} else {
-		task = cmd.CreateTask(managerclient.ValidateBackupTask)
+		task = cmd.CreateTask(managerclient2.ValidateBackupTask)
 	}
 
 	props := task.Properties.(map[string]interface{})
@@ -128,6 +128,6 @@ func (cmd *command) run(args []string) error {
 		return errors.New("nothing to do")
 	}
 
-	fmt.Fprintln(cmd.OutOrStdout(), managerclient.TaskID(task))
+	fmt.Fprintln(cmd.OutOrStdout(), managerclient2.TaskID(task))
 	return nil
 }
diff --git a/pkg/command/backup/cmd.go b/pkg/command/backup/cmd.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"
@@ -23,7 +23,7 @@ var updateRes []byte
 
 type command struct {
 	flag.TaskBase
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	cluster          string
 	dc               []string
@@ -39,15 +39,15 @@ type command struct {
 	purgeOnly        bool
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := newCommand(client, false)
 	updateCmd := newCommand(client, true)
 	cmd.AddCommand(&updateCmd.Command)
 
 	return &cmd.Command
 }
 
-func newCommand(client *managerclient.Client, update bool) *command {
+func newCommand(client *managerclient2.Client, update bool) *command {
 	var (
 		cmd = &command{
 			client: client,
@@ -92,20 +92,20 @@ func (cmd *command) init() {
 
 func (cmd *command) run(args []string) error {
 	var (
-		task *managerclient.Task
+		task *managerclient2.Task
 		ok   bool
 	)
 
 	if cmd.Update() {
-		a := managerclient.BackupTask
+		a := managerclient2.BackupTask
 		if len(args) > 0 {
 			a = args[0]
 		}
 		taskType, taskID, err := cmd.client.TaskSplit(cmd.Context(), cmd.cluster, a)
 		if err != nil {
 			return err
 		}
-		if taskType != managerclient.BackupTask {
+		if taskType != managerclient2.BackupTask {
 			return fmt.Errorf("can't handle %s task", taskType)
 		}
 		task, err = cmd.client.GetTask(cmd.Context(), cmd.cluster, taskType, taskID)
@@ -114,7 +114,7 @@ func (cmd *command) run(args []string) error {
 		}
 		ok = cmd.UpdateTask(task)
 	} else {
-		task = cmd.CreateTask(managerclient.BackupTask)
+		task = cmd.CreateTask(managerclient2.BackupTask)
 	}
 
 	props := task.Properties.(map[string]interface{})
@@ -192,6 +192,6 @@ func (cmd *command) run(args []string) error {
 		return errors.New("nothing to do")
 	}
 
-	fmt.Fprintln(cmd.OutOrStdout(), managerclient.TaskID(task))
+	fmt.Fprintln(cmd.OutOrStdout(), managerclient2.TaskID(task))
 	return nil
 }
diff --git a/pkg/command/cluster/clusteradd/cmd.go b/pkg/command/cluster/clusteradd/cmd.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/clipper"
 	"github.com/scylladb/scylla-manager/v3/pkg/util/fsutil"
 	"github.com/spf13/cobra"
@@ -21,7 +21,7 @@ var res []byte
 
 type command struct {
 	cobra.Command
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	id                     string
 	name                   string
@@ -38,7 +38,7 @@ type command struct {
 	forceNonSSLSessionPort bool
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := &command{
 		client: client,
 	}
@@ -84,7 +84,7 @@ func (cmd *command) run() error {
 		}
 	}
 
-	c := &managerclient.Cluster{
+	c := &managerclient2.Cluster{
 		ID:                     cmd.id,
 		Name:                   cmd.name,
 		Labels:                 cmd.label.NewLabels(),

diff --git a/pkg/command/info/cmd.go b/pkg/command/info/cmd.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
@@ -17,14 +17,14 @@ var res []byte
 
 type command struct {
 	cobra.Command
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	cluster string
 	limit   int
 	cause   bool
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := &command{
 		client: client,
 		Command: cobra.Command{
@@ -66,7 +66,7 @@ func (cmd *command) run(args []string) error {
 		return fmt.Errorf("expected exactly 1 task, got %d", len(tasks.TaskListItemSlice))
 	}
 
-	ti := managerclient.TaskInfo{
+	ti := managerclient2.TaskInfo{
 		TaskListItem: tasks.TaskListItemSlice[0],
 	}
 	if err := ti.Render(w); err != nil {

diff --git a/pkg/command/info/cmd_integration_api_test.go b/pkg/command/info/cmd_integration_api_test.go
@@ -12,7 +12,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/scylladb/scylla-manager/v3/swagger/gen/scylla-manager/models"
 )
 
@@ -22,7 +22,7 @@ const (
 )
 
 func TestSctoolInfoLabelsIntegrationAPITest(t *testing.T) {
-	client, err := managerclient.NewClient("http://localhost:5080/api/v1")
+	client, err := managerclient2.NewClient("http://localhost:5080/api/v1")
 	if err != nil {
 		t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err)
 	}
@@ -41,7 +41,7 @@ func TestSctoolInfoLabelsIntegrationAPITest(t *testing.T) {
 		}
 	}()
 
-	taskID, err := client.CreateTask(context.Background(), clusterID, &managerclient.Task{
+	taskID, err := client.CreateTask(context.Background(), clusterID, &managerclient2.Task{
 		Type:    "repair",
 		Enabled: true,
 		Labels: map[string]string{
@@ -53,7 +53,7 @@ func TestSctoolInfoLabelsIntegrationAPITest(t *testing.T) {
 		t.Logf("Failed to create task, err = {%v}", err)
 	}
 
-	if err := client.UpdateTask(context.Background(), clusterID, &managerclient.Task{
+	if err := client.UpdateTask(context.Background(), clusterID, &managerclient2.Task{
 		ID:      taskID.String(),
 		Type:    "repair",
 		Enabled: true,

diff --git a/pkg/command/legacy/task/taskdelete/cmd.go b/pkg/command/legacy/task/taskdelete/cmd.go
@@ -6,7 +6,7 @@ import (
 	_ "embed"
 
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
@@ -16,12 +16,12 @@ var res []byte
 
 type command struct {
 	cobra.Command
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	cluster string
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := &command{
 		client: client,
 		Command: cobra.Command{
@@ -46,7 +46,7 @@ func (cmd *command) init() {
 }
 
 func (cmd *command) run(args []string) error {
-	taskType, taskID, _, err := managerclient.TaskSplit(args[0])
+	taskType, taskID, _, err := managerclient2.TaskSplit(args[0])
 	if err != nil {
 		return err
 	}

diff --git a/pkg/command/legacy/task/taskhistory/cmd.go b/pkg/command/legacy/task/taskhistory/cmd.go
@@ -6,7 +6,7 @@ import (
 	_ "embed"
 
 	"github.com/scylladb/scylla-manager/v3/pkg/command/flag"
-	"github.com/scylladb/scylla-manager/v3/pkg/managerclient"
+	managerclient2 "github.com/scylladb/scylla-manager/v3/pkg/managerclient"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 )
@@ -16,13 +16,13 @@ var res []byte
 
 type command struct {
 	cobra.Command
-	client *managerclient.Client
+	client *managerclient2.Client
 
 	cluster string
 	limit   int
 }
 
-func NewCommand(client *managerclient.Client) *cobra.Command {
+func NewCommand(client *managerclient2.Client) *cobra.Command {
 	cmd := &command{
 		client: client,
 		Command: cobra.Command{
@@ -48,7 +48,7 @@ func (cmd *command) init() {
 }
 
 func (cmd *command) run(args []string) error {
-	taskType, taskID, _, err := managerclient.TaskSplit(args[0])
+	taskType, taskID, _, err := managerclient2.TaskSplit(args[0])
 	if err != nil {
 		return err
 	}