Accepts ints and strings for Screenboard size.

Besides integer sizes in pixel (e.g. 768) the API can also return percentages
(e.g. "100%").

Fixes zorkian#192

Author: mrwonko

datadog-accessors.go

@@ -6400,18 +6400,18 @@ func (r *Rule) SetTimeframe(v string) {
 }
 
 // GetHeight returns the Height field if non-nil, zero value otherwise.
-func (s *Screenboard) GetHeight() int {
+func (s *Screenboard) GetHeight() StrIntD {
 	if s == nil || s.Height == nil {
-		return 0
+		return ""
 	}
 	return *s.Height
 }
 
 // GetHeightOk returns a tuple with the Height field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (s *Screenboard) GetHeightOk() (int, bool) {
+func (s *Screenboard) GetHeightOk() (StrIntD, bool) {
 	if s == nil || s.Height == nil {
-		return 0, false
+		return "", false
 	}
 	return *s.Height, true
 }
@@ -6426,7 +6426,7 @@ func (s *Screenboard) HasHeight() bool {
 }
 
 // SetHeight allocates a new s.Height and returns the pointer to it.
-func (s *Screenboard) SetHeight(v int) {
+func (s *Screenboard) SetHeight(v StrIntD) {
 	s.Height = &v
 }
 
@@ -6555,18 +6555,18 @@ func (s *Screenboard) SetTitle(v string) {
 }
 
 // GetWidth returns the Width field if non-nil, zero value otherwise.
-func (s *Screenboard) GetWidth() int {
+func (s *Screenboard) GetWidth() StrIntD {
 	if s == nil || s.Width == nil {
-		return 0
+		return ""
 	}
 	return *s.Width
 }
 
 // GetWidthOk returns a tuple with the Width field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (s *Screenboard) GetWidthOk() (int, bool) {
+func (s *Screenboard) GetWidthOk() (StrIntD, bool) {
 	if s == nil || s.Width == nil {
-		return 0, false
+		return "", false
 	}
 	return *s.Width, true
 }
@@ -6581,7 +6581,7 @@ func (s *Screenboard) HasWidth() bool {
 }
 
 // SetWidth allocates a new s.Width and returns the pointer to it.
-func (s *Screenboard) SetWidth(v int) {
+func (s *Screenboard) SetWidth(v StrIntD) {
 	s.Width = &v
 }
 

integration/screenboards_test.go

@@ -3,7 +3,7 @@ package integration
 import (
 	"testing"
 
-	"github.com/zorkian/go-datadog-api"
+	datadog "github.com/zorkian/go-datadog-api"
 )
 
 func TestScreenboardCreateAndDelete(t *testing.T) {
@@ -93,8 +93,8 @@ func TestScreenboardGet(t *testing.T) {
 func getTestScreenboard() *datadog.Screenboard {
 	return &datadog.Screenboard{
 		Title:   datadog.String("___Test-Board___"),
-		Height:  datadog.Int(600),
-		Width:   datadog.Int(800),
+		Height:  datadog.StrInt("600"),
+		Width:   datadog.StrInt("800"),
 		Widgets: []datadog.Widget{},
 	}
 }
@@ -129,10 +129,10 @@ func assertScreenboardEquals(t *testing.T, actual, expected *datadog.Screenboard
 		t.Errorf("Screenboard title does not match: %s != %s", *actual.Title, *expected.Title)
 	}
 	if *actual.Width != *expected.Width {
-		t.Errorf("Screenboard width does not match: %d != %d", *actual.Width, *expected.Width)
+		t.Errorf("Screenboard width does not match: %s != %s", *actual.Width, *expected.Width)
 	}
 	if *actual.Height != *expected.Height {
-		t.Errorf("Screenboard width does not match: %d != %d", *actual.Height, *expected.Height)
+		t.Errorf("Screenboard width does not match: %s != %s", *actual.Height, *expected.Height)
 	}
 	if len(actual.Widgets) != len(expected.Widgets) {
 		t.Errorf("Number of Screenboard widgets does not match: %d != %d", len(actual.Widgets), len(expected.Widgets))

screenboards.go

@@ -17,8 +17,8 @@ import (
 type Screenboard struct {
 	Id                *int               `json:"id,omitempty"`
 	Title             *string            `json:"board_title,omitempty"`
-	Height            *int               `json:"height,omitempty"`
-	Width             *int               `json:"width,omitempty"`
+	Height            *StrIntD           `json:"height,omitempty"`
+	Width             *StrIntD           `json:"width,omitempty"`
 	Shared            *bool              `json:"shared,omitempty"`
 	TemplateVariables []TemplateVariable `json:"template_variables,omitempty"`
 	Widgets           []Widget           `json:"widgets"`

screenboards_test.go

@@ -12,60 +12,81 @@ import (
 )
 
 func TestGetScreenboard(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response, err := ioutil.ReadFile("./testdata/fixtures/screenboard_response.json")
-		if err != nil {
-			// mustn't call t.Fatal from a different Goroutine
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		w.Write(response)
-	}))
-	defer ts.Close()
-
-	datadogClient := Client{
-		baseUrl:      ts.URL,
-		HttpClient:   ts.Client(),
-		RetryTimeout: 5 * time.Second,
-	}
-
-	got, err := datadogClient.GetScreenboard(6334)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	want := &Screenboard{
-		Id:       Int(6334),
-		Title:    String("dogapi test"),
-		Height:   Int(768),
-		Width:    Int(1024),
-		ReadOnly: Bool(false),
-		Widgets: []Widget{
-			{
-				Type:   String("image"),
-				Height: Int(20),
-				Width:  Int(32),
-				X:      Int(32),
-				Y:      Int(7),
-				URL:    String("http://path/to/image.jpg"),
-			},
-			{
-				Type: String("timeseries"),
-				TileDef: &TileDef{
-					Precision: StrInt("42"),
+	tests := []struct {
+		file string
+		want *Screenboard
+	}{
+		{
+			file: "screenboard_response",
+			want: &Screenboard{
+				Id:       Int(6334),
+				Title:    String("dogapi test"),
+				Height:   StrInt("768"),
+				Width:    StrInt("1024"),
+				ReadOnly: Bool(false),
+				Widgets: []Widget{
+					{
+						Type:   String("image"),
+						Height: Int(20),
+						Width:  Int(32),
+						X:      Int(32),
+						Y:      Int(7),
+						URL:    String("http://path/to/image.jpg"),
+					},
+					{
+						Type: String("timeseries"),
+						TileDef: &TileDef{
+							Precision: StrInt("42"),
+						},
+					},
+					{
+						Type: String("timeseries"),
+						TileDef: &TileDef{
+							Precision: StrInt("*"),
+						},
+					},
 				},
 			},
-			{
-				Type: String("timeseries"),
-				TileDef: &TileDef{
-					Precision: StrInt("*"),
-				},
+		},
+		{
+			file: "screenboard_response_fullscreen",
+			want: &Screenboard{
+				Id:       Int(6335),
+				Title:    String("dogapi fullscreen test"),
+				Height:   StrInt("100%"),
+				Width:    StrInt("100%"),
+				ReadOnly: Bool(false),
 			},
 		},
 	}
+	for _, tt := range tests {
+		t.Run(tt.file, func(t *testing.T) {
+			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				response, err := ioutil.ReadFile("./testdata/fixtures/" + tt.file + ".json")
+				if err != nil {
+					// mustn't call t.Fatal from a different Goroutine
+					http.Error(w, err.Error(), http.StatusInternalServerError)
+					return
+				}
+				w.Write(response)
+			}))
+			defer ts.Close()
+
+			datadogClient := Client{
+				baseUrl:      ts.URL,
+				HttpClient:   ts.Client(),
+				RetryTimeout: 5 * time.Second,
+			}
+
+			got, err := datadogClient.GetScreenboard(6334)
+			if err != nil {
+				t.Fatal(err)
+			}
 
-	if !reflect.DeepEqual(got, want) {
-		// Go formatting doesn't handle pointers gracefully, so we're spewing
-		t.Errorf("got:\n%s\nwant:\n%s", spew.Sdump(got), spew.Sdump(want))
+			if !reflect.DeepEqual(got, tt.want) {
+				// Go formatting doesn't handle pointers gracefully, so we're spewing
+				t.Errorf("got:\n%s\nwant:\n%s", spew.Sdump(got), spew.Sdump(tt.want))
+			}
+		})
 	}
 }

testdata/fixtures/screenboard_response_fullscreen.json

@@ -0,0 +1,9 @@
+{
+  "board_title": "dogapi fullscreen test",
+  "id": 6335,
+  "height": "100%",
+  "width": "100%",
+  "created": "2019-03-01T13:37:00.420042+01:00",
+  "modified": "2019-03-01T15:25:26.726234+01:00",
+  "read_only": false
+}