Move etcd/tarantool connection to URIOpts-based in lib/cluster

Author: AlexandrLitkevich

cli/cluster/cmd/common.go

@@ -1,17 +1,15 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"os"
 
 	clientv3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/tarantool/go-tarantool/v2"
 	"github.com/tarantool/tt/cli/cluster"
 	libcluster "github.com/tarantool/tt/lib/cluster"
-	"github.com/tarantool/tt/lib/connect"
+	libconnect "github.com/tarantool/tt/lib/connect"
 )
 
 // printRawClusterConfig prints a raw cluster configuration or an instance
@@ -137,87 +135,12 @@ func printConfig(config *libcluster.Config) {
 	fmt.Print(config.String())
 }
 
-// connectOpts is additional connect options specified by a user.
-type connectOpts struct {
-	Username string
-	Password string
-}
-
-// connectTarantool establishes a connection to Tarantool.
-func connectTarantool(uriOpts connect.UriOpts, connOpts connectOpts) (tarantool.Connector, error) {
-	if uriOpts.Username == "" && uriOpts.Password == "" {
-		uriOpts.Username = connOpts.Username
-		uriOpts.Password = connOpts.Password
-		if uriOpts.Username == "" {
-			uriOpts.Username = os.Getenv(connect.TarantoolUsernameEnv)
-		}
-		if uriOpts.Password == "" {
-			uriOpts.Password = os.Getenv(connect.TarantoolPasswordEnv)
-		}
-	}
-
-	dialer, connectorOpts, err := MakeConnectOptsFromUriOpts(uriOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx := context.Background()
-	if connectorOpts.Timeout > 0 {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, connectorOpts.Timeout)
-		defer cancel()
-	}
-	conn, err := tarantool.Connect(ctx, dialer, connectorOpts)
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to tarantool: %w", err)
-	}
-	return conn, nil
-}
-
-// connectEtcd establishes a connection to etcd.
-func connectEtcd(uriOpts connect.UriOpts, connOpts connectOpts) (*clientv3.Client, error) {
-	etcdOpts := MakeEtcdOptsFromUriOpts(uriOpts)
-	if etcdOpts.Username == "" && etcdOpts.Password == "" {
-		etcdOpts.Username = connOpts.Username
-		etcdOpts.Password = connOpts.Password
-		if etcdOpts.Username == "" {
-			etcdOpts.Username = os.Getenv(connect.EtcdUsernameEnv)
-		}
-		if etcdOpts.Password == "" {
-			etcdOpts.Password = os.Getenv(connect.EtcdPasswordEnv)
-		}
-	}
-
-	etcdcli, err := libcluster.ConnectEtcd(etcdOpts)
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to etcd: %w", err)
-	}
-	return etcdcli, nil
-}
-
-// doOnStorage determines a storage based on the opts.
-func doOnStorage(connOpts connectOpts, opts connect.UriOpts,
-	tarantoolFunc func(tarantool.Connector) error, etcdFunc func(*clientv3.Client) error) error {
-	etcdcli, errEtcd := connectEtcd(opts, connOpts)
-	if errEtcd == nil {
-		return etcdFunc(etcdcli)
-	}
-
-	conn, errTarantool := connectTarantool(opts, connOpts)
-	if errTarantool == nil {
-		return tarantoolFunc(conn)
-	}
-
-	return fmt.Errorf("failed to establish a connection to tarantool or etcd: %w, %w",
-		errTarantool, errEtcd)
-}
-
 // createPublisherAndCollector creates a new data publisher and collector based on UriOpts.
 func createPublisherAndCollector(
 	publishers libcluster.DataPublisherFactory,
 	collectors libcluster.CollectorFactory,
-	connOpts connectOpts,
-	opts connect.UriOpts) (libcluster.DataPublisher, libcluster.Collector, func(), error) {
+	connOpts libcluster.ConnectOpts,
+	opts libconnect.UriOpts) (libcluster.DataPublisher, libcluster.Collector, func(), error) {
 	prefix, key, timeout := opts.Prefix, opts.Params["key"], opts.Timeout
 
 	var (
@@ -265,7 +188,7 @@ func createPublisherAndCollector(
 		return nil
 	}
 
-	if err := doOnStorage(connOpts, opts, tarantoolFunc, etcdFunc); err != nil {
+	if err := libcluster.DoOnStorage(connOpts, opts, tarantoolFunc, etcdFunc); err != nil {
 		return nil, nil, nil, err
 	}
 

cli/cluster/cmd/publish.go

@@ -38,7 +38,7 @@ func PublishUri(publishCtx PublishCtx, opts connect.UriOpts) error {
 		return err
 	}
 
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: publishCtx.Username,
 		Password: publishCtx.Password,
 	}

cli/cluster/cmd/replicaset.go

@@ -107,7 +107,7 @@ func pickPatchKey(keys []string, force bool, pathMsg string) (int, error) {
 func createDataCollectorAndKeyPublisher(
 	collectors libcluster.DataCollectorFactory,
 	publishers libcluster.DataPublisherFactory,
-	opts connect.UriOpts, connOpts connectOpts) (
+	opts connect.UriOpts, connOpts libcluster.ConnectOpts) (
 	libcluster.DataCollector, replicaset.DataPublisher, func(), error) {
 	prefix, key, timeout := opts.Prefix, opts.Params["key"], opts.Timeout
 	var (
@@ -145,7 +145,7 @@ func createDataCollectorAndKeyPublisher(
 		return nil
 	}
 
-	if err := doOnStorage(connOpts, opts, tarantoolFunc, etcdFunc); err != nil {
+	if err := libcluster.DoOnStorage(connOpts, opts, tarantoolFunc, etcdFunc); err != nil {
 		return nil, nil, nil, err
 	}
 
@@ -158,7 +158,7 @@ func Promote(url string, ctx PromoteCtx) error {
 	if err != nil {
 		return fmt.Errorf("invalid URL %q: %w", url, err)
 	}
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: ctx.Username,
 		Password: ctx.Password,
 	}
@@ -205,7 +205,7 @@ func Demote(url string, ctx DemoteCtx) error {
 	if err != nil {
 		return fmt.Errorf("invalid URL %q: %w", url, err)
 	}
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: ctx.Username,
 		Password: ctx.Password,
 	}
@@ -252,7 +252,7 @@ func Expel(url string, ctx ExpelCtx) error {
 	if err != nil {
 		return fmt.Errorf("invalid URL %q: %w", url, err)
 	}
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: ctx.Username,
 		Password: ctx.Password,
 	}
@@ -306,7 +306,7 @@ func ChangeRole(url string, ctx RolesChangeCtx, action replicaset.RolesChangerAc
 	if err != nil {
 		return fmt.Errorf("invalid URL %q: %w", url, err)
 	}
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: ctx.Username,
 		Password: ctx.Password,
 	}

cli/cluster/cmd/show.go

@@ -23,7 +23,7 @@ type ShowCtx struct {
 
 // ShowUri shows a configuration from URI.
 func ShowUri(showCtx ShowCtx, opts connect.UriOpts) error {
-	connOpts := connectOpts{
+	connOpts := libcluster.ConnectOpts{
 		Username: showCtx.Username,
 		Password: showCtx.Password,
 	}