Include rule ID in request body of all integration tests (#1637)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 16cf2b7e477e · 2024-06-05T19:13:04.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-06-04 15:12:37.086064",
-            "spec_repo_commit": "60183db6"
+            "regenerated": "2024-06-05 15:00:50.431480",
+            "spec_repo_commit": "8e7244ae"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-06-04 15:12:37.103928",
-            "spec_repo_commit": "60183db6"
+            "regenerated": "2024-06-05 15:00:50.449984",
+            "spec_repo_commit": "8e7244ae"
         }
     }
 }
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-CSM-Threats-Agent-rule-returns-Bad-Request-response_400928944/frozen.json b/cassettes/v2/CSM-Threats_3156990395/Update-a-CSM-Threats-Agent-rule-returns-Bad-Request-response_400928944/frozen.json
@@ -1 +1 @@
-"2024-04-23T17:57:50.511Z"
+"2024-05-28T19:38:08.047Z"
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-CSM-Threats-Agent-rule-returns-Bad-Request-response_400928944/recording.har b/cassettes/v2/CSM-Threats_3156990395/Update-a-CSM-Threats-Agent-rule-returns-Bad-Request-response_400928944/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "a99541b697ee701869d771100ce6c3b9",
+        "_id": "f62fa329b7d7f3c439455f1d7d83ff69",
         "_order": 0,
         "cache": {},
         "request": {
@@ -32,17 +32,17 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"data\":{\"attributes\":{\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"name\":\"testupdateacsmthreatsagentrulereturnsbadrequestresponse1713895070\"},\"type\":\"agent_rule\"}}"
+            "text": "{\"data\":{\"attributes\":{\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"name\":\"testupdateacsmthreatsagentrulereturnsbadrequestresponse1716925088\"},\"type\":\"agent_rule\"}}"
           },
           "queryString": [],
           "url": "https://api.datadoghq.com/api/v2/remote_config/products/cws/agent_rules"
         },
         "response": {
-          "bodySize": 464,
+          "bodySize": 520,
           "content": {
             "mimeType": "application/json",
-            "size": 464,
-            "text": "{\"data\":{\"id\":\"rgf-aao-lo8\",\"type\":\"agent_rule\",\"attributes\":{\"category\":\"Process Activity\",\"creationDate\":1713895070561,\"creator\":{\"name\":\"\",\"handle\":\"frog@datadoghq.com\"},\"defaultRule\":false,\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"filters\":[\"os == \\\"linux\\\"\"],\"name\":\"testupdateacsmthreatsagentrulereturnsbadrequestresponse1713895070\",\"updateDate\":1713895070561,\"updater\":{\"name\":\"\",\"handle\":\"frog@datadoghq.com\"}}}}"
+            "size": 520,
+            "text": "{\"data\":{\"id\":\"0wn-l36-875\",\"type\":\"agent_rule\",\"attributes\":{\"category\":\"Process Activity\",\"creationDate\":1716925088306,\"creator\":{\"name\":\"CI Account\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\"},\"defaultRule\":false,\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"filters\":[\"os == \\\"linux\\\"\"],\"name\":\"testupdateacsmthreatsagentrulereturnsbadrequestresponse1716925088\",\"updateDate\":1716925088306,\"updater\":{\"name\":\"CI Account\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\"}}}}"
           },
           "cookies": [],
           "headers": [
@@ -57,11 +57,11 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2024-04-23T17:57:50.514Z",
-        "time": 505
+        "startedDateTime": "2024-05-28T19:38:08.254Z",
+        "time": 648
       },
       {
-        "_id": "7a6b4c77c3fbeb488042a0914546aa3d",
+        "_id": "093c028966a7d4d4e415092f0a75ee45",
         "_order": 0,
         "cache": {},
         "request": {
@@ -85,17 +85,17 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"open.file.path = sh\"},\"id\":\"abc-123-xyz\",\"type\":\"agent_rule\"}}"
+            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"open.file.path = sh\"},\"id\":\"0wn-l36-875\",\"type\":\"agent_rule\"}}"
           },
           "queryString": [],
-          "url": "https://api.datadoghq.com/api/v2/remote_config/products/cws/agent_rules/rgf-aao-lo8"
+          "url": "https://api.datadoghq.com/api/v2/remote_config/products/cws/agent_rules/0wn-l36-875"
         },
         "response": {
-          "bodySize": 47,
+          "bodySize": 211,
           "content": {
             "mimeType": "application/json",
-            "size": 47,
-            "text": "{\"errors\":[{\"title\":\"failed to update rule\"}]}\n"
+            "size": 211,
+            "text": "{\"errors\":[\"input_validation_error(Field 'expression' is invalid: rule `testupdateacsmthreatsagentrulereturnsbadrequestresponse1716925088` error: syntax error `1:18: unexpected token \\\"sh\\\" (expected \\\"~\\\")`)\"]}"
           },
           "cookies": [],
           "headers": [
@@ -104,17 +104,17 @@
               "value": "application/json"
             }
           ],
-          "headersSize": 216,
+          "headersSize": 217,
           "httpVersion": "HTTP/1.1",
           "redirectURL": "",
           "status": 400,
           "statusText": "Bad Request"
         },
