Add metric_namespace_configs to GCP v2 API (#2248)

* Regenerate client from commit 2db17c21 of spec repo

* pre-commit fixes

---------

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

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-05 21:07:14.133850",
-            "spec_repo_commit": "6c0fa1b6"
+            "regenerated": "2024-11-05 22:28:18.913806",
+            "spec_repo_commit": "2db17c21"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-05 21:07:14.151593",
-            "spec_repo_commit": "6c0fa1b6"
+            "regenerated": "2024-11-05 22:28:18.931370",
+            "spec_repo_commit": "2db17c21"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -9623,6 +9623,20 @@ components:
           nullable: true
           type: array
       type: object
+    GCPMetricNamespaceConfig:
+      description: Configuration for a GCP metric namespace.
+      properties:
+        disabled:
+          default: false
+          description: When disabled, Datadog does not collect metrics that are related
+            to this GCP metric namespace.
+          example: true
+          type: boolean
+        id:
+          description: The id of the GCP metric namespace.
+          example: aiplatform
+          type: string
+      type: object
     GCPSTSDelegateAccount:
       description: Datadog principal service account info.
       properties:
@@ -9725,6 +9739,14 @@ components:
             account.'
           example: true
           type: boolean
+        metric_namespace_configs:
+          description: Configurations for GCP metric namespaces.
+          example:
+          - disabled: true
+            id: aiplatform
+          items:
+            $ref: '#/components/schemas/GCPMetricNamespaceConfig'
+          type: array
         resource_collection_enabled:
           description: When enabled, Datadog scans for all resources in your GCP environment.
           type: boolean

docs/datadog_api_client.v2.model.rst

@@ -3868,6 +3868,13 @@ datadog\_api\_client.v2.model.full\_application\_key\_attributes module
    :members:
    :show-inheritance:
 
+datadog\_api\_client.v2.model.gcp\_metric\_namespace\_config module
+-------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.gcp_metric_namespace_config
+   :members:
+   :show-inheritance:
+
 datadog\_api\_client.v2.model.gcp\_service\_account\_meta module
 ----------------------------------------------------------------
 

src/datadog_api_client/v2/model/gcp_metric_namespace_config.py

@@ -0,0 +1,43 @@
+# 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.
+from __future__ import annotations
+
+from typing import Union
+
+from datadog_api_client.model_utils import (
+    ModelNormal,
+    cached_property,
+    unset,
+    UnsetType,
+)
+
+
+class GCPMetricNamespaceConfig(ModelNormal):
+    @cached_property
+    def openapi_types(_):
+        return {
+            "disabled": (bool,),
+            "id": (str,),
+        }
+
+    attribute_map = {
+        "disabled": "disabled",
+        "id": "id",
+    }
+
+    def __init__(self_, disabled: Union[bool, UnsetType] = unset, id: Union[str, UnsetType] = unset, **kwargs):
+        """
+        Configuration for a GCP metric namespace.
+
+        :param disabled: When disabled, Datadog does not collect metrics that are related to this GCP metric namespace.
+        :type disabled: bool, optional
+
+        :param id: The id of the GCP metric namespace.
+        :type id: str, optional
+        """
+        if disabled is not unset:
+            kwargs["disabled"] = disabled
+        if id is not unset:
+            kwargs["id"] = id
+        super().__init__(kwargs)

src/datadog_api_client/v2/model/gcpsts_service_account_attributes.py

@@ -3,7 +3,7 @@
 # Copyright 2019-Present Datadog, Inc.
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, TYPE_CHECKING
 
 from datadog_api_client.model_utils import (
     ModelNormal,
@@ -13,9 +13,15 @@
 )
 
 
+if TYPE_CHECKING:
+    from datadog_api_client.v2.model.gcp_metric_namespace_config import GCPMetricNamespaceConfig
+
+
 class GCPSTSServiceAccountAttributes(ModelNormal):
     @cached_property
     def openapi_types(_):
+        from datadog_api_client.v2.model.gcp_metric_namespace_config import GCPMetricNamespaceConfig
+
         return {
             "account_tags": ([str],),
             "automute": (bool,),
@@ -25,6 +31,7 @@ def openapi_types(_):
             "is_cspm_enabled": (bool,),
             "is_resource_change_collection_enabled": (bool,),
             "is_security_command_center_enabled": (bool,),
+            "metric_namespace_configs": ([GCPMetricNamespaceConfig],),
             "resource_collection_enabled": (bool,),
         }
 
@@ -37,6 +44,7 @@ def openapi_types(_):
         "is_cspm_enabled": "is_cspm_enabled",
         "is_resource_change_collection_enabled": "is_resource_change_collection_enabled",
         "is_security_command_center_enabled": "is_security_command_center_enabled",
+        "metric_namespace_configs": "metric_namespace_configs",
         "resource_collection_enabled": "resource_collection_enabled",
     }
 
