Enable body matching in VCR (#378)

We didn't enable body matching, so we didn't test whether it matches on
replay. This fixes and re-record the ones that didn't match.

Author: therve

tests/conftest.py

@@ -249,6 +249,7 @@ def vcr_config():
     config = dict(
         filter_headers=("DD-API-KEY", "DD-APPLICATION-KEY"),
         filter_query_parameters=("api_key", "application_key"),
+        match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'body']
     )
     if tracer:
         config["ignore_hosts"] = [tracer.writer._hostname]

tests/v1/cassettes/test_scenarios/test_create_an_slo_object_returns_ok_response.frozen

@@ -1 +1 @@
-2021-04-09T16:17:03.866538+02:00
+2021-04-14T09:52:03.634557+02:00

tests/v1/cassettes/test_scenarios/test_create_an_slo_object_returns_ok_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
     body: '{"type": "metric", "description": "string", "groups": ["env:test", "role:mysql"],
-      "monitor_ids": [], "name": "datadog-api-client-python-test_create_an_slo_object_returns_ok_response-1617977823.866538",
+      "monitor_ids": [], "name": "Test-Create_an_SLO_object_returns_OK_response-1618386724",
       "query": {"denominator": "sum:httpservice.hits{!code:3xx}.as_count()", "numerator":
       "sum:httpservice.hits{code:2xx}.as_count()"}, "tags": ["env:prod", "app:core"],
       "thresholds": [{"target": 95.0, "target_display": "95.0", "timeframe": "7d",
@@ -14,22 +14,22 @@ interactions:
       Dd-Operation-Id:
       - CreateSlo
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.7.9; os Darwin; arch
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
         x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v1/slo
   response:
     body:
-      string: '{"data":[{"description":"string","monitor_tags":[],"creator":{"handle":"[email protected]","name":null,"email":"[email protected]"},"thresholds":[{"warning":98.0,"warning_display":"98.","target":95.0,"target_display":"95.","timeframe":"7d"}],"groups":["env:test","role:mysql"],"type_id":1,"query":{"denominator":"sum:httpservice.hits{!code:3xx}.as_count()","numerator":"sum:httpservice.hits{code:2xx}.as_count()"},"id":"324305dde65658ada6a47adcf320618b","name":"datadog-api-client-python-test_create_an_slo_object_returns_ok_response-1617977823.866538","created_at":1617977824,"tags":["app:core","env:prod"],"modified_at":1617977824,"type":"metric"}],"error":null}'
+      string: '{"data":[{"description":"string","monitor_tags":[],"creator":{"handle":"[email protected]","name":null,"email":"[email protected]"},"thresholds":[{"warning":98.0,"warning_display":"98.","target":95.0,"target_display":"95.","timeframe":"7d"}],"groups":["env:test","role:mysql"],"type_id":1,"query":{"denominator":"sum:httpservice.hits{!code:3xx}.as_count()","numerator":"sum:httpservice.hits{code:2xx}.as_count()"},"id":"27593afa4fb35e89be67633dddcae50c","name":"Test-Create_an_SLO_object_returns_OK_response-1618386724","created_at":1618386724,"tags":["app:core","env:prod"],"modified_at":1618386724,"type":"metric"}],"error":null}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '666'
+      - '633'
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:04 GMT
+      - Wed, 14 Apr 2021 07:52:04 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -43,7 +43,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
@@ -67,13 +67,13 @@ interactions:
       Dd-Operation-Id:
       - DeleteSlo
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.7.9; os Darwin; arch
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
         x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/slo/324305dde65658ada6a47adcf320618b
+    uri: https://api.datadoghq.com/api/v1/slo/27593afa4fb35e89be67633dddcae50c
   response:
     body:
-      string: '{"data":["324305dde65658ada6a47adcf320618b"],"error":null}'
+      string: '{"data":["27593afa4fb35e89be67633dddcae50c"],"error":null}'
     headers:
       Connection:
       - keep-alive
@@ -82,7 +82,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:04 GMT
+      - Wed, 14 Apr 2021 07:52:04 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -96,15 +96,15 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '3000'
       x-ratelimit-period:
       - '10'
       x-ratelimit-remaining:
-      - '2998'
+      - '2999'
       x-ratelimit-reset:
       - '6'
     status:

tests/v1/cassettes/test_scenarios/test_delete_an_slo_returns_ok_response.frozen

@@ -1 +1 @@
-2021-04-09T16:17:06.422617+02:00
+2021-04-14T09:55:24.418098+02:00

tests/v1/cassettes/test_scenarios/test_delete_an_slo_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"type": "metric", "name": "datadog-api-client-python-test_delete_an_slo_returns_ok_response-1617977826.422617",
+    body: '{"type": "metric", "name": "Test-Delete_an_SLO_returns_OK_response-1618386924",
       "thresholds": [{"timeframe": "7d", "target": 95.0, "warning": 98.0}], "query":
       {"numerator": "sum:httpservice.hits{code:2xx}.as_count()", "denominator": "sum:httpservice.hits{!code:3xx}.as_count()"}}'
     headers:
@@ -11,22 +11,22 @@ interactions:
       Dd-Operation-Id:
       - CreateSlo
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.7.9; os Darwin; arch
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
         x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v1/slo
   response:
     body:
-      string: '{"data":[{"description":"","monitor_tags":[],"creator":{"handle":"[email protected]","name":null,"email":"[email protected]"},"thresholds":[{"warning":98.0,"warning_display":"98.","target":95.0,"target_display":"95.","timeframe":"7d"}],"type_id":1,"query":{"denominator":"sum:httpservice.hits{!code:3xx}.as_count()","numerator":"sum:httpservice.hits{code:2xx}.as_count()"},"id":"8c9f80b7df085cd1b4fb6648c3ff3226","name":"datadog-api-client-python-test_delete_an_slo_returns_ok_response-1617977826.422617","created_at":1617977827,"tags":[],"modified_at":1617977827,"type":"metric"}],"error":null}'
+      string: '{"data":[{"description":"","monitor_tags":[],"creator":{"handle":"[email protected]","name":null,"email":"[email protected]"},"thresholds":[{"warning":98.0,"warning_display":"98.","target":95.0,"target_display":"95.","timeframe":"7d"}],"type_id":1,"query":{"denominator":"sum:httpservice.hits{!code:3xx}.as_count()","numerator":"sum:httpservice.hits{code:2xx}.as_count()"},"id":"0418feb3f8e35a9895eec945778fdaad","name":"Test-Delete_an_SLO_returns_OK_response-1618386924","created_at":1618386925,"tags":[],"modified_at":1618386925,"type":"metric"}],"error":null}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '597'
+      - '564'
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:07 GMT
+      - Wed, 14 Apr 2021 07:55:25 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -40,17 +40,17 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '500'
       x-ratelimit-period:
       - '60'
       x-ratelimit-remaining:
-      - '497'
+      - '499'
       x-ratelimit-reset:
-      - '53'
+      - '36'
     status:
       code: 200
       message: OK
@@ -64,13 +64,13 @@ interactions:
       Dd-Operation-Id:
       - DeleteSlo
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.7.9; os Darwin; arch
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
         x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/slo/8c9f80b7df085cd1b4fb6648c3ff3226
+    uri: https://api.datadoghq.com/api/v1/slo/0418feb3f8e35a9895eec945778fdaad
   response:
     body:
-      string: '{"data":["8c9f80b7df085cd1b4fb6648c3ff3226"],"error":null}'
+      string: '{"data":["0418feb3f8e35a9895eec945778fdaad"],"error":null}'
     headers:
       Connection:
       - keep-alive
@@ -79,7 +79,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:09 GMT
+      - Wed, 14 Apr 2021 07:55:25 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -93,17 +93,17 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '3000'
       x-ratelimit-period:
       - '10'
       x-ratelimit-remaining:
-      - '2997'
+      - '2999'
       x-ratelimit-reset:
-      - '1'
+      - '5'
     status:
       code: 200
       message: OK
@@ -117,13 +117,13 @@ interactions:
       Dd-Operation-Id:
       - DeleteSlo
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.7.9; os Darwin; arch
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
         x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/slo/8c9f80b7df085cd1b4fb6648c3ff3226
+    uri: https://api.datadoghq.com/api/v1/slo/0418feb3f8e35a9895eec945778fdaad
   response:
     body:
-      string: '{"errors": ["SLO not found: 8c9f80b7df085cd1b4fb6648c3ff3226 not found"]}'
+      string: '{"errors": ["SLO not found: 0418feb3f8e35a9895eec945778fdaad not found"]}'
     headers:
       Connection:
       - keep-alive
@@ -132,7 +132,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:10 GMT
+      - Wed, 14 Apr 2021 07:55:25 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -146,17 +146,17 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '3000'
       x-ratelimit-period:
       - '10'
       x-ratelimit-remaining:
-      - '2999'
+      - '2998'
       x-ratelimit-reset:
-      - '10'
+      - '5'
     status:
       code: 404
       message: Not Found

tests/v2/cassettes/test_scenarios/test_create_a_logbased_metric_returns_ok_response.frozen

@@ -1 +1 @@
-2021-04-09T22:21:15.303905+02:00
+2021-04-14T09:55:32.503966+02:00

tests/v2/cassettes/test_scenarios/test_create_a_logbased_metric_returns_ok_response.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data": {"id": "Test-Create_a_logbased_metric_returns_OK_response-1617999675",
+    body: '{"data": {"id": "Test-Create_a_log_based_metric_returns_OK_response-1618386933",
       "type": "logs_metrics", "attributes": {"compute": {"aggregation_type": "count"}}}}'
     headers:
       Accept:
@@ -10,21 +10,22 @@ interactions:
       Dd-Operation-Id:
       - CreateLogsMetric
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
+        x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v2/logs/config/metrics
   response:
     body:
-      string: '{"data":{"id":"Test_Create_a_logbased_metric_returns_OK_response_1617999675","attributes":{"filter":{"query":"*"},"group_by":[],"compute":{"aggregation_type":"count"}},"type":"logs_metrics"}}'
+      string: '{"data":{"id":"Test_Create_a_log_based_metric_returns_OK_response_1618386933","attributes":{"filter":{"query":"*"},"group_by":[],"compute":{"aggregation_type":"count"}},"type":"logs_metrics"}}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '191'
+      - '192'
       Content-Type:
       - application/json;charset=utf-8
       Date:
-      - Fri, 09 Apr 2021 20:21:16 GMT
+      - Wed, 14 Apr 2021 07:55:33 GMT
       cache-control:
       - no-cache
       content-disposition:
@@ -40,19 +41,19 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-debug:
-      - dPySkcOzIZtKyMKDAAzuysY3gNGGj6RtYogGuSb76E8mPvoqzREyRp6lPYm91hQU
+      - F5gm0Rce1/Abr9/0Fw8HAqWfiz0FdiH8er/AXnN6lOn3L6KyGgbsLCwgPlob1No8
       x-dd-version:
