V1.8.1 Fix flow of logic for org_id fetch to pass acceptance test (#1028)

* Fix config test TestAccConfigDSOrgID_basic

* Change flow of getting org_id

* Disable long running custom_role test

Author: martinstibbe

mongodbatlas/data_source_mongodbatlas_org_id.go

@@ -38,13 +38,13 @@ func dataSourceMongoDBAtlasOrgIDRead(ctx context.Context, d *schema.ResourceData
 		return diag.Errorf("error getting API Key's org assigned (%s): ", err)
 	}
 
-	if err := d.Set("org_id", apiKeyOrgList.APIKey.Roles[0].OrgID); err != nil {
-		return diag.Errorf(errorProjectSetting, `org_id`, root.APIKey.ID, err)
-	}
-
-	for _, role := range apiKeyOrgList.APIKey.Roles {
+	for idx, role := range apiKeyOrgList.APIKey.Roles {
 		if strings.HasPrefix(role.RoleName, "ORG_") {
-			d.SetId(apiKeyOrgList.APIKey.Roles[0].OrgID)
+			if err := d.Set("org_id", apiKeyOrgList.APIKey.Roles[idx].OrgID); err != nil {
+				return diag.Errorf(errorProjectSetting, `org_id`, root.APIKey.ID, err)
+			}
+			d.SetId(apiKeyOrgList.APIKey.Roles[idx].OrgID)
+			return nil
 		}
 	}
 

mongodbatlas/resource_mongodbatlas_custom_db_role_test.go

@@ -412,6 +412,7 @@ func TestAccConfigRSCustomDBRoles_MultipleCustomRoles(t *testing.T) {
 }
 
 func TestAccConfigRSCustomDBRoles_MultipleResources(t *testing.T) {
+	t.Skip()
 	var (
 		resourceName = "mongodbatlas_custom_db_role.test"
 		projectID    = os.Getenv("MONGODB_ATLAS_PROJECT_ID")