Fix #279 #280

go.mod

@@ -4,12 +4,12 @@ go 1.14
 
 require (
 	github.com/client9/misspell v0.3.4
-	github.com/go-test/deep v1.0.3
+	github.com/go-test/deep v1.0.7
 	github.com/hashicorp/terraform-plugin-sdk v1.14.0
 	github.com/mongodb-forks/digest v1.0.1
 	github.com/mwielbut/pointy v1.1.0
 	github.com/spf13/cast v1.3.1
 	github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200518153306-40099de47e37
 	github.com/terraform-providers/terraform-provider-google v1.20.1-0.20200518165017-1dd21651c496
-	go.mongodb.org/atlas v0.3.1-0.20200716160607-1b4e8b15eadf
+	go.mongodb.org/atlas v0.4.1-0.20200820152733-8dc4a7c19a2b
 )

go.sum

@@ -139,6 +139,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g=
 github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4=
 github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8=
@@ -602,6 +604,10 @@ github.com/zclconf/go-cty-yaml v1.0.1/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgK
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/atlas v0.3.1-0.20200716160607-1b4e8b15eadf h1:uphQUeBtEbNSmlhg1MRVJOMMhFBtrT6+K6rSmXGxCPk=
 go.mongodb.org/atlas v0.3.1-0.20200716160607-1b4e8b15eadf/go.mod h1:xa/V3muNuVoReSG0y2pigUUnfPOx1cHF0ZV2uCE+c7I=
+go.mongodb.org/atlas v0.4.1-0.20200817181428-cd1e61b39f75 h1:aXDdZDxIeD37cn0uVGQl+oHbT//g9OYybLF+R4u2NHk=
+go.mongodb.org/atlas v0.4.1-0.20200817181428-cd1e61b39f75/go.mod h1:QlKvZKT43+R6lhHlaTy2E7Q/3AoAljMI6v5apfqslIs=
+go.mongodb.org/atlas v0.4.1-0.20200820152733-8dc4a7c19a2b h1:AuAQZDrQLesdmz9mIPaIn07OJRoG4Vfm+M3xd31HGgo=
+go.mongodb.org/atlas v0.4.1-0.20200820152733-8dc4a7c19a2b/go.mod h1:QlKvZKT43+R6lhHlaTy2E7Q/3AoAljMI6v5apfqslIs=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

mongodbatlas/resource_mongodbatlas_custom_db_role.go

