Skip to content

use verbs "revoke" and "grant" #12

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
leslie-corbalt merged 1 commit into from
Nov 24, 2025
Merged

use verbs "revoke" and "grant" #12

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
12 changes: 6 additions & 6 deletions migrations/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func EnsureUsersWithRoles(db *sqlx.DB, users []PostgreSQLUser, authType UserAuth
return fmt.Errorf("Failed to create user %q: %w", user.Username, err)
}

// Drop all existing roles
dropRolesSQL := fmt.Sprintf(`
// Revoke all existing roles
revokeRolesSQL := fmt.Sprintf(`
DO $$
DECLARE
r RECORD;
Expand All @@ -71,16 +71,16 @@ func EnsureUsersWithRoles(db *sqlx.DB, users []PostgreSQLUser, authType UserAuth
END LOOP;
END
$$;`, pq.QuoteLiteral(user.Username), pq.QuoteIdentifier(user.Username))
_, err = tx.Exec(dropRolesSQL)
_, err = tx.Exec(revokeRolesSQL)
if err != nil {
return fmt.Errorf("Failed to drop roles for user %q: %w", user.Username, err)
return fmt.Errorf("Failed to revoke roles for user %q: %w", user.Username, err)
}

// There could be privileges on a variety of different objects.
// See https://www.postgresql.org/docs/current/sql-revoke.html
// But we will just worry about roles.

// Add roles
// Grant roles
roles := user.GrantRoles
if authType == UserAuthenticationTypeIAM {
roles = append(roles, "rds_iam")
Expand All @@ -89,7 +89,7 @@ func EnsureUsersWithRoles(db *sqlx.DB, users []PostgreSQLUser, authType UserAuth
grantSQL := fmt.Sprintf("GRANT %s TO %s", pq.QuoteIdentifier(role), pq.QuoteIdentifier(user.Username))
_, err = tx.Exec(grantSQL)
if err != nil {
return fmt.Errorf("Failed to give role %q to user %q: %w", role, user.Username, err)
return fmt.Errorf("Failed to grant role %q to user %q: %w", role, user.Username, err)
}
}

Expand Down