Remove duplicate generated tests (#1684)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 93dc1a6a6a34 · 2023-09-26T12:27:44.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": "2023-09-25 15:28:52.727061",
-            "spec_repo_commit": "a8ef99d8"
+            "regenerated": "2023-09-26 12:21:39.654859",
+            "spec_repo_commit": "c1694968"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2023-09-25 15:28:52.740393",
-            "spec_repo_commit": "a8ef99d8"
+            "regenerated": "2023-09-26 12:21:39.686082",
+            "spec_repo_commit": "c1694968"
         }
     }
 }
diff --git a/examples/v1/usage-metering/GetUsageCIApp.py b/examples/v1/usage-metering/GetUsageCIApp.py
@@ -2,16 +2,17 @@
 Get hourly usage for CI visibility returns "OK" response
 """
 
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v1.api.usage_metering_api import UsageMeteringApi
-from datetime import datetime
-from dateutil.tz import tzutc
 
 configuration = Configuration()
 with ApiClient(configuration) as api_client:
     api_instance = UsageMeteringApi(api_client)
     response = api_instance.get_usage_ci_app(
-        start_hr=datetime(2021, 11, 11, 11, 11, 11, 111000, tzinfo=tzutc()),
+        start_hr=(datetime.now() + relativedelta(days=-5)),
+        end_hr=(datetime.now() + relativedelta(days=-3)),
     )
 
     print(response)
diff --git a/examples/v1/usage-metering/GetUsageCIApp_1064440884.py b/examples/v1/usage-metering/GetUsageCIApp_1064440884.py
diff --git a/examples/v1/usage-metering/GetUsageCWS.py b/examples/v1/usage-metering/GetUsageCWS.py
@@ -2,16 +2,17 @@
 Get hourly usage for cloud workload security returns "OK" response
 """
 
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from datadog_api_client import ApiClient, Configuration
 from datadog_api_client.v1.api.usage_metering_api import UsageMeteringApi
-from datetime import datetime
-from dateutil.tz import tzutc
 
 configuration = Configuration()
 with ApiClient(configuration) as api_client:
     api_instance = UsageMeteringApi(api_client)
     response = api_instance.get_usage_cws(
-        start_hr=datetime(2021, 11, 11, 11, 11, 11, 111000, tzinfo=tzutc()),
+        start_hr=(datetime.now() + relativedelta(days=-5)),
+        end_hr=(datetime.now() + relativedelta(days=-3)),
     )
 
     print(response)
diff --git a/examples/v1/usage-metering/GetUsageCWS_736958514.py b/examples/v1/usage-metering/GetUsageCWS_736958514.py
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_bad_request_response.frozen b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_bad_request_response.frozen
@@ -1 +1 @@
-2022-02-24T14:52:00.008Z
+2023-09-25T19:13:30.824Z
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_bad_request_response.yaml b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_bad_request_response.yaml
@@ -5,10 +5,10 @@ interactions:
       accept:
       - application/json;datetime-format=rfc3339
     method: GET
-    uri: https://api.datadoghq.com/api/v1/usage/ci-app?start_hr=2022-02-21T14%3A52%3A00.008Z&end_hr=2022-02-19T14%3A52%3A00.008Z
+    uri: https://api.datadoghq.com/api/v1/usage/ci-app?start_hr=2023-09-22T19%3A13%3A30.824Z&end_hr=2023-09-20T19%3A13%3A30.824Z
   response:
     body:
-      string: '{"errors": ["start_hr [YYYY-MM-DDThh] must be before end_hr [YYYY-MM-DDThh]"]}'
+      string: '{"errors":["start_hr [YYYY-MM-DDThh] must be before end_hr [YYYY-MM-DDThh]"]}'
     headers:
       content-type:
       - application/json
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_ok_response.frozen b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_ok_response.frozen
@@ -1 +1 @@
-2022-02-24T14:52:00.155Z
+2023-09-25T18:27:41.222Z
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_ok_response.yaml b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_ci_visibility_returns_ok_response.yaml
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_cloud_workload_security_returns_ok_response.frozen b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_cloud_workload_security_returns_ok_response.frozen
@@ -1 +1 @@
-2022-04-01T00:41:21.858Z
+2023-09-25T19:19:28.364Z
diff --git a/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_cloud_workload_security_returns_ok_response.yaml b/tests/v1/cassettes/test_scenarios/test_get_hourly_usage_for_cloud_workload_security_returns_ok_response.yaml
diff --git a/tests/v1/features/usage_metering.feature b/tests/v1/features/usage_metering.feature
@@ -72,35 +72,21 @@ Feature: Usage Metering
     Then the response status is 200 OK
 
   @team:DataDog/red-zone-revenue-query
