Merge pull request #88 from l-with/fix-import-issue-87

fix-import
l-with · Sep 13, 2024 · 277f617 · 277f617
2 parents b8086cc + 8861526
commit 277f617
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/ldap/resource_entry.go b/ldap/resource_entry.go
@@ -146,29 +146,18 @@ func resourceLDAPEntryImport(_ context.Context, d *schema.ResourceData, _ interf
 
 func resourceLDAPEntryRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	cl := m.(*client.Client)
-	//	return diag.Errorf("should not read")
 
-	dn := d.Get(attributeNameDn).(string)
-
-	var attributes *[]string
-	{
-		var ldapEntry client.LdapEntry
-		dataJson := d.Get(attributeNameDataJson)
-		err := json.Unmarshal([]byte(dataJson.(string)), &ldapEntry.Entry)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		attributes = client.GetAttributeNames(&ldapEntry)
-	}
-
-	ldapEntry, err := cl.ReadEntryByDN(dn, "("+dummyFilter+")", attributes)
+	id := d.Id()
+	ldapEntry, err := cl.ReadEntryByDN(id, "("+dummyFilter+")", &[]string{"*"})
 	if err != nil {
 		if err.(*ldap.Error).ResultCode == ldap.LDAPResultNoSuchObject {
 			d.SetId("")
 			return nil
 		}
 		return diag.FromErr(err)
 	}
+	dn := id
+	d.Set(attributeNameDn, dn)
 	ignoreAndBase64Encode := getIgnoreAndBase64encode(d)
 	ignoreRDNAttributes := client.GetRDNAttributes(ldapEntry, dn)
 	if ignoreRDNAttributes != nil {