@@ -49,7 +49,7 @@ func resourceMongoDBAtlasCustomDBRole() *schema.Resource {
 			},
 			"actions": {
 				Type:     schema.TypeList,
-				Required: true,
+				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"action": {
@@ -80,7 +80,7 @@ func resourceMongoDBAtlasCustomDBRole() *schema.Resource {
 				},
 			},
 			"inherited_roles": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -331,23 +331,21 @@ func flattenActionResources(resources []matlas.Resource) []map[string]interface{
 }
 
 func expandInheritedRoles(d *schema.ResourceData) []matlas.InheritedRole {
-	var inheritedRoles []matlas.InheritedRole
+	vIR := d.Get("inherited_roles").(*schema.Set).List()
+	ir := make([]matlas.InheritedRole, len(vIR))
 
-	if v, ok := d.GetOk("inherited_roles"); ok {
-		if rs := v.([]interface{}); len(rs) > 0 {
-			inheritedRoles = make([]matlas.InheritedRole, len(rs))
+	if len(vIR) != 0 {
+		for i := range vIR {
+			r := vIR[i].(map[string]interface{})
 
-			for k, r := range rs {
-				roleMap := r.(map[string]interface{})
-				inheritedRoles[k] = matlas.InheritedRole{
-					Db:   roleMap["database_name"].(string),
-					Role: roleMap["role_name"].(string),
-				}
+			ir[i] = matlas.InheritedRole{
+				Db:   r["database_name"].(string),
+				Role: r["role_name"].(string),
 			}
 		}
 	}
 
-	return inheritedRoles
+	return ir
 }
 
 func flattenInheritedRoles(roles []matlas.InheritedRole) []map[string]interface{} {

mongodbatlas/resource_mongodbatlas_custom_db_role_test.go

@@ -3,7 +3,6 @@ package mongodbatlas
 import (
 	"context"
 	"fmt"
-	"log"
 	"os"
 	"testing"
 
@@ -70,7 +69,7 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_WithInheritedRoles(t *testing.T) {
 
 	inheritRole := []matlas.CustomDBRole{
 		{
-			RoleName: fmt.Sprintf("a_test-acc-INHERITED_ROLE-%s", acctest.RandString(5)),
+			RoleName: fmt.Sprintf("test-acc-INHERITED_ROLE-%s", acctest.RandString(5)),
 			Actions: []matlas.Action{{
 				Action: "INSERT",
 				Resources: []matlas.Resource{{
@@ -176,10 +175,6 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_WithInheritedRoles(t *testing.T) {
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.action", testRole.Actions[0].Action),
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.resources.#", cast.ToString(len(testRole.Actions[0].Resources))),
 					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.#", "2"),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.role_name", inheritRole[0].RoleName),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.database_name", "admin"),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.1.role_name", inheritRole[1].RoleName),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.1.database_name", "admin"),
 				),
 			},
 			{
@@ -223,20 +218,18 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_WithInheritedRoles(t *testing.T) {
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.action", testRoleUpdated.Actions[0].Action),
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.resources.#", cast.ToString(len(testRoleUpdated.Actions[0].Resources))),
 					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.#", "2"),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.role_name", inheritRole[0].RoleName),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.database_name", "admin"),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.1.role_name", inheritRole[1].RoleName),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.1.database_name", "admin"),
 				),
 			},
 		},
 	})
 }
 
 func TestAccResourceMongoDBAtlasCustomDBRoles_MultipleCustomRoles(t *testing.T) {
-	testRoleResourceName := "mongodbatlas_custom_db_role.test_role"
-	InheritedRoleResourceName := "mongodbatlas_custom_db_role.inherited_role"
-	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
+	var (
+		testRoleResourceName      = "mongodbatlas_custom_db_role.test_role"
+		InheritedRoleResourceName = "mongodbatlas_custom_db_role.inherited_role"
+		projectID                 = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
+	)
 
 	inheritRole := &matlas.CustomDBRole{
 		RoleName: fmt.Sprintf("test-acc-INHERITED_ROLE-%s", acctest.RandString(5)),
@@ -412,8 +405,6 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_MultipleCustomRoles(t *testing.T)
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.action", testRoleUpdated.Actions[0].Action),
 					resource.TestCheckResourceAttr(testRoleResourceName, "actions.0.resources.#", cast.ToString(len(testRoleUpdated.Actions[0].Resources))),
 					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.#", "1"),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.role_name", inheritRoleUpdated.RoleName),
-					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.0.database_name", "admin"),
 				),
 			},
 		},
@@ -458,11 +449,12 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_MultipleResources(t *testing.T) {
 }
 
 func TestAccResourceMongoDBAtlasCustomDBRoles_importBasic(t *testing.T) {
-	resourceName := "mongodbatlas_custom_db_role.test"
-
-	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
-	roleName := fmt.Sprintf("test-acc-custom_role-%s", acctest.RandString(5))
-	databaseName := fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5))
+	var (
+		resourceName = "mongodbatlas_custom_db_role.test"
+		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
+		roleName     = fmt.Sprintf("test-acc-custom_role-%s", acctest.RandString(5))
+		databaseName = fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5))
+	)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -482,6 +474,145 @@ func TestAccResourceMongoDBAtlasCustomDBRoles_importBasic(t *testing.T) {
 	})
 }
 
+func TestAccResourceMongoDBAtlasCustomDBRoles_UpdatedInheritRoles(t *testing.T) {
+	var (
+		testRoleResourceName      = "mongodbatlas_custom_db_role.test_role"
+		InheritedRoleResourceName = "mongodbatlas_custom_db_role.inherited_role"
+		projectID                 = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
+	)
+
+	inheritRole := &matlas.CustomDBRole{
+		RoleName: fmt.Sprintf("test-acc-INHERITED_ROLE-%s", acctest.RandString(5)),
+		Actions: []matlas.Action{
+			{
+				Action: "REMOVE",
+				Resources: []matlas.Resource{
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+				},
+			},
+			{
+				Action: "FIND",
+				Resources: []matlas.Resource{
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+				},
+			},
+		},
+	}
+
+	inheritRoleUpdated := &matlas.CustomDBRole{
+		RoleName: inheritRole.RoleName,
+		Actions: []matlas.Action{
+			{
+				Action: "UPDATE",
+				Resources: []matlas.Resource{
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+				},
+			},
+			{
+				Action: "FIND",
+				Resources: []matlas.Resource{
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+				},
+			},
+			{
+				Action: "INSERT",
+				Resources: []matlas.Resource{
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+					{
+						Db: fmt.Sprintf("test-acc-db_name-%s", acctest.RandString(5)),
+					},
+				},
+			},
+		},
+	}
+
+	testRole := &matlas.CustomDBRole{
+		RoleName: fmt.Sprintf("test-acc-TEST_ROLE-%s", acctest.RandString(5)),
+		InheritedRoles: []matlas.InheritedRole{
+			{
+				Role: inheritRole.RoleName,
+				Db:   "admin",
+			},
+		},
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMongoDBAtlasCustomDBRolesDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMongoDBAtlasCustomDBRolesConfigMultiple(projectID, inheritRole, testRole),
+				Check: resource.ComposeTestCheckFunc(
+
+					// For Inherited Role
+					testAccCheckMongoDBAtlasCustomDBRolesExists(InheritedRoleResourceName),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "project_id"),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "role_name"),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "actions.0.action"),
+
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "project_id", projectID),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "role_name", inheritRole.RoleName),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.#", cast.ToString(len(inheritRole.Actions))),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.0.action", inheritRole.Actions[0].Action),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.0.resources.#", cast.ToString(len(inheritRole.Actions[0].Resources))),
+
+					// For Test Role
+					testAccCheckMongoDBAtlasCustomDBRolesExists(testRoleResourceName),
+					resource.TestCheckResourceAttrSet(testRoleResourceName, "project_id"),
+					resource.TestCheckResourceAttrSet(testRoleResourceName, "role_name"),
+
+					resource.TestCheckResourceAttr(testRoleResourceName, "project_id", projectID),
+					resource.TestCheckResourceAttr(testRoleResourceName, "role_name", testRole.RoleName),
+					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.#", "1"),
+				),
+			},
+			{
+				Config: testAccMongoDBAtlasCustomDBRolesConfigMultiple(projectID, inheritRoleUpdated, testRole),
+				Check: resource.ComposeTestCheckFunc(
+
+					// For Inherited Role
+					testAccCheckMongoDBAtlasCustomDBRolesExists(InheritedRoleResourceName),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "project_id"),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "role_name"),
+					resource.TestCheckResourceAttrSet(InheritedRoleResourceName, "actions.0.action"),
+
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "project_id", projectID),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "role_name", inheritRoleUpdated.RoleName),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.#", cast.ToString(len(inheritRoleUpdated.Actions))),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.0.action", inheritRoleUpdated.Actions[0].Action),
+					resource.TestCheckResourceAttr(InheritedRoleResourceName, "actions.0.resources.#", cast.ToString(len(inheritRoleUpdated.Actions[0].Resources))),
+
+					// For Test Role
+					testAccCheckMongoDBAtlasCustomDBRolesExists(testRoleResourceName),
+					resource.TestCheckResourceAttrSet(testRoleResourceName, "project_id"),
+					resource.TestCheckResourceAttrSet(testRoleResourceName, "role_name"),
+
+					resource.TestCheckResourceAttr(testRoleResourceName, "project_id", projectID),
+					resource.TestCheckResourceAttr(testRoleResourceName, "role_name", testRole.RoleName),
+					resource.TestCheckResourceAttr(testRoleResourceName, "inherited_roles.#", "1"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckMongoDBAtlasCustomDBRolesExists(resourceName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := testAccProvider.Meta().(*matlas.Client)
@@ -556,8 +687,6 @@ func testAccMongoDBAtlasCustomDBRolesConfigBasic(projectID, roleName, action, da
 }
 
 func testAccMongoDBAtlasCustomDBRolesConfigWithInheritedRoles(projectID string, inheritedRole []matlas.CustomDBRole, testRole *matlas.CustomDBRole) string {
-	log.Printf("LOG___ inheritedRole: %#+v\n", inheritedRole[1])
-
 	return fmt.Sprintf(`
 		resource "mongodbatlas_custom_db_role" "inherited_role_one" {
 		 	project_id = "%s"