-      - '35.4280781'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '100'
       x-ratelimit-period:
       - '3600'
       x-ratelimit-remaining:
-      - '82'
+      - '19'
       x-ratelimit-reset:
-      - '2325'
+      - '268'
     status:
       code: 200
       message: OK
@@ -66,9 +67,10 @@ interactions:
       Dd-Operation-Id:
       - DeleteLogsMetric
       User-Agent:
-      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
+      - datadog-api-client-python/1.0.0b8.dev35+dirty (python 3.8.8; os Darwin; arch
+        x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Create_a_logbased_metric_returns_OK_response_1617999675
+    uri: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Create_a_log_based_metric_returns_OK_response_1618386933
   response:
     body:
       string: '{}'
@@ -80,7 +82,7 @@ interactions:
       Content-Type:
       - application/json;charset=utf-8
       Date:
-      - Fri, 09 Apr 2021 20:21:16 GMT
+      - Wed, 14 Apr 2021 07:55:33 GMT
       cache-control:
       - no-cache
       content-disposition:
@@ -94,19 +96,19 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-debug:
-      - l8RQo2maZqJf6GFThBbKNE6dvthz6njusVtau3dPXJWL2RLFoN81H+BLPB/1xgs1
+      - 5gfwVh/5HZ+AnGd/Di93w3NEWC6KMHT9KzmHEiRJmNdOjBtAsbOcgVFyqEChw71h
       x-dd-version:
-      - '35.4280781'
+      - '35.4306674'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
       - '100'
       x-ratelimit-period:
       - '3600'
       x-ratelimit-remaining:
-      - '81'
+      - '18'
       x-ratelimit-reset:
-      - '2324'
+      - '267'
     status:
       code: 200
       message: OK

tests/v2/cassettes/test_scenarios/test_delete_a_logbased_metric_returns_ok_response.frozen

@@ -1 +1 @@
-2021-04-09T22:21:04.518094+02:00
+2021-04-14T09:55:30.968010+02:00