Skip to content

[v13] fix tsh db connect to active cassandra db #26378

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

Merged
GavinFrazar merged 1 commit into from
May 17, 2023
Merged

[v13] fix tsh db connect to active cassandra db #26378

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
17 changes: 11 additions & 6 deletions tool/tsh/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ func onDatabaseConnect(cf *CLIConf) error {
if err != nil {
return trace.Wrap(err)
}
route, database, err := getDatabaseInfo(cf, tc, cf.DatabaseService)
route, database, err := getDatabaseInfo(cf, tc)
if err != nil {
return trace.Wrap(err)
}
Expand Down Expand Up @@ -836,7 +836,7 @@ func onDatabaseConnect(cf *CLIConf) error {

// getDatabaseInfo fetches information about the database from tsh profile is DB is active in profile. Otherwise,
// the ListDatabases endpoint is called.
func getDatabaseInfo(cf *CLIConf, tc *client.TeleportClient, dbName string) (*tlsca.RouteToDatabase, types.Database, error) {
func getDatabaseInfo(cf *CLIConf, tc *client.TeleportClient) (*tlsca.RouteToDatabase, types.Database, error) {
database, err := pickActiveDatabase(cf)
if err == nil {
switch database.Protocol {
Expand All @@ -850,14 +850,14 @@ func getDatabaseInfo(cf *CLIConf, tc *client.TeleportClient, dbName string) (*tl
if err != nil && !trace.IsNotFound(err) {
return nil, nil, trace.Wrap(err)
}
db, err := getDatabase(cf, tc, dbName)
if err != nil {
return nil, nil, trace.Wrap(err)
}

dbService := cf.DatabaseService
username := cf.DatabaseUser
databaseName := cf.DatabaseName
if database != nil {
if dbService == "" {
dbService = database.ServiceName
}
if username == "" {
username = database.Username
}
Expand All @@ -866,6 +866,11 @@ func getDatabaseInfo(cf *CLIConf, tc *client.TeleportClient, dbName string) (*tl
}
}

db, err := getDatabase(cf, tc, dbService)
if err != nil {
return nil, nil, trace.Wrap(err)
}

return &tlsca.RouteToDatabase{
ServiceName: db.GetName(),
Protocol: db.GetProtocol(),
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func onProxyCommandDB(cf *CLIConf) error {
if err != nil {
return trace.Wrap(err)
}
route, db, err := getDatabaseInfo(cf, tc, cf.DatabaseService)
route, db, err := getDatabaseInfo(cf, tc)
if err != nil {
return trace.Wrap(err)
}
Expand Down