-        "startedDateTime": "2024-04-23T17:57:51.025Z",
-        "time": 69
+        "startedDateTime": "2024-05-28T19:38:08.909Z",
+        "time": 164
       },
       {
-        "_id": "afa7a7d1c1caefb9f520649fb1c00360",
+        "_id": "3fee0144947347d25c7babbbf617da0b",
         "_order": 0,
         "cache": {},
         "request": {
@@ -131,7 +131,7 @@
           "httpVersion": "HTTP/1.1",
           "method": "DELETE",
           "queryString": [],
-          "url": "https://api.datadoghq.com/api/v2/remote_config/products/cws/agent_rules/rgf-aao-lo8"
+          "url": "https://api.datadoghq.com/api/v2/remote_config/products/cws/agent_rules/0wn-l36-875"
         },
         "response": {
           "bodySize": 0,
@@ -152,8 +152,8 @@
           "status": 204,
           "statusText": "No Content"
         },
-        "startedDateTime": "2024-04-23T17:57:51.101Z",
-        "time": 372
+        "startedDateTime": "2024-05-28T19:38:09.079Z",
+        "time": 403
       }
     ],
     "pages": [],
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Bad-Request-response_1212149568/frozen.json b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Bad-Request-response_1212149568/frozen.json
@@ -1 +1 @@
-"2024-04-23T17:57:52.935Z"
+"2024-05-28T19:38:09.490Z"
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Bad-Request-response_1212149568/recording.har b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Bad-Request-response_1212149568/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "b3eba028608a40da1192a0f517604940",
+        "_id": "a135c5ab5ca5e21838b2ea5530f3a5c9",
         "_order": 0,
         "cache": {},
         "request": {
@@ -26,23 +26,23 @@
               "value": "application/json"
             }
           ],
