Accept integers for ConditionalFormat.Value

Author: mrwonko

datadog-accessors.go

@@ -851,7 +851,7 @@ func (c *ConditionalFormat) SetPalette(v string) {
 }
 
 // GetValue returns the Value field if non-nil, zero value otherwise.
-func (c *ConditionalFormat) GetValue() string {
+func (c *ConditionalFormat) GetValue() StrintD {
 	if c == nil || c.Value == nil {
 		return ""
 	}
@@ -860,7 +860,7 @@ func (c *ConditionalFormat) GetValue() string {
 
 // GetValueOk returns a tuple with the Value field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (c *ConditionalFormat) GetValueOk() (string, bool) {
+func (c *ConditionalFormat) GetValueOk() (StrintD, bool) {
 	if c == nil || c.Value == nil {
 		return "", false
 	}
@@ -877,7 +877,7 @@ func (c *ConditionalFormat) HasValue() bool {
 }
 
 // SetValue allocates a new c.Value and returns the pointer to it.
-func (c *ConditionalFormat) SetValue(v string) {
+func (c *ConditionalFormat) SetValue(v StrintD) {
 	c.Value = &v
 }
 

screen_widgets.go

@@ -56,12 +56,12 @@ type TileDefRequest struct {
 }
 
 type ConditionalFormat struct {
-	Color      *string `json:"color,omitempty"`
-	Palette    *string `json:"palette,omitempty"`
-	Comparator *string `json:"comparator,omitempty"`
-	Invert     *bool   `json:"invert,omitempty"`
-	Value      *string `json:"value,omitempty"`
-	ImageURL   *string `json:"image_url,omitempty"`
+	Color      *string  `json:"color,omitempty"`
+	Palette    *string  `json:"palette,omitempty"`
+	Comparator *string  `json:"comparator,omitempty"`
+	Invert     *bool    `json:"invert,omitempty"`
+	Value      *StrintD `json:"value,omitempty"`
+	ImageURL   *string  `json:"image_url,omitempty"`
 }
 
 type TileDefRequestStyle struct {

screenboards_test.go

@@ -75,6 +75,89 @@ func TestGetScreenboard(t *testing.T) {
 				},
 			},
 		},
+		{
+			file: "screenboard_response_conditional_format",
+			want: &Screenboard{
+				Id:    Int(334488),
+				Title: String("OrderCapture ScreenBoard"),
+				Widgets: []Widget{
+					{
+						Type: String("query_value"),
+						TileDef: &TileDef{
+							Viz: String("query_value"),
+							Requests: []TileDefRequest{
+								{
+									ConditionalFormats: []ConditionalFormat{
+										// string values in JSON
+										{
+											Palette:    String("white_on_red"),
+											Comparator: String(">"),
+											Value:      Strint("1000"),
+										},
+										{
+											Palette:    String("white_on_yellow"),
+											Comparator: String(">="),
+											Value:      Strint("200"),
+										},
+										{
+											Palette:    String("white_on_green"),
+											Comparator: String("<"),
+											Value:      Strint("200"),
+										},
+									},
+								},
+							},
+						},
+					},
+					{
+						Type: String("query_value"),
+						TileDef: &TileDef{
+							Viz: String("query_value"),
+							Requests: []TileDefRequest{
+								{
+									ConditionalFormats: []ConditionalFormat{
+										// null values in JSON
+										{
+											Palette:    String("white_on_red"),
+											Comparator: String(">"),
+											Value:      nil,
+										},
+										{
+											Palette:    String("white_on_yellow"),
+											Comparator: String(">="),
+											Value:      nil,
+										},
+										{
+											Palette:    String("white_on_green"),
+											Comparator: String("<"),
+											Value:      nil,
+										},
+									},
+								},
+							},
+						},
+					},
+					{
+						Type: String("toplist"),
+						TileDef: &TileDef{
+							Viz: String("toplist"),
+							Requests: []TileDefRequest{
+								{
+									ConditionalFormats: []ConditionalFormat{
+										// number value in JSON
+										{
+											Palette:    String("white_on_red"),
+											Comparator: String(">"),
+											Value:      Strint("1"),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.file, func(t *testing.T) {

testdata/fixtures/screenboard_response_conditional_format.json

@@ -0,0 +1,78 @@
+{
+	"new_id": "zcw-f49-698",
+	"id": 334488,
+	"widgets": [
+		{
+			"tile_def": {
+				"viz": "query_value",
+				"requests": [
+					{
+						"conditional_formats": [
+							{
+								"palette": "white_on_red",
+								"comparator": ">",
+								"value": "1000"
+							},
+							{
+								"palette": "white_on_yellow",
+								"comparator": ">=",
+								"value": "200"
+							},
+							{
+								"palette": "white_on_green",
+								"comparator": "<",
+								"value": "200"
+							}
+						]
+					}
+				]
+			},
+			"type": "query_value"
+		},
+		{
+			"tile_def": {
+				"viz": "query_value",
+				"requests": [
+					{
+						"conditional_formats": [
+							{
+								"palette": "white_on_red",
+								"value": null,
+								"comparator": ">"
+							},
+							{
+								"palette": "white_on_yellow",
+								"value": null,
+								"comparator": ">="
+							},
+							{
+								"palette": "white_on_green",
+								"value": null,
+								"comparator": "<"
+							}
+						]
+					}
+				]
+			},
+			"type": "query_value"
+		},
+		{
+			"tile_def": {
+				"viz": "toplist",
+				"requests": [
+					{
+						"conditional_formats": [
+							{
+								"palette": "white_on_red",
+								"comparator": ">",
+								"value": 1
+							}
+						]
+					}
+				]
+			},
+			"type": "toplist"
+		}
+	],
+	"board_title": "OrderCapture ScreenBoard"
+}