fix postgresql_user_mapping on AWS RDS Aurora (#274)

Co-authored-by: Cyril Gaudin <cyril.gaudin@gmail.com>
cyrilgdn · Mar 18, 2023 · 8c7f87e · 8c7f87e
1 parent 3fb80ed
commit 8c7f87e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/postgresql/resource_postgresql_user_mapping.go b/postgresql/resource_postgresql_user_mapping.go
@@ -112,7 +112,7 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
 	defer deferredRollback(txn)
 
 	var userMappingOptions []string
-	query := "SELECT umoptions FROM pg_user_mappings WHERE usename = $1 and srvname = $2"
+	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))
 	switch {
 	case err == sql.ErrNoRows:
@@ -125,7 +125,7 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
 
 	mappedOptions := make(map[string]interface{})
 	for _, v := range userMappingOptions {
-		pair := strings.Split(v, "=")
+		pair := strings.SplitN(v, "=", 2)
 		mappedOptions[pair[0]] = pair[1]
 	}
 

diff --git a/postgresql/resource_postgresql_user_mapping_test.go b/postgresql/resource_postgresql_user_mapping_test.go
@@ -32,6 +32,8 @@ func TestAccPostgresqlUserMapping_Basic(t *testing.T) {
 						"postgresql_user_mapping.remote", "options.user", "admin"),
 					resource.TestCheckResourceAttr(
 						"postgresql_user_mapping.remote", "options.password", "pass"),
+					resource.TestCheckResourceAttr(
+						"postgresql_user_mapping.special_chars", "options.password", "pass=$*'"),
 				),
 			},
 		},
@@ -191,6 +193,19 @@ resource "postgresql_user_mapping" "remote" {
     password = "pass"
   }
 }
+
+resource "postgresql_role" "special" {
+  name = "special"
+}
+
+resource "postgresql_user_mapping" "special_chars" {
+  server_name = postgresql_server.myserver_postgres.server_name
+  user_name   = postgresql_role.special.name
+  options = {
+	user = "admin"
+	password = "pass=$*'"
+  }
+}
 `
 
 var testAccPostgresqlUserMappingChanges2 = `