-          "headersSize": 626,
+          "headersSize": 625,
           "httpVersion": "HTTP/1.1",
           "method": "POST",
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"data\":{\"attributes\":{\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"name\":\"testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1713895072\"},\"type\":\"agent_rule\"}}"
+            "text": "{\"data\":{\"attributes\":{\"description\":\"My Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\",\"name\":\"testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1716925089\"},\"type\":\"agent_rule\"}}"
           },
           "queryString": [],
           "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules"
         },
         "response": {
-          "bodySize": 644,
+          "bodySize": 696,
           "content": {
             "mimeType": "application/json",
-            "size": 644,
-            "text": "{\"data\":{\"id\":\"1su-fqy-sjj\",\"attributes\":{\"version\":1,\"name\":\"testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1713895072\",\"description\":\"My Agent rule\",\"expression\":\"exec.file.name == \\\"sh\\\"\",\"category\":\"Process Activity\",\"creationAuthorUuId\":\"3ad549bf-eba0-11e9-a77a-0705486660d0\",\"creationDate\":1713895073105,\"updateAuthorUuId\":\"3ad549bf-eba0-11e9-a77a-0705486660d0\",\"updateDate\":1713895073105,\"filters\":[\"os == \\\"linux\\\"\"],\"actions\":[],\"agentConstraint\":\"\",\"enabled\":true,\"defaultRule\":false,\"creator\":{\"name\":null,\"handle\":\"frog@datadoghq.com\"},\"updater\":{\"name\":null,\"handle\":\"frog@datadoghq.com\"}},\"type\":\"agent_rule\"}}\n"
+            "size": 696,
+            "text": "{\"data\":{\"id\":\"qdg-dfm-kku\",\"attributes\":{\"version\":1,\"name\":\"testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1716925089\",\"description\":\"My Agent rule\",\"expression\":\"exec.file.name == \\\"sh\\\"\",\"category\":\"Process Activity\",\"creationAuthorUuId\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"creationDate\":1716925089625,\"updateAuthorUuId\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"updateDate\":1716925089625,\"filters\":[\"os == \\\"linux\\\"\"],\"actions\":[],\"agentConstraint\":\"\",\"defaultRule\":false,\"enabled\":true,\"creator\":{\"name\":\"CI Account\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\"},\"updater\":{\"name\":\"CI Account\",\"handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\"}},\"type\":\"agent_rule\"}}\n"
           },
           "cookies": [],
           "headers": [
@@ -57,15 +57,15 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2024-04-23T17:57:52.941Z",
-        "time": 209
+        "startedDateTime": "2024-05-28T19:38:09.492Z",
+        "time": 165
       },
       {
-        "_id": "fc3a0e05fde83b13d3546bff3703a77e",
+        "_id": "f29f2542be39334fdc8b2ad205b681c8",
         "_order": 0,
         "cache": {},
         "request": {
-          "bodySize": 127,
+          "bodySize": 146,
           "cookies": [],
           "headers": [
             {
@@ -85,17 +85,17 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"open.file.path = sh\"},\"type\":\"agent_rule\"}}"
+            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"open.file.path = sh\"},\"id\":\"qdg-dfm-kku\",\"type\":\"agent_rule\"}}"
           },
           "queryString": [],
-          "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules/1su-fqy-sjj"
+          "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules/qdg-dfm-kku"
         },
         "response": {
           "bodySize": 223,
           "content": {
             "mimeType": "application/json",
             "size": 223,
-            "text": "{\"errors\":[\"input_validation_error(Field 'expression' is invalid: rule `testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1713895072` error: syntax error `1:18: unexpected token \\\"sh\\\" (expected \\\"~\\\")`)\"]}\n"
+            "text": "{\"errors\":[\"input_validation_error(Field 'expression' is invalid: rule `testupdateacloudworkloadsecurityagentrulereturnsbadrequestresponse1716925089` error: syntax error `1:18: unexpected token \\\"sh\\\" (expected \\\"~\\\")`)\"]}\n"
           },
           "cookies": [],
           "headers": [
@@ -110,11 +110,11 @@
           "status": 400,
           "statusText": "Bad Request"
         },
-        "startedDateTime": "2024-04-23T17:57:53.160Z",
-        "time": 147
+        "startedDateTime": "2024-05-28T19:38:09.662Z",
+        "time": 252
       },
       {
-        "_id": "cafb04cf3a107fe88db957c0413163b9",
+        "_id": "12b5b1ee2dbbabf1ccfc539561fe7778",
         "_order": 0,
         "cache": {},
         "request": {
@@ -127,11 +127,11 @@
               "value": "*/*"
             }
           ],
-          "headersSize": 574,
+          "headersSize": 573,
           "httpVersion": "HTTP/1.1",
           "method": "DELETE",
           "queryString": [],
-          "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules/1su-fqy-sjj"
+          "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules/qdg-dfm-kku"
         },
         "response": {
           "bodySize": 0,
@@ -147,8 +147,8 @@
           "status": 204,
           "statusText": "No Content"
         },
-        "startedDateTime": "2024-04-23T17:57:53.321Z",
-        "time": 149
+        "startedDateTime": "2024-05-28T19:38:09.918Z",
+        "time": 134
       }
     ],
     "pages": [],
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Not-Found-response_2338204855/frozen.json b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Not-Found-response_2338204855/frozen.json
@@ -1 +1 @@
-"2024-04-23T17:57:53.479Z"
+"2024-05-28T19:38:10.057Z"
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Not-Found-response_2338204855/recording.har b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-Not-Found-response_2338204855/recording.har
@@ -8,11 +8,11 @@
     },
     "entries": [
       {
-        "_id": "2b54221f717931ce25c6f8724fba4f74",
+        "_id": "7edac9ea36b8deb46f4ba1e4b54dd869",
         "_order": 0,
         "cache": {},
         "request": {
-          "bodySize": 132,
+          "bodySize": 151,
           "cookies": [],
           "headers": [
             {
@@ -26,13 +26,13 @@
               "value": "application/json"
             }
           ],
-          "headersSize": 639,
+          "headersSize": 638,
           "httpVersion": "HTTP/1.1",
           "method": "PATCH",
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\"},\"type\":\"agent_rule\"}}"
+            "text": "{\"data\":{\"attributes\":{\"description\":\"Test Agent rule\",\"enabled\":true,\"expression\":\"exec.file.name == \\\"sh\\\"\"},\"id\":\"abc-123-xyz\",\"type\":\"agent_rule\"}}"
           },
           "queryString": [],
           "url": "https://api.datadoghq.com/api/v2/security_monitoring/cloud_workload_security/agent_rules/abc-123-xyz"
@@ -51,14 +51,14 @@
               "value": "application/json"
             }
           ],
