Regenerate client from commit 12e050e of spec repo (#319)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-10-15 20:21:48.679835",
-            "spec_repo_commit": "452360f"
+            "regenerated": "2021-10-16 11:02:48.670750",
+            "spec_repo_commit": "12e050e"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-10-15 20:22:51.786005",
-            "spec_repo_commit": "452360f"
+            "regenerated": "2021-10-16 11:03:39.781259",
+            "spec_repo_commit": "12e050e"
         }
     }
 }

docs/v1/AWSIntegrationApi.md

@@ -40,9 +40,12 @@ let params: v1.AWSIntegrationApiCreateAWSAccountRequest = {
     accountSpecificNamespaceRules: {
       key: true,
     },
+    cspmResourceCollectionEnabled: true,
     excludedRegions: ["us-east-1", "us-west-2"],
     filterTags: ["<KEY>:<VALUE>"],
     hostTags: ["<KEY>:<VALUE>"],
+    metricsCollectionEnabled: false,
+    resourceCollectionEnabled: true,
     roleName: "DatadogAWSIntegrationRole",
     secretAccessKey: "secretAccessKey_example",
   },
@@ -174,9 +177,12 @@ let params: v1.AWSIntegrationApiCreateNewAWSExternalIDRequest = {
     accountSpecificNamespaceRules: {
       key: true,
     },
+    cspmResourceCollectionEnabled: true,
     excludedRegions: ["us-east-1", "us-west-2"],
     filterTags: ["<KEY>:<VALUE>"],
     hostTags: ["<KEY>:<VALUE>"],
+    metricsCollectionEnabled: false,
+    resourceCollectionEnabled: true,
     roleName: "DatadogAWSIntegrationRole",
     secretAccessKey: "secretAccessKey_example",
   },
@@ -545,9 +551,12 @@ let params: v1.AWSIntegrationApiUpdateAWSAccountRequest = {
     accountSpecificNamespaceRules: {
       key: true,
     },
+    cspmResourceCollectionEnabled: true,
     excludedRegions: ["us-east-1", "us-west-2"],
     filterTags: ["<KEY>:<VALUE>"],
     hostTags: ["<KEY>:<VALUE>"],
+    metricsCollectionEnabled: false,
+    resourceCollectionEnabled: true,
     roleName: "DatadogAWSIntegrationRole",
     secretAccessKey: "secretAccessKey_example",
   },

features/v1/aws_integration.feature

@@ -12,21 +12,21 @@ Feature: AWS Integration
   @generated @skip
   Scenario: Create an AWS integration returns "Bad Request" response
     Given new "CreateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip
   Scenario: Create an AWS integration returns "Conflict Error" response
     Given new "CreateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 409 Conflict Error
 
   @generated @skip
   Scenario: Create an AWS integration returns "OK" response
     Given new "CreateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 200 OK
 
@@ -68,14 +68,14 @@ Feature: AWS Integration
   @generated @skip
   Scenario: Generate a new external ID returns "Bad Request" response
     Given new "CreateNewAWSExternalID" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip
   Scenario: Generate a new external ID returns "OK" response
     Given new "CreateNewAWSExternalID" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 200 OK
 
@@ -126,20 +126,20 @@ Feature: AWS Integration
   @generated @skip
   Scenario: Update an AWS integration returns "Bad Request" response
     Given new "UpdateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip
   Scenario: Update an AWS integration returns "Conflict Error" response
     Given new "UpdateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 409 Conflict Error
 
   @generated @skip
   Scenario: Update an AWS integration returns "OK" response
     Given new "UpdateAWSAccount" request
-    And body with value {"access_key_id": null, "account_id": "1234567", "account_specific_namespace_rules": {"auto_scaling": false, "opswork": false}, "excluded_regions": ["us-east-1", "us-west-2"], "filter_tags": ["<KEY>:<VALUE>"], "host_tags": ["<KEY>:<VALUE>"], "role_name": "DatadogAWSIntegrationRole", "secret_access_key": null}
+    And body with value {"access_key_id": null, "account_id": "1234567", "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", "secret_access_key": null}
     When the request is sent
     Then the response status is 200 OK

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

