Skip to content

support specials on user mapping #515

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support specials on user mapping #515

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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ require (
github.com/sean-/postgresql-acl v0.0.0-20161225120419-d10489e5d217
github.com/stretchr/testify v1.9.0
gocloud.dev v0.34.0
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.26.0
golang.org/x/oauth2 v0.10.0
google.golang.org/api v0.134.0
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,6 +1386,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
Expand Down
35 changes: 30 additions & 5 deletions postgresql/resource_postgresql_user_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/lib/pq"

"golang.org/x/exp/slices"
)

const (
Expand Down Expand Up @@ -52,6 +54,16 @@ func resourcePostgreSQLUserMapping() *schema.Resource {
}
}

func quoteUsername(username string) string {
usernameSpecials := []string{"CURRENT_ROLE", "CURRENT_USER", "PUBLIC", "USER"}
if slices.Contains(usernameSpecials, username) {
// don't use quotes on specials
return username
} else {
return pq.QuoteIdentifier(username)
}
}

func resourcePostgreSQLUserMappingCreate(db *DBConnection, d *schema.ResourceData) error {
if !db.featureSupported(featureServer) {
return fmt.Errorf(
Expand All @@ -64,7 +76,7 @@ func resourcePostgreSQLUserMappingCreate(db *DBConnection, d *schema.ResourceDat
serverName := d.Get(userMappingServerNameAttr).(string)

b := bytes.NewBufferString("CREATE USER MAPPING ")
fmt.Fprint(b, " FOR ", pq.QuoteIdentifier(username))
fmt.Fprint(b, " FOR ", quoteUsername(username))
fmt.Fprint(b, " SERVER ", pq.QuoteIdentifier(serverName))

if options, ok := d.GetOk(userMappingOptionsAttr); ok {
Expand Down Expand Up @@ -105,6 +117,15 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
username := d.Get(userMappingUserNameAttr).(string)
serverName := d.Get(userMappingServerNameAttr).(string)

var usernameSpecial string
if username == "PUBLIC" {
usernameSpecial = username
username = "public"
} else if slices.Contains([]string{"CURRENT_ROLE", "CURRENT_USER", "USER"}, username) {
usernameSpecial = username
username = db.client.config.getDatabaseUsername()
}

txn, err := startTransaction(db.client, "")
if err != nil {
return err
Expand All @@ -115,7 +136,7 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
query := "SELECT umoptions FROM information_schema._pg_user_mappings WHERE authorization_identifier = $1 and foreign_server_name = $2"
err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))

if err != sql.ErrNoRows && err != nil {
if err != nil {
// Fallback to pg_user_mappings table if information_schema._pg_user_mappings is not available
query := "SELECT umoptions FROM pg_user_mappings WHERE usename = $1 and srvname = $2"
err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))
Expand All @@ -136,7 +157,11 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
mappedOptions[pair[0]] = pair[1]
}

d.Set(userMappingUserNameAttr, username)
if usernameSpecial != "" {
d.Set(userMappingUserNameAttr, usernameSpecial)
} else {
d.Set(userMappingUserNameAttr, username)
}
d.Set(userMappingServerNameAttr, serverName)
d.Set(userMappingOptionsAttr, mappedOptions)
d.SetId(generateUserMappingID(d))
Expand All @@ -161,7 +186,7 @@ func resourcePostgreSQLUserMappingDelete(db *DBConnection, d *schema.ResourceDat
}
defer deferredRollback(txn)

sql := fmt.Sprintf("DROP USER MAPPING FOR %s SERVER %s ", pq.QuoteIdentifier(username), pq.QuoteIdentifier(serverName))
sql := fmt.Sprintf("DROP USER MAPPING FOR %s SERVER %s ", quoteUsername(username), pq.QuoteIdentifier(serverName))
if _, err := txn.Exec(sql); err != nil {
return err
}
Expand Down Expand Up @@ -199,7 +224,7 @@ func setUserMappingOptionsIfChanged(db *DBConnection, d *schema.ResourceData) er
serverName := d.Get(userMappingServerNameAttr).(string)

b := bytes.NewBufferString("ALTER USER MAPPING ")
fmt.Fprintf(b, " FOR %s SERVER %s ", pq.QuoteIdentifier(username), pq.QuoteIdentifier(serverName))
fmt.Fprintf(b, " FOR %s SERVER %s ", quoteUsername(username), pq.QuoteIdentifier(serverName))

oldOptions, newOptions := d.GetChange(userMappingOptionsAttr)
fmt.Fprint(b, " OPTIONS ( ")
Expand Down
Loading