From 2de5c8d5c9fe37345588db0545f5d4fb626fd3a9 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Fri, 2 Jun 2017 17:09:56 -0500 Subject: [PATCH 1/2] provider/datadog: make datadog_user verified a computed attribute It's read-only and generates supurious diffs for verified users. --- builtin/providers/datadog/resource_datadog_user.go | 7 ++++--- builtin/providers/datadog/resource_datadog_user_test.go | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/builtin/providers/datadog/resource_datadog_user.go b/builtin/providers/datadog/resource_datadog_user.go index 17c80ef3e1fb..102907817a49 100644 --- a/builtin/providers/datadog/resource_datadog_user.go +++ b/builtin/providers/datadog/resource_datadog_user.go @@ -5,6 +5,7 @@ import ( "log" "strings" + "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/helper/schema" "gopkg.in/zorkian/go-datadog-api.v2" ) @@ -49,7 +50,7 @@ func resourceDatadogUser() *schema.Resource { }, "verified": { Type: schema.TypeBool, - Optional: true, + Computed: true, }, }, } @@ -96,7 +97,7 @@ func resourceDatadogUserCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(u.GetHandle()) - return nil + return resourceDatadogUserRead(d, meta) } func resourceDatadogUserRead(d *schema.ResourceData, meta interface{}) error { @@ -107,7 +108,7 @@ func resourceDatadogUserRead(d *schema.ResourceData, meta interface{}) error { return err } - log.Printf("[DEBUG] user: %v", u) + log.Printf("[DEBUG] user: %s", spew.Sdump(u)) d.Set("disabled", u.GetDisabled()) d.Set("email", u.GetEmail()) d.Set("handle", u.GetHandle()) diff --git a/builtin/providers/datadog/resource_datadog_user_test.go b/builtin/providers/datadog/resource_datadog_user_test.go index 22f77ce09485..cdda12721ff0 100644 --- a/builtin/providers/datadog/resource_datadog_user_test.go +++ b/builtin/providers/datadog/resource_datadog_user_test.go @@ -26,6 +26,8 @@ func TestAccDatadogUser_Updated(t *testing.T) { "datadog_user.foo", "handle", "test@example.com"), resource.TestCheckResourceAttr( "datadog_user.foo", "name", "Test User"), + resource.TestCheckResourceAttr( + "datadog_user.foo", "verified", "false"), ), }, resource.TestStep{ @@ -42,6 +44,8 @@ func TestAccDatadogUser_Updated(t *testing.T) { "datadog_user.foo", "is_admin", "true"), resource.TestCheckResourceAttr( "datadog_user.foo", "name", "Updated User"), + resource.TestCheckResourceAttr( + "datadog_user.foo", "verified", "false"), ), }, }, From 8c07718eefb80c11231ee8b5e4e8d2860de2437f Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Mon, 5 Jun 2017 11:51:04 +0300 Subject: [PATCH 2/2] Update resource_datadog_user.go --- builtin/providers/datadog/resource_datadog_user.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin/providers/datadog/resource_datadog_user.go b/builtin/providers/datadog/resource_datadog_user.go index 102907817a49..e48be1a2f233 100644 --- a/builtin/providers/datadog/resource_datadog_user.go +++ b/builtin/providers/datadog/resource_datadog_user.go @@ -5,7 +5,6 @@ import ( "log" "strings" - "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/helper/schema" "gopkg.in/zorkian/go-datadog-api.v2" ) @@ -108,7 +107,6 @@ func resourceDatadogUserRead(d *schema.ResourceData, meta interface{}) error { return err } - log.Printf("[DEBUG] user: %s", spew.Sdump(u)) d.Set("disabled", u.GetDisabled()) d.Set("email", u.GetEmail()) d.Set("handle", u.GetHandle())