provider/datadog: Upgrade to Datadog API v2 (#12098)

* provider/datadog: Pulls v2 and removes v1 of library go-datadog-api.

    See zorkian/go-datadog-api#56 for context.

    * Fixes bug in backoff implementation that decreased performance significantly.
    * Uses pointers for field types, providing support of distinguishing
        between if a value is set, or the default value for that type is
        effective.

* provider/datadog: Convert provider to use v2 of go-datadog-api.

* provider/datadog: Update vendored library.

* provider/datadog: Update dashboard resource to reflect API updates.

Author: ojongerius

builtin/providers/datadog/config.go

@@ -3,7 +3,7 @@ package datadog
 import (
 	"log"
 
-	"github.com/zorkian/go-datadog-api"
+	"gopkg.in/zorkian/go-datadog-api.v2"
 )
 
 // Config holds API and APP keys to authenticate to Datadog.

builtin/providers/datadog/resource_datadog_monitor.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/zorkian/go-datadog-api"
+	"gopkg.in/zorkian/go-datadog-api.v2"
 )
 
 func resourceDatadogMonitor() *schema.Resource {
@@ -137,17 +137,18 @@ func buildMonitorStruct(d *schema.ResourceData) *datadog.Monitor {
 	var thresholds datadog.ThresholdCount
 
 	if r, ok := d.GetOk("thresholds.ok"); ok {
-		thresholds.Ok = json.Number(r.(string))
+		thresholds.SetOk(json.Number(r.(string)))
 	}
 	if r, ok := d.GetOk("thresholds.warning"); ok {
-		thresholds.Warning = json.Number(r.(string))
+		thresholds.SetWarning(json.Number(r.(string)))
 	}
 	if r, ok := d.GetOk("thresholds.critical"); ok {
-		thresholds.Critical = json.Number(r.(string))
+		thresholds.SetCritical(json.Number(r.(string)))
 	}
 
 	o := datadog.Options{
-		Thresholds: thresholds,
+		Thresholds:   &thresholds,
+		NotifyNoData: datadog.Bool(d.Get("notify_no_data").(bool)),
 	}
 	if attr, ok := d.GetOk("silenced"); ok {
 		s := make(map[string]int)
@@ -158,42 +159,42 @@ func buildMonitorStruct(d *schema.ResourceData) *datadog.Monitor {
 		o.Silenced = s
 	}
 	if attr, ok := d.GetOk("notify_no_data"); ok {
-		o.NotifyNoData = attr.(bool)
+		o.SetNotifyNoData(attr.(bool))
 	}
 	if attr, ok := d.GetOk("new_host_delay"); ok {
-		o.NewHostDelay = datadog.Int(attr.(int))
+		o.SetNewHostDelay(attr.(int))
 	}
 	if attr, ok := d.GetOk("no_data_timeframe"); ok {
 		o.NoDataTimeframe = datadog.NoDataTimeframe(attr.(int))
 	}
 	if attr, ok := d.GetOk("renotify_interval"); ok {
-		o.RenotifyInterval = attr.(int)
+		o.SetRenotifyInterval(attr.(int))
 	}
 	if attr, ok := d.GetOk("notify_audit"); ok {
-		o.NotifyAudit = attr.(bool)
+		o.SetNotifyAudit(attr.(bool))
 	}
 	if attr, ok := d.GetOk("timeout_h"); ok {
-		o.TimeoutH = attr.(int)
+		o.SetTimeoutH(attr.(int))
 	}
 	if attr, ok := d.GetOk("escalation_message"); ok {
-		o.EscalationMessage = attr.(string)
+		o.SetEscalationMessage(attr.(string))
 	}
 	if attr, ok := d.GetOk("include_tags"); ok {
-		o.IncludeTags = attr.(bool)
+		o.SetIncludeTags(attr.(bool))
 	}
 	if attr, ok := d.GetOk("require_full_window"); ok {
-		o.RequireFullWindow = attr.(bool)
+		o.SetRequireFullWindow(attr.(bool))
 	}
 	if attr, ok := d.GetOk("locked"); ok {
-		o.Locked = attr.(bool)
+		o.SetLocked(attr.(bool))
 	}
 
 	m := datadog.Monitor{
-		Type:    d.Get("type").(string),
-		Query:   d.Get("query").(string),
-		Name:    d.Get("name").(string),
-		Message: d.Get("message").(string),
-		Options: o,
+		Type:    datadog.String(d.Get("type").(string)),
+		Query:   datadog.String(d.Get("query").(string)),
+		Name:    datadog.String(d.Get("name").(string)),
+		Message: datadog.String(d.Get("message").(string)),
+		Options: &o,
 	}
 
 	if attr, ok := d.GetOk("tags"); ok {
@@ -237,7 +238,7 @@ func resourceDatadogMonitorCreate(d *schema.ResourceData, meta interface{}) erro
 		return fmt.Errorf("error updating monitor: %s", err.Error())
 	}
 
-	d.SetId(strconv.Itoa(m.Id))
+	d.SetId(strconv.Itoa(m.GetId()))
 
 	return nil
 }
@@ -257,9 +258,9 @@ func resourceDatadogMonitorRead(d *schema.ResourceData, meta interface{}) error
 
 	thresholds := make(map[string]string)
 	for k, v := range map[string]json.Number{
-		"ok":       m.Options.Thresholds.Ok,
-		"warning":  m.Options.Thresholds.Warning,
-		"critical": m.Options.Thresholds.Critical,
+		"ok":       m.Options.Thresholds.GetOk(),
+		"warning":  m.Options.Thresholds.GetWarning(),
+		"critical": m.Options.Thresholds.GetCritical(),
 	} {
 		s := v.String()
 		if s != "" {
@@ -273,24 +274,24 @@ func resourceDatadogMonitorRead(d *schema.ResourceData, meta interface{}) error
 	}
 
 	log.Printf("[DEBUG] monitor: %v", m)
-	d.Set("name", m.Name)
-	d.Set("message", m.Message)
-	d.Set("query", m.Query)
-	d.Set("type", m.Type)
+	d.Set("name", m.GetName())
+	d.Set("message", m.GetMessage())
+	d.Set("query", m.GetQuery())
+	d.Set("type", m.GetType())
 	d.Set("thresholds", thresholds)
 
-	d.Set("new_host_delay", m.Options.NewHostDelay)
-	d.Set("notify_no_data", m.Options.NotifyNoData)
+	d.Set("new_host_delay", m.Options.GetNewHostDelay())
+	d.Set("notify_no_data", m.Options.GetNotifyNoData())
 	d.Set("no_data_timeframe", m.Options.NoDataTimeframe)
-	d.Set("renotify_interval", m.Options.RenotifyInterval)
-	d.Set("notify_audit", m.Options.NotifyAudit)
-	d.Set("timeout_h", m.Options.TimeoutH)
-	d.Set("escalation_message", m.Options.EscalationMessage)
+	d.Set("renotify_interval", m.Options.GetRenotifyInterval())
+	d.Set("notify_audit", m.Options.GetNotifyAudit())
+	d.Set("timeout_h", m.Options.GetTimeoutH())
+	d.Set("escalation_message", m.Options.GetEscalationMessage())
 	d.Set("silenced", m.Options.Silenced)
-	d.Set("include_tags", m.Options.IncludeTags)
+	d.Set("include_tags", m.Options.GetIncludeTags())
 	d.Set("tags", tags)
-	d.Set("require_full_window", m.Options.RequireFullWindow)
-	d.Set("locked", m.Options.Locked)
+	d.Set("require_full_window", m.Options.GetRequireFullWindow()) // TODO Is this one of those options that we neeed to check?
+	d.Set("locked", m.Options.GetLocked())
 
 	return nil
 }
@@ -305,15 +306,15 @@ func resourceDatadogMonitorUpdate(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
-	m.Id = i
+	m.Id = datadog.Int(i)
 	if attr, ok := d.GetOk("name"); ok {
-		m.Name = attr.(string)
+		m.SetName(attr.(string))
 	}
 	if attr, ok := d.GetOk("message"); ok {
-		m.Message = attr.(string)
+		m.SetMessage(attr.(string))
 	}
 	if attr, ok := d.GetOk("query"); ok {
-		m.Query = attr.(string)
+		m.SetQuery(attr.(string))
 	}
 
 	if attr, ok := d.GetOk("tags"); ok {
@@ -324,40 +325,43 @@ func resourceDatadogMonitorUpdate(d *schema.ResourceData, meta interface{}) erro
 		m.Tags = s
 	}
 
-	o := datadog.Options{}
+	o := datadog.Options{
+		NotifyNoData: datadog.Bool(d.Get("notify_no_data").(bool)),
+	}
 	if attr, ok := d.GetOk("thresholds"); ok {
 		thresholds := attr.(map[string]interface{})
+		o.Thresholds = &datadog.ThresholdCount{} // TODO: This is a little annoying..
 		if thresholds["ok"] != nil {
-			o.Thresholds.Ok = json.Number(thresholds["ok"].(string))
+			o.Thresholds.SetOk(json.Number(thresholds["ok"].(string)))
 		}
 		if thresholds["warning"] != nil {
-			o.Thresholds.Warning = json.Number(thresholds["warning"].(string))
+			o.Thresholds.SetWarning(json.Number(thresholds["warning"].(string)))
 		}
 		if thresholds["critical"] != nil {
-			o.Thresholds.Critical = json.Number(thresholds["critical"].(string))
+			o.Thresholds.SetCritical(json.Number(thresholds["critical"].(string)))
 		}
 	}
 
 	if attr, ok := d.GetOk("notify_no_data"); ok {
-		o.NotifyNoData = attr.(bool)
+		o.SetNotifyNoData(attr.(bool))
 	}
 	if attr, ok := d.GetOk("new_host_delay"); ok {
-		o.NewHostDelay = datadog.Int(attr.(int))
+		o.SetNewHostDelay(attr.(int))
 	}
 	if attr, ok := d.GetOk("no_data_timeframe"); ok {
 		o.NoDataTimeframe = datadog.NoDataTimeframe(attr.(int))
 	}
 	if attr, ok := d.GetOk("renotify_interval"); ok {
-		o.RenotifyInterval = attr.(int)
+		o.SetRenotifyInterval(attr.(int))
 	}
 	if attr, ok := d.GetOk("notify_audit"); ok {
-		o.NotifyAudit = attr.(bool)
+		o.SetNotifyAudit(attr.(bool))
 	}
 	if attr, ok := d.GetOk("timeout_h"); ok {
-		o.TimeoutH = attr.(int)
+		o.SetTimeoutH(attr.(int))
 	}
 	if attr, ok := d.GetOk("escalation_message"); ok {
-		o.EscalationMessage = attr.(string)
+		o.SetEscalationMessage(attr.(string))
 	}
 	if attr, ok := d.GetOk("silenced"); ok {
 		// TODO: this is not very defensive, test if we can fail non int input
@@ -368,16 +372,16 @@ func resourceDatadogMonitorUpdate(d *schema.ResourceData, meta interface{}) erro
 		o.Silenced = s
 	}
 	if attr, ok := d.GetOk("include_tags"); ok {
-		o.IncludeTags = attr.(bool)
+		o.SetIncludeTags(attr.(bool))
 	}
 	if attr, ok := d.GetOk("require_full_window"); ok {
-		o.RequireFullWindow = attr.(bool)
+		o.SetRequireFullWindow(attr.(bool))
 	}
 	if attr, ok := d.GetOk("locked"); ok {
-		o.Locked = attr.(bool)
+		o.SetLocked(attr.(bool))
 	}
 
-	m.Options = o
+	m.Options = &o
 
 	if err = client.UpdateMonitor(m); err != nil {
 		return fmt.Errorf("error updating monitor: %s", err.Error())

builtin/providers/datadog/resource_datadog_monitor_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	"github.com/zorkian/go-datadog-api"
+	"gopkg.in/zorkian/go-datadog-api.v2"
 )
 
 func TestAccDatadogMonitor_Basic(t *testing.T) {