Add support for restricted_roles in synthetics and add additional readOnly fields

datadog_sync/model/synthetics_tests.py

@@ -20,16 +20,22 @@ class SyntheticsTests(BaseResource):
             "synthetics_tests": ["steps.params.subtestPublicId"],
             "synthetics_private_locations": ["locations"],
             "synthetics_global_variables": ["config.configVariables.id"],
+            "roles": ["options.restricted_roles"],
         },
         base_path="/api/v1/synthetics/tests",
-        excluded_attributes=["deleted_at", "org_id", "public_id", "monitor_id", "modified_at", "created_at", "creator"],
-        excluded_attributes_re=[
-            "updatedAt",
-            "notify_audit",
-            "locked",
-            "include_tags",
-            "new_host_delay",
-            "notify_no_data",
+        excluded_attributes=[
+            "deleted_at",
+            "org_id",
+            "public_id",
+            "monitor_id",
+            "modified_at",
+            "created_at",
+            "creator",
+            "created_by",
+            "modified_by",
+            "overall_state",
+            "overall_state_modified",
+            "stepCount",
         ],
     )
     # Additional SyntheticsTests specific attributes

datadog_sync/utils/base_resource.py

@@ -23,7 +23,6 @@ class ResourceConfig:
     resource_connections: Optional[Dict[str, List[str]]] = None
     non_nullable_attr: Optional[List[str]] = None
     excluded_attributes: Optional[List[str]] = None
-    excluded_attributes_re: Optional[List[str]] = None
     concurrent: bool = True
     source_resources: dict = field(default_factory=dict)
     destination_resources: dict = field(default_factory=dict)

datadog_sync/utils/resource_utils.py

@@ -102,7 +102,6 @@ def check_diff(resource_config, resource, state):
         state,
         ignore_order=True,
         exclude_paths=resource_config.excluded_attributes,
-        exclude_regex_paths=resource_config.excluded_attributes_re,
     )
 
 

tests/integration/cassettes/test_cli/TestCli.test_cleanup.frozen

@@ -1 +1 @@
-2023-05-03T13:03:39.945490-04:00
+2023-07-13T11:45:13.357791-04:00

tests/integration/cassettes/test_cli/TestCli.test_import.frozen

@@ -1 +1 @@
-2023-05-03T13:02:51.436026-04:00
+2023-07-13T11:44:26.267672-04:00

tests/integration/cassettes/test_cli/TestCli.test_sync.frozen

@@ -1 +1 @@
-2023-05-03T13:02:56.036879-04:00
+2023-07-13T11:44:30.260569-04:00

tests/integration/test_cli.py

@@ -102,6 +102,22 @@ def test_cleanup(self, runner):
                 "--skip-failed-resource-connections=False",
             ],
         )
+        if ret.exit_code != 0:
+            # Retry cleanup if there was an error on the previous run.
+            # We currently do not build a graph for cleanup hence we run into situations where
+            # we attemp to delete resources before its usage areas are cleanup.
+            # E.g. synthetics global variable is attempted to be deleted before the
+            # synthetics test using it.
+            ret = runner.invoke(
+                cli,
+                [
+                    "sync",
+                    "--validate=false",
+                    f"--resources={self.resources}",
+                    "--cleanup=force",
+                    "--skip-failed-resource-connections=False",
+                ],
+            )
         assert not ret.output
         assert 0 == ret.exit_code