@@ -50,6 +58,7 @@ def __init__(
         is_cspm_enabled: Union[bool, UnsetType] = unset,
         is_resource_change_collection_enabled: Union[bool, UnsetType] = unset,
         is_security_command_center_enabled: Union[bool, UnsetType] = unset,
+        metric_namespace_configs: Union[List[GCPMetricNamespaceConfig], UnsetType] = unset,
         resource_collection_enabled: Union[bool, UnsetType] = unset,
         **kwargs,
     ):
@@ -81,6 +90,9 @@ def __init__(
         :param is_security_command_center_enabled: When enabled, Datadog will attempt to collect Security Command Center Findings. Note: This requires additional permissions on the service account.
         :type is_security_command_center_enabled: bool, optional
 
+        :param metric_namespace_configs: Configurations for GCP metric namespaces.
+        :type metric_namespace_configs: [GCPMetricNamespaceConfig], optional
+
         :param resource_collection_enabled: When enabled, Datadog scans for all resources in your GCP environment.
         :type resource_collection_enabled: bool, optional
         """
@@ -100,6 +112,8 @@ def __init__(
             kwargs["is_resource_change_collection_enabled"] = is_resource_change_collection_enabled
         if is_security_command_center_enabled is not unset:
             kwargs["is_security_command_center_enabled"] = is_security_command_center_enabled
+        if metric_namespace_configs is not unset:
+            kwargs["metric_namespace_configs"] = metric_namespace_configs
         if resource_collection_enabled is not unset:
             kwargs["resource_collection_enabled"] = resource_collection_enabled
         super().__init__(kwargs)

src/datadog_api_client/v2/models/__init__.py

@@ -689,6 +689,7 @@
 from datadog_api_client.v2.model.full_api_key_attributes import FullAPIKeyAttributes
 from datadog_api_client.v2.model.full_application_key import FullApplicationKey
 from datadog_api_client.v2.model.full_application_key_attributes import FullApplicationKeyAttributes
+from datadog_api_client.v2.model.gcp_metric_namespace_config import GCPMetricNamespaceConfig
 from datadog_api_client.v2.model.gcpsts_delegate_account import GCPSTSDelegateAccount
 from datadog_api_client.v2.model.gcpsts_delegate_account_attributes import GCPSTSDelegateAccountAttributes
 from datadog_api_client.v2.model.gcpsts_delegate_account_response import GCPSTSDelegateAccountResponse
@@ -2610,6 +2611,7 @@
     "FullAPIKeyAttributes",
     "FullApplicationKey",
     "FullApplicationKeyAttributes",
+    "GCPMetricNamespaceConfig",
     "GCPSTSDelegateAccount",
     "GCPSTSDelegateAccountAttributes",
     "GCPSTSDelegateAccountResponse",

tests/v2/features/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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true}, "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}]}, "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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true}, "type": "gcp_service_account"}}
+    And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "cloud_run_revision_filters": ["$KEY:$VALUE"], "host_filters": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}]}, "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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true}, "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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}]}, "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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true}, "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": [], "is_resource_change_collection_enabled": true, "is_security_command_center_enabled": true, "metric_namespace_configs": [{"disabled": true, "id": "aiplatform"}]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
     When the request is sent
     Then the response status is 404 Not Found