Skip to content

connect: remove ttv1 dependency #1280

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

Open
sssciel wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

connect: remove ttv1 dependency #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion cli/search/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,12 @@ func FetchBundlesInfo(searchCtx *SearchCtx, cliOpts *config.CliOpts) (
searchCtx.Program)
}

credentials, err := connect.GetCreds(cliOpts)
var credPath string
if cliOpts.EE != nil {
credPath = cliOpts.EE.CredPath
}

credentials, err := connect.GetCreds(credPath)
if err != nil {
return nil, err
}
Expand Down
1 change: 0 additions & 1 deletion lib/cluster/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ require (
github.com/spf13/pflag v1.0.6 // indirect
github.com/tarantool/go-iproto v1.1.0 // indirect
github.com/tarantool/go-openssl v1.2.1 // indirect
github.com/tarantool/tt v1.3.1 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.4.3 // indirect
Expand Down
2 changes: 0 additions & 2 deletions lib/cluster/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ github.com/tarantool/go-tarantool/v2 v2.4.2 h1:rkzYtFhLJLA9RDIhjzN93MJBN5PBxHW4+
github.com/tarantool/go-tarantool/v2 v2.4.2/go.mod h1:MTbhdjFc3Jl63Lgi/UJr5D+QbT+QegqOzsNJGmaw7VM=
github.com/tarantool/go-tlsdialer v1.0.2 h1:TiOkihvC2ufLbOqJcJLuQ9I7W5bsZtmnT7KHF/t8n4s=
github.com/tarantool/go-tlsdialer v1.0.2/go.mod h1:ztE9J5oh4YzNQkSqlpjA0OkY89zHy/BiJJbbSFm+IiQ=
github.com/tarantool/tt v1.3.1 h1:bczu649MCQaX6k9HFA71MJ5V70nY4E0grBxGLJvYSD8=
github.com/tarantool/tt v1.3.1/go.mod h1:Z+YuHc9FNtWDcKyrOVjZ7B3fw7s0imW3QKSMAV7Qjpk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
Expand Down
9 changes: 4 additions & 5 deletions lib/connect/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strings"
"syscall"

"github.com/tarantool/tt/cli/config"
"golang.org/x/term"
)

Expand Down Expand Up @@ -102,15 +101,15 @@ func getCredsFromEnvVars() (UserCredentials, error) {
return res, nil
}

// getCreds gets credentials for tarantool-ee download.
func GetCreds(cliOpts *config.CliOpts) (UserCredentials, error) {
if cliOpts.EE == nil || (cliOpts.EE != nil && cliOpts.EE.CredPath == "") {
// GetCreds gets credentials for tarantool-ee download.
func GetCreds(credPath string) (UserCredentials, error) {
if credPath == "" {
creds, err := getCredsFromEnvVars()
if err == nil {
return creds, nil
}
return getCredsInteractive()
}

return getCredsFromFile(cliOpts.EE.CredPath)
return getCredsFromFile(credPath)
}
3 changes: 1 addition & 2 deletions lib/connect/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ go 1.25.7
require (
github.com/pmezard/go-difflib v1.0.0
github.com/stretchr/testify v1.10.0
github.com/tarantool/tt v1.3.1
golang.org/x/term v0.40.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/kr/pretty v0.2.1 // indirect
golang.org/x/sys v0.41.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
2 changes: 0 additions & 2 deletions lib/connect/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tarantool/tt v1.3.1 h1:bczu649MCQaX6k9HFA71MJ5V70nY4E0grBxGLJvYSD8=
github.com/tarantool/tt v1.3.1/go.mod h1:Z+YuHc9FNtWDcKyrOVjZ7B3fw7s0imW3QKSMAV7Qjpk=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
Expand Down
Loading