Skip to content

Commit 3a21130

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit e2359f28 of spec repo
1 parent abdeab1 commit 3a21130

File tree

11 files changed

+38
-22
lines changed

11 files changed

+38
-22
lines changed

‎.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-04-05 17:05:16.833733",
8-
"spec_repo_commit": "9b7c8967"
7+
"regenerated": "2024-04-05 18:31:54.551277",
8+
"spec_repo_commit": "e2359f28"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-04-05 17:05:16.851932",
13-
"spec_repo_commit": "9b7c8967"
12+
"regenerated": "2024-04-05 18:31:54.568754",
13+
"spec_repo_commit": "e2359f28"
1414
}
1515
}
1616
}

‎.generator/schemas/v1/openapi.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ components:
9090
description: Regions to exclude.
9191
type: string
9292
type: array
93+
extended_resource_collection_enabled:
94+
default: false
95+
description: Whether Datadog collects a standard set of resources from your
96+
AWS account.
97+
example: true
98+
type: boolean
9399
filter_tags:
94100
description: 'The array of EC2 tags (in the form `key:value`) defines a
95101
filter that Datadog uses when collecting metrics from EC2.
@@ -128,8 +134,9 @@ components:
128134
type: boolean
129135
resource_collection_enabled:
130136
default: false
131-
description: Whether Datadog collects a standard set of resources from your
132-
AWS account.
137+
deprecated: true
138+
description: Deprecated in favor of 'extended_resource_collection_enabled'.
139+
Whether Datadog collects a standard set of resources from your AWS account.
133140
example: true
134141
type: boolean
135142
role_name:

‎cassettes/v1/AWS-Integration_2071210100/Create-an-AWS-integration-returns-OK-response_3371466541/recording.har

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"postData": {
3333
"mimeType": "application/json",
3434
"params": [],
35-
"text": "{\"account_id\":\"169988502100\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
35+
"text": "{\"account_id\":\"169988502100\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"extended_resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"

‎cassettes/v1/AWS-Integration_2071210100/Delete-an-AWS-integration-returns-OK-response_3815706596/recording.har

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"postData": {
3333
"mimeType": "application/json",
3434
"params": [],
35-
"text": "{\"account_id\":\"170059471500\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
35+
"text": "{\"account_id\":\"170059471500\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"extended_resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"

‎cassettes/v1/AWS-Integration_2071210100/Update-an-AWS-integration-returns-OK-response_598706190/recording.har

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"postData": {
3333
"mimeType": "application/json",
3434
"params": [],
35-
"text": "{\"account_id\":\"170076337600\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
35+
"text": "{\"account_id\":\"170076337600\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":true,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":false,\"extended_resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -85,7 +85,7 @@
8585
"postData": {
8686
"mimeType": "application/json",
8787
"params": [],
88-
"text": "{\"account_id\":\"170076337600\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":false,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":true,\"resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
88+
"text": "{\"account_id\":\"170076337600\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":false,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":true,\"extended_resource_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
8989
},
9090
"queryString": [
9191
{

‎examples/v1/aws-integration/CreateAWSAccount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const params: v1.AWSIntegrationApiCreateAWSAccountRequest = {
1818
filterTags: ["$KEY:$VALUE"],
1919
hostTags: ["$KEY:$VALUE"],
2020
metricsCollectionEnabled: false,
21-
resourceCollectionEnabled: true,
21+
extendedResourceCollectionEnabled: true,
2222
roleName: "DatadogAWSIntegrationRole",
2323
},
2424
};

‎examples/v1/aws-integration/CreateNewAWSExternalID.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const params: v1.AWSIntegrationApiCreateNewAWSExternalIDRequest = {
1616
},
1717
cspmResourceCollectionEnabled: true,
1818
excludedRegions: ["us-east-1", "us-west-2"],
19+
extendedResourceCollectionEnabled: true,
1920
filterTags: ["$KEY:$VALUE"],
2021
hostTags: ["$KEY:$VALUE"],
2122
metricsCollectionEnabled: false,

‎examples/v1/aws-integration/UpdateAWSAccount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const params: v1.AWSIntegrationApiUpdateAWSAccountRequest = {
1818
filterTags: ["$KEY:$VALUE"],
1919
hostTags: ["$KEY:$VALUE"],
2020
metricsCollectionEnabled: true,
21-
resourceCollectionEnabled: true,
21+
extendedResourceCollectionEnabled: true,
2222
roleName: "DatadogAWSIntegrationRole",
2323
},
2424
accountId: "163662907100",

‎features/v1/aws_integration.feature

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ Feature: AWS Integration
1212
@generated @skip @team:DataDog/cloud-integrations
1313
Scenario: Create an AWS integration returns "Bad Request" response
1414
Given new "CreateAWSAccount" request
15-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
15+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
1616
When the request is sent
1717
Then the response status is 400 Bad Request
1818

1919
@generated @skip @team:DataDog/cloud-integrations
2020
Scenario: Create an AWS integration returns "Conflict Error" response
2121
Given new "CreateAWSAccount" request
22-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
22+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
2323
When the request is sent
2424
Then the response status is 409 Conflict Error
2525

2626
@team:DataDog/cloud-integrations
2727
Scenario: Create an AWS integration returns "OK" response
2828
Given new "CreateAWSAccount" request
29-
And body with value {"account_id": "{{ timestamp("now") }}00", "account_specific_namespace_rules": {"auto_scaling": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
29+
And body with value {"account_id": "{{ timestamp("now") }}00", "account_specific_namespace_rules": {"auto_scaling": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "extended_resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
3030
When the request is sent
3131
Then the response status is 200 OK
3232

@@ -97,14 +97,14 @@ Feature: AWS Integration
9797
@generated @skip @team:DataDog/cloud-integrations
9898
Scenario: Generate a new external ID returns "Bad Request" response
9999
Given new "CreateNewAWSExternalID" request
100-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
100+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
101101
When the request is sent
102102
Then the response status is 400 Bad Request
103103

104104
@generated @skip @team:DataDog/cloud-integrations
105105
Scenario: Generate a new external ID returns "OK" response
106106
Given new "CreateNewAWSExternalID" request
107-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
107+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
108108
When the request is sent
109109
Then the response status is 200 OK
110110

@@ -169,22 +169,22 @@ Feature: AWS Integration
169169
@generated @skip @team:DataDog/cloud-integrations
170170
Scenario: Update an AWS integration returns "Bad Request" response
171171
Given new "UpdateAWSAccount" request
172-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
172+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
173173
When the request is sent
174174
Then the response status is 400 Bad Request
175175

176176
@generated @skip @team:DataDog/cloud-integrations
177177
Scenario: Update an AWS integration returns "Conflict Error" response
178178
Given new "UpdateAWSAccount" request
179-
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
179+
And body with value {"account_id": "123456789012", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "cspm_resource_collection_enabled": true, "excluded_regions": ["us-east-1", "us-west-2"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
180180
When the request is sent
181181
Then the response status is 409 Conflict Error
182182

183183
@team:DataDog/cloud-integrations
184184
Scenario: Update an AWS integration returns "OK" response
185185
Given there is a valid "aws_account" in the system
186186
And new "UpdateAWSAccount" request
187-
And body with value {"account_id": "{{ timestamp("now") }}00", "account_specific_namespace_rules": {"auto_scaling": false}, "cspm_resource_collection_enabled": false, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": true, "resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
187+
And body with value {"account_id": "{{ timestamp("now") }}00", "account_specific_namespace_rules": {"auto_scaling": false}, "cspm_resource_collection_enabled": false, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": true, "extended_resource_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
188188
And request contains "account_id" parameter with value "{{ timestamp("now") }}00"
189189
And request contains "role_name" parameter with value "DatadogAWSIntegrationRole"
190190
When the request is sent

‎features/v1/given.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
{
105105
"name": "body",
106106
"origin": "request",
107-
"value": "{\n \"account_id\": \"{{ timestamp(\"now\") }}00\",\n \"account_specific_namespace_rules\": {\n \"auto_scaling\": false\n },\n \"cspm_resource_collection_enabled\": true,\n \"excluded_regions\": [\n \"us-east-1\",\n \"us-west-2\"\n ],\n \"filter_tags\": [\n \"$KEY:$VALUE\"\n ],\n \"host_tags\": [\n \"$KEY:$VALUE\"\n ],\n \"metrics_collection_enabled\": false,\n \"resource_collection_enabled\": true,\n \"role_name\": \"DatadogAWSIntegrationRole\"\n}"
107+
"value": "{\n \"account_id\": \"{{ timestamp(\"now\") }}00\",\n \"account_specific_namespace_rules\": {\n \"auto_scaling\": false\n },\n \"cspm_resource_collection_enabled\": true,\n \"excluded_regions\": [\n \"us-east-1\",\n \"us-west-2\"\n ],\n \"filter_tags\": [\n \"$KEY:$VALUE\"\n ],\n \"host_tags\": [\n \"$KEY:$VALUE\"\n ],\n \"metrics_collection_enabled\": false,\n \"extended_resource_collection_enabled\": true,\n \"role_name\": \"DatadogAWSIntegrationRole\"\n}"
108108
}
109109
],
110110
"step": "there is a valid \"aws_account\" in the system",

‎packages/datadog-api-client-v1/models/AWSAccount.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ export class AWSAccount {
3333
* to exclude from metrics collection.
3434
*/
3535
"excludedRegions"?: Array<string>;
36+
/**
37+
* Whether Datadog collects a standard set of resources from your AWS account.
38+
*/
39+
"extendedResourceCollectionEnabled"?: boolean;
3640
/**
3741
* The array of EC2 tags (in the form `key:value`) defines a filter that Datadog uses when collecting metrics from EC2.
3842
* Wildcards, such as `?` (for single characters) and `*` (for multiple characters) can also be used.
@@ -52,7 +56,7 @@ export class AWSAccount {
5256
*/
5357
"metricsCollectionEnabled"?: boolean;
5458
/**
55-
* Whether Datadog collects a standard set of resources from your AWS account.
59+
* Deprecated in favor of 'extended_resource_collection_enabled'. Whether Datadog collects a standard set of resources from your AWS account.
5660
*/
5761
"resourceCollectionEnabled"?: boolean;
5862
/**
@@ -100,6 +104,10 @@ export class AWSAccount {
100104
baseName: "excluded_regions",
101105
type: "Array<string>",
102106
},
107+
extendedResourceCollectionEnabled: {
108+
baseName: "extended_resource_collection_enabled",
109+
type: "boolean",
110+
},
103111
filterTags: {
104112
baseName: "filter_tags",
105113
type: "Array<string>",

0 commit comments

Comments
 (0)