Allow floating point Widget positions

They happen.

Author: mrwonko

cmd/tools/gen-accessors.go

@@ -177,6 +177,8 @@ func (t *templateData) addIdent(x *ast.Ident, receiverType, fieldName string) {
 	switch x.String() {
 	case "int":
 		zeroValue = "0"
+	case "float32":
+		zeroValue = "0"
 	case "string":
 		zeroValue = `""`
 	case "bool":

datadog-accessors.go

@@ -10833,7 +10833,7 @@ func (w *Widget) SetWidth(v int) {
 }
 
 // GetX returns the X field if non-nil, zero value otherwise.
-func (w *Widget) GetX() int {
+func (w *Widget) GetX() float32 {
 	if w == nil || w.X == nil {
 		return 0
 	}
@@ -10842,7 +10842,7 @@ func (w *Widget) GetX() int {
 
 // GetXOk returns a tuple with the X field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (w *Widget) GetXOk() (int, bool) {
+func (w *Widget) GetXOk() (float32, bool) {
 	if w == nil || w.X == nil {
 		return 0, false
 	}
@@ -10859,12 +10859,12 @@ func (w *Widget) HasX() bool {
 }
 
 // SetX allocates a new w.X and returns the pointer to it.
-func (w *Widget) SetX(v int) {
+func (w *Widget) SetX(v float32) {
 	w.X = &v
 }
 
 // GetY returns the Y field if non-nil, zero value otherwise.
-func (w *Widget) GetY() int {
+func (w *Widget) GetY() float32 {
 	if w == nil || w.Y == nil {
 		return 0
 	}
@@ -10873,7 +10873,7 @@ func (w *Widget) GetY() int {
 
 // GetYOk returns a tuple with the Y field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (w *Widget) GetYOk() (int, bool) {
+func (w *Widget) GetYOk() (float32, bool) {
 	if w == nil || w.Y == nil {
 		return 0, false
 	}
@@ -10890,7 +10890,7 @@ func (w *Widget) HasY() bool {
 }
 
 // SetY allocates a new w.Y and returns the pointer to it.
-func (w *Widget) SetY(v int) {
+func (w *Widget) SetY(v float32) {
 	w.Y = &v
 }
 

helpers.go

@@ -28,6 +28,10 @@ func GetBool(v *bool) (bool, bool) {
 // to store v and returns a pointer to it.
 func Int(v int) *int { return &v }
 
+// Float32 is a helper routine that allocates a new float32 value
+// to store v and returns a pointer to it.
+func Float32(v float32) *float32 { return &v }
+
 // GetInt is a helper routine that returns a boolean representing
 // if a value was set, and if so, dereferences the pointer to it.
 func GetIntOk(v *int) (int, bool) {

screen_widgets.go

@@ -83,15 +83,15 @@ type Time struct {
 
 type Widget struct {
 	// Common attributes
-	Type       *string `json:"type,omitempty"`
-	Title      *bool   `json:"title,omitempty"`
-	TitleText  *string `json:"title_text,omitempty"`
-	TitleAlign *string `json:"title_align,omitempty"`
-	TitleSize  *int    `json:"title_size,omitempty"`
-	Height     *int    `json:"height,omitempty"`
-	Width      *int    `json:"width,omitempty"`
-	X          *int    `json:"x,omitempty"`
-	Y          *int    `json:"y,omitempty"`
+	Type       *string  `json:"type,omitempty"`
+	Title      *bool    `json:"title,omitempty"`
+	TitleText  *string  `json:"title_text,omitempty"`
+	TitleAlign *string  `json:"title_align,omitempty"`
+	TitleSize  *int     `json:"title_size,omitempty"`
+	Height     *int     `json:"height,omitempty"`
+	Width      *int     `json:"width,omitempty"`
+	X          *float32 `json:"x,omitempty"`
+	Y          *float32 `json:"y,omitempty"`
 
 	// For Timeseries, TopList, EventTimeline, EvenStream, AlertGraph, CheckStatus, ServiceSummary, LogStream widgets
 	Time *Time `json:"time,omitempty"`

screenboards_test.go

@@ -28,8 +28,8 @@ func TestGetScreenboard(t *testing.T) {
 						Type:   String("image"),
 						Height: Int(20),
 						Width:  Int(32),
-						X:      Int(32),
-						Y:      Int(7),
+						X:      Float32(32),
+						Y:      Float32(7),
 						URL:    String("http://path/to/image.jpg"),
 					},
 					{
@@ -158,6 +158,19 @@ func TestGetScreenboard(t *testing.T) {
 				},
 			},
 		},
+		{
+			file: "screenboard_response_widget_float_position",
+			want: &Screenboard{
+				Widgets: []Widget{
+					{
+						Type: String("free_text"),
+						Text: String("processed"),
+						X:    Float32(1),
+						Y:    Float32(70.83333333333334),
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.file, func(t *testing.T) {

testdata/fixtures/screenboard_response_widget_float_position.json

@@ -0,0 +1,10 @@
+{
+	"widgets": [
+		{
+			"text": "processed",
+			"x": 1,
+			"y": 70.83333333333334,
+			"type": "free_text"
+		}
+	]
+}