Skip to content

Commit f83cef0

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 337aa83 of spec repo
1 parent f112cad commit f83cef0

File tree

4 files changed

+38
-5
lines changed

4 files changed

+38
-5
lines changed

.generator/schemas/v2/openapi.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22330,6 +22330,13 @@ components:
2233022330
product for this service account. Note: This requires resource_collection_enabled
2233122331
to be set to true.'
2233222332
type: boolean
22333+
is_global_location_enabled:
22334+
default: true
22335+
description: "When enabled, metrics, events, and resources where location
22336+
is explicitly stated as \u201Cglobal\u201D or where location information
22337+
could not be deduced from GCP labels will be collected."
22338+
example: true
22339+
type: boolean
2233322340
is_per_project_quota_enabled:
2233422341
default: false
2233522342
description: When enabled, Datadog applies the `X-Goog-User-Project` header,
@@ -22371,6 +22378,16 @@ components:
2237122378
items:
2237222379
$ref: '#/components/schemas/GCPMonitoredResourceConfig'
2237322380
type: array
22381+
region_filter_configs:
22382+
description: Filters to limit metric collection by GCP region. By default
22383+
Datadog collects from all regions.
22384+
example:
22385+
- us-east1
22386+
- europe-north1
22387+
items:
22388+
description: Region Filter Configs
22389+
type: string
22390+
type: array
2237422391
resource_collection_enabled:
2237522392
description: When enabled, Datadog scans for all resources in your GCP environment.
2237622393
type: boolean

src/datadog_api_client/v2/model/gcpsts_service_account_attributes.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ def openapi_types(_):
3131
"cloud_run_revision_filters": ([str],),
3232
"host_filters": ([str],),
3333
"is_cspm_enabled": (bool,),
34+
"is_global_location_enabled": (bool,),
3435
"is_per_project_quota_enabled": (bool,),
3536
"is_resource_change_collection_enabled": (bool,),
3637
"is_security_command_center_enabled": (bool,),
3738
"metric_namespace_configs": ([GCPMetricNamespaceConfig],),
3839
"monitored_resource_configs": ([GCPMonitoredResourceConfig],),
40+
"region_filter_configs": ([str],),
3941
"resource_collection_enabled": (bool,),
4042
}
4143

@@ -46,11 +48,13 @@ def openapi_types(_):
4648
"cloud_run_revision_filters": "cloud_run_revision_filters",
4749
"host_filters": "host_filters",
4850
"is_cspm_enabled": "is_cspm_enabled",
51+
"is_global_location_enabled": "is_global_location_enabled",
4952
"is_per_project_quota_enabled": "is_per_project_quota_enabled",
5053
"is_resource_change_collection_enabled": "is_resource_change_collection_enabled",
5154
"is_security_command_center_enabled": "is_security_command_center_enabled",
5255
"metric_namespace_configs": "metric_namespace_configs",
5356
"monitored_resource_configs": "monitored_resource_configs",
57+
"region_filter_configs": "region_filter_configs",
5458
"resource_collection_enabled": "resource_collection_enabled",
5559
}
5660

