Add metric namespace config filters to V2 GCP API (#3417)

Co-authored-by: ci.datadog-api-spec <[email protected]>

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

.generator/schemas/v2/openapi.yaml

@@ -20582,9 +20582,20 @@ components:
             to this GCP metric namespace.
           example: true
           type: boolean
+        filters:
+          description: When enabled, Datadog applies these additional filters to limit
+            metric collection. A metric is collected only if it does not match all
+            exclusion filters and matches at least one allow filter.
+          example:
+          - snapshot.*
+          - '!*_by_region'
+          items:
+            description: A metric namespace filter
+            type: string
+          type: array
         id:
           description: The id of the GCP metric namespace.
-          example: aiplatform
+          example: pubsub
           type: string
       type: object
     GCPMonitoredResourceConfig:
@@ -20746,6 +20757,10 @@ components:
           example:
           - disabled: true
             id: aiplatform
+          - filters:
+            - snapshot.*
+            - '!*_by_region'
+            id: pubsub
           items:
             $ref: '#/components/schemas/GCPMetricNamespaceConfig'
           type: array

api/datadogV2/model_gcp_metric_namespace_config.go

@@ -12,6 +12,8 @@ import (
 type GCPMetricNamespaceConfig struct {
 	// When disabled, Datadog does not collect metrics that are related to this GCP metric namespace.
 	Disabled *bool `json:"disabled,omitempty"`
+	// When enabled, Datadog applies these additional filters to limit metric collection. A metric is collected only if it does not match all exclusion filters and matches at least one allow filter.
+	Filters []string `json:"filters,omitempty"`
 	// The id of the GCP metric namespace.
 	Id *string `json:"id,omitempty"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -68,6 +70,34 @@ func (o *GCPMetricNamespaceConfig) SetDisabled(v bool) {
 	o.Disabled = &v
 }
 
+// GetFilters returns the Filters field value if set, zero value otherwise.
+func (o *GCPMetricNamespaceConfig) GetFilters() []string {
+	if o == nil || o.Filters == nil {
+		var ret []string
+		return ret
+	}
+	return o.Filters
+}
+
+// GetFiltersOk returns a tuple with the Filters field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *GCPMetricNamespaceConfig) GetFiltersOk() (*[]string, bool) {
+	if o == nil || o.Filters == nil {
+		return nil, false
+	}
+	return &o.Filters, true
+}
+
+// HasFilters returns a boolean if a field has been set.
+func (o *GCPMetricNamespaceConfig) HasFilters() bool {
+	return o != nil && o.Filters != nil
+}
+
+// SetFilters gets a reference to the given []string and assigns it to the Filters field.
+func (o *GCPMetricNamespaceConfig) SetFilters(v []string) {
+	o.Filters = v
+}
+
 // GetId returns the Id field value if set, zero value otherwise.
 func (o *GCPMetricNamespaceConfig) GetId() string {
 	if o == nil || o.Id == nil {
@@ -105,6 +135,9 @@ func (o GCPMetricNamespaceConfig) MarshalJSON() ([]byte, error) {
 	if o.Disabled != nil {
 		toSerialize["disabled"] = o.Disabled
 	}
+	if o.Filters != nil {
+		toSerialize["filters"] = o.Filters
+	}
 	if o.Id != nil {
 		toSerialize["id"] = o.Id
 	}
@@ -118,19 +151,21 @@ func (o GCPMetricNamespaceConfig) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON deserializes the given payload.
 func (o *GCPMetricNamespaceConfig) UnmarshalJSON(bytes []byte) (err error) {
 	all := struct {
-		Disabled *bool   `json:"disabled,omitempty"`
-		Id       *string `json:"id,omitempty"`
+		Disabled *bool    `json:"disabled,omitempty"`
+		Filters  []string `json:"filters,omitempty"`
+		Id       *string  `json:"id,omitempty"`
 	}{}
 	if err = datadog.Unmarshal(bytes, &all); err != nil {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
 	}
 	additionalProperties := make(map[string]interface{})
 	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
-		datadog.DeleteKeys(additionalProperties, &[]string{"disabled", "id"})
+		datadog.DeleteKeys(additionalProperties, &[]string{"disabled", "filters", "id"})
 	} else {
 		return err
 	}
 	o.Disabled = all.Disabled
+	o.Filters = all.Filters
 	o.Id = all.Id
 
 	if len(additionalProperties) > 0 {

tests/scenarios/features/v2/gcp_integration.feature

@@ -34,14 +34,14 @@ Feature: GCP Integration
   @generated @skip @team:DataDog/gcp-integrations
   Scenario: Create a new entry for your service account returns "Bad Request" response
     Given new "CreateGCPSTSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/gcp-integrations
   Scenario: Create a new entry for your service account returns "Conflict" response
     Given new "CreateGCPSTSAccount" request
-    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 409 Conflict
 
@@ -151,15 +151,15 @@ Feature: GCP Integration
   Scenario: Update STS Service Account returns "Bad Request" response
     Given new "UpdateGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/gcp-integrations
   Scenario: Update STS Service Account returns "Not Found" response
     Given new "UpdateGCPSTSAccount" request
     And request contains "account_id" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": ["$KEY:$VALUE"], "is_per_project_quota_enabled": true, "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "monitored_resource_configs": [{"filters": ["$KEY:$VALUE"], "type": "gce_instance"}]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 404 Not Found