Add new grpc assertions for Synthetics tests

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-26 13:36:35.133461",
-            "spec_repo_commit": "cb58d3ae"
+            "regenerated": "2023-04-26 20:10:24.719015",
+            "spec_repo_commit": "8f11d99c"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-26 13:36:35.145952",
-            "spec_repo_commit": "cb58d3ae"
+            "regenerated": "2023-04-26 20:10:24.738210",
+            "spec_repo_commit": "8f11d99c"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -12245,6 +12245,8 @@ components:
       - networkHop
       - receivedMessage
       - grpcHealthcheckStatus
+      - grpcMetadata
+      - grpcProto
       - connection
       example: statusCode
       type: string
@@ -12265,6 +12267,8 @@ components:
       - NETWORK_HOP
       - RECEIVED_MESSAGE
       - GRPC_HEALTHCHECK_STATUS
+      - GRPC_METADATA
+      - GRPC_PROTO
       - CONNECTION
     SyntheticsAssertionXPathOperator:
       description: Assertion operator to apply.

examples/v1/synthetics/CreateSyntheticsAPITest_1402674167.java

@@ -14,6 +14,7 @@
 import com.datadog.api.client.v1.model.SyntheticsTestOptions;
 import com.datadog.api.client.v1.model.SyntheticsTestOptionsMonitorOptions;
 import com.datadog.api.client.v1.model.SyntheticsTestRequest;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
@@ -27,12 +28,23 @@ public static void main(String[] args) {
             .config(
                 new SyntheticsAPITestConfig()
                     .assertions(
-                        Collections.singletonList(
+                        Arrays.asList(
                             new SyntheticsAssertion(
                                 new SyntheticsAssertionTarget()
                                     .operator(SyntheticsAssertionOperator.IS)
                                     .target(1)
-                                    .type(SyntheticsAssertionType.GRPC_HEALTHCHECK_STATUS))))
+                                    .type(SyntheticsAssertionType.GRPC_HEALTHCHECK_STATUS)),
+                            new SyntheticsAssertion(
+                                new SyntheticsAssertionTarget()
+                                    .operator(SyntheticsAssertionOperator.IS)
+                                    .target("proto target")
+                                    .type(SyntheticsAssertionType.GRPC_PROTO)),
+                            new SyntheticsAssertion(
+                                new SyntheticsAssertionTarget()
+                                    .operator(SyntheticsAssertionOperator.IS)
+                                    .target("123")
+                                    .property("property")
+                                    .type(SyntheticsAssertionType.GRPC_METADATA))))
                     .request(
                         new SyntheticsTestRequest()
                             .host("localhost")

src/main/java/com/datadog/api/client/v1/model/SyntheticsAssertionType.java

@@ -51,6 +51,9 @@ public class SyntheticsAssertionType {
       new SyntheticsAssertionType("receivedMessage");
   public static final SyntheticsAssertionType GRPC_HEALTHCHECK_STATUS =
       new SyntheticsAssertionType("grpcHealthcheckStatus");
+  public static final SyntheticsAssertionType GRPC_METADATA =
+      new SyntheticsAssertionType("grpcMetadata");
+  public static final SyntheticsAssertionType GRPC_PROTO = new SyntheticsAssertionType("grpcProto");
   public static final SyntheticsAssertionType CONNECTION =
       new SyntheticsAssertionType("connection");
 
@@ -73,6 +76,8 @@ public class SyntheticsAssertionType {
               "networkHop",
               "receivedMessage",
               "grpcHealthcheckStatus",
+              "grpcMetadata",
+              "grpcProto",
               "connection"));
 
   private String value;

src/test/resources/cassettes/features/v1/Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response.freeze

@@ -1 +1 @@
-2022-08-30T12:58:58.411Z
+2023-04-25T13:05:10.528Z

src/test/resources/cassettes/features/v1/Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response.json

@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"config\":{\"assertions\":[{\"operator\":\"is\",\"target\":1,\"type\":\"grpcHealthcheckStatus\"}],\"request\":{\"host\":\"localhost\",\"message\":\"\",\"metadata\":{},\"method\":\"GET\",\"port\":50051,\"service\":\"Hello\"}},\"locations\":[\"aws:us-east-2\"],\"message\":\"BDD test payload: synthetics_api_grpc_test_payload.json\",\"name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1661864338\",\"options\":{\"min_failure_duration\":0,\"min_location_failed\":1,\"monitor_name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1661864338\",\"monitor_options\":{\"renotify_interval\":0},\"tick_every\":60},\"subtype\":\"grpc\",\"tags\":[\"testing:api\"],\"type\":\"api\"}"
+        "json": "{\"config\":{\"assertions\":[{\"operator\":\"is\",\"target\":1,\"type\":\"grpcHealthcheckStatus\"},{\"operator\":\"is\",\"target\":\"proto target\",\"type\":\"grpcProto\"},{\"operator\":\"is\",\"property\":\"property\",\"target\":\"123\",\"type\":\"grpcMetadata\"}],\"request\":{\"host\":\"localhost\",\"message\":\"\",\"metadata\":{},\"method\":\"GET\",\"port\":50051,\"service\":\"Hello\"}},\"locations\":[\"aws:us-east-2\"],\"message\":\"BDD test payload: synthetics_api_grpc_test_payload.json\",\"name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1682427910\",\"options\":{\"min_failure_duration\":0,\"min_location_failed\":1,\"monitor_name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1682427910\",\"monitor_options\":{\"renotify_interval\":0},\"tick_every\":60},\"subtype\":\"grpc\",\"tags\":[\"testing:api\"],\"type\":\"api\"}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"status\":\"live\",\"public_id\":\"jhh-fva-te6\",\"tags\":[\"testing:api\"],\"org_id\":321813,\"locations\":[\"aws:us-east-2\"],\"message\":\"BDD test payload: synthetics_api_grpc_test_payload.json\",\"deleted_at\":null,\"name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1661864338\",\"monitor_id\":81568616,\"type\":\"api\",\"created_at\":\"2022-08-30T12:58:58.963083+00:00\",\"modified_at\":\"2022-08-30T12:58:58.963083+00:00\",\"subtype\":\"grpc\",\"config\":{\"request\":{\"service\":\"Hello\",\"port\":50051,\"host\":\"localhost\",\"message\":\"\",\"method\":\"GET\",\"metadata\":{}},\"assertions\":[{\"operator\":\"is\",\"type\":\"grpcHealthcheckStatus\",\"target\":1}]},\"options\":{\"monitor_options\":{\"include_tags\":true,\"renotify_interval\":0,\"notify_audit\":false,\"new_host_delay\":300,\"on_missing_data\":\"show_no_data\"},\"tick_every\":60,\"monitor_name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1661864338\",\"min_failure_duration\":0,\"min_location_failed\":1}}",
+      "body": "{\"public_id\":\"ihe-qm5-bjz\",\"name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1682427910\",\"status\":\"live\",\"type\":\"api\",\"tags\":[\"testing:api\"],\"created_at\":\"2023-04-25T13:05:11.041226+00:00\",\"modified_at\":\"2023-04-25T13:05:11.041226+00:00\",\"config\":{\"assertions\":[{\"operator\":\"is\",\"target\":1,\"type\":\"grpcHealthcheckStatus\"},{\"operator\":\"is\",\"target\":\"proto target\",\"type\":\"grpcProto\"},{\"operator\":\"is\",\"property\":\"property\",\"target\":\"123\",\"type\":\"grpcMetadata\"}],\"request\":{\"host\":\"localhost\",\"message\":\"\",\"metadata\":{},\"method\":\"GET\",\"port\":50051,\"service\":\"Hello\"}},\"message\":\"BDD test payload: synthetics_api_grpc_test_payload.json\",\"options\":{\"min_failure_duration\":0,\"min_location_failed\":1,\"monitor_name\":\"Test-Create_an_API_GRPC_test_returns_OK_Returns_the_created_test_details_response-1682427910\",\"monitor_options\":{\"renotify_interval\":0,\"on_missing_data\":\"show_no_data\",\"notify_audit\":false,\"new_host_delay\":300,\"include_tags\":true},\"tick_every\":60},\"locations\":[\"aws:us-east-2\"],\"subtype\":\"grpc\",\"deleted_at\":null,\"monitor_id\":117244159,\"org_id\":569509}",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,13 +27,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e99b24dd-e1c4-605a-c885-2cd34d47c4bd"
+    "id": "7e3c3735-59b9-7d14-6b2d-4fa721f16373"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"public_ids\":[\"jhh-fva-te6\"]}"
+        "json": "{\"public_ids\":[\"ihe-qm5-bjz\"]}"
       },
       "headers": {},
       "method": "POST",
