fix: Avoids import error for database_user when both username and auth database contain hyphens

.changelog/2928.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_database_user: Avoids import error for database_user when both username and auth database contain hyphens
+```

docs/resources/database_user.md

@@ -178,10 +178,14 @@ In addition to all arguments above, the following attributes are exported:
 
 ## Import
 
-Database users can be imported using project ID and username, in the format `project_id`-`username`-`auth_database_name`, e.g.
+Database users can be imported using project ID, username, and auth database name in the format:
+
+1.  `project_id`-`username`-`auth_database_name`
+2.  `project_id`/`username`/`auth_database_name`
 
 ```
-$ terraform import mongodbatlas_database_user.my_user 1112222b3bf99403840e8934-my_user-admin
+terraform import mongodbatlas_database_user.my_user 1112222b3bf99403840e8934-my_user-admin # (1)
+terraform import mongodbatlas_database_user.my_user 1112222b3bf99403840e8934/my-username-dash/my-db-name # (2)
 ```
 
 ~> **NOTE:** Terraform will want to change the password after importing the user if a `password` argument is specified.

internal/common/conversion/import_state.go

@@ -10,6 +10,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 )
 
+func ImportSplit3(importRaw string) (ok bool, part1, part2, part3 string) {
+	parts := strings.Split(importRaw, "/")
+	if len(parts) != 3 {
+		return false, "", "", ""
+	}
+	return true, parts[0], parts[1], parts[2]
+}
+
 func ImportStateProjectIDClusterName(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse, attrNameProjectID, attrNameClusterName string) {
 	parts := strings.SplitN(req.ID, "-", 2)
 	if len(parts) != 2 {

internal/common/conversion/import_state_test.go

@@ -23,3 +23,52 @@ func TestValidateClusterName(t *testing.T) {
 	assert.Contains(t, err.Error(), "_invalidClusterName")
 	assert.Contains(t, err.Error(), "cluster_name must be a string with length between 1 and 64, starting and ending with an alphanumeric character, and containing only alphanumeric characters and hyphens")
 }
+
+func TestImportSplit3(t *testing.T) {
+	tests := map[string]struct {
+		importRaw string
+		part1     string
+		part2     string
+		part3     string
+		expected  bool
+	}{
+		"valid input": {
+			importRaw: "part1/part2/part3",
+			expected:  true,
+			part1:     "part1",
+			part2:     "part2",
+			part3:     "part3",
+		},
+		"invalid input with more parts": {
+			importRaw: "part1/part2/part3/part4",
+			expected:  false,
+			part1:     "",
+			part2:     "",
+			part3:     "",
+		},
+		"invalid input with two parts": {
+			importRaw: "part1/part2",
+			expected:  false,
+			part1:     "",
+			part2:     "",
+			part3:     "",
+		},
+		"invalid input with one part": {
+			importRaw: "part1",
+			expected:  false,
+			part1:     "",
+			part2:     "",
+			part3:     "",
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ok, part1, part2, part3 := conversion.ImportSplit3(tc.importRaw)
+			assert.Equal(t, tc.expected, ok)
+			assert.Equal(t, tc.part1, part1)
+			assert.Equal(t, tc.part2, part2)
+			assert.Equal(t, tc.part3, part3)
+		})
+	}
+}

internal/service/databaseuser/model_database_user_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/databaseuser"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.mongodb.org/atlas-sdk/v20241113004/admin"
 )
 
@@ -364,3 +365,68 @@ func getDatabaseUserModel(roles, labels, scopes basetypes.SetValue, password typ
 		Scopes:           scopes,
 	}
 }
+
+func TestSplitDatabaseUserImportID(t *testing.T) {
+	tests := map[string]struct {
+		importID    string
+		projectID   string
+		username    string
+		authDBName  string
+		errorString string
+	}{
+		"valid input": {
+			importID:   "664619d870c247237f4b86a6/my-username-dash/my-db-name",
+			projectID:  "664619d870c247237f4b86a6",
+			username:   "my-username-dash",
+			authDBName: "my-db-name",
+		},
+		"valid input legacy": {
+			importID:   "664619d870c247237f4b86a6-myUsernameCamel-mydbname",
+			projectID:  "664619d870c247237f4b86a6",
+			username:   "myUsernameCamel",
+			authDBName: "mydbname",
+		},
+		"invalid input projectID": {
+			importID:    "part1/part2/part3",
+			projectID:   "part1",
+			username:    "part2",
+			authDBName:  "part3",
+			errorString: "project_id must be a 24 character hex string: part1",
+		},
+		"invalid input with more parts": {
+			importID:    "part1/part2/part3/part4",
+			projectID:   "",
+			username:    "",
+			authDBName:  "",
+			errorString: databaseuser.ErrorImportFormat,
+		},
+		"invalid input with less parts": {
+			importID:    "part1/part2",
+			projectID:   "",
+			username:    "",
+			authDBName:  "",
+			errorString: databaseuser.ErrorImportFormat,
+		},
+		"empty input": {
+			importID:    "",
+			projectID:   "",
+			username:    "",
+			authDBName:  "",
+			errorString: databaseuser.ErrorImportFormat,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			part1, part2, part3, err := databaseuser.SplitDatabaseUserImportID(tc.importID)
+			if tc.errorString != "" {
+				require.EqualError(t, err, tc.errorString)
+			} else {
+				require.NoError(t, err)
+			}
+			assert.Equal(t, tc.projectID, part1)
+			assert.Equal(t, tc.username, part2)
+			assert.Equal(t, tc.authDBName, part3)
+		})
+	}
+}

internal/service/databaseuser/resource_database_user.go

@@ -17,11 +17,13 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 )
 
 const (
 	databaseUserResourceName = "database_user"
+	ErrorImportFormat        = "import format error: to import a Database User, use the format {project_id}-{username}-{auth_database_name} OR {project_id}/{username}/{auth_database_name}"
 )
 
 var _ resource.ResourceWithConfigure = &databaseUserRS{}
@@ -346,17 +348,19 @@ func (r *databaseUserRS) ImportState(ctx context.Context, req resource.ImportSta
 }
 
 func SplitDatabaseUserImportID(id string) (projectID, username, authDatabaseName string, err error) {
+	ok, projectID, username, authDatabaseName := conversion.ImportSplit3(id)
+	if ok {
+		err = conversion.ValidateProjectID(projectID)
+		return
+	}
 	var re = regexp.MustCompile(`(?s)^([0-9a-fA-F]{24})-(.*)-([$a-z]{1,15})$`)
 	parts := re.FindStringSubmatch(id)
-
 	if len(parts) != 4 {
-		err = errors.New("import format error: to import a Database User, use the format {project_id}-{username}-{auth_database_name}")
+		err = errors.New(ErrorImportFormat)
 		return
 	}
-
 	projectID = parts[1]
 	username = parts[2]
 	authDatabaseName = parts[3]
-
 	return
 }