Unify unique names (#368)

* Unify unique names

As a step for reusing the same cassettes, unify unique generation from
BDD scenario names.

* Reduce datetime precision

* Reduce precision

* Make it work in v2, handle recording mode

* Unique regexp

* Re-record, fix alnum

Author: therve

setup.cfg

@@ -70,7 +70,7 @@ where=src
 [tool:pytest]
 markers =
     dd_tag: add custom tags to span
-addopts = --cov=datadog_api_client --cov-config .coveragerc --cov-report=term-missing
+addopts = --cov=datadog_api_client --cov-config .coveragerc --cov-report=
 # addopts = --black --cov=datadog_api_client --cov-config .coveragerc --cov-report=term-missing
 
 [flake8]

tests/conftest.py

@@ -137,28 +137,29 @@ def glom(value, path):
     return g(value, re.sub(r"\[([0-9]*)\]", r".\1", path))
 
 
-@pytest.fixture
-def unique(request, freezer):
+def _get_prefix(request):
     test_class = request.cls
     if test_class:
-        prefix = "{}.{}".format(test_class.__name__, request.node.name)
+        main = "{}.{}".format(test_class.__name__, request.node.name)
     else:
-        prefix = request.node.name
+        base_name = request.node.__scenario_report__.scenario.name
+        main = re.sub(r"[^A-Za-z0-9]+", "_", base_name)[:100]
+    prefix = "Test-Python" if _disable_recording() else "Test"
+    return f"{prefix}-{main}"
+
 
+@pytest.fixture
+def unique(request, freezer):
+    prefix = _get_prefix(request)
     with freezer:
-        return f"datadog-api-client-python-{prefix}-{datetime.now().timestamp()}"
+        return f"{prefix}-{datetime.now().timestamp():.0f}"
 
 
 @pytest.fixture
 def unique_lower(request, freezer):
-    test_class = request.cls
-    if test_class:
-        prefix = "{}.{}".format(test_class.__name__, request.node.name)
-    else:
-        prefix = request.node.name
-
+    prefix = _get_prefix(request).lower()
     with freezer:
-        return f"datadog-api-client-python-{prefix}-{datetime.now().timestamp()}".lower()
+        return f"{prefix}-{datetime.now().timestamp():.0f}"
 
 
 @pytest.fixture
@@ -207,7 +208,7 @@ def context(vcr, unique, unique_lower, now_ts, now_iso, hour_later_ts, hour_late
         "unique": unique,
         "unique_lower": unique_lower,
         "unique_alnum": re.sub(r"[^A-Za-z0-9]+", "", unique),
-        "unique_lower_alnum": re.sub(r"[^a-z0-9]+", "", unique),
+        "unique_lower_alnum": re.sub(r"[^A-Za-z0-9]+", "", unique).lower(),
         "now_ts": now_ts,
         "now_iso": now_iso,
         "hour_later_ts": hour_later_ts,

tests/v1/cassettes/test_scenarios/test_create_a_new_dashboard_with_a_profile_metric_query.frozen

@@ -1 +1 @@
-2021-02-15T13:22:49.949769+01:00
+2021-04-09T22:22:15.472687+02:00

tests/v1/cassettes/test_scenarios/test_create_a_new_dashboard_with_a_profile_metric_query.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"layout_type": "ordered", "title": "datadog-api-client-python-test_create_a_new_dashboard_with_a_profile_metric_query-1613391769.949769
+    body: '{"layout_type": "ordered", "title": "Test-Create_a_new_dashboard_with_a_profile_metric_query-1617999735
       with Profile Metrics Query", "widgets": [{"definition": {"type": "timeseries",
       "requests": [{"profile_metrics_query": {"compute": {"aggregation": "sum", "facet":
       "@prof_core_cpu_cores"}, "search": {"query": "runtime:jvm"}, "group_by": [{"facet":
@@ -14,42 +14,38 @@ interactions:
       Dd-Operation-Id:
       - CreateDashboard
       User-Agent:
-      - datadog-api-client-python/1.0.0b6.dev47+dirty (python 3.9.0; os Darwin; arch
-        x86_64)
+      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v1/dashboard
   response:
     body:
-      string: '{"notify_list":null,"description":null,"author_name":null,"template_variables":null,"is_read_only":false,"id":"5cv-nzz-3h5","title":"datadog-api-client-python-test_create_a_new_dashboard_with_a_profile_metric_query-1613391769.949769
-        with Profile Metrics Query","url":"/dashboard/5cv-nzz-3h5/datadog-api-client-python-testcreateanewdashboardwithaprofilemetricquery-1613391","created_at":"2021-02-15T12:22:50.516001+00:00","modified_at":"2021-02-15T12:22:50.516001+00:00","author_handle":"[email protected]","widgets":[{"definition":{"requests":[{"profile_metrics_query":{"search":{"query":"runtime:jvm"},"group_by":[{"facet":"service","sort":{"facet":"@prof_core_cpu_cores","aggregation":"sum","order":"desc"},"limit":10}],"compute":{"facet":"@prof_core_cpu_cores","aggregation":"sum"}}}],"type":"timeseries"},"id":83318320383855}],"layout_type":"ordered"}'
+      string: '{"notify_list":null,"description":null,"author_name":null,"template_variables":null,"is_read_only":false,"id":"wkx-vhy-96m","title":"Test-Create_a_new_dashboard_with_a_profile_metric_query-1617999735
+        with Profile Metrics Query","url":"/dashboard/wkx-vhy-96m/test-createanewdashboardwithaprofilemetricquery-1617999735-with-profile-metrics","created_at":"2021-04-09T20:22:16.068974+00:00","modified_at":"2021-04-09T20:22:16.068974+00:00","author_handle":"[email protected]","widgets":[{"definition":{"requests":[{"profile_metrics_query":{"search":{"query":"runtime:jvm"},"group_by":[{"facet":"service","sort":{"facet":"@prof_core_cpu_cores","aggregation":"sum","order":"desc"},"limit":10}],"compute":{"facet":"@prof_core_cpu_cores","aggregation":"sum"}}}],"type":"timeseries"},"id":3620343832605725}],"layout_type":"ordered"}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '856'
+      - '824'
       Content-Type:
       - application/json
       Date:
-      - Mon, 15 Feb 2021 12:22:50 GMT
+      - Fri, 09 Apr 2021 20:22:16 GMT
       cache-control:
       - no-cache
       content-security-policy:
       - frame-ancestors 'self'; report-uri https://api.datadoghq.com/csp-report
       pragma:
       - no-cache
-      set-cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 22-Feb-2021 12:22:50 GMT;
-        secure; HttpOnly
       strict-transport-security:
       - max-age=15724800;
       vary:
       - Accept-Encoding
       x-content-type-options:
       - nosniff
       x-dd-debug:
-      - fIO2C4qGDheGHy4YbS+r3a3CXbh4cbRo7roILOimQyiHGjQdOat0cIpWCkupM1uX
+      - 2328yjLSqI4XmR1pVqrPRR/SFcQsbafjEpPmZx7/3PfxUK1nJQQsX+wrMelyVyj+
       x-dd-version:
-      - '35.3909333'
+      - '35.4280781'
       x-frame-options:
       - SAMEORIGIN
     status:
@@ -65,13 +61,12 @@ interactions:
       Dd-Operation-Id:
       - DeleteDashboard
       User-Agent:
-      - datadog-api-client-python/1.0.0b6.dev47+dirty (python 3.9.0; os Darwin; arch
-        x86_64)
+      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/dashboard/5cv-nzz-3h5
+    uri: https://api.datadoghq.com/api/v1/dashboard/wkx-vhy-96m
   response:
     body:
-      string: '{"deleted_dashboard_id":"5cv-nzz-3h5"}'
+      string: '{"deleted_dashboard_id":"wkx-vhy-96m"}'
     headers:
       Connection:
       - keep-alive
@@ -80,26 +75,23 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Mon, 15 Feb 2021 12:22:50 GMT
+      - Fri, 09 Apr 2021 20:22:16 GMT
       cache-control:
       - no-cache
       content-security-policy:
       - frame-ancestors 'self'; report-uri https://api.datadoghq.com/csp-report
       pragma:
       - no-cache
-      set-cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 22-Feb-2021 12:22:50 GMT;
-        secure; HttpOnly
       strict-transport-security:
       - max-age=15724800;
       vary:
       - Accept-Encoding
       x-content-type-options:
       - nosniff
       x-dd-debug:
-      - S1wfaMZOKGT/IoMw6fqAwAwGWo2vQ44sjF3YzuETnQfxZO2T5eJbs0aX3UKb9Dwu
+      - l4HFlaRP3QwYSqoGKhzbYfv7zgkK63HIRR7YkyVYZspq0lGjjTBwoK8V/alf+XYt
       x-dd-version:
-      - '35.3909333'
+      - '35.4280781'
       x-frame-options:
       - SAMEORIGIN
     status:

tests/v1/cassettes/test_scenarios/test_create_a_new_dashboard_with_timeseries_widget_containing_style_attributes.frozen

@@ -1 +1 @@
-2021-03-31T12:30:35.623828+00:00
+2021-04-09T22:22:14.553384+02:00

tests/v1/cassettes/test_scenarios/test_create_a_new_dashboard_with_timeseries_widget_containing_style_attributes.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"layout_type": "ordered", "title": "datadog-api-client-python-test_create_a_new_dashboard_with_timeseries_widget_containing_style_attributes-1617193835.623828
+    body: '{"layout_type": "ordered", "title": "Test-Create_a_new_dashboard_with_timeseries_widget_containing_style_attributes-1617999735
       with timeseries widget", "widgets": [{"definition": {"type": "timeseries", "requests":
       [{"q": "sum:trace.test.errors{env:prod,service:datadog-api-spec} by {resource_name}.as_count()",
       "on_right_yaxis": false, "style": {"palette": "warm", "line_type": "solid",
@@ -13,23 +13,23 @@ interactions:
       Dd-Operation-Id:
       - CreateDashboard
       User-Agent:
-      - datadog-api-client-python/0.1.dev287 (python 3.9.2; os Linux; arch x86_64)
+      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
     method: POST
     uri: https://api.datadoghq.com/api/v1/dashboard
   response:
     body:
-      string: '{"notify_list":null,"description":null,"author_name":"CI Account","template_variables":null,"is_read_only":false,"id":"trw-iyd-udn","title":"datadog-api-client-python-test_create_a_new_dashboard_with_timeseries_widget_containing_style_attributes-1617193835.623828
-        with timeseries widget","url":"/dashboard/trw-iyd-udn/datadog-api-client-python-testcreateanewdashboardwithtimeserieswidgetcontainings","created_at":"2021-03-31T12:30:35.953532+00:00","modified_at":"2021-03-31T12:30:35.953532+00:00","author_handle":"9919ec9b-ebc7-49ee-8dc8-03626e717cca","widgets":[{"definition":{"requests":[{"q":"sum:trace.test.errors{env:prod,service:datadog-api-spec}
-        by {resource_name}.as_count()","on_right_yaxis":false,"style":{"line_width":"normal","palette":"warm","line_type":"solid"},"display_type":"bars"}],"type":"timeseries"},"id":2527848781153118}],"layout_type":"ordered"}'
+      string: '{"notify_list":null,"description":null,"author_name":null,"template_variables":null,"is_read_only":false,"id":"3qq-2ni-bq8","title":"Test-Create_a_new_dashboard_with_timeseries_widget_containing_style_attributes-1617999735
+        with timeseries widget","url":"/dashboard/3qq-2ni-bq8/test-createanewdashboardwithtimeserieswidgetcontainingstyleattributes-1617999735","created_at":"2021-04-09T20:22:15.139084+00:00","modified_at":"2021-04-09T20:22:15.139084+00:00","author_handle":"[email protected]","widgets":[{"definition":{"requests":[{"q":"sum:trace.test.errors{env:prod,service:datadog-api-spec}
+        by {resource_name}.as_count()","on_right_yaxis":false,"style":{"line_width":"normal","palette":"warm","line_type":"solid"},"display_type":"bars"}],"type":"timeseries"},"id":497246117413773}],"layout_type":"ordered"}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '869'
+      - '809'
       Content-Type:
       - application/json
       Date:
-      - Wed, 31 Mar 2021 12:30:35 GMT
+      - Fri, 09 Apr 2021 20:22:15 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -43,9 +43,9 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-debug:
-      - nLnnBNvlCFDECRnZvzDb0z4sAO35G+IMidcAs8vrCKyjvsKWE8Yd9S3n6OjZ1qRN
+      - tpRCH6w417YjBovRJ8VmtuXmNONVYiRp2c8d2AxjPdGBn8PCtgG4vAztrx3qUZAN
       x-dd-version:
-      - '35.4208184'
+      - '35.4280781'
       x-frame-options:
       - SAMEORIGIN
     status:
@@ -61,12 +61,12 @@ interactions:
       Dd-Operation-Id:
       - DeleteDashboard
       User-Agent:
-      - datadog-api-client-python/0.1.dev287 (python 3.9.2; os Linux; arch x86_64)
+      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
     method: DELETE
-    uri: https://api.datadoghq.com/api/v1/dashboard/trw-iyd-udn
+    uri: https://api.datadoghq.com/api/v1/dashboard/3qq-2ni-bq8
   response:
     body:
-      string: '{"deleted_dashboard_id":"trw-iyd-udn"}'
+      string: '{"deleted_dashboard_id":"3qq-2ni-bq8"}'
     headers:
       Connection:
       - keep-alive
@@ -75,7 +75,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Wed, 31 Mar 2021 12:30:36 GMT
+      - Fri, 09 Apr 2021 20:22:15 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -91,7 +91,7 @@ interactions:
       x-dd-debug:
       - HbtaOKlJ6OCrx9tMXO6ivMTrEM+g0c93HDp08trmOmgdHozC5J+vn10F0H4WPjCU
       x-dd-version:
-      - '35.4208184'
+      - '35.4280781'
       x-frame-options:
       - SAMEORIGIN
     status:

tests/v1/cassettes/test_scenarios/test_delete_an_slo_returns_not_found_response.frozen

@@ -1 +1 @@
-2021-04-09T16:17:02.955456+02:00
+2021-04-12T17:31:12.619158+02:00

tests/v1/cassettes/test_scenarios/test_delete_an_slo_returns_not_found_response.yaml

@@ -9,23 +9,23 @@ 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/datadogapiclientpythontestdeleteansloreturnsnotfoundresponse1617977822955456
+    uri: https://api.datadoghq.com/api/v1/slo/testdeleteansloreturnsnotfoundresponse1618241473
   response:
     body:
-      string: '{"errors": ["SLO not found: datadogapiclientpythontestdeleteansloreturnsnotfoundresponse1617977822955456
+      string: '{"errors": ["SLO not found: testdeleteansloreturnsnotfoundresponse1618241473
         not found"]}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '117'
+      - '89'
       Content-Type:
       - application/json
       Date:
-      - Fri, 09 Apr 2021 14:17:03 GMT
+      - Mon, 12 Apr 2021 15:31:13 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -39,7 +39,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.4276613'
+      - '35.4290400'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:

tests/v1/cassettes/test_scenarios/test_get_a_monitors_details_returns_monitor_not_found_error_response.frozen

@@ -1 +1 @@
-2021-01-11T12:02:02.232318-05:00
+2021-04-09T22:22:10.426550+02:00

tests/v1/cassettes/test_scenarios/test_get_a_monitors_details_returns_monitor_not_found_error_response.yaml

@@ -9,22 +9,21 @@ interactions:
       Dd-Operation-Id:
       - GetMonitor
       User-Agent:
-      - datadog-api-client-python/1.0.0b5.dev24+dirty (python 3.7.9; os Darwin; arch
-        x86_64)
+      - datadog-api-client-python/1.0.0b8.dev29 (python 3.8.8; os Darwin; arch x86_64)
     method: GET
     uri: https://api.datadoghq.com/api/v1/monitor/12345
   response:
     body:
-      string: '{"errors":["Monitor not found"]}'
+      string: '{"errors": ["Monitor not found"]}'
     headers:
       Connection:
       - keep-alive
       Content-Length:
-      - '32'
+      - '33'
       Content-Type:
       - application/json
       Date:
-      - Mon, 11 Jan 2021 17:06:26 GMT
+      - Fri, 09 Apr 2021 20:22:11 GMT
       cache-control:
       - no-cache
       content-security-policy:
@@ -38,7 +37,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-dd-version:
-      - '35.3679038'
+      - '35.4280781'
       x-frame-options:
       - SAMEORIGIN
       x-ratelimit-limit:
@@ -48,7 +47,7 @@ interactions:
       x-ratelimit-remaining:
       - '2999'
       x-ratelimit-reset:
-      - '4'
+      - '10'
     status:
       code: 404
       message: Not Found