Add members to org data source

docs/data-sources/organization.md

@@ -36,6 +36,7 @@ data "auth0_organization" "some-organization-by-id" {
 - `connections` (Set of Object) (see [below for nested schema](#nestedatt--connections))
 - `display_name` (String) Friendly name of this organization.
 - `id` (String) The ID of this resource.
+- `members` (Set of String) User ID(s) that are members of the organization.
 - `metadata` (Map of String) Metadata associated with the organization. Maximum of 10 metadata properties allowed.
 
 <a id="nestedatt--branding"></a>

internal/auth0/organization/data_source.go

@@ -58,6 +58,15 @@ func dataSourceSchema() map[string]*schema.Schema {
 		},
 	}
 
+	dataSourceSchema["members"] = &schema.Schema{
+		Type: schema.TypeSet,
+		Elem: &schema.Schema{
+			Type: schema.TypeString,
+		},
+		Computed:    true,
+		Description: "User ID(s) that are members of the organization.",
+	}
+
 	return dataSourceSchema
 }
 
@@ -108,21 +117,23 @@ func readOrganizationForDataSource(_ context.Context, data *schema.ResourceData,
 
 	data.SetId(foundOrganization.GetID())
 
-	result := multierror.Append(
-		data.Set("name", foundOrganization.GetName()),
-		data.Set("display_name", foundOrganization.GetDisplayName()),
-		data.Set("branding", flattenOrganizationBranding(foundOrganization.GetBranding())),
-		data.Set("metadata", foundOrganization.GetMetadata()),
-	)
-
 	foundConnections, err := fetchAllOrganizationConnections(api, foundOrganization.GetID())
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	result = multierror.Append(
-		result,
+	foundMembers, err := fetchAllOrganizationMembers(api, foundOrganization.GetID())
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	result := multierror.Append(
+		data.Set("name", foundOrganization.GetName()),
+		data.Set("display_name", foundOrganization.GetDisplayName()),
+		data.Set("branding", flattenOrganizationBranding(foundOrganization.GetBranding())),
+		data.Set("metadata", foundOrganization.GetMetadata()),
 		data.Set("connections", flattenOrganizationConnections(foundConnections)),
+		data.Set("members", foundMembers),
 	)
 
 	return diag.FromErr(result.ErrorOrNil())
@@ -150,6 +161,30 @@ func fetchAllOrganizationConnections(api *management.Management, organizationID
 	return foundConnections, nil
 }
 
+func fetchAllOrganizationMembers(api *management.Management, organizationID string) ([]string, error) {
+	foundMembers := make([]string, 0)
+	var page int
+
+	for {
+		members, err := api.Organization.Members(organizationID, management.Page(page), management.PerPage(100))
+		if err != nil {
+			return nil, err
+		}
+
+		for _, member := range members.Members {
+			foundMembers = append(foundMembers, member.GetUserID())
+		}
+
+		if !members.HasNext() {
+			break
+		}
+
+		page++
+	}
+
+	return foundMembers, nil
+}
+
 func flattenOrganizationConnections(connections []*management.OrganizationConnection) []interface{} {
 	if connections == nil {
 		return nil

internal/auth0/organization/data_source_test.go

@@ -12,7 +12,15 @@ import (
 )
 
 const testAccGivenAnOrganizationWithConnectionsAndMembers = `
+resource "auth0_user" "user" {
+	connection_name = "Username-Password-Authentication"
+	email           = "{{.testName}}@auth0.com"
+	password        = "MyPass123$"
+}
+
 resource "auth0_connection" "my_connection" {
+	depends_on = [ auth0_user.user ]
+
 	name     = "Acceptance-Test-Connection-{{.testName}}"
 	strategy = "auth0"
 }
@@ -30,6 +38,13 @@ resource "auth0_organization_connection" "my_org_conn" {
 	organization_id = auth0_organization.my_organization.id
 	connection_id   = auth0_connection.my_connection.id
 }
+
+resource "auth0_organization_member" "org_member" {
+	depends_on = [ auth0_organization_connection.my_org_conn ]
+
+	organization_id = auth0_organization.my_organization.id
+	user_id         = auth0_user.user.id
+}
 `
 
 const testAccDataSourceOrganizationConfigByName = testAccGivenAnOrganizationWithConnectionsAndMembers + `
@@ -80,6 +95,7 @@ func TestAccDataSourceOrganizationByName(t *testing.T) {
 					resource.TestCheckResourceAttr("data.auth0_organization.test", "name", fmt.Sprintf("test-%s", testName)),
 					resource.TestCheckResourceAttr("data.auth0_organization.test", "connections.#", "1"),
 					resource.TestCheckResourceAttrSet("data.auth0_organization.test", "connections.0.connection_id"),
+					resource.TestCheckResourceAttr("data.auth0_organization.test", "members.#", "1"),
 				),
 			},
 		},
@@ -110,6 +126,7 @@ func TestAccDataSourceOrganizationByID(t *testing.T) {
 					resource.TestCheckResourceAttr("data.auth0_organization.test", "name", fmt.Sprintf("test-%s", testName)),
 					resource.TestCheckResourceAttr("data.auth0_organization.test", "connections.#", "1"),
 					resource.TestCheckResourceAttrSet("data.auth0_organization.test", "connections.0.connection_id"),
+					resource.TestCheckResourceAttr("data.auth0_organization.test", "members.#", "1"),
 				),
 			},
 		},

internal/auth0/organization/resource_members_test.go

@@ -67,6 +67,12 @@ resource "auth0_organization_members" "my_members" {
 	organization_id = auth0_organization.my_org.id
 	members         = [ auth0_user.user_1.id ]
 }
+
+data "auth0_organization" "my_org_data" {
+	depends_on = [ auth0_organization_members.my_members ]
+
+	organization_id = auth0_organization.my_org.id
+}
 `
 
 const testAccOrganizationMembersWithTwoMembers = `
@@ -97,6 +103,12 @@ resource "auth0_organization_members" "my_members" {
 	organization_id = auth0_organization.my_org.id
 	members         = [ auth0_user.user_1.id, auth0_user.user_2.id ]
 }
+
+data "auth0_organization" "my_org_data" {
+	depends_on = [ auth0_organization_members.my_members ]
+
+	organization_id = auth0_organization.my_org.id
+}
 `
 
 const testAccOrganizationMembersRemoveOneMember = `
@@ -119,6 +131,12 @@ resource "auth0_organization_members" "my_members" {
 	organization_id = auth0_organization.my_org.id
 	members         = [ auth0_user.user_2.id ]
 }
+
+data "auth0_organization" "my_org_data" {
+	depends_on = [ auth0_organization_members.my_members ]
+
+	organization_id = auth0_organization.my_org.id
+}
 `
 
 const testAccOrganizationMembersRemoveAllMembers = `
@@ -133,6 +151,25 @@ resource "auth0_organization_members" "my_members" {
 	organization_id = auth0_organization.my_org.id
 	members         = []
 }
+
+data "auth0_organization" "my_org_data" {
+	depends_on = [ auth0_organization_members.my_members ]
+
+	organization_id = auth0_organization.my_org.id
+}
+`
+
+const testAccOrganizationMembersDeleteResource = `
+resource "auth0_organization" "my_org" {
+	name         = "some-org-{{.testName}}"
+	display_name = "{{.testName}}"
+}
+
+data "auth0_organization" "my_org_data" {
+	depends_on = [ auth0_organization.my_org ]
+
+	organization_id = auth0_organization.my_org.id
+}
 `
 
 func TestAccOrganizationMembers(t *testing.T) {
@@ -148,24 +185,37 @@ func TestAccOrganizationMembers(t *testing.T) {
 				Config: acctest.ParseTestName(testAccOrganizationMembersWithOneMember, testName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_organization_members.my_members", "members.#", "1"),
+					resource.TestCheckResourceAttr("data.auth0_organization.my_org_data", "members.#", "1"),
 				),
 			},
 			{
 				Config: acctest.ParseTestName(testAccOrganizationMembersWithTwoMembers, testName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_organization_members.my_members", "members.#", "2"),
+					resource.TestCheckResourceAttr("data.auth0_organization.my_org_data", "members.#", "2"),
 				),
 			},
 			{
 				Config: acctest.ParseTestName(testAccOrganizationMembersRemoveOneMember, testName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_organization_members.my_members", "members.#", "1"),
+					resource.TestCheckResourceAttr("data.auth0_organization.my_org_data", "members.#", "1"),
 				),
 			},
 			{
 				Config: acctest.ParseTestName(testAccOrganizationMembersRemoveAllMembers, testName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_organization_members.my_members", "members.#", "0"),
+					resource.TestCheckResourceAttr("data.auth0_organization.my_org_data", "members.#", "0"),
+				),
+			},
+			{
+				Config: acctest.ParseTestName(testAccOrganizationMembersDeleteResource, testName),
+			},
+			{
+				RefreshState: true,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("data.auth0_organization.my_org_data", "members.#", "0"),
 				),
 			},
 		},