Skip to content

[v13] Fix invalid command example. #28018

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
Tener merged 2 commits into from
Jun 21, 2023
Merged

[v13] Fix invalid command example. #28018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ed0bfb
Fix invalid command example.
Tener Jun 16, 2023
01e36ae
Merge branch 'branch/v13' into bot/backport-27943-branch/v13
Tener Jun 21, 2023
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
14 changes: 11 additions & 3 deletions lib/config/database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,15 @@ func TestMakeDatabaseConfig(t *testing.T) {
flags: DatabaseSampleFlags{
StaticDatabaseName: "",
StaticDatabaseProtocol: "postgres",
StaticDatabaseURI: "postgres://localhost:5432",
StaticDatabaseURI: "localhost:5432",
},
requireFn: require.Error,
},
"MissingProtocol": {
flags: DatabaseSampleFlags{
StaticDatabaseName: "sample",
StaticDatabaseProtocol: "",
StaticDatabaseURI: "postgres://localhost:5432",
StaticDatabaseURI: "localhost:5432",
},
requireFn: require.Error,
},
Expand All @@ -372,11 +372,19 @@ func TestMakeDatabaseConfig(t *testing.T) {
},
requireFn: require.Error,
},
"BadURI": {
flags: DatabaseSampleFlags{
StaticDatabaseName: "sample",
StaticDatabaseProtocol: "postgres",
StaticDatabaseURI: "postgres://localhost:5432",
},
requireFn: require.Error,
},
"InvalidLabels": {
flags: DatabaseSampleFlags{
StaticDatabaseName: "sample",
StaticDatabaseProtocol: "postgres",
StaticDatabaseURI: "postgres://localhost:5432",
StaticDatabaseURI: "localhost:5432",
StaticDatabaseRawLabels: "abc",
},
requireFn: require.Error,
Expand Down
2 changes: 1 addition & 1 deletion tool/teleport/common/usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ the "us-west-1" and "us-west-2" regions.
--proxy=localhost:3080 \
--name=sample-db \
--protocol=postgres \
--uri=postgres://localhost:5432 \
--uri=localhost:5432 \
--labels=env=prod
Generates a configuration with a Postgres database.

Expand Down