Update descriptions for user and group datasources. (#69)

Also rename the ID fields for group and user datasources to something more meaningful.

ad/data_source_ad_group.go

@@ -13,10 +13,10 @@ func dataSourceADGroup() *schema.Resource {
 		Description: "Get the details of an Active Directory Group object.",
 		Read:        dataSourceADGroupRead,
 		Schema: map[string]*schema.Schema{
-			"guid": {
+			"group_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "The GUID of the Group object.",
+				Description: "The group's identifier. It can be the group's GUID, SID, Distinguished Name, or SAM Account Name.",
 			},
 			"sam_account_name": {
 				Type:        schema.TypeString,
@@ -59,22 +59,23 @@ func dataSourceADGroupRead(d *schema.ResourceData, meta interface{}) error {
 	}
 	defer meta.(ProviderConf).ReleaseWinRMClient(client)
 
-	dn := d.Get("guid").(string)
+	groupID := d.Get("group_id").(string)
 
-	g, err := winrmhelper.GetGroupFromHost(client, dn)
+	g, err := winrmhelper.GetGroupFromHost(client, groupID)
 	if err != nil {
 		return err
 	}
 	if g == nil {
-		return fmt.Errorf("No group found with dn %q", dn)
+		return fmt.Errorf("No group found with group_id %q", groupID)
 	}
 	_ = d.Set("sam_account_name", g.SAMAccountName)
 	_ = d.Set("display_name", g.Name)
 	_ = d.Set("scope", g.Scope)
 	_ = d.Set("category", g.Category)
 	_ = d.Set("container", g.Container)
 	_ = d.Set("name", g.Name)
+	_ = d.Set("group_id", groupID)
 
-	d.SetId(dn)
+	d.SetId(g.GUID)
 	return nil
 }

ad/data_source_ad_group_test.go

@@ -42,7 +42,7 @@ func testAccDatasourceADGroupConfigBasic(domain, name, sam, scope, gtype string)
 	 }
 	 
 	 data "ad_group" "d" {
-		 guid = ad_group.g.id
+		 group_id = ad_group.g.id
 	 }
 `, name, sam, scope, gtype)
 }

ad/data_source_ad_user.go

@@ -13,10 +13,10 @@ func dataSourceADUser() *schema.Resource {
 		Description: "Get the details of an Active Directory user object.",
 		Read:        dataSourceADUserRead,
 		Schema: map[string]*schema.Schema{
-			"guid": {
+			"user_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "The GUID of the user object.",
+				Description: "The user's identifier. It can be the group's GUID, SID, Distinguished Name, or SAM Account Name.",
 			},
 			"sam_account_name": {
 				Type:        schema.TypeString,
@@ -38,25 +38,25 @@ func dataSourceADUser() *schema.Resource {
 }
 
 func dataSourceADUserRead(d *schema.ResourceData, meta interface{}) error {
-	dn := d.Get("guid").(string)
+	userID := d.Get("user_id").(string)
 	client, err := meta.(ProviderConf).AcquireWinRMClient()
 	if err != nil {
 		return err
 	}
 	defer meta.(ProviderConf).ReleaseWinRMClient(client)
 
-	u, err := winrmhelper.GetUserFromHost(client, dn)
+	u, err := winrmhelper.GetUserFromHost(client, userID)
 	if err != nil {
 		return err
 	}
 
 	if u == nil {
-		return fmt.Errorf("No user found with dn %q", dn)
+		return fmt.Errorf("No user found with user_id %q", userID)
 	}
 	_ = d.Set("sam_account_name", u.SAMAccountName)
 	_ = d.Set("display_name", u.DisplayName)
 	_ = d.Set("principal_name", u.PrincipalName)
-	_ = d.Set("guid", u.GUID)
+	_ = d.Set("user_id", userID)
 	d.SetId(u.GUID)
 
 	return nil

ad/data_source_ad_user_test.go

@@ -40,7 +40,7 @@ func testAccDataSourceADUserBasic(domain, username, password string) string {
 	}
 	 
 	 data "ad_user" "d" {
-		 guid = ad_user.a.id
+		 user_id = ad_user.a.id
 	 }
 `, principalName, password, username)
 }

docs/data-sources/group.md

@@ -25,7 +25,7 @@ output "groupname" {
 
 ### Required
 
-- **guid** (String, Required) The GUID of the Group object.
+- **group_id** (String, Required) The group's identifier. It can be the group's GUID, SID, Distinguished Name, or SAM Account Name.
 
 ### Optional
 

docs/data-sources/user.md

@@ -25,7 +25,7 @@ output "username" {
 
 ### Required
 
-- **guid** (String, Required) The GUID of the user object.
+- **user_id** (String, Required) The user's identifier. It can be the group's GUID, SID, Distinguished Name, or SAM Account Name.
 
 ### Optional