Skip to content

Fixed bug where we triggered unnecessary connection attempts to externally managed databases #594

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
zohar7ch merged 1 commit into from
May 28, 2025
+10 −1
Merged

Fixed bug where we triggered unnecessary connection attempts to externally managed databases #594

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
11 changes: 10 additions & 1 deletion src/shared/databaseconfigurator/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,22 @@ func (p *PostgresConfigurator) getAllowedDatabasesDiffForUser(ctx context.Contex
}

func (p *PostgresConfigurator) revokeDatabasePermissions(ctx context.Context, username string, dbname string) error {
if IsManagedDBName(dbname) {
// If we know that this is managed DB, we don't want to try to connect to it, becasue we know that we will
// fail, and this might raise an alert on the database (for example, if we will try to connect to
// 'cloudsqladmin' database in managed Google cloud SQL)
logrus.WithField("database", dbname).Debug("Skipping known managed database")
return nil
}

err := p.setConnection(ctx, dbname)
if err != nil && (IsInvalidAuthorizationError(err) || IsManagedDBName(dbname)) {
if err != nil && IsInvalidAuthorizationError(err) {
// Probably an admin database that we're failing to connect to or something along those lines
// (like 'cloudsqladmin' database in managed Google cloud SQL)
logrus.WithField("database", dbname).Debug("Skipping invalid authorization error")
return nil
}

if err != nil {
pgErr, ok := TranslatePostgresConnectionError(err)
if ok {
Expand Down
Loading