CLOUDP-81828: Add support for collections when creating a dbuser (#602)

Author: gssbzn

internal/convert/database_user.go

@@ -26,6 +26,7 @@ const (
 	ExternalAuthDB      = "$external"
 	roleSep             = "@"
 	scopeSep            = ":"
+	collectionSep       = "."
 	defaultUserDatabase = "admin"
 	defaultResourceType = "CLUSTER"
 )
@@ -35,32 +36,38 @@ const (
 func BuildAtlasRoles(r []string) []atlas.Role {
 	roles := make([]atlas.Role, len(r))
 	for i, roleP := range r {
-		role := strings.Split(roleP, roleSep)
-		roleName := role[0]
-		databaseName := defaultUserDatabase
-		if len(role) > 1 {
-			databaseName = role[1]
+		roleName, databaseName := splitRoleAndDBName(roleP)
+		var collectionName string
+		dbCollection := strings.Split(databaseName, collectionSep)
+		databaseName = dbCollection[0]
+		if len(dbCollection) > 1 {
+			collectionName = strings.Join(dbCollection[1:], ".")
 		}
-
 		roles[i] = atlas.Role{
-			RoleName:     roleName,
-			DatabaseName: databaseName,
+			RoleName:       roleName,
+			DatabaseName:   databaseName,
+			CollectionName: collectionName,
 		}
 	}
 	return roles
 }
 
+func splitRoleAndDBName(roleAndDBNAme string) (role, dbName string) {
+	rd := strings.Split(roleAndDBNAme, roleSep)
+	dbName = defaultUserDatabase
+	role = rd[0]
+	if len(rd) > 1 {
+		dbName = rd[1]
+	}
+	return
+}
+
 // BuildOMRoles converts the roles inside the array of string in an array of opsmngr.Role structs.
 // r contains roles in the format roleName@dbName
 func BuildOMRoles(r []string) []*opsmngr.Role {
 	roles := make([]*opsmngr.Role, len(r))
 	for i, roleP := range r {
-		role := strings.Split(roleP, roleSep)
-		roleName := role[0]
-		databaseName := defaultUserDatabase
-		if len(role) > 1 {
-			databaseName = role[1]
-		}
+		roleName, databaseName := splitRoleAndDBName(roleP)
 
 		roles[i] = &opsmngr.Role{
 			Role:     roleName,

internal/convert/database_user_test.go

@@ -62,6 +62,26 @@ func TestBuildAtlasRoles(t *testing.T) {
 				},
 			},
 		},
+		{
+			input: []string{"[email protected]"},
+			want: []mongodbatlas.Role{
+				{
+					RoleName:       "admin",
+					DatabaseName:   "db",
+					CollectionName: "collection",
+				},
+			},
+		},
+		{
+			input: []string{"[email protected]"},
+			want: []mongodbatlas.Role{
+				{
+					RoleName:       "admin",
+					DatabaseName:   "db",
+					CollectionName: "collection.name",
+				},
+			},
+		},
 	}
 
 	for _, tc := range tests {