Merge pull request DataDog#121 from gphat/cory-update-dd-api-add-yaxi…

…s-bits

Bump datadog api to v2.18.0 and add support for include units and zero

CHANGELOG.md

@@ -1,4 +1,9 @@
 ## 1.6.0 (Unreleased)
+
+IMPROVEMENTS
+
+* Pull changes from go-datadog-api v2.18.0 ([#121](https://github.com/terraform-providers/terraform-provider-datadog/pull/121))
+
 ## 1.5.0 (November 06, 2018)
 
 IMPROVEMENTS:

datadog/resource_datadog_screenboard.go

@@ -956,8 +956,8 @@ func buildScreenboard(d *schema.ResourceData) (*datadog.Screenboard, error) {
 	return &datadog.Screenboard{
 		Id:                datadog.Int(id),
 		Title:             datadog.String(d.Get("title").(string)),
-		Height:            datadog.String(d.Get("height").(string)),
-		Width:             datadog.String(d.Get("width").(string)),
+		Height:            datadog.Int(d.Get("height").(int)),
+		Width:             datadog.Int(d.Get("width").(int)),
 		Shared:            datadog.Bool(d.Get("shared").(bool)),
 		ReadOnly:          datadog.Bool(d.Get("read_only").(bool)),
 		Widgets:           buildWidgets(&terraformWidgets),

datadog/resource_datadog_timeboard.go

@@ -440,6 +440,13 @@ func buildGraphs(terraformGraphs *[]interface{}) *[]datadog.Graph {
 			if v, ok := yaxis["scale"]; ok {
 				d.Definition.Yaxis.SetScale(v.(string))
 			}
+			if v, ok := t["include_zero"]; ok {
+				d.Definition.Yaxis.SetIncludeZero(v.(bool))
+			}
+
+			if v, ok := t["include_units"]; ok {
+				d.Definition.Yaxis.SetIncludeUnits(v.(bool))
+			}
 		}
 
 		if v, ok := t["autoscale"]; ok {
@@ -680,6 +687,14 @@ func buildTerraformGraph(datadogGraph datadog.Graph) map[string]interface{} {
 		yaxis["scale"] = v
 	}
 
+	if v, ok := definition.Yaxis.GetIncludeZeroOk(); ok {
+		yaxis["include_zero"] = strconv.FormatBool(v)
+	}
+
+	if v, ok := definition.Yaxis.GetIncludeUnitsOk(); ok {
+		yaxis["include_unis"] = strconv.FormatBool(v)
+	}
+
 	graph["yaxis"] = yaxis
 
 	if v, ok := definition.GetAutoscaleOk(); ok {

datadog/resource_datadog_timeboard_test.go

@@ -97,6 +97,8 @@ resource "datadog_timeboard" "acceptance_test" {
     yaxis {
       max = "50"
       scale = "sqrt"
+			include_zero = true
+			include_units = true
     }
   }
   graph {
@@ -184,6 +186,8 @@ func TestAccDatadogTimeboard_update(t *testing.T) {
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.0.marker.0.value", "y > 100"),
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.0.yaxis.max", "50"),
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.0.yaxis.scale", "sqrt"),
+			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.0.yaxis.include_units", "true"),
+			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.0.yaxis.include_zero", "true"),
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.1.title", "ELB Requests"),
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.1.viz", "query_value"),
 			resource.TestCheckResourceAttr("datadog_timeboard.acceptance_test", "graph.1.request.0.q", "sum:aws.elb.request_count{*}.as_count()"),