Merge pull request #12 from Ouest-France/SDKContextMigrate

Upgrade to SDK new context aware functions
Ouest-France · Mar 3, 2021 · 33b6f01 · 33b6f01
2 parents d98a675 + 33d2132
commit 33b6f01
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 21 deletions.
diff --git a/ldap/context.go b/ldap/context.go
@@ -0,0 +1,13 @@
+package ldap
+
+// CallerTypeKeyType represents an CallerType context key type
+type CallerTypeKeyType string
+
+// DatasourceCallerValueType represents an DatasourceCaller context key type
+type DatasourceCallerValueType bool
+
+// CallerTypeKey represents an CallerTypeKey context key
+const CallerTypeKey CallerTypeKeyType = "callerType"
+
+// DatasourceCaller represents an DatasourceCallerKeyValue context value
+const DatasourceCaller DatasourceCallerValueType = true
diff --git a/ldap/data_source_resource_ldap_group.go b/ldap/data_source_resource_ldap_group.go
@@ -1,14 +1,16 @@
 package ldap
 
 import (
+	"context"
 	"fmt"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceLDAPGroup() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceLDAPGroupRead,
+		ReadContext: dataSourceLDAPGroupRead,
 
 		Schema: map[string]*schema.Schema{
 			"ou": &schema.Schema{
@@ -34,10 +36,11 @@ func dataSourceLDAPGroup() *schema.Resource {
 	}
 }
 
-func dataSourceLDAPGroupRead(d *schema.ResourceData, m interface{}) error {
+func dataSourceLDAPGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	dn := fmt.Sprintf("CN=%s,%s", d.Get("name").(string), d.Get("ou").(string))
 
 	d.SetId(dn)
 
-	return resourceLDAPGroupRead(d, m)
+	// Add context key to signal the Read is called from a datasource
+	return resourceLDAPGroupRead(context.WithValue(ctx, CallerTypeKey, DatasourceCaller), d, m)
 }
diff --git a/ldap/resource_ldap_group.go b/ldap/resource_ldap_group.go
@@ -1,20 +1,22 @@
 package ldap
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	"github.com/Ouest-France/goldap"
 	"github.com/go-ldap/ldap/v3"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceLDAPGroup() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceLDAPGroupCreate,
-		Read:   resourceLDAPGroupRead,
-		Update: resourceLDAPGroupUpdate,
-		Delete: resourceLDAPGroupDelete,
+		CreateContext: resourceLDAPGroupCreate,
+		ReadContext:   resourceLDAPGroupRead,
+		UpdateContext: resourceLDAPGroupUpdate,
+		DeleteContext: resourceLDAPGroupDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -46,7 +48,7 @@ func resourceLDAPGroup() *schema.Resource {
 	}
 }
 
-func resourceLDAPGroupCreate(d *schema.ResourceData, m interface{}) error {
+func resourceLDAPGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*goldap.Client)
 
 	dn := fmt.Sprintf("CN=%s,%s", d.Get("name").(string), d.Get("ou").(string))
@@ -59,15 +61,15 @@ func resourceLDAPGroupCreate(d *schema.ResourceData, m interface{}) error {
 
 	err := client.CreateGroup(dn, d.Get("name").(string), d.Get("description").(string), members)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	d.SetId(dn)
 
-	return resourceLDAPGroupRead(d, m)
+	return resourceLDAPGroupRead(ctx, d, m)
 }
 
-func resourceLDAPGroupRead(d *schema.ResourceData, m interface{}) error {
+func resourceLDAPGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*goldap.Client)
 
 	dn := d.Id()
@@ -76,28 +78,36 @@ func resourceLDAPGroupRead(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		if err.(*ldap.Error).ResultCode == 32 {
 			// Object doesn't exist
+
+			// If Read is called from a datasource, return an error
+			if ctx.Value(CallerTypeKey) == DatasourceCaller {
+				return diag.Errorf("LDAP group not found: %s", dn)
+			}
+
+			// If not a call from datasource, remove the resource from the state
+			// and cleanly return
 			d.SetId("")
 			return nil
 		}
-		return err
+		return diag.FromErr(err)
 	}
 
 	if err := d.Set("name", attributes["name"][0]); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	// Remove the `CN=<group-name>,` from the DN to get the OU
 	ou := strings.ReplaceAll(dn, fmt.Sprintf("CN=%s,", attributes["name"][0]), "")
 	if err := d.Set("ou", ou); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	desc := ""
 	if val, ok := attributes["description"]; ok {
 		desc = val[0]
 	}
 	if err := d.Set("description", desc); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	members := []string{}
@@ -108,26 +118,26 @@ func resourceLDAPGroupRead(d *schema.ResourceData, m interface{}) error {
 	}
 	err = d.Set("members", members)
 
-	return err
+	return diag.FromErr(err)
 }
 
-func resourceLDAPGroupUpdate(d *schema.ResourceData, m interface{}) error {
+func resourceLDAPGroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*goldap.Client)
 	dn := fmt.Sprintf("CN=%s,%s", d.Get("name").(string), d.Get("ou").(string))
 
 	if err := client.UpdateGroup(dn, d.Get("name").(string), d.Get("description").(string)); err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
-	return resourceLDAPGroupRead(d, m)
+	return resourceLDAPGroupRead(ctx, d, m)
 }
 
-func resourceLDAPGroupDelete(d *schema.ResourceData, m interface{}) error {
+func resourceLDAPGroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	client := m.(*goldap.Client)
 
 	dn := fmt.Sprintf("CN=%s,%s", d.Get("name").(string), d.Get("ou").(string))
 
 	err := client.DeleteGroup(dn)
 
-	return err
+	return diag.FromErr(err)
 }