@@ -62,11 +66,13 @@ def __init__(
6266
cloud_run_revision_filters: Union[List[str], UnsetType] = unset,
6367
host_filters: Union[List[str], UnsetType] = unset,
6468
is_cspm_enabled: Union[bool, UnsetType] = unset,
69+
is_global_location_enabled: Union[bool, UnsetType] = unset,
6570
is_per_project_quota_enabled: Union[bool, UnsetType] = unset,
6671
is_resource_change_collection_enabled: Union[bool, UnsetType] = unset,
6772
is_security_command_center_enabled: Union[bool, UnsetType] = unset,
6873
metric_namespace_configs: Union[List[GCPMetricNamespaceConfig], UnsetType] = unset,
6974
monitored_resource_configs: Union[List[GCPMonitoredResourceConfig], UnsetType] = unset,
75+
region_filter_configs: Union[List[str], UnsetType] = unset,
7076
resource_collection_enabled: Union[bool, UnsetType] = unset,
7177
**kwargs,
7278
):
@@ -95,6 +101,9 @@ def __init__(
95101
: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.
96102
:type is_cspm_enabled: bool, optional
97103
104+
:param is_global_location_enabled: When enabled, metrics, events, and resources where location is explicitly stated as “global” or where location information could not be deduced from GCP labels will be collected.
105+
:type is_global_location_enabled: bool, optional
106+
98107
:param is_per_project_quota_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.
99108
:type is_per_project_quota_enabled: bool, optional
100109
@@ -110,6 +119,9 @@ def __init__(
110119
:param monitored_resource_configs: Configurations for GCP monitored resources.
111120
:type monitored_resource_configs: [GCPMonitoredResourceConfig], optional
112121
122+
:param region_filter_configs: Filters to limit metric collection by GCP region. By default Datadog collects from all regions.
123+
:type region_filter_configs: [str], optional
124+
113125
:param resource_collection_enabled: When enabled, Datadog scans for all resources in your GCP environment.
114126
:type resource_collection_enabled: bool, optional
115127
"""
@@ -125,6 +137,8 @@ def __init__(
125137
kwargs["host_filters"] = host_filters
126138
if is_cspm_enabled is not unset:
127139
kwargs["is_cspm_enabled"] = is_cspm_enabled
140+
if is_global_location_enabled is not unset:
141+
kwargs["is_global_location_enabled"] = is_global_location_enabled
128142
if is_per_project_quota_enabled is not unset:
129143
kwargs["is_per_project_quota_enabled"] = is_per_project_quota_enabled
130144
if is_resource_change_collection_enabled is not unset:
@@ -135,6 +149,8 @@ def __init__(
135149
kwargs["metric_namespace_configs"] = metric_namespace_configs
136150
if monitored_resource_configs is not unset:
137151
kwargs["monitored_resource_configs"] = monitored_resource_configs
152+
if region_filter_configs is not unset:
153+
kwargs["region_filter_configs"] = region_filter_configs
138154
if resource_collection_enabled is not unset:
139155
kwargs["resource_collection_enabled"] = resource_collection_enabled
140156
super().__init__(kwargs)

tests/v2/features/gcp_integration.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ Feature: GCP Integration
3434
@generated @skip @team:DataDog/gcp-integrations
3535
Scenario: Create a new entry for your service account returns "Bad Request" response
3636
Given new "CreateGCPSTSAccount" request
37-
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"}}
37+
And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "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": ["us-east1", "europe-north1"]}, "type": "gcp_service_account"}}
3838
When the request is sent
3939
Then the response status is 400 Bad Request
4040

4141
@generated @skip @team:DataDog/gcp-integrations
4242
Scenario: Create a new entry for your service account returns "Conflict" response
4343
Given new "CreateGCPSTSAccount" request
44-
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"}}
44+
And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "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": ["us-east1", "europe-north1"]}, "type": "gcp_service_account"}}
4545
When the request is sent
4646
Then the response status is 409 Conflict
4747

@@ -151,15 +151,15 @@ Feature: GCP Integration
151151
Scenario: Update STS Service Account returns "Bad Request" response
152152
Given new "UpdateGCPSTSAccount" request
153153
And request contains "account_id" parameter from "REPLACE.ME"
154-
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"}}
154+
And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "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": ["us-east1", "europe-north1"]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
155155
When the request is sent
156156
Then the response status is 400 Bad Request
157157

158158
@generated @skip @team:DataDog/gcp-integrations
159159
Scenario: Update STS Service Account returns "Not Found" response
160160
Given new "UpdateGCPSTSAccount" request
161161
And request contains "account_id" parameter from "REPLACE.ME"
162-
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"}}
162+
And body with value {"data": {"attributes": {"account_tags": [], "client_email": "[email protected]", "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": ["us-east1", "europe-north1"]}, "id": "d291291f-12c2-22g4-j290-123456678897", "type": "gcp_service_account"}}
163163
When the request is sent
164164
Then the response status is 404 Not Found
165165

tests/v2/features/given.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
"parameters": [
351351
{
352352
"name": "body",
353-
"value": "{\n \"data\": {\n \"type\": \"deployment_gate\",\n \"attributes\": {\n \"service\": \"my-service\",\n \"env\": \"production\",\n \"identifier\": \"my-gate-{{ unique_lower_alnum }}\",\n \"dry_run\": false\n }\n }\n}"
353+
"value": "{\n \"data\": {\n \"type\": \"deployment_gate\",\n \"attributes\": {\n \"service\": \"my-service\",\n \"env\": \"production\",\n \"identifier\": \"my-gate\",\n \"dry_run\": false\n }\n }\n}"
354354
}
355355
],
356356
"step": "there is a valid \"deployment_gate\" in the system",

0 commit comments

Comments
 (0)