Merge pull request #95 from Ouest-France/membersnames

Add members_names to ldap_group schema
Ouest-France · May 22, 2023 · 2a825ef · 2a825ef
2 parents eb53973 + c81a837
commit 2a825ef
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/docs/data-sources/group.md b/docs/data-sources/group.md
@@ -22,5 +22,6 @@ data "ldap_group" "group" {
 * `description` - Description attribute for the LDAP
 * `group_type` - Type of the group
 * `id` - The DN of the LDAP group.
-* `members` - LDAP group members.
+* `members` - LDAP DN of group members
+* `members_names` - LDAP name of group members
 * `managed_by` - ManagedBy attribute.
diff --git a/docs/resources/group.md b/docs/resources/group.md
@@ -24,6 +24,7 @@ resource "ldap_group" "group" {
 
 ## Attribute Reference
 
+* `members_names` - Names of the members
 * `id` - The DN of the LDAP group.
 
 ## Import

diff --git a/ldap/data_source_resource_ldap_group.go b/ldap/data_source_resource_ldap_group.go
@@ -42,7 +42,15 @@ func dataSourceLDAPGroup() *schema.Resource {
 				Computed:    true,
 			},
 			"members": {
-				Description: "LDAP group members.",
+				Description: "LDAP DN of group members DN",
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"members_names": {
+				Description: "LDAP group members names.",
 				Type:        schema.TypeSet,
 				Computed:    true,
 				Elem: &schema.Schema{

diff --git a/ldap/resource_ldap_group.go b/ldap/resource_ldap_group.go
@@ -3,6 +3,7 @@ package ldap
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/Ouest-France/goldap"
@@ -46,14 +47,22 @@ func resourceLDAPGroup() *schema.Resource {
 				Optional:    true,
 			},
 			"members": {
-				Description: " LDAP group members.",
+				Description: " LDAP group members DN",
 				Type:        schema.TypeSet,
 				Optional:    true,
 				Computed:    true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
+			"members_names": {
+				Description: "LDAP group members names.",
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"group_type": {
 				Description: "Type of the group",
 				Type:        schema.TypeString,
@@ -159,12 +168,25 @@ func resourceLDAPGroupRead(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	members := []string{}
+	members_names := []string{}
 	for name, values := range attributes {
 		if name == "member" && len(values) >= 1 {
 			members = append(members, values...)
+
+			for _, member := range values {
+				regName := regexp.MustCompile(`CN=(.*?),`)
+				matches := regName.FindStringSubmatch(member)
+				if len(matches) == 2 {
+					members_names = append(members_names, matches[1])
+				}
+			}
 		}
 	}
 	err = d.Set("members", members)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	err = d.Set("members_names", members_names)
 
 	return diag.FromErr(err)
 }