Added mandatory field resourceType when creating cloud_configuration rule (#1272)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-12-19 08:43:51.366804",
-            "spec_repo_commit": "69a446d0"
+            "regenerated": "2022-12-19 10:28:53.334299",
+            "spec_repo_commit": "45a3d9c9"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-12-19 08:43:51.380018",
-            "spec_repo_commit": "69a446d0"
+            "regenerated": "2022-12-19 10:28:53.345908",
+            "spec_repo_commit": "45a3d9c9"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -1788,7 +1788,15 @@ components:
           type: boolean
         regoRule:
           $ref: '#/components/schemas/CloudConfigurationRegoRule'
+        resourceType:
+          description: 'Main resource type to be checked by the rule. It should be
+            specified again in `regoRule.resourceTypes`.
+
+            '
+          example: aws_acm
+          type: string
       required:
+      - resourceType
       - regoRule
       type: object
     CloudConfigurationRegoRule:

examples/v2/security-monitoring/CreateSecurityMonitoringRule_1092490364.py

@@ -31,6 +31,7 @@
     ],
     options=CloudConfigurationRuleOptions(
         compliance_rule_options=CloudConfigurationComplianceRuleOptions(
+            resource_type="gcp_compute_disk",
             complex_rule=False,
             rego_rule=CloudConfigurationRegoRule(
                 policy="package datadog\n",

examples/v2/security-monitoring/UpdateSecurityMonitoringRule_428087276.py

@@ -31,6 +31,7 @@
     ],
     options=SecurityMonitoringRuleOptions(
         compliance_rule_options=CloudConfigurationComplianceRuleOptions(
+            resource_type="gcp_compute_disk",
             rego_rule=CloudConfigurationRegoRule(
                 policy="package datadog\n",
                 resource_types=[

src/datadog_api_client/v2/model/cloud_configuration_compliance_rule_options.py

@@ -25,14 +25,22 @@ def openapi_types(_):
         return {
             "complex_rule": (bool,),
             "rego_rule": (CloudConfigurationRegoRule,),
+            "resource_type": (str,),
         }
 
     attribute_map = {
         "complex_rule": "complexRule",
         "rego_rule": "regoRule",
+        "resource_type": "resourceType",
     }
 
-    def __init__(self_, rego_rule: CloudConfigurationRegoRule, complex_rule: Union[bool, UnsetType] = unset, **kwargs):
+    def __init__(
+        self_,
+        rego_rule: CloudConfigurationRegoRule,
+        resource_type: str,
+        complex_rule: Union[bool, UnsetType] = unset,
+        **kwargs,
+    ):
         """
         Options for cloud_configuration rules.
 
@@ -42,9 +50,13 @@ def __init__(self_, rego_rule: CloudConfigurationRegoRule, complex_rule: Union[b
 
         :param rego_rule: Rule details.
         :type rego_rule: CloudConfigurationRegoRule
+
+        :param resource_type: Main resource type to be checked by the rule. It should be specified again in ``regoRule.resourceTypes``.
+        :type resource_type: str
         """
         if complex_rule is not unset:
             kwargs["complex_rule"] = complex_rule
         super().__init__(kwargs)
 
         self_.rego_rule = rego_rule
+        self_.resource_type = resource_type

tests/v2/cassettes/test_scenarios/test_create_a_cloud_configuration_rule_returns_ok_response.frozen

@@ -1 +1 @@
-2022-12-14T08:46:48.145Z
+2022-12-16T18:53:53.418Z

tests/v2/cassettes/test_scenarios/test_create_a_cloud_configuration_rule_returns_ok_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
-    body: '{"cases":[{"notifications":["channel"],"status":"info"}],"complianceSignalOptions":{"userActivationStatus":true,"userGroupByFields":["@account_id"]},"isEnabled":false,"message":"ddd","name":"Test-Create_a_cloud_configuration_rule_returns_OK_response-1671007608_cloud","options":{"complianceRuleOptions":{"complexRule":false,"regoRule":{"policy":"package
-      datadog\n","resourceTypes":["gcp_compute_disk"]}}},"tags":["my:tag"],"type":"cloud_configuration"}'
+    body: '{"cases":[{"notifications":["channel"],"status":"info"}],"complianceSignalOptions":{"userActivationStatus":true,"userGroupByFields":["@account_id"]},"isEnabled":false,"message":"ddd","name":"Test-Create_a_cloud_configuration_rule_returns_OK_response-1671216833_cloud","options":{"complianceRuleOptions":{"complexRule":false,"regoRule":{"policy":"package
+      datadog\n","resourceTypes":["gcp_compute_disk"]},"resourceType":"gcp_compute_disk"}},"tags":["my:tag"],"type":"cloud_configuration"}'
     headers:
       accept:
       - application/json
@@ -11,9 +11,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/security_monitoring/rules
   response:
     body:
-      string: '{"creationAuthorId":1445416,"tags":["my:tag"],"type":"cloud_configuration","isEnabled":false,"hasExtendedTitle":true,"message":"ddd","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"regoRule":{"policy":"package
-        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671007608778,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
-        > 0"}],"id":"azn-bwu-qdq","isDefault":false,"name":"Test-Create_a_cloud_configuration_rule_returns_OK_response-1671007608_cloud"}
+      string: '{"creationAuthorId":1445416,"tags":["my:tag"],"type":"cloud_configuration","isEnabled":false,"hasExtendedTitle":true,"message":"ddd","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"resourceType":"gcp_compute_disk","regoRule":{"policy":"package
+        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671216834196,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
+        > 0"}],"id":"fat-bma-9yo","isDefault":false,"name":"Test-Create_a_cloud_configuration_rule_returns_OK_response-1671216833_cloud"}
 
         '
     headers:
@@ -28,7 +28,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/azn-bwu-qdq
+    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/fat-bma-9yo
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_get_a_cloud_configuration_rules_details_returns_ok_response.frozen

@@ -1 +1 @@
-2022-12-14T08:46:49.009Z
+2022-12-16T18:53:54.585Z

tests/v2/cassettes/test_scenarios/test_get_a_cloud_configuration_rules_details_returns_ok_response.yaml

@@ -1,8 +1,8 @@
 interactions:
 - request:
     body: '{"cases":[{"notifications":["channel"],"status":"info"}],"complianceSignalOptions":{"userActivationStatus":true,"userGroupByFields":["@account_id"]},"isEnabled":false,"message":"Cloud
-      configuration rule","name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671007609_cloud","options":{"complianceRuleOptions":{"complexRule":false,"regoRule":{"policy":"package
-      datadog\n","resourceTypes":["gcp_compute_disk"]}}},"tags":["a:tag"],"type":"cloud_configuration"}'
+      configuration rule","name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671216834_cloud","options":{"complianceRuleOptions":{"complexRule":false,"regoRule":{"policy":"package
+      datadog\n","resourceTypes":["gcp_compute_disk"]},"resourceType":"gcp_compute_disk"}},"tags":["a:tag"],"type":"cloud_configuration"}'
     headers:
       accept:
       - application/json
@@ -13,9 +13,9 @@ interactions:
   response:
     body:
       string: '{"creationAuthorId":1445416,"tags":["a:tag"],"type":"cloud_configuration","isEnabled":false,"hasExtendedTitle":true,"message":"Cloud
-        configuration rule","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"regoRule":{"policy":"package
-        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671007609108,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
-        > 0"}],"id":"jxe-vmy-pef","isDefault":false,"name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671007609_cloud"}
+        configuration rule","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"resourceType":"gcp_compute_disk","regoRule":{"policy":"package
+        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671216834810,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
+        > 0"}],"id":"bwb-onz-qhs","isDefault":false,"name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671216834_cloud"}
 
         '
     headers:
@@ -30,13 +30,13 @@ interactions:
       accept:
       - application/json
     method: GET
-    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/jxe-vmy-pef
+    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/bwb-onz-qhs
   response:
     body:
       string: '{"creationAuthorId":1445416,"tags":["a:tag"],"type":"cloud_configuration","isEnabled":false,"hasExtendedTitle":true,"message":"Cloud
-        configuration rule","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"regoRule":{"policy":"package
-        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671007609108,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
-        > 0"}],"id":"jxe-vmy-pef","isDefault":false,"name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671007609_cloud"}
+        configuration rule","options":{"detectionMethod":"threshold","evaluationWindow":7200,"maxSignalDuration":86400,"complianceRuleOptions":{"resourceType":"gcp_compute_disk","regoRule":{"policy":"package
+        datadog\n","resourceTypes":["gcp_compute_disk"]},"complexRule":false},"keepAlive":21600},"version":1,"createdAt":1671216834810,"filters":[],"queries":[{"query":"resource_type:gcp_compute_disk","groupByFields":["resource_type","resource_id"],"aggregation":"count","name":"a","distinctFields":[]}],"isDeleted":false,"complianceSignalOptions":{"defaultActivationStatus":null,"userActivationStatus":true,"defaultGroupByFields":null,"userGroupByFields":["@account_id"]},"cases":[{"status":"info","notifications":["channel"],"name":"","condition":"a
+        > 0"}],"id":"bwb-onz-qhs","isDefault":false,"name":"Test-Get_a_cloud_configuration_rule_s_details_returns_OK_response-1671216834_cloud"}
 
         '
     headers:
@@ -51,7 +51,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/jxe-vmy-pef
+    uri: https://api.datadoghq.com/api/v2/security_monitoring/rules/bwb-onz-qhs
   response:
     body:
       string: ''

tests/v2/cassettes/test_scenarios/test_update_a_cloud_configuration_rules_details_returns_ok_response.frozen

@@ -1 +1 @@
-2022-12-14T08:46:49.424Z
+2022-12-16T18:53:55.424Z