@@ -27,6 +27,10 @@ export class AWSAccount {
    * An object, (in the form `{\"namespace1\":true/false, \"namespace2\":true/false}`), that enables or disables metric collection for specific AWS namespaces for this AWS account only.
    */
   "accountSpecificNamespaceRules"?: { [key: string]: boolean };
+  /**
+   * Whether Datadog collects cloud security posture management resources from your AWS account. This includes additional resources not covered under the general `resource_collection`.
+   */
+  "cspmResourceCollectionEnabled"?: boolean;
   /**
    * An array of AWS regions to exclude from metrics collection.
    */
@@ -39,6 +43,14 @@ export class AWSAccount {
    * Array of tags (in the form `key:value`) to add to all hosts and metrics reporting through this integration.
    */
   "hostTags"?: Array<string>;
+  /**
+   * Whether Datadog collects metrics for this AWS account.
+   */
+  "metricsCollectionEnabled"?: boolean;
+  /**
+   * Whether Datadog collects a standard set of resources from your AWS account.
+   */
+  "resourceCollectionEnabled"?: boolean;
   /**
    * Your Datadog role delegation name.
    */
@@ -70,6 +82,11 @@ export class AWSAccount {
       type: "{ [key: string]: boolean; }",
       format: "",
     },
+    cspmResourceCollectionEnabled: {
+      baseName: "cspm_resource_collection_enabled",
+      type: "boolean",
+      format: "",
+    },
     excludedRegions: {
       baseName: "excluded_regions",
       type: "Array<string>",
@@ -85,6 +102,16 @@ export class AWSAccount {
       type: "Array<string>",
       format: "",
     },
+    metricsCollectionEnabled: {
+      baseName: "metrics_collection_enabled",
+      type: "boolean",
+      format: "",
+    },
+    resourceCollectionEnabled: {
+      baseName: "resource_collection_enabled",
+      type: "boolean",
+      format: "",
+    },
     roleName: {
       baseName: "role_name",
       type: "string",
@@ -118,6 +145,12 @@ export class AWSAccount {
       ""
     );
 
+    res.cspmResourceCollectionEnabled = ObjectSerializer.deserialize(
+      data.cspm_resource_collection_enabled,
+      "boolean",
+      ""
+    );
+
     res.excludedRegions = ObjectSerializer.deserialize(
       data.excluded_regions,
       "Array<string>",
@@ -136,6 +169,18 @@ export class AWSAccount {
       ""
     );
 
+    res.metricsCollectionEnabled = ObjectSerializer.deserialize(
+      data.metrics_collection_enabled,
+      "boolean",
+      ""
+    );
+
+    res.resourceCollectionEnabled = ObjectSerializer.deserialize(
+      data.resource_collection_enabled,
+      "boolean",
+      ""
+    );
+
     res.roleName = ObjectSerializer.deserialize(data.role_name, "string", "");
 
     res.secretAccessKey = ObjectSerializer.deserialize(
@@ -172,6 +217,12 @@ export class AWSAccount {
       ""
     );
 
+    res.cspm_resource_collection_enabled = ObjectSerializer.serialize(
+      data.cspmResourceCollectionEnabled,
+      "boolean",
+      ""
+    );
+
     res.excluded_regions = ObjectSerializer.serialize(
       data.excludedRegions,
       "Array<string>",
@@ -190,6 +241,18 @@ export class AWSAccount {
       ""
     );
 
+    res.metrics_collection_enabled = ObjectSerializer.serialize(
+      data.metricsCollectionEnabled,
+      "boolean",
+      ""
+    );
+
+    res.resource_collection_enabled = ObjectSerializer.serialize(
+      data.resourceCollectionEnabled,
+      "boolean",
+      ""
+    );
+
     res.role_name = ObjectSerializer.serialize(data.roleName, "string", "");
 
     res.secret_access_key = ObjectSerializer.serialize(