-  Scenario: Get hourly usage for CI Visibility returns "Bad Request" response
+  Scenario: Get hourly usage for CI visibility returns "Bad Request" response
     Given new "GetUsageCIApp" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 3d') }}"
     And request contains "end_hr" parameter with value "{{ timeISO('now - 5d') }}"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @team:DataDog/red-zone-revenue-query
-  Scenario: Get hourly usage for CI Visibility returns "OK" response
+  Scenario: Get hourly usage for CI visibility returns "OK" response
     Given new "GetUsageCIApp" request
     And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
     And request contains "end_hr" parameter with value "{{ timeISO('now - 3d') }}"
     When the request is sent
     Then the response status is 200 OK
 
-  @generated @skip @team:DataDog/red-zone-revenue-query
-  Scenario: Get hourly usage for CI visibility returns "Bad Request" response
-    Given new "GetUsageCIApp" request
-    And request contains "start_hr" parameter from "REPLACE.ME"
-    When the request is sent
-    Then the response status is 400 Bad Request
-
-  @generated @skip @team:DataDog/red-zone-revenue-query
-  Scenario: Get hourly usage for CI visibility returns "OK" response
-    Given new "GetUsageCIApp" request
-    And request contains "start_hr" parameter from "REPLACE.ME"
-    When the request is sent
-    Then the response status is 200 OK
-
   @generated @skip @team:DataDog/red-zone-revenue-query
   Scenario: Get hourly usage for CSM Pro returns "Bad Request" response
     Given new "GetUsageCloudSecurityPostureManagement" request
@@ -115,14 +101,6 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/red-zone-revenue-query
-  Scenario: Get hourly usage for Cloud Workload Security returns "OK" response
-    Given new "GetUsageCWS" request
-    And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
-    And request contains "end_hr" parameter with value "{{ timeISO('now - 3d') }}"
-    When the request is sent
-    Then the response status is 200 OK
-
   @team:DataDog/red-zone-revenue-query
   Scenario: Get hourly usage for Database Monitoring returns "OK" response
     Given new "GetUsageDBM" request
@@ -405,10 +383,11 @@ Feature: Usage Metering
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @generated @skip @team:DataDog/red-zone-revenue-query
+  @team:DataDog/red-zone-revenue-query
   Scenario: Get hourly usage for cloud workload security returns "OK" response
     Given new "GetUsageCWS" request
-    And request contains "start_hr" parameter from "REPLACE.ME"
+    And request contains "start_hr" parameter with value "{{ timeISO('now - 5d') }}"
+    And request contains "end_hr" parameter with value "{{ timeISO('now - 3d') }}"
     When the request is sent
     Then the response status is 200 OK
 

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": "2023-09-25 15:28:52.727061",`
`8`		`- "spec_repo_commit": "a8ef99d8"`
	`7`	`+ "regenerated": "2023-09-26 12:21:39.654859",`
	`8`	`+ "spec_repo_commit": "c1694968"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2023-09-25 15:28:52.740393",`
`13`		`- "spec_repo_commit": "a8ef99d8"`
	`12`	`+ "regenerated": "2023-09-26 12:21:39.686082",`
	`13`	`+ "spec_repo_commit": "c1694968"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2022-02-24T14:52:00.008Z`
	`1`	`+2023-09-25T19:13:30.824Z`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2022-02-24T14:52:00.155Z`
	`1`	`+2023-09-25T18:27:41.222Z`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2022-04-01T00:41:21.858Z`
	`1`	`+2023-09-25T19:19:28.364Z`