Skip to content

Commit 0efbcba

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Regenerate client from commit 299d867 of spec repo (#4154)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent d33b0de commit 0efbcba

2 files changed

Lines changed: 33 additions & 0 deletions

File tree

.generator/schemas/v1/openapi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,6 +2080,7 @@ components:
20802080
- $ref: "#/components/schemas/FormulaAndFunctionMetricQueryDefinition"
20812081
- $ref: "#/components/schemas/FormulaAndFunctionEventQueryDefinition"
20822082
- $ref: "#/components/schemas/FormulaAndFunctionApmResourceStatsQueryDefinition"
2083+
- $ref: "#/components/schemas/FormulaAndFunctionApmMetricsQueryDefinition"
20832084
DistributionWidgetRequest:
20842085
description: Updated distribution widget.
20852086
properties:

api/datadogV1/model_distribution_widget_histogram_request_query.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type DistributionWidgetHistogramRequestQuery struct {
1313
FormulaAndFunctionMetricQueryDefinition *FormulaAndFunctionMetricQueryDefinition
1414
FormulaAndFunctionEventQueryDefinition *FormulaAndFunctionEventQueryDefinition
1515
FormulaAndFunctionApmResourceStatsQueryDefinition *FormulaAndFunctionApmResourceStatsQueryDefinition
16+
FormulaAndFunctionApmMetricsQueryDefinition *FormulaAndFunctionApmMetricsQueryDefinition
1617

1718
// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
1819
UnparsedObject interface{}
@@ -33,6 +34,11 @@ func FormulaAndFunctionApmResourceStatsQueryDefinitionAsDistributionWidgetHistog
3334
return DistributionWidgetHistogramRequestQuery{FormulaAndFunctionApmResourceStatsQueryDefinition: v}
3435
}
3536

37+
// FormulaAndFunctionApmMetricsQueryDefinitionAsDistributionWidgetHistogramRequestQuery is a convenience function that returns FormulaAndFunctionApmMetricsQueryDefinition wrapped in DistributionWidgetHistogramRequestQuery.
38+
func FormulaAndFunctionApmMetricsQueryDefinitionAsDistributionWidgetHistogramRequestQuery(v *FormulaAndFunctionApmMetricsQueryDefinition) DistributionWidgetHistogramRequestQuery {
39+
return DistributionWidgetHistogramRequestQuery{FormulaAndFunctionApmMetricsQueryDefinition: v}
40+
}
41+
3642
// UnmarshalJSON turns data into one of the pointers in the struct.
3743
func (obj *DistributionWidgetHistogramRequestQuery) UnmarshalJSON(data []byte) error {
3844
var err error
@@ -88,11 +94,29 @@ func (obj *DistributionWidgetHistogramRequestQuery) UnmarshalJSON(data []byte) e
8894
obj.FormulaAndFunctionApmResourceStatsQueryDefinition = nil
8995
}
9096

97+
// try to unmarshal data into FormulaAndFunctionApmMetricsQueryDefinition
98+
err = datadog.Unmarshal(data, &obj.FormulaAndFunctionApmMetricsQueryDefinition)
99+
if err == nil {
100+
if obj.FormulaAndFunctionApmMetricsQueryDefinition != nil && obj.FormulaAndFunctionApmMetricsQueryDefinition.UnparsedObject == nil {
101+
jsonFormulaAndFunctionApmMetricsQueryDefinition, _ := datadog.Marshal(obj.FormulaAndFunctionApmMetricsQueryDefinition)
102+
if string(jsonFormulaAndFunctionApmMetricsQueryDefinition) == "{}" { // empty struct
103+
obj.FormulaAndFunctionApmMetricsQueryDefinition = nil
104+
} else {
105+
match++
106+
}
107+
} else {
108+
obj.FormulaAndFunctionApmMetricsQueryDefinition = nil
109+
}
110+
} else {
111+
obj.FormulaAndFunctionApmMetricsQueryDefinition = nil
112+
}
113+
91114
if match != 1 { // more than 1 match
92115
// reset to nil
93116
obj.FormulaAndFunctionMetricQueryDefinition = nil
94117
obj.FormulaAndFunctionEventQueryDefinition = nil
95118
obj.FormulaAndFunctionApmResourceStatsQueryDefinition = nil
119+
obj.FormulaAndFunctionApmMetricsQueryDefinition = nil
96120
return datadog.Unmarshal(data, &obj.UnparsedObject)
97121
}
98122
return nil // exactly one match
@@ -112,6 +136,10 @@ func (obj DistributionWidgetHistogramRequestQuery) MarshalJSON() ([]byte, error)
112136
return datadog.Marshal(&obj.FormulaAndFunctionApmResourceStatsQueryDefinition)
113137
}
114138

139+
if obj.FormulaAndFunctionApmMetricsQueryDefinition != nil {
140+
return datadog.Marshal(&obj.FormulaAndFunctionApmMetricsQueryDefinition)
141+
}
142+
115143
if obj.UnparsedObject != nil {
116144
return datadog.Marshal(obj.UnparsedObject)
117145
}
@@ -132,6 +160,10 @@ func (obj *DistributionWidgetHistogramRequestQuery) GetActualInstance() interfac
132160
return obj.FormulaAndFunctionApmResourceStatsQueryDefinition
133161
}
134162

163+
if obj.FormulaAndFunctionApmMetricsQueryDefinition != nil {
164+
return obj.FormulaAndFunctionApmMetricsQueryDefinition
165+
}
166+
135167
// all schemas are nil
136168
return nil
137169
}

0 commit comments

Comments
 (0)