Skip to content

Commit 6cb35d7

Browse files
fix overwriting of name field for IAM Group user in resourceSqlUserRead method (#11466) (#8024)
[upstream:879ae5218c3816369f5bcb449d4c983f6be1087a] Signed-off-by: Modular Magician <[email protected]>
1 parent 95e99d9 commit 6cb35d7

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.changelog/11466.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
sql: fixed overwriting of `name` field for IAM Group user for resource `google_sql_user`
3+
```

google-beta/services/sql/resource_sql_user.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,13 @@ func resourceSqlUserRead(d *schema.ResourceData, meta interface{}) error {
350350
}
351351

352352
for _, currentUser := range users.Items {
353+
var username string
353354
if !(strings.Contains(databaseInstance.DatabaseVersion, "POSTGRES") || currentUser.Type == "CLOUD_IAM_GROUP") {
354-
name = strings.Split(name, "@")[0]
355+
username = strings.Split(name, "@")[0]
356+
} else {
357+
username = name
355358
}
356-
if currentUser.Name == name {
359+
if currentUser.Name == username {
357360
// Host can only be empty for postgres instances,
358361
// so don't compare the host if the API host is empty.
359362
if host == "" || currentUser.Host == host {

0 commit comments

Comments
 (0)