aws api adding extended and deprecating old resource collection field (#1795)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 8b8089546b1d · 2024-04-10T20:27:58.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
Co-authored-by: api-clients-generation-pipeline[bot] &lt;54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-04-10 17:49:36.329308",
-            "spec_repo_commit": "bb0f8c92"
+            "regenerated": "2024-04-10 19:44:57.613520",
+            "spec_repo_commit": "3fb610b5"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-04-10 17:49:36.346913",
-            "spec_repo_commit": "bb0f8c92"
+            "regenerated": "2024-04-10 19:44:57.631078",
+            "spec_repo_commit": "3fb610b5"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -90,6 +90,12 @@ components:
             description: Regions to exclude.
             type: string
           type: array
+        extended_resource_collection_enabled:
+          default: false
+          description: Whether Datadog collects additional attributes and configuration
+            information about the resources in your AWS account. Required for `cspm_resource_collection`.
+          example: true
+          type: boolean
         filter_tags:
           description: 'The array of EC2 tags (in the form `key:value`) defines a
             filter that Datadog uses when collecting metrics from EC2.
@@ -128,8 +134,9 @@ components:
           type: boolean
         resource_collection_enabled:
           default: false
-          description: Whether Datadog collects a standard set of resources from your
-            AWS account.
+          deprecated: true
+          description: Deprecated in favor of 'extended_resource_collection_enabled'.
+            Whether Datadog collects a standard set of resources from your AWS account.
           example: true
           type: boolean
         role_name:
diff --git a/cassettes/features/v1/aws_integration/Create-an-AWS-integration-returns-OK-response.frozen b/cassettes/features/v1/aws_integration/Create-an-AWS-integration-returns-OK-response.frozen
@@ -1 +1 @@
-2023-11-13T14:17:01.291Z
+2024-04-05T18:30:30.891Z
diff --git a/cassettes/features/v1/aws_integration/Create-an-AWS-integration-returns-OK-response.yml b/cassettes/features/v1/aws_integration/Create-an-AWS-integration-returns-OK-response.yml
diff --git a/cassettes/features/v1/aws_integration/Delete-an-AWS-integration-returns-OK-response.frozen b/cassettes/features/v1/aws_integration/Delete-an-AWS-integration-returns-OK-response.frozen
@@ -1 +1 @@
-2023-11-21T19:25:15.118Z
+2024-04-05T18:30:32.594Z
diff --git a/cassettes/features/v1/aws_integration/Delete-an-AWS-integration-returns-OK-response.yml b/cassettes/features/v1/aws_integration/Delete-an-AWS-integration-returns-OK-response.yml
diff --git a/cassettes/features/v1/aws_integration/Update-an-AWS-integration-returns-OK-response.frozen b/cassettes/features/v1/aws_integration/Update-an-AWS-integration-returns-OK-response.frozen
@@ -1 +1 @@
-2023-11-23T18:16:16.323Z
+2024-04-05T18:30:34.377Z
diff --git a/cassettes/features/v1/aws_integration/Update-an-AWS-integration-returns-OK-response.yml b/cassettes/features/v1/aws_integration/Update-an-AWS-integration-returns-OK-response.yml
diff --git a/examples/v1/aws-integration/CreateAWSAccount.rb b/examples/v1/aws-integration/CreateAWSAccount.rb
@@ -13,14 +13,14 @@
     "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",
 })
 p api_instance.create_aws_account(body)
diff --git a/examples/v1/aws-integration/CreateNewAWSExternalID.rb b/examples/v1/aws-integration/CreateNewAWSExternalID.rb
@@ -13,6 +13,7 @@
     "us-east-1",
     "us-west-2",
   ],
+  extended_resource_collection_enabled: true,
   filter_tags: [
     "$KEY:$VALUE",
   ],
diff --git a/examples/v1/aws-integration/UpdateAWSAccount.rb b/examples/v1/aws-integration/UpdateAWSAccount.rb
@@ -13,14 +13,14 @@
     "us-east-1",
     "us-west-2",
   ],
