Skip to content

Commit 7ba0438

Browse files
authored
fixing client update side effects (#456)
1 parent b6d3da5 commit 7ba0438

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

mongodbatlas/resource_mongodbatlas_database_user.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
"net/url"
87
"regexp"
98
"strings"
109

@@ -146,9 +145,8 @@ func resourceMongoDBAtlasDatabaseUserRead(d *schema.ResourceData, meta interface
146145
authDatabaseName = d.Get("auth_database_name").(string)
147146
}
148147
}
149-
usernameEscaped := url.PathEscape(username)
150148

151-
dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), authDatabaseName, projectID, usernameEscaped)
149+
dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), authDatabaseName, projectID, username)
152150
if err != nil {
153151
// case 404
154152
// deleted in the backend case
@@ -262,9 +260,7 @@ func resourceMongoDBAtlasDatabaseUserUpdate(d *schema.ResourceData, meta interfa
262260
username := ids["username"]
263261
authDatabaseName := ids["auth_database_name"]
264262

265-
usernameEscaped := url.PathEscape(username)
266-
267-
dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), authDatabaseName, projectID, usernameEscaped)
263+
dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), authDatabaseName, projectID, username)
268264
if err != nil {
269265
return fmt.Errorf("error getting database user information to update it: %s", err)
270266
}
@@ -285,7 +281,7 @@ func resourceMongoDBAtlasDatabaseUserUpdate(d *schema.ResourceData, meta interfa
285281
dbUser.Scopes = expandScopes(d)
286282
}
287283

288-
_, _, err = conn.DatabaseUsers.Update(context.Background(), projectID, usernameEscaped, dbUser)
284+
_, _, err = conn.DatabaseUsers.Update(context.Background(), projectID, username, dbUser)
289285
if err != nil {
290286
return fmt.Errorf("error updating database user(%s): %s", username, err)
291287
}
@@ -301,9 +297,7 @@ func resourceMongoDBAtlasDatabaseUserDelete(d *schema.ResourceData, meta interfa
301297
username := ids["username"]
302298
authDatabaseName := ids["auth_database_name"]
303299

304-
usernameEscaped := url.PathEscape(username)
305-
306-
_, err := conn.DatabaseUsers.Delete(context.Background(), authDatabaseName, projectID, usernameEscaped)
300+
_, err := conn.DatabaseUsers.Delete(context.Background(), authDatabaseName, projectID, username)
307301
if err != nil {
308302
return fmt.Errorf("error deleting database user (%s): %s", username, err)
309303
}
@@ -319,9 +313,7 @@ func resourceMongoDBAtlasDatabaseUserImportState(d *schema.ResourceData, meta in
319313
return nil, err
320314
}
321315

322-
usernameEscaped := url.PathEscape(*username)
323-
324-
u, _, err := conn.DatabaseUsers.Get(context.Background(), *authDatabaseName, *projectID, usernameEscaped)
316+
u, _, err := conn.DatabaseUsers.Get(context.Background(), *authDatabaseName, *projectID, *username)
325317
if err != nil {
326318
return nil, fmt.Errorf("couldn't import user(%s) in project(%s), error: %s", *username, *projectID, err)
327319
}

mongodbatlas/resource_mongodbatlas_database_user_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"log"
7-
"net/url"
87
"os"
98
"testing"
109

@@ -619,9 +618,7 @@ func testAccCheckMongoDBAtlasDatabaseUserExists(resourceName string, dbUser *mat
619618
ids := decodeStateID(rs.Primary.ID)
620619
username := ids["username"]
621620

622-
dbUsername := url.PathEscape(username)
623-
624-
if dbUserResp, _, err := conn.DatabaseUsers.Get(context.Background(), ids["auth_database_name"], ids["project_id"], dbUsername); err == nil {
621+
if dbUserResp, _, err := conn.DatabaseUsers.Get(context.Background(), ids["auth_database_name"], ids["project_id"], username); err == nil {
625622
*dbUser = *dbUserResp
626623
return nil
627624
}

0 commit comments

Comments
 (0)