Skip to content

chore: added database_name as deprecated attribute #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2020
Merged

chore: added database_name as deprecated attribute #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions mongodbatlas/data_source_mongodbatlas_database_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mongodbatlas

import (
"context"
"errors"
"fmt"

"github.com/hashicorp/terraform/helper/schema"
Expand All @@ -21,9 +22,16 @@ func dataSourceMongoDBAtlasDatabaseUser() *schema.Resource {
Type: schema.TypeString,
Required: true,
},
"database_name": {
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"auth_database_name"},
Deprecated: "use auth_database_name instead",
},
"auth_database_name": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"database_name"},
},
"x509_type": {
Type: schema.TypeString,
Expand Down Expand Up @@ -74,18 +82,38 @@ func dataSourceMongoDBAtlasDatabaseUserRead(d *schema.ResourceData, meta interfa
conn := meta.(*matlas.Client)
projectID := d.Get("project_id").(string)
username := d.Get("username").(string)
databaseName := d.Get("auth_database_name").(string)

dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), databaseName, projectID, username)
dbName, dbNameOk := d.GetOk("database_name")
authDBName, authDBNameOk := d.GetOk("auth_database_name")
if !dbNameOk && !authDBNameOk {
return errors.New("one of database_name or auth_database_name must be configured")
}

var authDatabaseName string
if dbNameOk {
authDatabaseName = dbName.(string)
} else {
authDatabaseName = authDBName.(string)
}

dbUser, _, err := conn.DatabaseUsers.Get(context.Background(), authDatabaseName, projectID, username)
if err != nil {
return fmt.Errorf("error getting database user information: %s", err)
}
if err := d.Set("username", dbUser.Username); err != nil {
return fmt.Errorf("error setting `username` for database user (%s): %s", d.Id(), err)
}
if err := d.Set("auth_database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `auth_database_name` for database user (%s): %s", d.Id(), err)

if _, ok := d.GetOk("auth_database_name"); ok {
if err := d.Set("auth_database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `auth_database_name` for database user (%s): %s", d.Id(), err)
}
} else {
if err := d.Set("database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `database_name` for database user (%s): %s", d.Id(), err)
}
}

if err := d.Set("x509_type", dbUser.X509Type); err != nil {
return fmt.Errorf("error setting `x509_type` for database user (%s): %s", d.Id(), err)
}
Expand All @@ -99,7 +127,7 @@ func dataSourceMongoDBAtlasDatabaseUserRead(d *schema.ResourceData, meta interfa
d.SetId(encodeStateID(map[string]string{
"project_id": projectID,
"username": username,
"auth_database_name": databaseName,
"auth_database_name": authDatabaseName,
}))

return nil
Expand Down
37 changes: 32 additions & 5 deletions mongodbatlas/resource_mongodbatlas_database_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,16 @@ func resourceMongoDBAtlasDatabaseUser() *schema.Resource {
Required: true,
ForceNew: true,
},
"database_name": {
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"auth_database_name"},
Deprecated: "use auth_database_name instead",
},
"auth_database_name": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"database_name"},
},
"username": {
Type: schema.TypeString,
Expand Down Expand Up @@ -111,9 +118,17 @@ func resourceMongoDBAtlasDatabaseUserRead(d *schema.ResourceData, meta interface
if err := d.Set("username", dbUser.Username); err != nil {
return fmt.Errorf("error setting `username` for database user (%s): %s", d.Id(), err)
}
if err := d.Set("auth_database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `auth_database_name` for database user (%s): %s", d.Id(), err)

if _, ok := d.GetOk("auth_database_name"); ok {
if err := d.Set("auth_database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `auth_database_name` for database user (%s): %s", d.Id(), err)
}
} else {
if err := d.Set("database_name", dbUser.DatabaseName); err != nil {
return fmt.Errorf("error setting `database_name` for database user (%s): %s", d.Id(), err)
}
}

if err := d.Set("x509_type", dbUser.X509Type); err != nil {
return fmt.Errorf("error setting `x509_type` for database user (%s): %s", d.Id(), err)
}
Expand All @@ -131,7 +146,19 @@ func resourceMongoDBAtlasDatabaseUserCreate(d *schema.ResourceData, meta interfa
//Get client connection.
conn := meta.(*matlas.Client)
projectID := d.Get("project_id").(string)
authDatabaseName := d.Get("auth_database_name").(string)

dbName, dbNameOk := d.GetOk("database_name")
authDBName, authDBNameOk := d.GetOk("auth_database_name")
if !dbNameOk && !authDBNameOk {
return errors.New("one of database_name or auth_database_name must be configured")
}

var authDatabaseName string
if dbNameOk {
authDatabaseName = dbName.(string)
} else {
authDatabaseName = authDBName.(string)
}

dbUserReq := &matlas.DatabaseUser{
Roles: expandRoles(d),
Expand Down