Merge pull request #36 from Xyaren/main

Allow Import of user/grant containing "@" in the username.
winebarrel · Aug 23, 2021 · 4af5e73 · 4af5e73
2 parents 493f173 + b24c220
commit 4af5e73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mysql/resource_grant.go b/mysql/resource_grant.go
@@ -425,14 +425,14 @@ func DeleteGrant(d *schema.ResourceData, meta interface{}) error {
 }
 
 func ImportGrant(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-	userHost := strings.SplitN(d.Id(), "@", 2)
+	lastSeparatorIndex := strings.LastIndex(d.Id(), "@")
 
-	if len(userHost) != 2 {
+	if lastSeparatorIndex <= 0 {
 		return nil, fmt.Errorf("wrong ID format %s (expected USER@HOST)", d.Id())
 	}
 
-	user := userHost[0]
-	host := userHost[1]
+	user := d.Id()[0:lastSeparatorIndex]
+	host := d.Id()[lastSeparatorIndex+1:]
 
 	db, err := meta.(*MySQLConfiguration).GetDbConn()
 	if err != nil {

diff --git a/mysql/resource_user.go b/mysql/resource_user.go
@@ -252,14 +252,14 @@ func DeleteUser(d *schema.ResourceData, meta interface{}) error {
 }
 
 func ImportUser(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-	userHost := strings.SplitN(d.Id(), "@", 2)
+	lastSeparatorIndex := strings.LastIndex(d.Id(), "@")
 
-	if len(userHost) != 2 {
+	if lastSeparatorIndex <= 0 {
 		return nil, fmt.Errorf("wrong ID format %s (expected USER@HOST)", d.Id())
 	}
 
-	user := userHost[0]
-	host := userHost[1]
+	user := d.Id()[0:lastSeparatorIndex]
+	host := d.Id()[lastSeparatorIndex+1:]
 
 	db, err := meta.(*MySQLConfiguration).GetDbConn()
 	if err != nil {