Update v1 and v2 GCP API specs to support monitored_resource_configs (#2823)

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

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

.generator/schemas/v1/openapi.yaml

@@ -3288,15 +3288,19 @@ components:
           example: https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL
           type: string
         cloud_run_revision_filters:
-          description: 'Limit the Cloud Run revisions that are pulled into Datadog
-            by using tags.
+          deprecated: true
+          description: 'List of filters to limit the Cloud Run revisions that are
+            pulled into Datadog by using tags.
 
             Only Cloud Run revision resources that apply to specified filters are
-            imported into Datadog.'
+            imported into Datadog.
+
+            **Note:** This field is deprecated. Instead, use `monitored_resource_configs`
+            with `type=cloud_run_revision`'
           example:
           - $KEY:$VALUE
           items:
-            description: Cloud Run Filters
+            description: Cloud Run revision filters
             type: string
           type: array
         errors:
@@ -3309,11 +3313,16 @@ components:
             type: string
           type: array
         host_filters:
-          description: 'Limit the GCE instances that are pulled into Datadog by using
-            tags.
+          deprecated: true
+          description: 'A comma-separated list of filters to limit the VM instances
+            that are pulled into Datadog by using tags.
 
-            Only hosts that match one of the defined tags are imported into Datadog.'
-          example: key:value,filter:example
+            Only VM instance resources that apply to specified filters are imported
+            into Datadog.
+
+            **Note:** This field is deprecated. Instead, use `monitored_resource_configs`
+            with `type=gce_instance`'
+          example: $KEY1:$VALUE1,$KEY2:$VALUE2
           type: string
         is_cspm_enabled:
           description: 'When enabled, Datadog will activate the Cloud Security Monitoring
@@ -3334,6 +3343,15 @@ components:
             account.'
           example: true
           type: boolean
+        monitored_resource_configs:
+          description: Configurations for GCP monitored resources.
+          example:
+          - filters:
+            - $KEY:$VALUE
+            type: gce_instance
+          items:
+            $ref: '#/components/schemas/GCPMonitoredResourceConfig'
+          type: array
         private_key:
           description: Your private key name found in your JSON service account key.
           example: private_key
@@ -3366,6 +3384,37 @@ components:
       items:
         $ref: '#/components/schemas/GCPAccount'
       type: array
+    GCPMonitoredResourceConfig:
+      description: Configuration for a GCP monitored resource.
+      properties:
+        filters:
+          description: 'List of filters to limit the monitored resources that are
+            pulled into Datadog by using tags.
+
+            Only monitored resources that apply to specified filters are imported
+            into Datadog.'
+          example:
+          - $KEY:$VALUE
+          items:
+            description: A monitored resource filter
+            type: string
+          type: array
+        type:
+          $ref: '#/components/schemas/GCPMonitoredResourceConfigType'
+      type: object
+    GCPMonitoredResourceConfigType:
+      description: The GCP monitored resource type. Only a subset of resource types
+        are supported.
+      enum:
+      - cloud_function
+      - cloud_run_revision
+      - gce_instance
+      example: gce_instance
+      type: string
+      x-enum-varnames:
+      - CLOUD_FUNCTION
+      - CLOUD_RUN_REVISION
+      - GCE_INSTANCE
     GeomapWidgetDefinition:
       description: This visualization displays a series of values by country on a
         world map.

.generator/schemas/v2/openapi.yaml

@@ -17694,6 +17694,37 @@ components:
           example: aiplatform
           type: string
       type: object
+    GCPMonitoredResourceConfig:
+      description: Configuration for a GCP monitored resource.
+      properties:
+        filters:
+          description: 'List of filters to limit the monitored resources that are
+            pulled into Datadog by using tags.
+
+            Only monitored resources that apply to specified filters are imported
+            into Datadog.'
+          example:
+          - $KEY:$VALUE
+          items:
+            description: A monitored resource filter
+            type: string
+          type: array
+        type:
+          $ref: '#/components/schemas/GCPMonitoredResourceConfigType'
+      type: object
+    GCPMonitoredResourceConfigType:
+      description: The GCP monitored resource type. Only a subset of resource types
+        are supported.
+      enum:
+      - cloud_function
+      - cloud_run_revision
+      - gce_instance
+      example: gce_instance
+      type: string
+      x-enum-varnames:
+      - CLOUD_FUNCTION
+      - CLOUD_RUN_REVISION
+      - GCE_INSTANCE
     GCPSTSDelegateAccount:
       description: Datadog principal service account info.
       properties:
@@ -17761,21 +17792,35 @@ components:
           example: datadog-service-account@test-project.iam.gserviceaccount.com
           type: string
         cloud_run_revision_filters:
+          deprecated: true
           description: 'List of filters to limit the Cloud Run revisions that are
             pulled into Datadog by using tags.
 
             Only Cloud Run revision resources that apply to specified filters are
-            imported into Datadog.'
+            imported into Datadog.
+
+            **Note:** This field is deprecated. Instead, use `monitored_resource_configs`
+            with `type=cloud_run_revision`'
           example:
           - $KEY:$VALUE
           items:
-            description: Cloud Run Filters
+            description: Cloud Run revision filters
             type: string
           type: array
         host_filters:
-          description: Your Host Filters.
+          deprecated: true
+          description: 'List of filters to limit the VM instances that are pulled
+            into Datadog by using tags.
+
+            Only VM instance resources that apply to specified filters are imported
+            into Datadog.
+
+            **Note:** This field is deprecated. Instead, use `monitored_resource_configs`
+            with `type=gce_instance`'
+          example:
+          - $KEY:$VALUE
           items:
-            description: Host Filters
+            description: VM instance filters
             type: string
           type: array
         is_cspm_enabled:
@@ -17811,6 +17856,15 @@ components:
           items:
             $ref: '#/components/schemas/GCPMetricNamespaceConfig'
           type: array
+        monitored_resource_configs:
+          description: Configurations for GCP monitored resources.
+          example:
+          - filters:
+            - $KEY:$VALUE
+            type: gce_instance
+          items:
+            $ref: '#/components/schemas/GCPMonitoredResourceConfig'
+          type: array
         resource_collection_enabled:
           description: When enabled, Datadog scans for all resources in your GCP environment.
           type: boolean

docs/datadog_api_client.v1.model.rst

@@ -1040,6 +1040,20 @@ datadog\_api\_client.v1.model.gcp\_account\_list\_response module
    :members:
    :show-inheritance:
 
+datadog\_api\_client.v1.model.gcp\_monitored\_resource\_config module
+---------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v1.model.gcp_monitored_resource_config
+   :members:
+   :show-inheritance:
+
+datadog\_api\_client.v1.model.gcp\_monitored\_resource\_config\_type module
+---------------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v1.model.gcp_monitored_resource_config_type
+   :members:
+   :show-inheritance:
+
 datadog\_api\_client.v1.model.geomap\_widget\_definition module
 ---------------------------------------------------------------
 

docs/datadog_api_client.v2.model.rst

@@ -7417,6 +7417,20 @@ datadog\_api\_client.v2.model.gcp\_metric\_namespace\_config module
    :members:
    :show-inheritance:
 
+datadog\_api\_client.v2.model.gcp\_monitored\_resource\_config module
+---------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.gcp_monitored_resource_config
+   :members:
+   :show-inheritance:
+
+datadog\_api\_client.v2.model.gcp\_monitored\_resource\_config\_type module
+---------------------------------------------------------------------------
+
+.. automodule:: datadog_api_client.v2.model.gcp_monitored_resource_config_type
+   :members:
+   :show-inheritance:
+
 datadog\_api\_client.v2.model.gcp\_service\_account module
 ----------------------------------------------------------
 

src/datadog_api_client/v1/model/gcp_account.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.v1.model.gcp_monitored_resource_config import GCPMonitoredResourceConfig
+
+
 class GCPAccount(ModelNormal):
     @cached_property
     def openapi_types(_):
+        from datadog_api_client.v1.model.gcp_monitored_resource_config import GCPMonitoredResourceConfig
+
         return {
             "auth_provider_x509_cert_url": (str,),
             "auth_uri": (str,),
@@ -29,6 +35,7 @@ def openapi_types(_):
             "is_cspm_enabled": (bool,),
             "is_resource_change_collection_enabled": (bool,),
             "is_security_command_center_enabled": (bool,),
+            "monitored_resource_configs": ([GCPMonitoredResourceConfig],),
             "private_key": (str,),
             "private_key_id": (str,),
             "project_id": (str,),
@@ -50,6 +57,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",
+        "monitored_resource_configs": "monitored_resource_configs",
         "private_key": "private_key",
         "private_key_id": "private_key_id",
         "project_id": "project_id",
@@ -72,6 +80,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,
+        monitored_resource_configs: Union[List[GCPMonitoredResourceConfig], UnsetType] = unset,
         private_key: Union[str, UnsetType] = unset,
         private_key_id: Union[str, UnsetType] = unset,
         project_id: Union[str, UnsetType] = unset,
@@ -102,15 +111,17 @@ def __init__(
             where ``$CLIENT_EMAIL`` is the email found in your JSON service account key.
         :type client_x509_cert_url: str, optional
 
-        :param cloud_run_revision_filters: Limit the Cloud Run revisions that are pulled into Datadog by using tags.
+        :param cloud_run_revision_filters: List of filters to limit the Cloud Run revisions that are pulled into Datadog by using tags.
             Only Cloud Run revision resources that apply to specified filters are imported into Datadog.
+            **Note:** This field is deprecated. Instead, use ``monitored_resource_configs`` with ``type=cloud_run_revision`` **Deprecated**.
         :type cloud_run_revision_filters: [str], optional
 
         :param errors: An array of errors.
         :type errors: [str], optional
 
-        :param host_filters: Limit the GCE instances that are pulled into Datadog by using tags.
-            Only hosts that match one of the defined tags are imported into Datadog.
+        :param host_filters: A comma-separated list of filters to limit the VM instances that are pulled into Datadog by using tags.
+            Only VM instance resources that apply to specified filters are imported into Datadog.
+            **Note:** This field is deprecated. Instead, use ``monitored_resource_configs`` with ``type=gce_instance`` **Deprecated**.
         :type host_filters: str, optional
 
         :param is_cspm_enabled: When enabled, Datadog will activate the Cloud Security Monitoring product for this service account. Note: This requires resource_collection_enabled to be set to true.
@@ -122,6 +133,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 monitored_resource_configs: Configurations for GCP monitored resources.
+        :type monitored_resource_configs: [GCPMonitoredResourceConfig], optional
+
         :param private_key: Your private key name found in your JSON service account key.
         :type private_key: str, optional
 
@@ -164,6 +178,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 monitored_resource_configs is not unset:
+            kwargs["monitored_resource_configs"] = monitored_resource_configs
         if private_key is not unset:
             kwargs["private_key"] = private_key
         if private_key_id is not unset:

src/datadog_api_client/v1/model/gcp_monitored_resource_config.py

@@ -0,0 +1,55 @@
+# 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 List, Union, TYPE_CHECKING
+
+from datadog_api_client.model_utils import (
+    ModelNormal,
+    cached_property,
+    unset,
+    UnsetType,
+)
+
+
+if TYPE_CHECKING:
+    from datadog_api_client.v1.model.gcp_monitored_resource_config_type import GCPMonitoredResourceConfigType
+
+
+class GCPMonitoredResourceConfig(ModelNormal):
+    @cached_property
+    def openapi_types(_):
+        from datadog_api_client.v1.model.gcp_monitored_resource_config_type import GCPMonitoredResourceConfigType
+
+        return {
+            "filters": ([str],),
+            "type": (GCPMonitoredResourceConfigType,),
+        }
+
+    attribute_map = {
+        "filters": "filters",
+        "type": "type",
+    }
+
+    def __init__(
+        self_,
+        filters: Union[List[str], UnsetType] = unset,
+        type: Union[GCPMonitoredResourceConfigType, UnsetType] = unset,
+        **kwargs,
+    ):
+        """
+        Configuration for a GCP monitored resource.
+
+        :param filters: List of filters to limit the monitored resources that are pulled into Datadog by using tags.
+            Only monitored resources that apply to specified filters are imported into Datadog.
+        :type filters: [str], optional
+
+        :param type: The GCP monitored resource type. Only a subset of resource types are supported.
+        :type type: GCPMonitoredResourceConfigType, optional
+        """
+        if filters is not unset:
+            kwargs["filters"] = filters
+        if type is not unset:
+            kwargs["type"] = type
+        super().__init__(kwargs)