Merge pull request #194 from nyanshak/make-widget-precision-field-jso…

…n-number

Make Precision field in Widget *json.Number

cmd/tools/gen-accessors.go

@@ -185,6 +185,8 @@ func (t *templateData) addIdent(x *ast.Ident, receiverType, fieldName string) {
 		zeroValue = "0"
 	case "Status":
 		zeroValue = "0"
+	case "PrecisionT":
+		zeroValue = `""`
 	default:
 		zeroValue = fmt.Sprintf("%s{}", x.String())
 	}

dashboards.go

@@ -123,10 +123,10 @@ type GraphDefinition struct {
 	Yaxis Yaxis `json:"yaxis,omitempty"`
 
 	// For query value type graphs
-	Autoscale  *bool        `json:"autoscale,omitempty"`
-	TextAlign  *string      `json:"text_align,omitempty"`
-	Precision  *json.Number `json:"precision,omitempty"`
-	CustomUnit *string      `json:"custom_unit,omitempty"`
+	Autoscale  *bool       `json:"autoscale,omitempty"`
+	TextAlign  *string     `json:"text_align,omitempty"`
+	Precision  *PrecisionT `json:"precision,omitempty"`
+	CustomUnit *string     `json:"custom_unit,omitempty"`
 
 	// For hostmaps
 	Style                 *Style   `json:"style,omitempty"`

datadog-accessors.go

@@ -2897,7 +2897,7 @@ func (g *GraphDefinition) SetNodeType(v string) {
 }
 
 // GetPrecision returns the Precision field if non-nil, zero value otherwise.
-func (g *GraphDefinition) GetPrecision() json.Number {
+func (g *GraphDefinition) GetPrecision() PrecisionT {
 	if g == nil || g.Precision == nil {
 		return ""
 	}
@@ -2906,7 +2906,7 @@ func (g *GraphDefinition) GetPrecision() json.Number {
 
 // GetPrecisionOk returns a tuple with the Precision field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (g *GraphDefinition) GetPrecisionOk() (json.Number, bool) {
+func (g *GraphDefinition) GetPrecisionOk() (PrecisionT, bool) {
 	if g == nil || g.Precision == nil {
 		return "", false
 	}
@@ -2923,7 +2923,7 @@ func (g *GraphDefinition) HasPrecision() bool {
 }
 
 // SetPrecision allocates a new g.Precision and returns the pointer to it.
-func (g *GraphDefinition) SetPrecision(v json.Number) {
+func (g *GraphDefinition) SetPrecision(v PrecisionT) {
 	g.Precision = &v
 }
 
@@ -7826,7 +7826,7 @@ func (t *TileDef) SetNoMetricHosts(v bool) {
 }
 
 // GetPrecision returns the Precision field if non-nil, zero value otherwise.
-func (t *TileDef) GetPrecision() json.Number {
+func (t *TileDef) GetPrecision() PrecisionT {
 	if t == nil || t.Precision == nil {
 		return ""
 	}
@@ -7835,7 +7835,7 @@ func (t *TileDef) GetPrecision() json.Number {
 
 // GetPrecisionOk returns a tuple with the Precision field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (t *TileDef) GetPrecisionOk() (json.Number, bool) {
+func (t *TileDef) GetPrecisionOk() (PrecisionT, bool) {
 	if t == nil || t.Precision == nil {
 		return "", false
 	}
@@ -7852,7 +7852,7 @@ func (t *TileDef) HasPrecision() bool {
 }
 
 // SetPrecision allocates a new t.Precision and returns the pointer to it.
-func (t *TileDef) SetPrecision(v json.Number) {
+func (t *TileDef) SetPrecision(v PrecisionT) {
 	t.Precision = &v
 }
 
@@ -10120,7 +10120,7 @@ func (w *Widget) SetParams(v Params) {
 }
 
 // GetPrecision returns the Precision field if non-nil, zero value otherwise.
-func (w *Widget) GetPrecision() string {
+func (w *Widget) GetPrecision() PrecisionT {
 	if w == nil || w.Precision == nil {
 		return ""
 	}
@@ -10129,7 +10129,7 @@ func (w *Widget) GetPrecision() string {
 
 // GetPrecisionOk returns a tuple with the Precision field if it's non-nil, zero value otherwise
 // and a boolean to check if the value has been set.
-func (w *Widget) GetPrecisionOk() (string, bool) {
+func (w *Widget) GetPrecisionOk() (PrecisionT, bool) {
 	if w == nil || w.Precision == nil {
 		return "", false
 	}
@@ -10146,7 +10146,7 @@ func (w *Widget) HasPrecision() bool {
 }
 
 // SetPrecision allocates a new w.Precision and returns the pointer to it.
-func (w *Widget) SetPrecision(v string) {
+func (w *Widget) SetPrecision(v PrecisionT) {
 	w.Precision = &v
 }
 

helpers.go

@@ -65,3 +65,17 @@ func GetJsonNumberOk(v *json.Number) (json.Number, bool) {
 
 	return "", false
 }
+
+// Precision is a helper routine that allocates a new precision value
+// to store v and returns a pointer to it.
+func Precision(v PrecisionT) *PrecisionT { return &v }
+
+// GetPrecision is a helper routine that returns a boolean representing
+// if a value was set, and if so, dereferences the pointer to it.
+func GetPrecision(v *PrecisionT) (PrecisionT, bool) {
+	if v != nil {
+		return *v, true
+	}
+
+	return PrecisionT(""), false
+}

integration/screen_widgets_test.go

@@ -91,7 +91,7 @@ func TestWidgets(t *testing.T) {
 				}},
 				CustomUnit: datadog.String("%"),
 				Autoscale:  datadog.Bool(false),
-				Precision:  datadog.JsonNumber("6"),
+				Precision:  datadog.Precision("6"),
 				TextAlign:  datadog.String("right"),
 			},
 		},
@@ -241,7 +241,7 @@ func TestWidgets(t *testing.T) {
 			AlertID:    datadog.Int(123456),
 			TextSize:   datadog.String("fill_height"),
 			TextAlign:  datadog.String("right"),
-			Precision:  datadog.String("*"),
+			Precision:  datadog.Precision("*"),
 			Unit:       datadog.String("b"),
 		},
 		{

screen_widgets.go

@@ -2,14 +2,39 @@ package datadog
 
 import "encoding/json"
 
+type PrecisionT string
+
+// UnmarshalJSON is a Custom Unmarshal for PrecisionT. The Datadog API can
+// return 1 (int), "1" (number, but a string type) or something like "100%" or
+// "*" (string).
+func (p *PrecisionT) UnmarshalJSON(data []byte) error {
+	var err error
+	var precisionNum json.Number
+	if err = json.Unmarshal(data, &precisionNum); err == nil {
+		*p = PrecisionT(precisionNum)
+		return nil
+	}
+
+	var precisionStr string
+	if err = json.Unmarshal(data, &precisionStr); err == nil {
+		*p = PrecisionT(precisionStr)
+		return nil
+	}
+
+	var p0 PrecisionT
+	*p = p0
+
+	return err
+}
+
 type TileDef struct {
 	Events     []TileDefEvent   `json:"events,omitempty"`
 	Markers    []TileDefMarker  `json:"markers,omitempty"`
 	Requests   []TileDefRequest `json:"requests,omitempty"`
 	Viz        *string          `json:"viz,omitempty"`
 	CustomUnit *string          `json:"custom_unit,omitempty"`
 	Autoscale  *bool            `json:"autoscale,omitempty"`
-	Precision  *json.Number     `json:"precision,omitempty"`
+	Precision  *PrecisionT      `json:"precision,omitempty"`
 	TextAlign  *string          `json:"text_align,omitempty"`
 
 	// For hostmap
@@ -104,9 +129,9 @@ type Widget struct {
 	Color *string `json:"color,omitempty"`
 
 	// For AlertValue widget
-	TextSize  *string `json:"text_size,omitempty"`
-	Unit      *string `json:"unit,omitempty"`
-	Precision *string `json:"precision,omitempty"`
+	TextSize  *string     `json:"text_size,omitempty"`
+	Unit      *string     `json:"unit,omitempty"`
+	Precision *PrecisionT `json:"precision,omitempty"`
 
 	// AlertGraph widget
 	VizType *string `json:"viz_type,omitempty"`