Skip to content

Commit

Permalink
Merge branch 'branch/v15' into bot/backport-49351-branch/v15
Browse files Browse the repository at this point in the history
  • Loading branch information
gzdunek authored Nov 25, 2024
2 parents 12329b7 + e018d9a commit 539f6f0
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/tbot/tbot.go
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ func (b *Bot) preRunChecks(ctx context.Context) (_ func() error, err error) {
switch addrKind {
case config.AddressKindUnspecified:
return nil, trace.BadParameter(
"either a proxy or auth address must be set using --proxy, --auth-server or configuration",
"either a proxy or auth address must be set using --proxy-server, --auth-server or configuration",
)
case config.AddressKindAuth:
// TODO(noah): DELETE IN V17.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {
StyledBox,
useConnectionDiagnostic,
} from '../../Shared';
import { DatabaseEngine } from '../../SelectResource';
import { DatabaseEngine, getDatabaseProtocol } from '../../SelectResource';

export function TestConnection() {
const { resourceSpec, agentMeta } = useDiscover();
Expand Down Expand Up @@ -183,8 +183,7 @@ export function TestConnection() {
isDisabled={
attempt.status === 'processing' || nameOpts.length === 0
}
// Database name is required for Postgres.
isClearable={dbEngine !== DatabaseEngine.Postgres}
isClearable={!isDbNameRequired(dbEngine)}
/>
<CustomInputFieldForAsterisks
selectedOption={selectedDbName}
Expand Down Expand Up @@ -240,3 +239,17 @@ function getInputValue(input: string, inputKind: 'name' | 'user') {
}
return input;
}

function isDbNameRequired(engine: DatabaseEngine) {
const protocol = getDatabaseProtocol(engine);
switch (protocol) {
case 'mongodb':
case 'oracle':
case 'postgres':
case 'spanner':
case 'sqlserver':
return true;
default:
return false;
}
}
25 changes: 22 additions & 3 deletions web/packages/teleport/src/Discover/SelectResource/databases.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
{
dbMeta: {
location: DatabaseLocation.SelfHosted,
engine: DatabaseEngine.CoackroachDb,
engine: DatabaseEngine.CockroachDb,
},
name: 'CockroachDB',
keywords: selfhostedKeywords + 'cockroachdb',
Expand Down Expand Up @@ -404,13 +404,32 @@ export function getDatabaseProtocol(engine: DatabaseEngine): DbProtocol {
switch (engine) {
case DatabaseEngine.Postgres:
case DatabaseEngine.AuroraPostgres:
case DatabaseEngine.Redshift:
return 'postgres';
case DatabaseEngine.MySql:
case DatabaseEngine.AuroraMysql:
return 'mysql';
case DatabaseEngine.MongoDb:
return 'mongodb';
case DatabaseEngine.Redis:
return 'redis';
case DatabaseEngine.CockroachDb:
return 'cockroachdb';
case DatabaseEngine.SqlServer:
return 'sqlserver';
case DatabaseEngine.Snowflake:
return 'snowflake';
case DatabaseEngine.Cassandra:
return 'cassandra';
case DatabaseEngine.ElasticSearch:
return 'elasticsearch';
case DatabaseEngine.DynamoDb:
return 'dynamodb';
case DatabaseEngine.Doc:
return '' as any;
default:
engine satisfies never;
}

return '' as any;
}

export function getDefaultDatabasePort(engine: DatabaseEngine): string {
Expand Down
2 changes: 1 addition & 1 deletion web/packages/teleport/src/Discover/SelectResource/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export enum DatabaseEngine {
AuroraMysql,
MongoDb,
Redis,
CoackroachDb,
CockroachDb,
SqlServer,
Snowflake,
Cassandra,
Expand Down

0 comments on commit 539f6f0

Please sign in to comment.