Skip to content

Commit dc91a19

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
aws api adding extended and deprecating old resource collection field (#1591)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
1 parent f8ad34b commit dc91a19

File tree

14 files changed

+81
-65
lines changed

14 files changed

+81
-65
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-10 17:49:38.783202",
8-
"spec_repo_commit": "bb0f8c92"
7+
"regenerated": "2024-04-10 19:44:51.330205",
8+
"spec_repo_commit": "3fb610b5"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-04-10 17:49:38.803360",
13-
"spec_repo_commit": "bb0f8c92"
12+
"regenerated": "2024-04-10 19:44:51.348296",
13+
"spec_repo_commit": "3fb610b5"
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 additional attributes and configuration
96+
information about the resources in your AWS account. Required for `cspm_resource_collection`.
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/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2023-11-13T14:17:01.291Z"
1+
"2024-04-05T18:30:30.891Z"

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
"entries": [
1010
{
11-
"_id": "b345fb9c3709338914a9210da4d600fd",
11+
"_id": "f3b49bb6ccbec0a4a8c8d5f34460e5c8",
1212
"_order": 0,
1313
"cache": {},
1414
"request": {
15-
"bodySize": 340,
15+
"bodySize": 349,
1616
"cookies": [],
1717
"headers": [
1818
{
@@ -26,13 +26,13 @@
2626
"value": "application/json"
2727
}
2828
],
29-
"headersSize": 566,
29+
"headersSize": 564,
3030
"httpVersion": "HTTP/1.1",
3131
"method": "POST",
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\":\"171234183000\",\"account_specific_namespace_rules\":{\"auto_scaling\":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,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -42,7 +42,7 @@
4242
"content": {
4343
"mimeType": "application/json",
4444
"size": 51,
45-
"text": "{\"external_id\":\"9668e281c0ef4cc8be01710ef7a0ae4c\"}\n"
45+
"text": "{\"external_id\":\"acb8f6b8a844443dbb726d07dcb1a870\"}\n"
4646
},
4747
"cookies": [],
4848
"headers": [
@@ -57,11 +57,11 @@
5757
"status": 200,
5858
"statusText": "OK"
5959
},
60-
"startedDateTime": "2023-11-13T14:17:01.302Z",
61-
"time": 1169
60+
"startedDateTime": "2024-04-05T18:30:30.900Z",
61+
"time": 958
6262
},
6363
{
64-
"_id": "f88366bd5b70614a86ac275fdf744321",
64+
"_id": "3da73460b8b06d1164ef7bc5d9a1e0c5",
6565
"_order": 0,
6666
"cache": {},
6767
"request": {
@@ -85,7 +85,7 @@
8585
"postData": {
8686
"mimeType": "application/json",
8787
"params": [],
88-
"text": "{\"account_id\":\"169988502100\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
88+
"text": "{\"account_id\":\"171234183000\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
8989
},
9090
"queryString": [],
9191
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -110,8 +110,8 @@
110110
"status": 200,
111111
"statusText": "OK"
112112
},
113-
"startedDateTime": "2023-11-13T14:17:02.482Z",
114-
"time": 745
113+
"startedDateTime": "2024-04-05T18:30:31.867Z",
114+
"time": 702
115115
}
116116
],
117117
"pages": [],

‎cassettes/v1/AWS-Integration_2071210100/Delete-an-AWS-integration-returns-OK-response_3815706596/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2023-11-21T19:25:15.118Z"
1+
"2024-04-05T18:30:32.594Z"

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
"entries": [
1010
{
11-
"_id": "bb29ad65cdffba55412405b976907dc1",
11+
"_id": "348e74c61f4b79b1b6f79b18b6b7b72c",
1212
"_order": 0,
1313
"cache": {},
1414
"request": {
15-
"bodySize": 340,
15+
"bodySize": 349,
1616
"cookies": [],
1717
"headers": [
1818
{
@@ -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\":\"171234183200\",\"account_specific_namespace_rules\":{\"auto_scaling\":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,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -42,7 +42,7 @@
4242
"content": {
4343
"mimeType": "application/json",
4444
"size": 51,
45-
"text": "{\"external_id\":\"77c77ead62584b0fa1bb6a9fe7d2fa28\"}\n"
45+
"text": "{\"external_id\":\"6aa1bf95e5dc4c9985593e94169bd2f6\"}\n"
4646
},
4747
"cookies": [],
4848
"headers": [
@@ -57,11 +57,11 @@
5757
"status": 200,
5858
"statusText": "OK"
5959
},
60-
"startedDateTime": "2023-11-21T19:25:15.135Z",
61-
"time": 1335
60+
"startedDateTime": "2024-04-05T18:30:32.599Z",
61+
"time": 912
6262
},
6363
{
64-
"_id": "c922634dc5c2ad1983b0cbb0aad81180",
64+
"_id": "d95107559fb91e0e2661820fc7c24618",
6565
"_order": 0,
6666
"cache": {},
6767
"request": {
@@ -85,7 +85,7 @@
8585
"postData": {
8686
"mimeType": "application/json",
8787
"params": [],
88-
"text": "{\"account_id\":\"170059471500\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
88+
"text": "{\"account_id\":\"171234183200\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
8989
},
9090
"queryString": [],
9191
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -110,11 +110,11 @@
110110
"status": 200,
111111
"statusText": "OK"
112112
},
113-
"startedDateTime": "2023-11-21T19:25:16.482Z",
114-
"time": 1225
113+
"startedDateTime": "2024-04-05T18:30:33.516Z",
114+
"time": 533
115115
},
116116
{
117-
"_id": "c922634dc5c2ad1983b0cbb0aad81180",
117+
"_id": "d95107559fb91e0e2661820fc7c24618",
118118
"_order": 1,
119119
"cache": {},
120120
"request": {
@@ -138,7 +138,7 @@
138138
"postData": {
139139
"mimeType": "application/json",
140140
"params": [],
141-
"text": "{\"account_id\":\"170059471500\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
141+
"text": "{\"account_id\":\"171234183200\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
142142
},
143143
"queryString": [],
144144
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -148,7 +148,7 @@
148148
"content": {
149149
"mimeType": "application/json",
150150
"size": 69,
151-
"text": "{\"errors\":[\"AWS account 170059471500 does not exist in integration\"]}"
151+
"text": "{\"errors\":[\"AWS account 171234183200 does not exist in integration\"]}"
152152
},
153153
"cookies": [],
154154
"headers": [
@@ -163,8 +163,8 @@
163163
"status": 400,
164164
"statusText": "Bad Request"
165165
},
166-
"startedDateTime": "2023-11-21T19:25:17.719Z",
167-
"time": 646
166+
"startedDateTime": "2024-04-05T18:30:34.055Z",
167+
"time": 290
168168
}
169169
],
170170
"pages": [],

‎cassettes/v1/AWS-Integration_2071210100/Update-an-AWS-integration-returns-OK-response_598706190/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2023-11-23T18:16:16.323Z"
1+
"2024-04-05T18:30:34.377Z"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
"entries": [
1010
{
11-
"_id": "e683ecb697b42ae82b13f186c3db794e",
11+
"_id": "7e45d349dc2c7cf2254ac96981cb3b8c",
1212
"_order": 0,
1313
"cache": {},
1414
"request": {
15-
"bodySize": 340,
15+
"bodySize": 349,
1616
"cookies": [],
1717
"headers": [
1818
{
@@ -26,13 +26,13 @@
2626
"value": "application/json"
2727
}
2828
],
29-
"headersSize": 566,
29+
"headersSize": 565,
3030
"httpVersion": "HTTP/1.1",
3131
"method": "POST",
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\":\"171234183400\",\"account_specific_namespace_rules\":{\"auto_scaling\":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,\"role_name\":\"DatadogAWSIntegrationRole\"}"
3636
},
3737
"queryString": [],
3838
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -42,7 +42,7 @@
4242
"content": {
4343
"mimeType": "application/json",
4444
"size": 51,
45-
"text": "{\"external_id\":\"c7298c166e774bf1bd1bc0419e68f1a0\"}\n"
45+
"text": "{\"external_id\":\"c8ceedec95fc472fb6156f3104d425c9\"}\n"
4646
},
4747
"cookies": [],
4848
"headers": [
@@ -57,15 +57,15 @@
5757
"status": 200,
5858
"statusText": "OK"
5959
},
60-
"startedDateTime": "2023-11-23T18:16:16.343Z",
61-
"time": 2615
60+
"startedDateTime": "2024-04-05T18:30:34.387Z",
61+
"time": 2202
6262
},
6363
{
64-
"_id": "b9ef091797137f878c603a564f800395",
64+
"_id": "1e790ee1b18795ef17d095b586ba7c7f",
6565
"_order": 0,
6666
"cache": {},
6767
"request": {
68-
"bodySize": 340,
68+
"bodySize": 349,
6969
"cookies": [],
7070
"headers": [
7171
{
@@ -85,19 +85,19 @@
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\":\"171234183400\",\"account_specific_namespace_rules\":{\"auto_scaling\":false},\"cspm_resource_collection_enabled\":false,\"excluded_regions\":[\"us-east-1\",\"us-west-2\"],\"extended_resource_collection_enabled\":true,\"filter_tags\":[\"$KEY:$VALUE\"],\"host_tags\":[\"$KEY:$VALUE\"],\"metrics_collection_enabled\":true,\"role_name\":\"DatadogAWSIntegrationRole\"}"
8989
},
9090
"queryString": [
9191
{
9292
"name": "account_id",
93-
"value": "170076337600"
93+
"value": "171234183400"
9494
},
9595
{
9696
"name": "role_name",
9797
"value": "DatadogAWSIntegrationRole"
9898
}
9999
],
100-
"url": "https://api.datadoghq.com/api/v1/integration/aws?account_id=170076337600&role_name=DatadogAWSIntegrationRole"
100+
"url": "https://api.datadoghq.com/api/v1/integration/aws?account_id=171234183400&role_name=DatadogAWSIntegrationRole"
101101
},
102102
"response": {
103103
"bodySize": 3,
@@ -119,11 +119,11 @@
119119
"status": 200,
120120
"statusText": "OK"
121121
},
122-
"startedDateTime": "2023-11-23T18:16:18.984Z",
123-
"time": 1204
122+
"startedDateTime": "2024-04-05T18:30:36.613Z",
123+
"time": 901
124124
},
125125
{
126-
"_id": "9979a2c458fd639b7988df76fa0025d7",
126+
"_id": "60b4327d82df8e63aaefa6cbf2a229d8",
127127
"_order": 0,
128128
"cache": {},
129129
"request": {
@@ -147,7 +147,7 @@
147147
"postData": {
148148
"mimeType": "application/json",
149149
"params": [],
150-
"text": "{\"account_id\":\"170076337600\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
150+
"text": "{\"account_id\":\"171234183400\",\"role_name\":\"DatadogAWSIntegrationRole\"}"
151151
},
152152
"queryString": [],
153153
"url": "https://api.datadoghq.com/api/v1/integration/aws"
@@ -172,8 +172,8 @@
172172
"status": 200,
173173
"statusText": "OK"
174174
},
175-
"startedDateTime": "2023-11-23T18:16:20.211Z",
176-
"time": 977
175+
"startedDateTime": "2024-04-05T18:30:37.519Z",
176+
"time": 600
177177
}
178178
],
179179
"pages": [],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const params: v1.AWSIntegrationApiCreateAWSAccountRequest = {
1515
},
1616
cspmResourceCollectionEnabled: true,
1717
excludedRegions: ["us-east-1", "us-west-2"],
18+
extendedResourceCollectionEnabled: true,
1819
filterTags: ["$KEY:$VALUE"],
1920
hostTags: ["$KEY:$VALUE"],
2021
metricsCollectionEnabled: false,
21-
resourceCollectionEnabled: 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
@@ -15,10 +15,10 @@ const params: v1.AWSIntegrationApiUpdateAWSAccountRequest = {
1515
},
1616
cspmResourceCollectionEnabled: false,
1717
excludedRegions: ["us-east-1", "us-west-2"],
18+
extendedResourceCollectionEnabled: true,
1819
filterTags: ["$KEY:$VALUE"],
1920
hostTags: ["$KEY:$VALUE"],
2021
metricsCollectionEnabled: true,
21-
resourceCollectionEnabled: true,
2222
roleName: "DatadogAWSIntegrationRole",
2323
},
2424
accountId: "163662907100",

0 commit comments

Comments
 (0)