Revert "Remove duplicate MonitorFormulaAndFunctionCostDataSource schema" (#3859)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: api-clients-generation-pipeline[bot]

.generator/schemas/v1/openapi.yaml

@@ -7524,13 +7524,25 @@ components:
         - L2NORM
         - PERCENTILE
         - STDDEV
+    MonitorFormulaAndFunctionCostDataSource:
+      description: Data source for cost queries.
+      enum:
+        - metrics
+        - cloud_cost
+        - datadog_usage
+      example: "cloud_cost"
+      type: string
+      x-enum-varnames:
+        - METRICS
+        - CLOUD_COST
+        - DATADOG_USAGE
     MonitorFormulaAndFunctionCostQueryDefinition:
       description: A formula and functions cost query.
       properties:
         aggregator:
           $ref: "#/components/schemas/MonitorFormulaAndFunctionCostAggregator"
         data_source:
-          $ref: "#/components/schemas/MonitorFormulaAndFunctionMetricsDataSource"
+          $ref: "#/components/schemas/MonitorFormulaAndFunctionCostDataSource"
         name:
           description: Name of the query for use in formulas.
           example: "query1"

api/datadogV1/model_monitor_formula_and_function_cost_data_source.go

@@ -0,0 +1,68 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2019-Present Datadog, Inc.
+
+package datadogV1
+
+import (
+	"fmt"
+
+	"github.com/DataDog/datadog-api-client-go/v2/api/datadog"
+)
+
+// MonitorFormulaAndFunctionCostDataSource Data source for cost queries.
+type MonitorFormulaAndFunctionCostDataSource string
+
+// List of MonitorFormulaAndFunctionCostDataSource.
+const (
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_METRICS       MonitorFormulaAndFunctionCostDataSource = "metrics"
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_CLOUD_COST    MonitorFormulaAndFunctionCostDataSource = "cloud_cost"
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_DATADOG_USAGE MonitorFormulaAndFunctionCostDataSource = "datadog_usage"
+)
+
+var allowedMonitorFormulaAndFunctionCostDataSourceEnumValues = []MonitorFormulaAndFunctionCostDataSource{
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_METRICS,
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_CLOUD_COST,
+	MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_DATADOG_USAGE,
+}
+
+// GetAllowedValues reeturns the list of possible values.
+func (v *MonitorFormulaAndFunctionCostDataSource) GetAllowedValues() []MonitorFormulaAndFunctionCostDataSource {
+	return allowedMonitorFormulaAndFunctionCostDataSourceEnumValues
+}
+
+// UnmarshalJSON deserializes the given payload.
+func (v *MonitorFormulaAndFunctionCostDataSource) UnmarshalJSON(src []byte) error {
+	var value string
+	err := datadog.Unmarshal(src, &value)
+	if err != nil {
+		return err
+	}
+	*v = MonitorFormulaAndFunctionCostDataSource(value)
+	return nil
+}
+
+// NewMonitorFormulaAndFunctionCostDataSourceFromValue returns a pointer to a valid MonitorFormulaAndFunctionCostDataSource
+// for the value passed as argument, or an error if the value passed is not allowed by the enum.
+func NewMonitorFormulaAndFunctionCostDataSourceFromValue(v string) (*MonitorFormulaAndFunctionCostDataSource, error) {
+	ev := MonitorFormulaAndFunctionCostDataSource(v)
+	if ev.IsValid() {
+		return &ev, nil
+	}
+	return nil, fmt.Errorf("invalid value '%v' for MonitorFormulaAndFunctionCostDataSource: valid values are %v", v, allowedMonitorFormulaAndFunctionCostDataSourceEnumValues)
+}
+
+// IsValid return true if the value is valid for the enum, false otherwise.
+func (v MonitorFormulaAndFunctionCostDataSource) IsValid() bool {
+	for _, existing := range allowedMonitorFormulaAndFunctionCostDataSourceEnumValues {
+		if existing == v {
+			return true
+		}
+	}
+	return false
+}
+
+// Ptr returns reference to MonitorFormulaAndFunctionCostDataSource value.
+func (v MonitorFormulaAndFunctionCostDataSource) Ptr() *MonitorFormulaAndFunctionCostDataSource {
+	return &v
+}

api/datadogV1/model_monitor_formula_and_function_cost_query_definition.go

@@ -14,8 +14,8 @@ import (
 type MonitorFormulaAndFunctionCostQueryDefinition struct {
 	// Aggregation methods for metric queries.
 	Aggregator *MonitorFormulaAndFunctionCostAggregator `json:"aggregator,omitempty"`
-	// Data source for metrics queries.
-	DataSource MonitorFormulaAndFunctionMetricsDataSource `json:"data_source"`
+	// Data source for cost queries.
+	DataSource MonitorFormulaAndFunctionCostDataSource `json:"data_source"`
 	// Name of the query for use in formulas.
 	Name string `json:"name"`
 	// The monitor query.
@@ -29,7 +29,7 @@ type MonitorFormulaAndFunctionCostQueryDefinition struct {
 // This constructor will assign default values to properties that have it defined,
 // and makes sure properties required by API are set, but the set of arguments
 // will change when the set of required properties is changed.
-func NewMonitorFormulaAndFunctionCostQueryDefinition(dataSource MonitorFormulaAndFunctionMetricsDataSource, name string, query string) *MonitorFormulaAndFunctionCostQueryDefinition {
+func NewMonitorFormulaAndFunctionCostQueryDefinition(dataSource MonitorFormulaAndFunctionCostDataSource, name string, query string) *MonitorFormulaAndFunctionCostQueryDefinition {
 	this := MonitorFormulaAndFunctionCostQueryDefinition{}
 	this.DataSource = dataSource
 	this.Name = name
@@ -74,25 +74,25 @@ func (o *MonitorFormulaAndFunctionCostQueryDefinition) SetAggregator(v MonitorFo
 }
 
 // GetDataSource returns the DataSource field value.
-func (o *MonitorFormulaAndFunctionCostQueryDefinition) GetDataSource() MonitorFormulaAndFunctionMetricsDataSource {
+func (o *MonitorFormulaAndFunctionCostQueryDefinition) GetDataSource() MonitorFormulaAndFunctionCostDataSource {
 	if o == nil {
-		var ret MonitorFormulaAndFunctionMetricsDataSource
+		var ret MonitorFormulaAndFunctionCostDataSource
 		return ret
 	}
 	return o.DataSource
 }
 
 // GetDataSourceOk returns a tuple with the DataSource field value
 // and a boolean to check if the value has been set.
-func (o *MonitorFormulaAndFunctionCostQueryDefinition) GetDataSourceOk() (*MonitorFormulaAndFunctionMetricsDataSource, bool) {
+func (o *MonitorFormulaAndFunctionCostQueryDefinition) GetDataSourceOk() (*MonitorFormulaAndFunctionCostDataSource, bool) {
 	if o == nil {
 		return nil, false
 	}
 	return &o.DataSource, true
 }
 
 // SetDataSource sets field value.
-func (o *MonitorFormulaAndFunctionCostQueryDefinition) SetDataSource(v MonitorFormulaAndFunctionMetricsDataSource) {
+func (o *MonitorFormulaAndFunctionCostQueryDefinition) SetDataSource(v MonitorFormulaAndFunctionCostDataSource) {
 	o.DataSource = v
 }
 
@@ -164,10 +164,10 @@ func (o MonitorFormulaAndFunctionCostQueryDefinition) MarshalJSON() ([]byte, err
 // UnmarshalJSON deserializes the given payload.
 func (o *MonitorFormulaAndFunctionCostQueryDefinition) UnmarshalJSON(bytes []byte) (err error) {
 	all := struct {
-		Aggregator *MonitorFormulaAndFunctionCostAggregator    `json:"aggregator,omitempty"`
-		DataSource *MonitorFormulaAndFunctionMetricsDataSource `json:"data_source"`
-		Name       *string                                     `json:"name"`
-		Query      *string                                     `json:"query"`
+		Aggregator *MonitorFormulaAndFunctionCostAggregator `json:"aggregator,omitempty"`
+		DataSource *MonitorFormulaAndFunctionCostDataSource `json:"data_source"`
+		Name       *string                                  `json:"name"`
+		Query      *string                                  `json:"query"`
 	}{}
 	if err = datadog.Unmarshal(bytes, &all); err != nil {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)

examples/v1/monitors/CreateMonitor_1303514967.go

@@ -31,7 +31,7 @@ func main() {
 			Variables: []datadogV1.MonitorFormulaAndFunctionQueryDefinition{
 				datadogV1.MonitorFormulaAndFunctionQueryDefinition{
 					MonitorFormulaAndFunctionCostQueryDefinition: &datadogV1.MonitorFormulaAndFunctionCostQueryDefinition{
-						DataSource: datadogV1.MONITORFORMULAANDFUNCTIONMETRICSDATASOURCE_CLOUD_COST,
+						DataSource: datadogV1.MONITORFORMULAANDFUNCTIONCOSTDATASOURCE_CLOUD_COST,
 						Query:      "sum:aws.cost.net.amortized.shared.resources.allocated{aws_product IN (amplify ,athena, backup, bedrock ) } by {aws_product}.rollup(sum, 86400)",
 						Name:       "query1",
 						Aggregator: datadogV1.MONITORFORMULAANDFUNCTIONCOSTAGGREGATOR_SUM.Ptr(),