-          "headersSize": 653,
+          "headersSize": 654,
           "httpVersion": "HTTP/1.1",
           "redirectURL": "",
           "status": 404,
           "statusText": "Not Found"
         },
-        "startedDateTime": "2024-04-23T17:57:53.488Z",
-        "time": 142
+        "startedDateTime": "2024-05-28T19:38:10.060Z",
+        "time": 154
       }
     ],
     "pages": [],
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-OK-response_925510030/frozen.json b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-OK-response_925510030/frozen.json
@@ -1 +1 @@
-"2024-04-23T17:57:53.638Z"
+"2024-05-28T19:38:10.219Z"
diff --git a/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-OK-response_925510030/recording.har b/cassettes/v2/CSM-Threats_3156990395/Update-a-Cloud-Workload-Security-Agent-rule-returns-OK-response_925510030/recording.har
diff --git a/examples/v2/csm-threats/UpdateCloudWorkloadSecurityAgentRule.ts b/examples/v2/csm-threats/UpdateCloudWorkloadSecurityAgentRule.ts
diff --git a/features/v2/csm_threats.feature b/features/v2/csm_threats.feature

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-06-04 15:12:37.086064",`
`8`		`- "spec_repo_commit": "60183db6"`
	`7`	`+ "regenerated": "2024-06-05 15:00:50.431480",`
	`8`	`+ "spec_repo_commit": "8e7244ae"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-06-04 15:12:37.103928",`
`13`		`- "spec_repo_commit": "60183db6"`
	`12`	`+ "regenerated": "2024-06-05 15:00:50.449984",`
	`13`	`+ "spec_repo_commit": "8e7244ae"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"2024-04-23T17:57:50.511Z"`
	`1`	`+"2024-05-28T19:38:08.047Z"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"2024-04-23T17:57:52.935Z"`
	`1`	`+"2024-05-28T19:38:09.490Z"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"2024-04-23T17:57:53.479Z"`
	`1`	`+"2024-05-28T19:38:10.057Z"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"2024-04-23T17:57:53.638Z"`
	`1`	`+"2024-05-28T19:38:10.219Z"`