@@ -42,7 +42,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"deleted_tests\":[{\"deleted_at\":\"2022-08-30T12:59:04.527227+00:00\",\"public_id\":\"jhh-fva-te6\"}]}",
+      "body": "{\"deleted_tests\":[{\"public_id\":\"ihe-qm5-bjz\",\"deleted_at\":\"2023-04-25T13:05:11.578194+00:00\"}]}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "36704ea9-a5b7-79a7-6a87-30f57b2ca57f"
+    "id": "70ee1e70-5b0e-2f2a-8d69-f7dda9957d42"
   }
 ]

src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json

@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]

src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json

@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]

src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json

@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
   }
 ]

src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json

@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
+    "id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
   }
 ]

src/test/resources/cassettes/features/v2/Create_Scanning_Group_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15a"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7d"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7c"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15c"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15b"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Delete_a_monitor_configuration_policy_returns_OK_response.json

@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13b530fd-8b91-17a8-9930-69a27759db42"
+    "id": "13b530fd-8b91-17a8-9930-69a27759db44"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Get_a_RUM_application_returns_OK_response.json

@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "74945625-c01a-a598-e538-65a53ceb0685"
+    "id": "74945625-c01a-a598-e538-65a53ceb0688"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Get_all_monitor_configuration_policies_returns_OK_response.json

@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13b530fd-8b91-17a8-9930-69a27759db44"
+    "id": "13b530fd-8b91-17a8-9930-69a27759db42"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Grant_permission_to_a_role_returns_OK_response.json

@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15d"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed160"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/List_permissions_for_a_role_returns_OK_response.json

@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json

@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216f"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892175"
   }
 ]

src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed15e"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed158"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed159"
+    "id": "33fa4a39-57ef-afdd-007a-0db82f7ed161"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Revoke_permission_returns_Bad_Request_response.json

@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json

@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216e"
   },
   {
     "httpRequest": {

src/test/resources/cassettes/features/v2/Revoke_permission_returns_OK_response.json

@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216c"
   },
   {
     "httpRequest": {