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

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

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

src/datadogV2/model/model_gcp_metric_namespace_config.rs

@@ -14,6 +14,9 @@ pub struct GCPMetricNamespaceConfig {
     /// When disabled, Datadog does not collect metrics that are related to this GCP metric namespace.
     #[serde(rename = "disabled")]
     pub disabled: Option<bool>,
+    /// 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.
+    #[serde(rename = "filters")]
+    pub filters: Option<Vec<String>>,
     /// The id of the GCP metric namespace.
     #[serde(rename = "id")]
     pub id: Option<String>,
@@ -28,6 +31,7 @@ impl GCPMetricNamespaceConfig {
     pub fn new() -> GCPMetricNamespaceConfig {
         GCPMetricNamespaceConfig {
             disabled: None,
+            filters: None,
             id: None,
             additional_properties: std::collections::BTreeMap::new(),
             _unparsed: false,
@@ -39,6 +43,11 @@ impl GCPMetricNamespaceConfig {
         self
     }
 
+    pub fn filters(mut self, value: Vec<String>) -> Self {
+        self.filters = Some(value);
+        self
+    }
+
     pub fn id(mut self, value: String) -> Self {
         self.id = Some(value);
         self
@@ -77,6 +86,7 @@ impl<'de> Deserialize<'de> for GCPMetricNamespaceConfig {
                 M: MapAccess<'a>,
             {
                 let mut disabled: Option<bool> = None;
+                let mut filters: Option<Vec<String>> = None;
                 let mut id: Option<String> = None;
                 let mut additional_properties: std::collections::BTreeMap<
                     String,
@@ -92,6 +102,12 @@ impl<'de> Deserialize<'de> for GCPMetricNamespaceConfig {
                             }
                             disabled = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
+                        "filters" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            filters = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
                         "id" => {
                             if v.is_null() {
                                 continue;
@@ -108,6 +124,7 @@ impl<'de> Deserialize<'de> for GCPMetricNamespaceConfig {
 
                 let content = GCPMetricNamespaceConfig {
                     disabled,
+                    filters,
                     id,
                     additional_properties,
                     _unparsed,

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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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": "datadog-service-account@test-project.iam.gserviceaccount.com", "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