+  extended_resource_collection_enabled: true,
   filter_tags: [
     "$KEY:$VALUE",
   ],
   host_tags: [
     "$KEY:$VALUE",
   ],
   metrics_collection_enabled: true,
-  resource_collection_enabled: true,
   role_name: "DatadogAWSIntegrationRole",
 })
 opts = {
diff --git a/features/v1/aws_integration.feature b/features/v1/aws_integration.feature
@@ -12,21 +12,21 @@ Feature: AWS Integration
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Create an AWS integration returns "Bad Request" response
     Given new "CreateAWSAccount" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Create an AWS integration returns "Conflict Error" response
     Given new "CreateAWSAccount" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 409 Conflict Error
 
   @team:DataDog/cloud-integrations
   Scenario: Create an AWS integration returns "OK" response
     Given new "CreateAWSAccount" request
-    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"}
+    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"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": false, "role_name": "DatadogAWSIntegrationRole"}
     When the request is sent
     Then the response status is 200 OK
 
@@ -97,14 +97,14 @@ Feature: AWS Integration
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Generate a new external ID returns "Bad Request" response
     Given new "CreateNewAWSExternalID" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Generate a new external ID returns "OK" response
     Given new "CreateNewAWSExternalID" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 200 OK
 
@@ -169,22 +169,22 @@ Feature: AWS Integration
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update an AWS integration returns "Bad Request" response
     Given new "UpdateAWSAccount" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update an AWS integration returns "Conflict Error" response
     Given new "UpdateAWSAccount" request
-    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"}
+    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"}
     When the request is sent
     Then the response status is 409 Conflict Error
 
   @team:DataDog/cloud-integrations
   Scenario: Update an AWS integration returns "OK" response
     Given there is a valid "aws_account" in the system
     And new "UpdateAWSAccount" request
-    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"}
+    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"], "extended_resource_collection_enabled": true, "filter_tags": ["$KEY:$VALUE"], "host_tags": ["$KEY:$VALUE"], "metrics_collection_enabled": true, "role_name": "DatadogAWSIntegrationRole"}
     And request contains "account_id" parameter with value "{{ timestamp("now") }}00"
     And request contains "role_name" parameter with value "DatadogAWSIntegrationRole"
     When the request is sent
diff --git a/features/v1/given.json b/features/v1/given.json
@@ -104,7 +104,7 @@
       {
         "name": "body",
         "origin": "request",
-        "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}"
+        "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  \"extended_resource_collection_enabled\": true,\n  \"filter_tags\": [\n      \"$KEY:$VALUE\"\n  ],\n  \"host_tags\": [\n      \"$KEY:$VALUE\"\n  ],\n  \"metrics_collection_enabled\": false,\n  \"role_name\": \"DatadogAWSIntegrationRole\"\n}"
       }
     ],
     "step": "there is a valid \"aws_account\" in the system",
diff --git a/lib/datadog_api_client/v1/models/aws_account.rb b/lib/datadog_api_client/v1/models/aws_account.rb

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`"spec_versions": {`
`5`	`5`	`"v1": {`
`6`	`6`	`"apigentools_version": "1.6.6",`
`7`		`- "regenerated": "2024-04-10 17:49:36.329308",`
`8`		`- "spec_repo_commit": "bb0f8c92"`
	`7`	`+ "regenerated": "2024-04-10 19:44:57.613520",`
	`8`	`+ "spec_repo_commit": "3fb610b5"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-04-10 17:49:36.346913",`
`13`		`- "spec_repo_commit": "bb0f8c92"`
	`12`	`+ "regenerated": "2024-04-10 19:44:57.631078",`
	`13`	`+ "spec_repo_commit": "3fb610b5"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2023-11-13T14:17:01.291Z`
	`1`	`+2024-04-05T18:30:30.891Z`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2023-11-21T19:25:15.118Z`
	`1`	`+2024-04-05T18:30:32.594Z`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2023-11-23T18:16:16.323Z`
	`1`	`+2024-04-05T18:30:34.377Z`