Skip to content

Make this deterministic #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-richey merged 2 commits into from
Dec 1, 2025
Merged

Make this deterministic #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec2839
Make this deterministic
michael-richey Nov 26, 2025
797b7dc
New cassettes
michael-richey Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 20 additions & 11 deletions datadog_sync/model/team_memberships.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,31 @@ async def update_resource(self, _id: str, resource: Dict) -> Tuple[str, Dict]:

async def delete_resource(self, _id: str) -> None:
destination_client = self.config.destination_client
self.destination_team_memberships = await self.get_resources(destination_client)

# check the destination for a matching resource
# Get the state directly without refetching resources to avoid race conditions
# during concurrent cleanups where teams might already be deleted
state = self.config.state.destination[self.resource_type].get(_id, None)
existing = self._get_existing_team_membership(state)

# skip if the membership isn't found at the destination
if not existing:
# skip if the membership isn't found in state
if not state:
raise SkipResource(_id, self.resource_type, f"resource {_id} not found for deletion")

# delete the matching resource
team_id = existing["relationships"]["team"]["data"]["id"]
user_id = existing["relationships"]["user"]["data"]["id"]
await destination_client.delete(
self.team_memberships_path.format(team_id) + f"/{user_id}",
)
# Use team_id and user_id directly from state to avoid race conditions
team_id = state["relationships"]["team"]["data"]["id"]
user_id = state["relationships"]["user"]["data"]["id"]

try:
await destination_client.delete(
self.team_memberships_path.format(team_id) + f"/{user_id}",
)
except Exception as e:
# If we get a 404, the membership or team may have already been deleted
# This can happen during cleanup when teams are deleted concurrently
if "404" in str(e):
raise SkipResource(
_id, self.resource_type, f"resource {_id} or its team not found (may have been already deleted)"
)
raise

def connect_id(self, key: str, r_obj: Dict, resource_to_connect: str) -> Optional[List[str]]:
failed_connections = []
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_cleanup.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:40:18.790823-05:00
2025-11-26T14:29:28.806831-05:00
3,627 changes: 1,900 additions & 1,727 deletions tests/integration/cassettes/test_cli/TestCli.test_cleanup.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_import.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:39:41.254732-05:00
2025-11-26T14:28:50.396758-05:00
22,016 changes: 12,314 additions & 9,702 deletions tests/integration/cassettes/test_cli/TestCli.test_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_import_without_verify_ddr_status.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:39:56.095639-05:00
2025-11-26T14:29:05.284050-05:00
13,616 changes: 6,243 additions & 7,373 deletions tests/integration/cassettes/test_cli/TestCli.test_import_without_verify_ddr_status.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_migrate.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:40:10.917756-05:00
2025-11-26T14:29:20.165545-05:00
51,930 changes: 25,361 additions & 26,569 deletions tests/integration/cassettes/test_cli/TestCli.test_migrate.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_migrate_without_verify_ddr_status.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:40:03.947644-05:00
2025-11-26T14:29:13.146249-05:00
11,946 changes: 5,362 additions & 6,584 deletions tests/integration/cassettes/test_cli/TestCli.test_migrate_without_verify_ddr_status.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_sync.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:39:45.609370-05:00
2025-11-26T14:28:54.901646-05:00
45,013 changes: 22,491 additions & 22,522 deletions tests/integration/cassettes/test_cli/TestCli.test_sync.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_sync_without_verify_ddr_status.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:39:57.839253-05:00
2025-11-26T14:29:07.101721-05:00
36,325 changes: 18,146 additions & 18,179 deletions tests/integration/cassettes/test_cli/TestCli.test_sync_without_verify_ddr_status.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/integration/cassettes/test_cli/TestCli.test_verify_ddr_status_failure.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:39:54.007727-05:00
2025-11-26T14:29:03.256114-05:00
2 changes: 1 addition & 1 deletion ...es/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_no_resource_diffs.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:26.346388-05:00
2025-11-26T14:20:03.620418-05:00
1,454 changes: 781 additions & 673 deletions ...rces/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_no_resource_diffs.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ces/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_cleanup.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:27.837021-05:00
2025-11-26T14:20:05.204535-05:00
2,916 changes: 1,566 additions & 1,350 deletions ...urces/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_cleanup.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...rces/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_import.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:17.330084-05:00
2025-11-26T14:19:54.382862-05:00
1,502 changes: 821 additions & 681 deletions ...ources/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_import_per_file.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:30.922135-05:00
2025-11-26T14:20:08.356803-05:00
1,454 changes: 781 additions & 673 deletions ...ssettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_import_per_file.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ources/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_sync.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:19.580087-05:00
2025-11-26T14:19:56.693396-05:00
1,744 changes: 939 additions & 805 deletions ...esources/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_sync.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ssettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_sync_per_file.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:33.571689-05:00
2025-11-26T14:20:11.014936-05:00
1,744 changes: 939 additions & 805 deletions ...cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_sync_per_file.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_update_sync.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:22.892227-05:00
2025-11-26T14:19:59.917327-05:00
1,754 changes: 944 additions & 810 deletions ...s/cassettes/test_authn_mappings/TestAuthNMappingsResources.test_resource_update_sync.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../test_authn_mappings/TestAuthNMappingsResources.test_resource_update_sync_per_file.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:36.947818-05:00
2025-11-26T14:20:14.431533-05:00
1,754 changes: 944 additions & 810 deletions ...es/test_authn_mappings/TestAuthNMappingsResources.test_resource_update_sync_per_file.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../cassettes/test_dashboard_lists/TestDashboardListsResources.test_no_resource_diffs.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:49.593577-05:00
2025-11-26T14:20:27.687521-05:00
809 changes: 446 additions & 363 deletions ...es/cassettes/test_dashboard_lists/TestDashboardListsResources.test_no_resource_diffs.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...s/cassettes/test_dashboard_lists/TestDashboardListsResources.test_resource_cleanup.frozen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-11-11T09:31:50.607125-05:00
2025-11-26T14:20:28.722680-05:00
Loading
Loading