improve handling of nil values from terraform by checking for HasChanged

alexkappa · Sep 17, 2018 · 317c001 · 317c001
1 parent a3fe2dd
commit 317c001
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/auth0/resource_auth0_client.go b/auth0/resource_auth0_client.go
@@ -154,6 +154,7 @@ func newClient() *schema.Resource {
 			"token_endpoint_auth_method": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					"none",
 					"client_secret_post",

diff --git a/auth0/util.go b/auth0/util.go
@@ -6,9 +6,11 @@ import (
 )
 
 func String(d *schema.ResourceData, key string) (s *string) {
-	v, ok := d.GetOkExists(key)
-	if ok {
-		s = auth0.String(v.(string))
+	if d.HasChange(key) {
+		v, ok := d.GetOkExists(key)
+		if ok {
+			s = auth0.String(v.(string))
+		}
 	}
 	return
 }
@@ -22,9 +24,11 @@ func MapString(m map[string]interface{}, key string) (s *string) {
 }
 
 func Int(d *schema.ResourceData, key string) (i *int) {
-	v, ok := d.GetOkExists(key)
-	if ok {
-		i = auth0.Int(v.(int))
+	if d.HasChange(key) {
+		v, ok := d.GetOkExists(key)
+		if ok {
+			i = auth0.Int(v.(int))
+		}
 	}
 	return
 }
@@ -38,9 +42,11 @@ func MapInt(m map[string]interface{}, key string) (i *int) {
 }
 
 func Bool(d *schema.ResourceData, key string) (b *bool) {
-	v, ok := d.GetOkExists(key)
-	if ok {
-		b = auth0.Bool(v.(bool))
+	if d.HasChange(key) {
+		v, ok := d.GetOkExists(key)
+		if ok {
+			b = auth0.Bool(v.(bool))
+		}
 	}
 	return
 }
@@ -54,17 +60,21 @@ func MapBool(m map[string]interface{}, key string) (b *bool) {
 }
 
 func Slice(d *schema.ResourceData, key string) (s []interface{}) {
-	v, ok := d.GetOkExists(key)
-	if ok {
-		s = v.([]interface{})
+	if d.HasChange(key) {
+		v, ok := d.GetOkExists(key)
+		if ok {
+			s = v.([]interface{})
+		}
 	}
 	return
 }
 
 func Map(d *schema.ResourceData, key string) (m map[string]interface{}) {
-	v, ok := d.GetOkExists(key)
-	if ok {
-		m = v.(map[string]interface{})
+	if d.HasChange(key) {
+		v, ok := d.GetOkExists(key)
+		if ok {
+			m = v.(map[string]interface{})
+		}
 	}
 	return
 }
diff --git a/example/client/main.tf b/example/client/main.tf
@@ -5,7 +5,7 @@ resource "auth0_client" "my_app_client" {
   description     = "Example Application Loooooong Description"
   app_type        = "non_interactive"
   is_first_party  = true
-  oidc_conformant = true
+  oidc_conformant = false
   callbacks       = ["https://example.com/callback"]
   allowed_origins = ["https://example.com"]
   web_origins     = ["https://example.com"]