Fix logs index creation request (#243)

* fix coroutine * update test
DataDog · May 2, 2024 · 0837ba4 · 0837ba4
1 parent 1fb7a57
commit 0837ba4
Show file tree

Hide file tree

Showing 9 changed files with 252 additions and 87 deletions.
diff --git a/datadog_sync/model/logs_indexes.py b/datadog_sync/model/logs_indexes.py
@@ -53,7 +53,7 @@ async def create_resource(self, _id: str, resource: Dict) -> Tuple[str, Dict]:
             return await self.update_resource(_id, resource)
 
         destination_client = self.config.destination_client
-        resp = destination_client.post(self.resource_config.base_path, resource)
+        resp = await destination_client.post(self.resource_config.base_path, resource)
         if not resp.get("daily_limit"):
             resp["disable_daily_limit"] = True
 

diff --git a/...ources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_no_resource_diffs.frozen b/...ources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_no_resource_diffs.frozen
@@ -1 +1 @@
-2023-01-04T16:45:32.434039-05:00
+2024-05-02T10:48:01.497239-04:00
diff --git a/...esources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_no_resource_diffs.yaml b/...esources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_no_resource_diffs.yaml
@@ -0,0 +1,32 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Content-Type:
+      - application/json
+    method: GET
+    uri: https://api.datadoghq.eu/api/v1/logs/config/indexes
+  response:
+    body:
+      string: '{"indexes": [{"name": "gcp-index-name", "filter": {"query": "source:gcp.*"},
+        "num_retention_days": 15, "daily_limit": 200000000, "is_rate_limited": false,
+        "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+00:00"},
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": []},
+        {"name": "test-index", "filter": {"query": "test:filter"}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "-04:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}, {"name": "main", "filter": {"query": "updated"},
+        "num_retention_days": 15, "daily_limit": null, "is_rate_limited": false, "daily_limit_reset":
+        null, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+        [{"name": "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*",
+        "sample_rate": 1.0}}]}, {"name": "new-index", "filter": {"query": ""}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "-04:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}]}'
+    headers:
+      Content-Type:
+      - application/json
+    status:
+      code: 200
+      message: OK
+version: 1
diff --git a/...esources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_import.frozen b/...esources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_import.frozen
@@ -1 +1 @@
-2023-01-04T16:45:04.704113-05:00
+2024-05-02T10:47:07.067663-04:00
diff --git a/.../resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_import.yaml b/.../resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_import.yaml
@@ -2,22 +2,50 @@ interactions:
 - request:
     body: null
     headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate
       Content-Type:
       - application/json
     method: GET
     uri: https://api.datadoghq.com/api/v1/logs/config/indexes
   response:
     body:
-      string: '{"indexes": [{"num_retention_days": 15, "name": "main", "is_rate_limited":
-        false, "filter": {"query": ""}, "exclusion_filters": [{"is_enabled": true,
-        "filter": {"query": "source:gcp.*", "sample_rate": 1.0}, "name": "gcp-filter"}],
-        "daily_limit": null}, {"num_retention_days": 15, "name": "gcp-index-name",
-        "is_rate_limited": false, "filter": {"query": "source:gcp.*"}, "exclusion_filters":
-        [], "daily_limit": 200000000}]}'
+      string: '{"indexes": [{"name": "main", "filter": {"query": ""}, "num_retention_days":
+        15, "daily_limit": null, "is_rate_limited": false, "daily_limit_reset": null,
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": [{"name":
+        "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*", "sample_rate":
+        1.0}}]}, {"name": "gcp-index-name", "filter": {"query": "source:gcp.*"}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "+00:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}, {"name": "new-index", "filter": {"query":
+        ""}, "num_retention_days": 15, "daily_limit": 200000000, "is_rate_limited":
+        false, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "-04:00"},
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": []}]}'
+    headers:
+      Content-Type:
+      - application/json
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Content-Type:
+      - application/json
+    method: GET
+    uri: https://api.datadoghq.eu/api/v1/logs/config/indexes
+  response:
+    body:
+      string: '{"indexes": [{"name": "gcp-index-name", "filter": {"query": "source:gcp.*"},
+        "num_retention_days": 15, "daily_limit": 200000000, "is_rate_limited": false,
+        "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+00:00"},
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": []},
+        {"name": "test-index", "filter": {"query": "test:filter"}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "-04:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}, {"name": "main", "filter": {"query": ""},
+        "num_retention_days": 15, "daily_limit": null, "is_rate_limited": false, "daily_limit_reset":
+        null, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+        [{"name": "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*",
+        "sample_rate": 1.0}}]}]}'
     headers:
       Content-Type:
       - application/json

diff --git a/.../resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_sync.frozen b/.../resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_sync.frozen
@@ -1 +1 @@
-2023-01-04T16:45:04.922666-05:00
+2024-05-02T10:47:07.598960-04:00
diff --git a/...on/resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_sync.yaml b/...on/resources/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_sync.yaml
@@ -2,70 +2,94 @@ interactions:
 - request:
     body: null
     headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate
       Content-Type:
       - application/json
     method: GET
     uri: https://api.datadoghq.eu/api/v1/logs/config/indexes
   response:
     body:
