From 832eff9bd2aa74066673f4e3c38175596c1910e2 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 3 Dec 2025 16:02:26 +0000 Subject: [PATCH] Regenerate client from commit 2f0f9b0 of spec repo --- .generator/schemas/v2/openapi.yaml | 17 +++++++++++++ features/v2/gcp_integration.feature | 8 +++---- .../gcpsts_service_account_attributes.rb | 24 ++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 05ce562f5e20..ee59b59c5e8d 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -22824,6 +22824,13 @@ components: product for this service account. Note: This requires resource_collection_enabled to be set to true.' type: boolean + is_global_location_enabled: + default: true + description: "When enabled, metrics where location is explicitly stated + as \u201Cglobal\u201D or where location information cannot be deduced + from GCP labels is collected." + example: true + type: boolean is_per_project_quota_enabled: default: false description: When enabled, Datadog applies the `X-Goog-User-Project` header, @@ -22865,6 +22872,16 @@ components: items: $ref: '#/components/schemas/GCPMonitoredResourceConfig' type: array + region_filter_configs: + description: Filters to limit metric collection by GCP location, such as + region, multi-region, or zone. By default, Datadog collects from all locations. + example: + - nam4 + - europe-north1 + items: + description: Region Filter Configs + type: string + type: array resource_collection_enabled: description: When enabled, Datadog scans for all resources in your GCP environment. type: boolean diff --git a/features/v2/gcp_integration.feature b/features/v2/gcp_integration.feature index 6d47a1508eb6..6dcb271ec177 100644 --- a/features/v2/gcp_integration.feature +++ b/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"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "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_global_location_enabled": true, "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"}], "region_filter_configs": ["nam4", "europe-north1"]}, "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"}, {"filters": ["snapshot.*", "!*_by_region"], "id": "pubsub"}], "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_global_location_enabled": true, "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"}], "region_filter_configs": ["nam4", "europe-north1"]}, "type": "gcp_service_account"}} When the request is sent Then the response status is 409 Conflict @@ -151,7 +151,7 @@ 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"}, {"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"}} + 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_global_location_enabled": true, "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"}], "region_filter_configs": ["nam4", "europe-north1"]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}} When the request is sent Then the response status is 400 Bad Request @@ -159,7 +159,7 @@ Feature: GCP Integration 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"}, {"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"}} + 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_global_location_enabled": true, "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"}], "region_filter_configs": ["nam4", "europe-north1"]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}} When the request is sent Then the response status is 404 Not Found diff --git a/lib/datadog_api_client/v2/models/gcpsts_service_account_attributes.rb b/lib/datadog_api_client/v2/models/gcpsts_service_account_attributes.rb index f35f2baf5f2f..e14c67688378 100644 --- a/lib/datadog_api_client/v2/models/gcpsts_service_account_attributes.rb +++ b/lib/datadog_api_client/v2/models/gcpsts_service_account_attributes.rb @@ -43,6 +43,9 @@ class GCPSTSServiceAccountAttributes # 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. attr_accessor :is_cspm_enabled + # When enabled, metrics where location is explicitly stated as “global” or where location information cannot be deduced from GCP labels is collected. + attr_accessor :is_global_location_enabled + # When enabled, Datadog applies the `X-Goog-User-Project` header, attributing Google Cloud billing and quota usage to the project being monitored rather than the default service account project. attr_accessor :is_per_project_quota_enabled @@ -58,6 +61,9 @@ class GCPSTSServiceAccountAttributes # Configurations for GCP monitored resources. attr_accessor :monitored_resource_configs + # Filters to limit metric collection by GCP location, such as region, multi-region, or zone. By default, Datadog collects from all locations. + attr_accessor :region_filter_configs + # When enabled, Datadog scans for all resources in your GCP environment. attr_accessor :resource_collection_enabled @@ -73,11 +79,13 @@ def self.attribute_map :'cloud_run_revision_filters' => :'cloud_run_revision_filters', :'host_filters' => :'host_filters', :'is_cspm_enabled' => :'is_cspm_enabled', + :'is_global_location_enabled' => :'is_global_location_enabled', :'is_per_project_quota_enabled' => :'is_per_project_quota_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', :'monitored_resource_configs' => :'monitored_resource_configs', + :'region_filter_configs' => :'region_filter_configs', :'resource_collection_enabled' => :'resource_collection_enabled' } end @@ -92,11 +100,13 @@ def self.openapi_types :'cloud_run_revision_filters' => :'Array', :'host_filters' => :'Array', :'is_cspm_enabled' => :'Boolean', + :'is_global_location_enabled' => :'Boolean', :'is_per_project_quota_enabled' => :'Boolean', :'is_resource_change_collection_enabled' => :'Boolean', :'is_security_command_center_enabled' => :'Boolean', :'metric_namespace_configs' => :'Array', :'monitored_resource_configs' => :'Array', + :'region_filter_configs' => :'Array', :'resource_collection_enabled' => :'Boolean' } end @@ -149,6 +159,10 @@ def initialize(attributes = {}) self.is_cspm_enabled = attributes[:'is_cspm_enabled'] end + if attributes.key?(:'is_global_location_enabled') + self.is_global_location_enabled = attributes[:'is_global_location_enabled'] + end + if attributes.key?(:'is_per_project_quota_enabled') self.is_per_project_quota_enabled = attributes[:'is_per_project_quota_enabled'] end @@ -173,6 +187,12 @@ def initialize(attributes = {}) end end + if attributes.key?(:'region_filter_configs') + if (value = attributes[:'region_filter_configs']).is_a?(Array) + self.region_filter_configs = value + end + end + if attributes.key?(:'resource_collection_enabled') self.resource_collection_enabled = attributes[:'resource_collection_enabled'] end @@ -210,11 +230,13 @@ def ==(o) cloud_run_revision_filters == o.cloud_run_revision_filters && host_filters == o.host_filters && is_cspm_enabled == o.is_cspm_enabled && + is_global_location_enabled == o.is_global_location_enabled && is_per_project_quota_enabled == o.is_per_project_quota_enabled && is_resource_change_collection_enabled == o.is_resource_change_collection_enabled && is_security_command_center_enabled == o.is_security_command_center_enabled && metric_namespace_configs == o.metric_namespace_configs && monitored_resource_configs == o.monitored_resource_configs && + region_filter_configs == o.region_filter_configs && resource_collection_enabled == o.resource_collection_enabled && additional_properties == o.additional_properties end @@ -223,7 +245,7 @@ def ==(o) # @return [Integer] Hash code # @!visibility private def hash - [account_tags, automute, client_email, cloud_run_revision_filters, host_filters, is_cspm_enabled, is_per_project_quota_enabled, is_resource_change_collection_enabled, is_security_command_center_enabled, metric_namespace_configs, monitored_resource_configs, resource_collection_enabled, additional_properties].hash + [account_tags, automute, client_email, cloud_run_revision_filters, host_filters, is_cspm_enabled, is_global_location_enabled, is_per_project_quota_enabled, is_resource_change_collection_enabled, is_security_command_center_enabled, metric_namespace_configs, monitored_resource_configs, region_filter_configs, resource_collection_enabled, additional_properties].hash end end end