-      string: '{"indexes": [{"num_retention_days": 15, "name": "main", "is_rate_limited":
-        false, "filter": {"query": "updated"}, "exclusion_filters": [{"is_enabled":
-        true, "filter": {"query": "source:gcp.*", "sample_rate": 1.0}, "name": "gcp-filter"}],
-        "daily_limit": null}, {"num_retention_days": 15, "name": "gcp-index-name",
-        "is_rate_limited": false, "filter": {"query": "source:gcp.*updated"}, "exclusion_filters":
-        [], "daily_limit": 200000000}, {"num_retention_days": 15, "name": "test-index",
-        "is_rate_limited": false, "filter": {"query": "source:python OR source:java"},
-        "exclusion_filters": [{"is_enabled": false, "filter": {"query": "*", "sample_rate":
-        1.0}, "name": "payment"}], "daily_limit": null}]}'
-    headers: {}
+      string: '{"indexes": [{"name": "gcp-index-name", "filter": {"query": "source:gcp.*"},
+        "num_retention_days": 15, "daily_limit": 200000000, "is_rate_limited": false,
+        "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset": "+00:00"},
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": []},
+        {"name": "test-index", "filter": {"query": "test:filter"}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "-04:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}, {"name": "main", "filter": {"query": ""},
+        "num_retention_days": 15, "daily_limit": null, "is_rate_limited": false, "daily_limit_reset":
+        null, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+        [{"name": "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*",
+        "sample_rate": 1.0}}]}]}'
+    headers:
+      Content-Type:
+      - application/json
     status:
       code: 200
       message: OK
 - request:
-    body: '{"num_retention_days": 15, "filter": {"query": ""}, "exclusion_filters":
-      [{"is_enabled": true, "filter": {"query": "source:gcp.*", "sample_rate": 1.0},
-      "name": "gcp-filter"}], "disable_daily_limit": true}'
+    body: '{"filter": {"query": ""}, "num_retention_days": 15, "daily_limit_reset":
+      null, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+      [{"name": "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*",
+      "sample_rate": 1.0}}], "disable_daily_limit": true}'
     headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate
       Content-Type:
       - application/json
     method: PUT
     uri: https://api.datadoghq.eu/api/v1/logs/config/indexes/main
   response:
     body:
-      string: '{"num_retention_days": 15, "name": "main", "is_rate_limited": false,
-        "filter": {"query": ""}, "exclusion_filters": [{"is_enabled": true, "filter":
-        {"query": "source:gcp.*", "sample_rate": 1.0}, "name": "gcp-filter"}], "daily_limit":
-        null}'
-    headers: {}
+      string: '{"name": "main", "filter": {"query": ""}, "num_retention_days": 15,
+        "daily_limit": null, "is_rate_limited": false, "daily_limit_reset": null,
+        "daily_limit_warning_threshold_percentage": null, "exclusion_filters": [{"name":
+        "gcp-filter", "is_enabled": true, "filter": {"query": "source:gcp.*", "sample_rate":
+        1.0}}]}'
+    headers:
+      Content-Type:
+      - application/json
     status:
       code: 200
       message: OK
 - request:
-    body: '{"num_retention_days": 15, "filter": {"query": "source:gcp.*"}, "exclusion_filters":
-      [], "daily_limit": 200000000}'
+    body: '{"filter": {"query": "source:gcp.*"}, "num_retention_days": 15, "daily_limit":
+      200000000, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset":
+      "+00:00"}, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+      []}'
     headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate
       Content-Type:
       - application/json
     method: PUT
     uri: https://api.datadoghq.eu/api/v1/logs/config/indexes/gcp-index-name
   response:
     body:
-      string: '{"num_retention_days": 15, "name": "gcp-index-name", "is_rate_limited":
-        false, "filter": {"query": "source:gcp.*"}, "exclusion_filters": [], "daily_limit":
-        200000000}'
-    headers: {}
+      string: '{"name": "gcp-index-name", "filter": {"query": "source:gcp.*"}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "+00:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}'
+    headers:
+      Content-Type:
+      - application/json
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"name": "new-index", "filter": {"query": ""}, "num_retention_days": 15,
+      "daily_limit": 200000000, "daily_limit_reset": {"reset_time": "14:00", "reset_utc_offset":
+      "-04:00"}, "daily_limit_warning_threshold_percentage": null, "exclusion_filters":
+      []}'
+    headers:
+      Content-Type:
+      - application/json
+    method: POST
+    uri: https://api.datadoghq.eu/api/v1/logs/config/indexes
+  response:
+    body:
+      string: '{"name": "new-index", "filter": {"query": ""}, "num_retention_days":
+        15, "daily_limit": 200000000, "is_rate_limited": false, "daily_limit_reset":
+        {"reset_time": "14:00", "reset_utc_offset": "-04:00"}, "daily_limit_warning_threshold_percentage":
+        null, "exclusion_filters": []}'
+    headers:
+      Content-Type:
+      - application/json
     status:
       code: 200
       message: OK

diff --git a/...ces/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_update_sync.frozen b/...ces/cassettes/test_logs_indexes/TestLogsIndexesResources.test_resource_update_sync.frozen
@@ -1 +1 @@
-2023-01-04T16:45:06.611312-05:00
+2024-05-02T10:47:31.096385-04:00